gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] [gnunet] 13/18: Cleanup TODOs, bugfix in cleanup and start


From: gnunet
Subject: [GNUnet-SVN] [gnunet] 13/18: Cleanup TODOs, bugfix in cleanup and start of bidirectional chain resolution: - removed and/or implemented all remaining TODOs - fixed a bug in cleanup_handle() which caused to not cleanup correctly when a solution was prematurely found - delegation_chain_bw/fw_resolution_start() not has a return value to indicate whether a solution was prematurely found - cleaned up the test_... files (an additional cleanup commit might follow)
Date: Mon, 07 Oct 2019 12:31:09 +0200

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

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 3099a7c25cf6b11b0f1909e5a2651d65c0e921c7
Author: Andreas Ebner <address@hidden>
AuthorDate: Fri Sep 20 10:49:02 2019 +0200

    Cleanup TODOs, bugfix in cleanup and start of bidirectional chain 
resolution:
    - removed and/or implemented all remaining TODOs
    - fixed a bug in cleanup_handle() which caused to not cleanup correctly 
when a solution was prematurely found
    - delegation_chain_bw/fw_resolution_start() not has a return value to 
indicate whether a solution was prematurely found
    - cleaned up the test_... files (an additional cleanup commit might follow)
---
 po/POTFILES.in                                     |   43 +-
 po/de.po                                           | 2298 ++++++++---------
 po/es.po                                           | 2646 +++++++++----------
 po/fr.po                                           | 2323 ++++++++---------
 po/it.po                                           | 2683 ++++++++------------
 po/sv.po                                           | 2510 +++++++++---------
 po/vi.po                                           | 2357 ++++++++---------
 po/zh_CN.po                                        | 2268 ++++++++---------
 src/credential/credential_api.c                    |    3 +-
 src/credential/gnunet-credential.c                 |   17 +-
 src/credential/gnunet-service-credential.c         |   62 +-
 src/credential/test_credential_bi_and.sh           |    4 +-
 src/credential/test_credential_bi_and2.sh          |    4 +-
 src/credential/test_credential_bi_and3.sh          |    6 +-
 ...tial_own_and2.sh => test_credential_bi_and4.sh} |    4 +-
 src/credential/test_credential_bi_bw.sh            |    4 +-
 src/credential/test_credential_bi_bw_link.sh       |    4 +-
 src/credential/test_credential_bi_bw_link2.sh      |    4 +-
 src/credential/test_credential_bi_fw.sh            |    4 +-
 src/credential/test_credential_issue.sh            |    9 +-
 src/credential/test_credential_own.sh              |   27 +-
 src/credential/test_credential_verify.sh           |   41 +-
 src/credential/test_credential_verify_and.sh       |   50 +-
 src/credential/test_credential_verify_simple.sh    |   30 +-
 24 files changed, 7814 insertions(+), 9587 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1a6a4a67d..b564be17a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -87,8 +87,8 @@ src/core/gnunet-service-core_kx.c
 src/core/gnunet-service-core_sessions.c
 src/core/gnunet-service-core_typemap.c
 src/credential/credential_api.c
-src/credential/credential_misc.c
 src/credential/credential_serialization.c
+src/credential/delegate_misc.c
 src/credential/gnunet-credential.c
 src/credential/gnunet-service-credential.c
 src/credential/plugin_gnsrecord_credential.c
@@ -131,6 +131,7 @@ src/dns/gnunet-zonewalk.c
 src/dns/plugin_block_dns.c
 src/exit/gnunet-daemon-exit.c
 src/exit/gnunet-helper-exit.c
+src/exit/gnunet-helper-exit-windows.c
 src/fragmentation/defragmentation.c
 src/fragmentation/fragmentation.c
 src/fs/fs_api.c
@@ -177,6 +178,7 @@ src/gns/gnunet-bcd.c
 src/gns/gnunet-dns2gns.c
 src/gns/gnunet-gns-benchmark.c
 src/gns/gnunet-gns.c
+src/gns/gnunet-gns-helper-service-w32.c
 src/gns/gnunet-gns-import.c
 src/gns/gnunet-gns-proxy.c
 src/gns/gnunet-service-gns.c
@@ -192,6 +194,10 @@ src/gnsrecord/gnsrecord_crypto.c
 src/gnsrecord/gnsrecord_misc.c
 src/gnsrecord/gnsrecord_serialization.c
 src/gnsrecord/plugin_gnsrecord_dns.c
+src/gns/w32nsp.c
+src/gns/w32nsp-install.c
+src/gns/w32nsp-resolve.c
+src/gns/w32nsp-uninstall.c
 src/hello/address.c
 src/hello/gnunet-hello.c
 src/hello/hello.c
@@ -203,7 +209,6 @@ src/identity/gnunet-identity.c
 src/identity/gnunet-service-identity.c
 src/identity/identity_api.c
 src/identity/identity_api_lookup.c
-src/identity/identity_api_suffix_lookup.c
 src/identity/plugin_rest_identity.c
 src/json/json.c
 src/json/json_generator.c
@@ -226,7 +231,7 @@ src/namestore/gnunet-service-namestore.c
 src/namestore/gnunet-zoneimport.c
 src/namestore/namestore_api.c
 src/namestore/namestore_api_monitor.c
-src/namestore/plugin_namestore_flat.c
+src/namestore/plugin_namestore_heap.c
 src/namestore/plugin_namestore_postgres.c
 src/namestore/plugin_namestore_sqlite.c
 src/namestore/plugin_rest_namestore.c
@@ -238,7 +243,9 @@ src/nat-auto/gnunet-service-nat-auto_legacy.c
 src/nat-auto/nat_auto_api.c
 src/nat-auto/nat_auto_api_test.c
 src/nat/gnunet-helper-nat-client.c
+src/nat/gnunet-helper-nat-client-windows.c
 src/nat/gnunet-helper-nat-server.c
+src/nat/gnunet-helper-nat-server-windows.c
 src/nat/gnunet-nat.c
 src/nat/gnunet-service-nat.c
 src/nat/gnunet-service-nat_externalip.c
@@ -298,7 +305,6 @@ src/regex/regex_test_graph.c
 src/regex/regex_test_lib.c
 src/regex/regex_test_random.c
 src/rest/gnunet-rest-server.c
-src/rest/plugin_rest_config.c
 src/rest/plugin_rest_copying.c
 src/rest/rest.c
 src/revocation/gnunet-revocation.c
@@ -398,6 +404,7 @@ src/transport/gnunet-service-transport_neighbours.c
 src/transport/gnunet-service-transport_plugins.c
 src/transport/gnunet-service-transport_validation.c
 src/transport/gnunet-transport.c
+src/transport/gnunet-transport-certificate-creation.c
 src/transport/gnunet-transport-profiler.c
 src/transport/gnunet-transport-wlan-receiver.c
 src/transport/gnunet-transport-wlan-sender.c
@@ -415,6 +422,7 @@ src/transport/tcp_connection_legacy.c
 src/transport/tcp_server_legacy.c
 src/transport/tcp_server_mst_legacy.c
 src/transport/tcp_service_legacy.c
+src/transport/transport_api2_address.c
 src/transport/transport_api2_application.c
 src/transport/transport_api2_communication.c
 src/transport/transport_api2_core.c
@@ -427,7 +435,6 @@ src/transport/transport_api_manipulation.c
 src/transport/transport_api_monitor_peers.c
 src/transport/transport_api_monitor_plugins.c
 src/transport/transport_api_offer_hello.c
-src/transport/transport-testing2.c
 src/transport/transport-testing.c
 src/transport/transport-testing-filenames.c
 src/transport/transport-testing-loggers.c
@@ -449,7 +456,6 @@ src/util/container_multihashmap32.c
 src/util/container_multihashmap.c
 src/util/container_multipeermap.c
 src/util/container_multishortmap.c
-src/util/container_multiuuidmap.c
 src/util/crypto_abe.c
 src/util/crypto_crc.c
 src/util/crypto_ecc.c
@@ -472,11 +478,13 @@ src/util/getopt_helpers.c
 src/util/gnunet-config.c
 src/util/gnunet-config-diff.c
 src/util/gnunet-ecc.c
+src/util/gnunet-helper-w32-console.c
 src/util/gnunet-qr.c
 src/util/gnunet-resolver.c
 src/util/gnunet-scrypt.c
 src/util/gnunet-service-resolver.c
 src/util/gnunet-timeout.c
+src/util/gnunet-timeout-w32.c
 src/util/gnunet-uri.c
 src/util/helper.c
 src/util/load.c
@@ -502,36 +510,21 @@ src/util/speedup.c
 src/util/strings.c
 src/util/time.c
 src/util/tun.c
+src/util/w32cat.c
+src/util/win.c
+src/util/winproc.c
 src/vpn/gnunet-helper-vpn.c
+src/vpn/gnunet-helper-vpn-windows.c
 src/vpn/gnunet-service-vpn.c
 src/vpn/gnunet-vpn.c
 src/vpn/vpn_api.c
 src/zonemaster/gnunet-service-zonemaster.c
 src/zonemaster/gnunet-service-zonemaster-monitor.c
 src/fs/fs_api.h
-src/fs/fs_publish_ublock.h
-src/fs/gnunet-service-fs_cp.h
-src/fs/gnunet-service-fs.h
-src/fs/gnunet-service-fs_pe.h
-src/fs/gnunet-service-fs_pr.h
-src/fs/gnunet-service-fs_push.h
-src/fs/gnunet-service-fs_put.h
 src/include/compat.h
-src/include/gnunet_bio_lib.h
 src/include/gnunet_common.h
 src/include/gnunet_mq_lib.h
-src/include/gnunet_network_lib.h
 src/include/gnunet_time_lib.h
-src/nat/gnunet-service-nat_helper.h
-src/nat/gnunet-service-nat_mini.h
-src/nat/gnunet-service-nat_stun.h
 src/scalarproduct/scalarproduct.h
 src/testbed/testbed_api.h
-src/testbed/testbed_api_hosts.h
 src/testbed/testbed_api_operations.h
-src/testbed/testbed_api_peers.h
-src/testbed/testbed_api_sd.h
-src/testbed/testbed_api_topology.h
-src/transport/transport-testing.h
-src/util/disk.h
-src/util/speedup.h
diff --git a/po/de.po b/po/de.po
index 948c9c4f5..b074954f2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden\n"
-"POT-Creation-Date: 2019-02-09 22:07+0000\n"
+"POT-Creation-Date: 2019-09-04 12:56+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"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.7.4\n"
 
@@ -226,8 +226,7 @@ msgid "Control services and the Automated Restart Manager 
(ARM)"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:388 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
+#: src/transport/tcp_service_legacy.c:557
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
@@ -236,36 +235,30 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3829
-#: src/transport/plugin_transport_xt.c:1139
-#: src/transport/plugin_transport_xt.c:1145
-#: src/transport/plugin_transport_xt.c:3833
+#: src/transport/plugin_transport_tcp.c:3835
 #: src/transport/tcp_service_legacy.c:576
-#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
-#: src/util/service.c:643
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1150
+#: src/util/service.c:1156
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:457 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
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
+#: src/util/service.c:1195
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:462 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
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
+#: src/util/service.c:1200
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:495 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
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1236
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -273,8 +266,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:517 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
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1254
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -282,8 +274,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:556
 #: src/transport/plugin_transport_http_server.c:2688
 #: 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
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1295
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
@@ -291,8 +282,7 @@ msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
 #: src/arm/gnunet-service-arm.c:575
 #: src/transport/plugin_transport_http_server.c:2706
 #: 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
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1315
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -363,14 +353,139 @@ 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-new.c:756
+#: 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/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/plugin_ats2_common.c:90
+#, c-format
+msgid ""
+"Could not load %s quota for network `%s': `%s', assigning default bandwidth "
+"%llu\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:1870
+#, 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:1914
+#, 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:2476
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
+#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
+#: src/ats/plugin_ats_mlp.c:2602 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:2671
+#, 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:2680
+#, 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:2690
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2699
+#, 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
@@ -382,6 +497,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 ""
@@ -389,17 +513,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"
@@ -517,131 +630,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-new.c:733
-#: 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/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/plugin_ats2_common.c:90
-#, c-format
-msgid ""
-"Could not load %s quota for network `%s': `%s', assigning default bandwidth %"
-"llu\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:1870
-#, 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:1914
-#, 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:2476
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
-#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
-#: src/ats/plugin_ats_mlp.c:2602 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:2671
-#, 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:2680
-#, 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:2690
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2699
-#, 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 ""
@@ -773,28 +761,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:120
-#, 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:216
-#, 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:277
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1052,8 +1018,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:120
+#, 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:216
+#, 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 "Fehler beim Lesen aus STDIN: %d %s\n"
@@ -1351,7 +1339,7 @@ msgid "# valid ephemeral keys received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
 #: src/core/gnunet-service-core_kx.c:1180
-#: src/transport/gnunet-service-transport_validation.c:1128
+#: src/transport/gnunet-service-transport_validation.c:1129
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
@@ -1376,7 +1364,7 @@ msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
 #: src/core/gnunet-service-core_kx.c:1351
-#: src/transport/gnunet-service-transport_validation.c:1461
+#: src/transport/gnunet-service-transport_validation.c:1462
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -1482,129 +1470,149 @@ msgstr "# Bytes empfangen über TCP"
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/credential/credential_misc.c:88
-#, fuzzy, c-format
-msgid "Unable to parse CRED record string `%s'\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-
-#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:994
+#: src/credential/gnunet-credential.c:381 src/namestore/gnunet-namestore.c:994
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/credential/gnunet-credential.c:280
-#: src/credential/gnunet-credential.c:434
+#: src/credential/gnunet-credential.c:397
+#: src/credential/gnunet-credential.c:859
 #, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:361
-#: src/credential/gnunet-credential.c:423
+#: src/credential/gnunet-credential.c:532
+#: src/credential/gnunet-service-credential.c:1728
+#: src/namestore/gnunet-namestore.c:1019
+#: src/namestore/gnunet-namestore-fcfsd.c:1138
+#, fuzzy, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/credential/gnunet-credential.c:798
+#: src/credential/gnunet-credential.c:849
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/credential/gnunet-credential.c:372
-#: src/credential/gnunet-credential.c:444
+#: src/credential/gnunet-credential.c:807
+#: src/credential/gnunet-credential.c:868
 #, fuzzy, c-format
 msgid "Failed to connect to CREDENTIAL\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/credential/gnunet-credential.c:379
+#: src/credential/gnunet-credential.c:813
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:387
+#: src/credential/gnunet-credential.c:820
 #, fuzzy, c-format
 msgid "ego required\n"
 msgstr "Gültiger Typ ist erforderlich\n"
 
-#: src/credential/gnunet-credential.c:403
+#: src/credential/gnunet-credential.c:830
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:414
+#: src/credential/gnunet-credential.c:839
 #, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:451
+#: src/credential/gnunet-credential.c:874
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:504
-#, fuzzy, c-format
-msgid "Issuer ego required\n"
-msgstr "Gültiger Typ ist erforderlich\n"
-
-#: src/credential/gnunet-credential.c:516
+#: src/credential/gnunet-credential.c:930
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:536
-msgid "create credential"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:540
+#: src/credential/gnunet-credential.c:951
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:545
+#: src/credential/gnunet-credential.c:958
 #, fuzzy
-msgid "The public key of the subject to lookup the credential for"
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/credential/gnunet-credential.c:550
-msgid "The name of the credential presented by the subject"
+#: src/credential/gnunet-credential.c:965
+msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:555
+#: src/credential/gnunet-credential.c:972
 msgid "The public key of the authority to verify the credential against"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:560
-msgid "The ego to use"
+#: src/credential/gnunet-credential.c:977
+msgid "The ego/zone name to use"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:565
+#: src/credential/gnunet-credential.c:983
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:570
-msgid "The time to live for the credential"
+#: src/credential/gnunet-credential.c:989
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/credential/gnunet-credential.c:574
+#: src/credential/gnunet-credential.c:994
 msgid "collect credentials"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:588
+#: src/credential/gnunet-credential.c:999
+msgid "Create and issue a credential issuer side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1004
+msgid "Issue a credential subject side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1009
+msgid "Create, sign and return a credential subject side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1016
+msgid "Import signed credentials that should be issued to a zone/ego"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1020
+msgid "Create private record entry."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1026
+#: src/credential/gnunet-credential.c:1032
+msgid "Indicates that the collect/verify process is done via forward search."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1045
 #, fuzzy
 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:185
+#: src/credential/gnunet-service-credential.c:1723 src/gns/gnunet-gns.c:185
+#: 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:1138
-#: src/namestore/gnunet-namestore.c:1019
-#, fuzzy, c-format
-msgid "Failed to connect to namestore\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/credential/plugin_gnsrecord_credential.c:186
+#: src/credential/plugin_gnsrecord_credential.c:182
 #, fuzzy, c-format
 msgid "Unable to parse ATTR record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
+#: src/credential/plugin_rest_credential.c:1128
+#, fuzzy
+msgid "GNS REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:311
 #: src/datastore/gnunet-service-datastore.c:757
 msgid "# bytes stored"
@@ -1655,14 +1663,12 @@ msgstr ""
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_sqlite.c:53
 #: src/peerstore/plugin_peerstore_sqlite.c:52
-#: src/psycstore/plugin_psycstore_mysql.c:62
-#: src/reclaim/plugin_reclaim_sqlite.c:52
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:818 src/include/gnunet_common.h:827
+#: src/include/gnunet_common.h:840 src/include/gnunet_common.h:849
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1672,7 +1678,6 @@ msgstr "»%s« schlug bei %s:%d mit dem Fehler %s fehl\n"
 #: src/datastore/plugin_datastore_sqlite.c:508
 #: src/namecache/plugin_namecache_sqlite.c:229
 #: src/namestore/plugin_namestore_sqlite.c:265
-#: src/reclaim/plugin_reclaim_sqlite.c:336
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1983,22 +1988,20 @@ msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
 
 #: src/datastore/plugin_datastore_mysql.c:1180
-#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr "MySQL-Datenbank läuft\n"
 
-#: src/datastore/plugin_datastore_postgres.c:276
-#: src/datastore/plugin_datastore_postgres.c:893
+#: src/datastore/plugin_datastore_postgres.c:280
+#: src/datastore/plugin_datastore_postgres.c:897
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:854
+#: src/datastore/plugin_datastore_postgres.c:858
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:952
-#: src/psycstore/plugin_psycstore_postgres.c:1506
+#: src/datastore/plugin_datastore_postgres.c:956
 msgid "Postgres database running\n"
 msgstr "PostgreSQL-Datenbank läuft\n"
 
@@ -2014,8 +2017,6 @@ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 #: src/namecache/plugin_namecache_sqlite.c:173
 #: src/namestore/plugin_namestore_sqlite.c:206
 #: src/peerstore/plugin_peerstore_sqlite.c:535
-#: src/psycstore/plugin_psycstore_sqlite.c:325
-#: src/reclaim/plugin_reclaim_sqlite.c:212
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
@@ -2037,8 +2038,7 @@ msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1405
 #: src/namecache/plugin_namecache_sqlite.c:557
-#: src/namestore/plugin_namestore_sqlite.c:750
-#: src/reclaim/plugin_reclaim_sqlite.c:711
+#: src/namestore/plugin_namestore_sqlite.c:751
 msgid "Sqlite database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
@@ -2108,6 +2108,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 src/rps/gnunet-rps-profiler.c:3083
+#, 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:300
+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 ""
@@ -2372,53 +2419,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 src/rps/gnunet-rps-profiler.c:2953
-#, 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"
@@ -2503,11 +2503,6 @@ msgstr ""
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:175
-#, fuzzy
-msgid "Print information about DV state"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
 #: src/exit/gnunet-daemon-exit.c:960
 #, fuzzy
 msgid "# TCP packets sent via TUN"
@@ -2960,62 +2955,67 @@ msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
-#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
+#: src/fs/fs_publish.c:725
+#, fuzzy, c-format
+msgid "Can not index file `%s': %s.\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
+
+#: src/fs/fs_publish.c:782 src/fs/fs_publish.c:827 src/fs/fs_publish.c:848
+#: src/fs/fs_publish.c:878 src/fs/fs_publish.c:1144
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/fs/fs_publish.c:780
+#: src/fs/fs_publish.c:784
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "Anfrage an den Transportdienst konnte nicht gestellt werden\n"
 
-#: src/fs/fs_publish.c:825
+#: src/fs/fs_publish.c:829
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:845
+#: src/fs/fs_publish.c:849
 msgid "filename too long"
 msgstr "Dateiname zu lang"
 
-#: src/fs/fs_publish.c:876
+#: src/fs/fs_publish.c:880
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:902
+#: src/fs/fs_publish.c:906
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
+#: src/fs/fs_publish.c:995 src/fs/fs_publish.c:1031
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1094
+#: src/fs/fs_publish.c:1098
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/fs/fs_publish.c:1102
+#: src/fs/fs_publish.c:1106
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:1142
+#: src/fs/fs_publish.c:1146
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1381
+#: src/fs/fs_publish.c:1385
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "Verbindung fehlgeschlagen: %s\n"
 
-#: src/fs/fs_publish.c:1472
+#: src/fs/fs_publish.c:1476
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3089,96 +3089,96 @@ msgstr "Es konnte keine Verbindung mit gnunetd 
hergestellt werden."
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_uri.c:234
+#: src/fs/fs_uri.c:236
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:293
+#: src/fs/fs_uri.c:295
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:311
+#: src/fs/fs_uri.c:313
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:318
+#: src/fs/fs_uri.c:320
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:388
+#: src/fs/fs_uri.c:390
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:429
+#: src/fs/fs_uri.c:431
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:444
+#: src/fs/fs_uri.c:446
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:523
+#: src/fs/fs_uri.c:525
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:538
+#: src/fs/fs_uri.c:540
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:548
+#: src/fs/fs_uri.c:550
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:556
+#: src/fs/fs_uri.c:558
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:566
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:570
+#: src/fs/fs_uri.c:572
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:576
+#: src/fs/fs_uri.c:578
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:587
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:591
+#: src/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:609
+#: src/fs/fs_uri.c:611
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:645
 #, fuzzy
 msgid "invalid argument"
 msgstr "Ungültiges Argument »%s«\n"
 
-#: src/fs/fs_uri.c:655
+#: src/fs/fs_uri.c:657
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1092
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3218,11 +3218,11 @@ msgstr "Sie dürfen nur eine Datei zum Deindizieren 
angeben.\n"
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad LEVEL an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:907
+#: src/fs/gnunet-auto-share.c:772
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:907
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
@@ -3305,7 +3305,7 @@ msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
 #: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:215 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3329,12 +3329,12 @@ msgid "Target filename must be specified.\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:872
-#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:273 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:312
+#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:315
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 
@@ -3342,7 +3342,7 @@ msgstr "Den Grad LEVEL der gewünschten 
Empfänger-Anonymität setzen"
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:316
+#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3368,6 +3368,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 ""
@@ -3384,15 +3393,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"
@@ -3484,7 +3484,7 @@ msgstr ""
 
 #: src/fs/gnunet-publish.c:687
 #, fuzzy
-msgid "Internal error scanning directory.\n"
+msgid "Error scanning directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
 #: src/fs/gnunet-publish.c:715
@@ -3529,6 +3529,10 @@ msgstr "Option `%s' macht keinen Sinn ohne die Option 
`%s'.\n"
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n"
 
+#: src/fs/gnunet-publish.c:911
+msgid "enable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
 #: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
@@ -3601,33 +3605,33 @@ msgstr ""
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:204
+#: src/fs/gnunet-search.c:207
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/fs/gnunet-search.c:260
+#: src/fs/gnunet-search.c:263
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:284
+#: src/fs/gnunet-search.c:287
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/fs/gnunet-search.c:321
+#: src/fs/gnunet-search.c:324
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:329
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:332
+#: src/fs/gnunet-search.c:335
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:348
+#: src/fs/gnunet-search.c:351
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -4039,39 +4043,39 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:203
+#: src/gns/gnunet-dns2gns.c:214
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:405
+#: src/gns/gnunet-dns2gns.c:416
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:421
+#: src/gns/gnunet-dns2gns.c:432
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/gns/gnunet-dns2gns.c:429
+#: src/gns/gnunet-dns2gns.c:440
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:588
+#: src/gns/gnunet-dns2gns.c:600
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:688
+#: src/gns/gnunet-dns2gns.c:748
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:693
+#: src/gns/gnunet-dns2gns.c:753
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:710
+#: src/gns/gnunet-dns2gns.c:770
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4087,6 +4091,29 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:199
+#, 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 ""
@@ -4121,130 +4148,107 @@ 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:980
+#: src/gns/gnunet-gns-proxy.c:989
 #, 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:1005
+#: src/gns/gnunet-gns-proxy.c:1014
 #, 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:1026
+#: src/gns/gnunet-gns-proxy.c:1035
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1041
+#: src/gns/gnunet-gns-proxy.c:1050
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gns/gnunet-gns-proxy.c:1056
+#: src/gns/gnunet-gns-proxy.c:1065
 #, 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:1066
+#: src/gns/gnunet-gns-proxy.c:1075
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1090
+#: src/gns/gnunet-gns-proxy.c:1099
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1221
+#: src/gns/gnunet-gns-proxy.c:1230
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2121
+#: src/gns/gnunet-gns-proxy.c:2131
 #, 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:2642
+#: src/gns/gnunet-gns-proxy.c:2652
 #, 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:2674
+#: src/gns/gnunet-gns-proxy.c:2684
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2875
+#: src/gns/gnunet-gns-proxy.c:2885
 #, 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:2897 src/rest/gnunet-rest-server.c:658
+#: src/gns/gnunet-gns-proxy.c:2907 src/rest/gnunet-rest-server.c:668
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3233
+#: src/gns/gnunet-gns-proxy.c:3243
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3262
+#: src/gns/gnunet-gns-proxy.c:3272
 #, 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:3345
+#: src/gns/gnunet-gns-proxy.c:3355
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3635
+#: src/gns/gnunet-gns-proxy.c:3693
 #, 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:3763
+#: src/gns/gnunet-gns-proxy.c:3821
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3768
+#: src/gns/gnunet-gns-proxy.c:3826
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3772
+#: src/gns/gnunet-gns-proxy.c:3830
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3798
+#: src/gns/gnunet-gns-proxy.c:3856
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199
-#, 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:506
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4256,8 +4260,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:561
-#: 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"
@@ -4351,6 +4355,11 @@ msgstr "Fehler beim Speichern der Konfigurationsdatei 
`%s':"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
+#: src/gns/plugin_rest_gns.c:452
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
 #: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4739,7 +4748,7 @@ msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2814
+#: src/transport/gnunet-service-transport.c:2827
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -4869,15 +4878,15 @@ msgstr "Fehler beim Speichern der Konfigurationsdatei 
`%s':"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
+#: src/identity/plugin_rest_identity.c:1297
+msgid "Identity REST API initialized\n"
+msgstr ""
+
 #: src/json/json.c:123
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
-msgid "This command doesn't do anything yet."
-msgstr ""
-
 #: src/my/my.c:196 src/my/my.c:215
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
@@ -4943,8 +4952,8 @@ msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
 #: src/namecache/plugin_namecache_flat.c:121
 #: src/namecache/plugin_namecache_flat.c:255
-#: src/namestore/plugin_namestore_heap.c:148
-#: src/namestore/plugin_namestore_heap.c:395
+#: src/namestore/plugin_namestore_heap.c:179
+#: src/namestore/plugin_namestore_heap.c:412
 #: src/peerstore/plugin_peerstore_flat.c:379
 #: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
@@ -4952,14 +4961,14 @@ msgid "Unable to initialize file: %s.\n"
 msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
 
 #: src/namecache/plugin_namecache_flat.c:132
-#: src/namestore/plugin_namestore_heap.c:159
+#: src/namestore/plugin_namestore_heap.c:190
 #: src/peerstore/plugin_peerstore_flat.c:394
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
 #: src/namecache/plugin_namecache_flat.c:151
-#: src/namestore/plugin_namestore_heap.c:172
+#: src/namestore/plugin_namestore_heap.c:203
 #: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
@@ -4978,70 +4987,6 @@ msgstr "Sqlite-Datenbank läuft\n"
 msgid "Failed to setup database at `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:549
-#, 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:576
-#, 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:597
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:629
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:689
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:777
-#, 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:796
-#, 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:832
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:841
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1071
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1099
-#, 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:1147
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1173
-msgid "name of the zone that is to be managed by FCFSD"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1192
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
-
 #: src/namestore/gnunet-namestore.c:341
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -5246,6 +5191,70 @@ msgstr ""
 msgid "name of the ego controlling the zone"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-fcfsd.c:549
+#, 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:576
+#, 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:597
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:629
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:689
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:777
+#, 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:796
+#, 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:832
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:841
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1099
+#, 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:1147
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1173
+msgid "name of the zone that is to be managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1192
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
 #: src/namestore/gnunet-service-namestore.c:900
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
@@ -5263,11 +5272,16 @@ msgstr ""
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_heap.c:778
+#: src/namestore/plugin_namestore_heap.c:773
 #, fuzzy
 msgid "heap file database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
+#: src/namestore/plugin_rest_namestore.c:1079
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
 #: src/nat-auto/gnunet-nat-auto.c:193
 #, fuzzy
 msgid "Suggested configuration changes:\n"
@@ -5553,6 +5567,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 ""
@@ -5577,15 +5595,68 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-nse.c:122
-msgid "Show network size estimates from 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/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/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
@@ -5597,7 +5668,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:299
-#: src/rest-plugins/plugin_rest_peerinfo.c:501
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
@@ -5656,83 +5727,31 @@ msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:897
 #, fuzzy
-msgid "Print information about peers."
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:168
-#, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:173
-#, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:208
-#, fuzzy, c-format
-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"
+msgid "Print information about peers."
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/peerinfo/gnunet-service-peerinfo.c:667
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
+#: src/transport/gnunet-service-transport_plugins.c:168
 #, fuzzy, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
+msgid "Starting transport plugins `%s'\n"
+msgstr "Teste Transport(e) %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1100
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:173
 #, 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 ""
+msgid "Loading `%s' transport plugin\n"
+msgstr "Teste Transport(e) %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1451
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:208
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/peerinfo/peerinfo_api.c:220
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:796
 #, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
+msgid "Peerinfo REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
 
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
@@ -5743,21 +5762,20 @@ msgstr ""
 msgid "Could not load database backend `%s'\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/peerstore/peerstore_api.c:532 src/peerstore/peerstore_api.c:581
+#: src/peerstore/peerstore_api.c:605 src/peerstore/peerstore_api.c:657
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:595
+#: src/peerstore/peerstore_api.c:671
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/peerstore/peerstore_api.c:731
+#: src/peerstore/peerstore_api.c:807
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
 #: src/peerstore/plugin_peerstore_sqlite.c:453
-#: src/psycstore/plugin_psycstore_sqlite.c:282
 #, c-format
 msgid ""
 "Error executing SQL query: %s\n"
@@ -5765,8 +5783,6 @@ msgid ""
 msgstr ""
 
 #: src/peerstore/plugin_peerstore_sqlite.c:488
-#: src/psycstore/plugin_psycstore_mysql.c:250
-#: src/psycstore/plugin_psycstore_sqlite.c:259
 #, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
@@ -5783,114 +5799,6 @@ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
 msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:249
-#, fuzzy
-msgid "Failed to store membership information!\n"
-msgstr "Fehler beim Speichern der Konfiguration!"
-
-#: src/psycstore/gnunet-service-psycstore.c:271
-#, fuzzy
-msgid "Failed to test membership!\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:300
-#, fuzzy
-msgid "Dropping invalid fragment\n"
-msgstr "Ungültiges Argument »%s«\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:311
-#, fuzzy
-msgid "Failed to store fragment\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:368
-#, fuzzy
-msgid "Failed to get fragment!\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:434
-#, fuzzy
-msgid "Failed to get message!\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:464
-#, fuzzy
-msgid "Failed to get message fragment!\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:494
-#, fuzzy
-msgid "Failed to get master counters!\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:675
-#, fuzzy, c-format
-msgid "Failed to begin modifying state: %d\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:685
-#, fuzzy, c-format
-msgid "Failed to modify state: %d\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:693
-#, fuzzy
-msgid "Failed to end modifying state!\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:730
-#, fuzzy
-msgid "Tried to set invalid state variable name!\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:744
-#, fuzzy
-msgid "Failed to begin synchronizing state!\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:761
-#, fuzzy
-msgid "Failed to end synchronizing state!\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:779
-#: src/psycstore/gnunet-service-psycstore.c:795
-#, fuzzy
-msgid "Failed to reset state!\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:824
-#: src/psycstore/gnunet-service-psycstore.c:881
-#, fuzzy
-msgid "Tried to get invalid state variable name!\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:851
-#: src/psycstore/gnunet-service-psycstore.c:896
-#, fuzzy
-msgid "Failed to get state variable!\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
-
-#: src/psycstore/plugin_psycstore_mysql.c:281
-#, fuzzy
-msgid "Unable to initialize Mysql.\n"
-msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
-
-#: src/psycstore/plugin_psycstore_mysql.c:291
-#, fuzzy, c-format
-msgid "Failed to run SQL statement `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:61
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s (%d)\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:1924
-#, fuzzy
-msgid "SQLite database running\n"
-msgstr "SQL Datenbank beschädigt, Ergebnis wird ignoriert.\n"
-
 #: src/pt/gnunet-daemon-pt.c:423
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
@@ -5954,61 +5862,79 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:467
+#: src/reclaim/gnunet-reclaim.c:495
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/reclaim/gnunet-reclaim.c:475
+#: src/reclaim/gnunet-reclaim.c:501
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:483
+#: src/reclaim/gnunet-reclaim.c:507
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/reclaim/gnunet-reclaim.c:506
-msgid "Add attribute"
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "Add an attribute NAME"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:527
+msgid "Add an attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:512
-msgid "Attribute value"
+#: src/reclaim/gnunet-reclaim.c:530
+msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:517
-msgid "Ego"
+#: src/reclaim/gnunet-reclaim.c:533
+msgid "The EGO to use"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:522
-msgid "Audience (relying party)"
+#: src/reclaim/gnunet-reclaim.c:535
+msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:526
-msgid "List attributes for Ego"
+#: src/reclaim/gnunet-reclaim.c:538
+msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:531
-msgid "Issue a ticket"
+#: src/reclaim/gnunet-reclaim.c:542
+msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:536
+#: src/reclaim/gnunet-reclaim.c:545
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:541
+#: src/reclaim/gnunet-reclaim.c:548
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:546
+#: src/reclaim/gnunet-reclaim.c:551
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:551
+#: src/reclaim/gnunet-reclaim.c:553
+msgid "List tickets of ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:556
 msgid "Expiration interval of the attribute"
 msgstr ""
 
+#: src/reclaim/gnunet-reclaim.c:560
+msgid "re:claimID command line tool"
+msgstr ""
+
+#: src/reclaim/plugin_rest_openid_connect.c:2051
+#: src/reclaim/plugin_rest_reclaim.c:1018
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
 #: src/reclaim/reclaim_api.c:436
 #, fuzzy
 msgid "failed to store record\n"
@@ -6098,50 +6024,20 @@ msgstr ""
 msgid "Search string `%s' is too long!\n"
 msgstr "Dienst »%s« läuft nicht\n"
 
-#: src/rest-plugins/plugin_rest_copying.c:209
-#, fuzzy
-msgid "COPYING REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/rest-plugins/plugin_rest_credential.c:1128
-#, fuzzy
-msgid "GNS REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/rest-plugins/plugin_rest_gns.c:452
-#, fuzzy
-msgid "Gns REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/rest-plugins/plugin_rest_identity.c:1297
-msgid "Identity REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_namestore.c:1079
-#, fuzzy
-msgid "Namestore REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/rest-plugins/plugin_rest_openid_connect.c:2245
-#: src/rest-plugins/plugin_rest_reclaim.c:1079
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/rest-plugins/plugin_rest_peerinfo.c:796
-#, fuzzy
-msgid "Peerinfo REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/rest/gnunet-rest-server.c:927
+#: src/rest/gnunet-rest-server.c:986
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:944
+#: src/rest/gnunet-rest-server.c:1003
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
+#: src/rest/plugin_rest_copying.c:209
+#, fuzzy
+msgid "COPYING REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
 #: src/revocation/gnunet-revocation.c:129
 #, c-format
 msgid "Key `%s' is valid\n"
@@ -6201,7 +6097,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
+#: src/revocation/gnunet-revocation.c:437
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
@@ -6276,35 +6172,35 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/rps/gnunet-rps-profiler.c:2959
+#: src/rps/gnunet-rps.c:260
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:264
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:268
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:3088
 msgid "duration of the profiling"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2965
+#: src/rps/gnunet-rps-profiler.c:3093
 msgid "timeout for the profiling"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2971
+#: src/rps/gnunet-rps-profiler.c:3098
 #, fuzzy
 msgid "number of PeerIDs to request"
 msgstr "Anzahl an Durchläufen"
 
-#: src/rps/gnunet-rps-profiler.c:2986
+#: src/rps/gnunet-rps-profiler.c:3114
 msgid "Measure quality and performance of the RPS service."
 msgstr ""
 
-#: src/rps/gnunet-rps.c:260
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:264
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:268
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/scalarproduct/gnunet-scalarproduct.c:220
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6360,10 +6256,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"
@@ -6388,7 +6284,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2005
+#: src/set/gnunet-service-set.c:2008
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
@@ -6435,131 +6331,6 @@ msgstr ""
 msgid "element size"
 msgstr ""
 
-#: src/social/gnunet-social.c:1166
-#, fuzzy
-msgid "--place missing or invalid.\n"
-msgstr "Ungültige Antwort auf `%s'.\n"
-
-#: src/social/gnunet-social.c:1217
-msgid "assign --name in state to --data"
-msgstr ""
-
-#: src/social/gnunet-social.c:1222
-msgid "say good-bye and leave somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1227
-msgid "create a place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1232
-msgid "destroy a place we were hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1237
-msgid "enter somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1243
-msgid "find state matching name prefix"
-msgstr ""
-
-#: src/social/gnunet-social.c:1248
-msgid "replay history of messages up to the given --limit"
-msgstr ""
-
-#: src/social/gnunet-social.c:1253
-msgid "reconnect to a previously created place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1258
-msgid "publish something to a place we are hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1263
-msgid "reconnect to a previously entered place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1268
-msgid "search for state matching exact name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1273
-msgid "submit something to somebody's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1278
-msgid "list of egos and subscribed places"
-msgstr ""
-
-#: src/social/gnunet-social.c:1283
-msgid "extract and replay history between message IDs --start and --until"
-msgstr ""
-
-#: src/social/gnunet-social.c:1292
-msgid "application ID to use when connecting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1298
-msgid "message body or state value"
-msgstr ""
-
-#: src/social/gnunet-social.c:1304
-#, fuzzy
-msgid "name or public key of ego"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/social/gnunet-social.c:1309
-msgid "wait for incoming messages"
-msgstr ""
-
-#: src/social/gnunet-social.c:1315
-msgid "GNS name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1321
-msgid "peer ID for --guest-enter"
-msgstr ""
-
-#: src/social/gnunet-social.c:1327
-msgid "name (key) to query from state"
-msgstr ""
-
-#: src/social/gnunet-social.c:1333
-msgid "method name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1339
-#, fuzzy
-msgid "number of messages to replay from history"
-msgstr "Anzahl an Durchläufen"
-
-#: src/social/gnunet-social.c:1345
-msgid "key address of place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1351
-msgid "start message ID for history replay"
-msgstr ""
-
-#: src/social/gnunet-social.c:1356
-msgid "respond to entry requests by admitting all guests"
-msgstr ""
-
-#: src/social/gnunet-social.c:1362
-msgid "end message ID for history replay"
-msgstr ""
-
-#: src/social/gnunet-social.c:1367
-msgid "respond to entry requests by refusing all guests"
-msgstr ""
-
-#: src/social/gnunet-social.c:1377
-msgid ""
-"gnunet-social - Interact with the social service: enter/leave, send/receive "
-"messages, access history and state.\n"
-msgstr ""
-
 #: src/sq/sq.c:54
 #, c-format
 msgid "Failure to bind %u-th SQL parameter\n"
@@ -6723,7 +6494,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Ungültiger Parameter für `%s' bei %s:%d.\n"
 
 #: src/testbed/generate-underlay-topology.c:342
-#: src/testbed/gnunet-testbed-profiler.c:283
+#: src/testbed/gnunet-testbed-profiler.c:282
 msgid "create COUNT number of peers"
 msgstr ""
 
@@ -6832,17 +6603,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"
@@ -6855,6 +6615,17 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
+#: src/testbed/gnunet-testbed-profiler.c:287
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:291
+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"
@@ -7031,47 +6802,47 @@ msgstr ""
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1159
+#: src/testing/testing.c:1161
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1168
+#: src/testing/testing.c:1170
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing.c:1178
+#: src/testing/testing.c:1180
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1191
+#: src/testing/testing.c:1193
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/testing/testing.c:1205
+#: src/testing/testing.c:1207
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/testing/testing.c:1217
+#: src/testing/testing.c:1219
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/testing/testing.c:1242
+#: src/testing/testing.c:1244
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/testing/testing.c:1344
+#: src/testing/testing.c:1346
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "»%s« konnte nicht gestartet werden: %s\n"
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1649
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
@@ -7147,18 +6918,18 @@ msgstr "# HELLO-Meldungen empfangen"
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2329
-#: src/transport/gnunet-communicator-udp.c:2883
-#: src/transport/gnunet-service-tng.c:4679
-#: src/transport/gnunet-service-transport.c:2782
+#: src/transport/gnunet-communicator-tcp.c:2334
+#: src/transport/gnunet-communicator-udp.c:2938
+#: src/transport/gnunet-service-tng.c:7070
+#: src/transport/gnunet-service-transport.c:2795
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2393
+#: src/transport/gnunet-communicator-tcp.c:2398
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2954
+#: src/transport/gnunet-communicator-udp.c:3016
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7168,60 +6939,60 @@ msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "Maximale Anzahl der Verbindungen ist %u\n"
 
-#: src/transport/gnunet-communicator-unix.c:1073
+#: src/transport/gnunet-communicator-unix.c:1074
 #: src/transport/plugin_transport_unix.c:1403
 #, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Pfad zu »%s« kann nicht erstellt werden\n"
 
-#: src/transport/gnunet-communicator-unix.c:1162
+#: src/transport/gnunet-communicator-unix.c:1163
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:448
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:452
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:817
+#: src/transport/gnunet-service-transport.c:826
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1550
+#: src/transport/gnunet-service-transport.c:1563
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1710
+#: src/transport/gnunet-service-transport.c:1723
 msgid "# bytes total received"
 msgstr "# Bytes insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:1807
+#: src/transport/gnunet-service-transport.c:1820
 msgid "# bytes payload received"
 msgstr "# Bytes Nutzdaten empfangen"
 
-#: src/transport/gnunet-service-transport.c:2124
-#: src/transport/gnunet-service-transport.c:2596
+#: src/transport/gnunet-service-transport.c:2137
+#: src/transport/gnunet-service-transport.c:2609
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2600
+#: src/transport/gnunet-service-transport.c:2613
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport.c:2708
+#: src/transport/gnunet-service-transport.c:2721
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2717
+#: src/transport/gnunet-service-transport.c:2730
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\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 ""
@@ -7231,202 +7002,202 @@ msgstr ""
 msgid "# session creation failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1052
+#: src/transport/gnunet-service-transport_neighbours.c:1053
 msgid "# DISCONNECT messages sent"
 msgstr "# DISCONNECT-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1175
+#: src/transport/gnunet-service-transport_neighbours.c:1176
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1323
-#: src/transport/gnunet-service-transport_neighbours.c:1784
+#: src/transport/gnunet-service-transport_neighbours.c:1324
+#: src/transport/gnunet-service-transport_neighbours.c:1785
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1328
+#: src/transport/gnunet-service-transport_neighbours.c:1329
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1334
+#: src/transport/gnunet-service-transport_neighbours.c:1335
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1394
+#: src/transport/gnunet-service-transport_neighbours.c:1395
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1478
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1514
+#: src/transport/gnunet-service-transport_neighbours.c:1515
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1522
+#: src/transport/gnunet-service-transport_neighbours.c:1523
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1532
+#: src/transport/gnunet-service-transport_neighbours.c:1533
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1577
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1586
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1595
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1603
+#: src/transport/gnunet-service-transport_neighbours.c:1604
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1608
+#: src/transport/gnunet-service-transport_neighbours.c:1609
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1614
+#: src/transport/gnunet-service-transport_neighbours.c:1615
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1681
+#: src/transport/gnunet-service-transport_neighbours.c:1682
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1715
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1730
+#: src/transport/gnunet-service-transport_neighbours.c:1731
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1853
+#: src/transport/gnunet-service-transport_neighbours.c:1854
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1873
+#: src/transport/gnunet-service-transport_neighbours.c:1874
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1913
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# DISCONNECT-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1929
+#: src/transport/gnunet-service-transport_neighbours.c:1930
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1959
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2027
+#: src/transport/gnunet-service-transport_neighbours.c:2028
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2081
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2098
+#: src/transport/gnunet-service-transport_neighbours.c:2099
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2261
+#: src/transport/gnunet-service-transport_neighbours.c:2262
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2266
+#: src/transport/gnunet-service-transport_neighbours.c:2267
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2653
+#: src/transport/gnunet-service-transport_neighbours.c:2654
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3139
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# SESSION_ACK-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3146
+#: src/transport/gnunet-service-transport_neighbours.c:3147
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3165
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3200
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3225
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3238
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3411
+#: src/transport/gnunet-service-transport_neighbours.c:3412
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# CONNECT_ACK-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3447
+#: src/transport/gnunet-service-transport_neighbours.c:3448
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3535
+#: src/transport/gnunet-service-transport_neighbours.c:3536
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3543
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3583
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3589
+#: src/transport/gnunet-service-transport_neighbours.c:3590
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3600
+#: src/transport/gnunet-service-transport_neighbours.c:3601
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3735
+#: src/transport/gnunet-service-transport_neighbours.c:3736
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7461,7 +7232,7 @@ msgstr ""
 #: src/transport/gnunet-service-transport_validation.c:491
 #: src/transport/gnunet-service-transport_validation.c:677
 #: src/transport/gnunet-service-transport_validation.c:997
-#: src/transport/gnunet-service-transport_validation.c:1609
+#: src/transport/gnunet-service-transport_validation.c:1610
 #, fuzzy
 msgid "# validations running"
 msgstr "Sqlite-Datenbank läuft\n"
@@ -7488,102 +7259,65 @@ msgstr ""
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1123
+#: src/transport/gnunet-service-transport_validation.c:1124
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:1174
+#: src/transport/gnunet-service-transport_validation.c:1175
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1187
+#: src/transport/gnunet-service-transport_validation.c:1188
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1190
+#: src/transport/gnunet-service-transport_validation.c:1191
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1198
+#: src/transport/gnunet-service-transport_validation.c:1199
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1211
+#: src/transport/gnunet-service-transport_validation.c:1212
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1266
+#: src/transport/gnunet-service-transport_validation.c:1267
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "PONG-Signatur für Knoten »%s« konnte nicht erstellt werden\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1317
+#: src/transport/gnunet-service-transport_validation.c:1318
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1326
+#: src/transport/gnunet-service-transport_validation.c:1327
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1499
+#: src/transport/gnunet-service-transport_validation.c:1500
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1517
+#: src/transport/gnunet-service-transport_validation.c:1518
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1572
+#: src/transport/gnunet-service-transport_validation.c:1573
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1627
+#: src/transport/gnunet-service-transport_validation.c:1628
 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"
@@ -7716,6 +7450,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 ""
@@ -7724,13 +7463,43 @@ 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:3530
-#: src/transport/plugin_transport_tcp.c:3895
-#: src/transport/plugin_transport_tcp.c:3902
-#: src/transport/plugin_transport_xt.c:3899
-#: src/transport/plugin_transport_xt.c:3906
+#: src/transport/plugin_transport_tcp.c:3901
+#: src/transport/plugin_transport_tcp.c:3908
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7800,7 +7569,6 @@ msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2905
 #: src/transport/plugin_transport_udp.c:3627
-#: src/transport/plugin_transport_xu.c:2049
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7903,128 +7671,117 @@ msgstr "# Bytes gesendet über SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von SMTP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1551
-#: src/transport/plugin_transport_tcp.c:2877
-#: src/transport/plugin_transport_xt.c:1553
-#: src/transport/plugin_transport_xt.c:2879
+#: src/transport/plugin_transport_tcp.c:1557
+#: src/transport/plugin_transport_tcp.c:2883
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1734
-#: src/transport/plugin_transport_tcp.c:1958
-#: src/transport/plugin_transport_tcp.c:3141
-#: src/transport/plugin_transport_tcp.c:4018
-#: src/transport/plugin_transport_xt.c:1736
-#: src/transport/plugin_transport_xt.c:1960
-#: src/transport/plugin_transport_xt.c:3143
+#: src/transport/plugin_transport_tcp.c:1740
+#: src/transport/plugin_transport_tcp.c:1964
+#: src/transport/plugin_transport_tcp.c:3147
+#: src/transport/plugin_transport_tcp.c:4024
 msgid "# TCP sessions active"
 msgstr "# aktive TCP-Sitzungen"
 
-#: src/transport/plugin_transport_tcp.c:1776
-#: src/transport/plugin_transport_tcp.c:1940
-#: src/transport/plugin_transport_tcp.c:2064
-#: src/transport/plugin_transport_tcp.c:2137
-#: src/transport/plugin_transport_tcp.c:2237
-#: src/transport/plugin_transport_tcp.c:2262
-#: 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
+#: src/transport/plugin_transport_tcp.c:1782
+#: src/transport/plugin_transport_tcp.c:1946
+#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2143
+#: src/transport/plugin_transport_tcp.c:2243
+#: src/transport/plugin_transport_tcp.c:2268
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes derzeit in TCP-Puffern"
 
-#: src/transport/plugin_transport_tcp.c:1779
-#: src/transport/plugin_transport_xt.c:1781
+#: src/transport/plugin_transport_tcp.c:1785
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (unterbrochen)"
 
-#: src/transport/plugin_transport_tcp.c:2067
-#: src/transport/plugin_transport_xt.c:2069
+#: src/transport/plugin_transport_tcp.c:2073
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (Zeitüberschreitung)"
 
-#: src/transport/plugin_transport_tcp.c:2141
-#: src/transport/plugin_transport_xt.c:2143
+#: src/transport/plugin_transport_tcp.c:2147
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes über TCP übertragen"
 
-#: src/transport/plugin_transport_tcp.c:2539
-#: src/transport/plugin_transport_xt.c:2541
+#: src/transport/plugin_transport_tcp.c:2545
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2715
-#: src/transport/plugin_transport_xt.c:2717
+#: src/transport/plugin_transport_tcp.c:2721
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3207
-#: src/transport/plugin_transport_xt.c:3209
+#: src/transport/plugin_transport_tcp.c:3213
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:3413
-#: src/transport/plugin_transport_xt.c:3415
+#: src/transport/plugin_transport_tcp.c:3419
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:3464
-#: src/transport/plugin_transport_tcp.c:3522
-#: src/transport/plugin_transport_xt.c:3466
-#: src/transport/plugin_transport_xt.c:3524
+#: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_tcp.c:3528
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/transport/plugin_transport_tcp.c:3468
-#: src/transport/plugin_transport_xt.c:3470
+#: src/transport/plugin_transport_tcp.c:3474
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# verbundener Knoten"
 
-#: src/transport/plugin_transport_tcp.c:3474
-#: src/transport/plugin_transport_xt.c:3476
+#: src/transport/plugin_transport_tcp.c:3480
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3476
-#: src/transport/plugin_transport_xt.c:3478
+#: src/transport/plugin_transport_tcp.c:3482
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3516
-#: src/transport/plugin_transport_xt.c:3518
+#: src/transport/plugin_transport_tcp.c:3522
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3526
-#: src/transport/plugin_transport_xt.c:3528
+#: src/transport/plugin_transport_tcp.c:3532
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3845
-#: src/transport/plugin_transport_xt.c:3849
+#: src/transport/plugin_transport_tcp.c:3851
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten des Dienstes.\n"
 
-#: src/transport/plugin_transport_tcp.c:4006
+#: src/transport/plugin_transport_tcp.c:4012
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "TCP-Transportdienst wartet auf Port %llu\n"
 
-#: src/transport/plugin_transport_tcp.c:4010
+#: src/transport/plugin_transport_tcp.c:4016
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4014
+#: src/transport/plugin_transport_tcp.c:4020
 #, c-format
 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:3371
 #, c-format
 msgid ""
@@ -8045,7 +7802,6 @@ 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:3721
-#: src/transport/plugin_transport_xu.c:2143
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
@@ -8055,19 +7811,15 @@ msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
 #: src/transport/plugin_transport_udp.c:3883
 #: src/transport/plugin_transport_udp.c:3897
-#: 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:3929
-#: 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:3956
-#: src/transport/plugin_transport_xu.c:2374
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
@@ -8077,21 +7829,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:1416
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
@@ -8168,55 +7905,6 @@ 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"
@@ -8227,17 +7915,17 @@ msgstr "Zugriff verweigert auf »%s«\n"
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1624
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1634
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127
+#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1640
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
@@ -8249,7 +7937,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2396
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:864
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -8259,27 +7947,27 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:988
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:1031
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1555
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:953
-#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1195
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1708
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1228
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1741
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8294,44 +7982,44 @@ msgstr "Es konnte keine Verbindung mit gnunetd 
hergestellt werden.\n"
 msgid "Service `%s' runs at %s\n"
 msgstr "Dienst »%s« läuft auf %s\n"
 
-#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1502
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:2015
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1506
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:2019
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1510
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:2023
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1525
-#: src/util/service.c:1380
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1535
+#: src/util/service.c:1893
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1382
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1895
 msgid "No such user"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1401
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1914
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu »%s« geändert werden: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1762
+#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:2276
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:1826
-#: src/util/service.c:1841
+#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:2340
+#: src/util/service.c:2355
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:1853
+#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:2367
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "GNUnet Konfiguration"
@@ -8374,11 +8062,11 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:734
+#: src/util/client.c:749
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:925
+#: src/util/client.c:941
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8425,18 +8113,18 @@ msgstr ""
 msgid "unknown address"
 msgstr "Unbekannte Adresse"
 
-#: src/util/common_logging.c:1500
+#: src/util/common_logging.c:1513
 msgid "invalid address"
 msgstr "Ungültige Adresse"
 
-#: src/util/common_logging.c:1518
+#: src/util/common_logging.c:1531
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/util/common_logging.c:1539
+#: src/util/common_logging.c:1552
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8485,26 +8173,26 @@ msgstr ""
 #: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have %"
-"llu)\n"
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:862
+#: src/util/crypto_ecc.c:887
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_ecc.c:917
+#: src/util/crypto_ecc.c:946
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_ecc.c:996
+#: src/util/crypto_ecc.c:1025
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:1057
+#: src/util/crypto_ecc.c:1086
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
@@ -8555,17 +8243,17 @@ msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: 
`%s'.\n"
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/disk.c:1255
+#: src/util/disk.c:1265
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/dnsparser.c:260
+#: src/util/dnsparser.c:264
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/util/dnsparser.c:950
+#: src/util/dnsparser.c:954
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
@@ -8671,7 +8359,7 @@ msgstr ""
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:282
+#: src/util/getopt_helpers.c:282 src/util/gnunet-qr.c:300
 msgid "be verbose"
 msgstr ""
 
@@ -8720,52 +8408,52 @@ msgstr "Sie müssen für die Option »%s« zusätzlich eine 
Zahl angeben.\n"
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:160
+#: src/util/gnunet-config.c:161
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
 
-#: src/util/gnunet-config.c:173
+#: src/util/gnunet-config.c:174
 #, fuzzy, c-format
 msgid "%s or %s argument is required\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/util/gnunet-config.c:181
+#: src/util/gnunet-config.c:182
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:232
+#: src/util/gnunet-config.c:234
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:286
-msgid "obtain option of value as a filename (with $-expansion)"
+#: src/util/gnunet-config.c:288
+msgid "interpret option value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:291
+#: src/util/gnunet-config.c:293
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:296
+#: src/util/gnunet-config.c:298
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:301
+#: src/util/gnunet-config.c:303
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:305
+#: src/util/gnunet-config.c:307
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "GNUnet Konfiguration"
 
-#: src/util/gnunet-config.c:309
+#: src/util/gnunet-config.c:311
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:322
+#: src/util/gnunet-config.c:324
 msgid "Manipulate GNUnet configuration files"
 msgstr "GNUnet-Konfigurationsdateien bearbeiten"
 
@@ -8860,6 +8548,33 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
+#: src/util/gnunet-qr.c:108 src/util/gnunet-uri.c:91
+#, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "URL beginnt nicht mit »%s«\n"
+
+#: src/util/gnunet-qr.c:116 src/util/gnunet-uri.c:98
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:127 src/util/gnunet-uri.c:108
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:297
+msgid "use video-device DEVICE (default: /dev/video0"
+msgstr ""
+
+#: src/util/gnunet-qr.c:303
+msgid "do not show preview windows"
+msgstr ""
+
+#: src/util/gnunet-qr.c:311
+msgid "Scan a QR code using a video device and import the uri read"
+msgstr ""
+
 #: src/util/gnunet-resolver.c:168
 msgid "perform a reverse lookup"
 msgstr ""
@@ -8893,7 +8608,7 @@ msgstr ""
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:1443
+#: src/util/gnunet-service-resolver.c:1424
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
@@ -8902,21 +8617,6 @@ msgstr ""
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:91
-#, c-format
-msgid "Invalid URI: does not start with `%s'\n"
-msgstr "URL beginnt nicht mit »%s«\n"
-
-#: src/util/gnunet-uri.c:98
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:108
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
-msgstr ""
-
 #: src/util/gnunet-uri.c:170
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
@@ -8936,12 +8636,12 @@ msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei 
%s:%d.\n"
 msgid "Error writing to `%s': %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/util/network.c:136
+#: src/util/network.c:176
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1795 src/util/network.c:1979
+#: src/util/network.c:1835 src/util/network.c:2019
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9051,18 +8751,18 @@ msgstr "Standarddienst »%s« ist nicht korrekt 
eingerichtet!\n"
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/service.c:1307
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
-msgstr ""
-
-#: src/util/service.c:2141
+#: src/util/service.c:668
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
+#: src/util/service.c:1820
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
 #: src/util/signal.c:89
 #, fuzzy, c-format
 msgid "signal (%d, %p) returned %d.\n"
@@ -9192,12 +8892,12 @@ msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
 
-#: src/util/time.c:828 src/util/time.c:860
+#: src/util/time.c:844 src/util/time.c:876
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:866
+#: src/util/time.c:882
 #, c-format
 msgid ""
 "Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
@@ -9377,64 +9077,72 @@ 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"
 
-#: src/include/gnunet_common.h:772 src/include/gnunet_common.h:779
-#: src/include/gnunet_common.h:789
+#: src/include/gnunet_common.h:794 src/include/gnunet_common.h:801
+#: src/include/gnunet_common.h:811
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d. Aborting.\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/include/gnunet_common.h:797
+#: src/include/gnunet_common.h:819
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/include/gnunet_common.h:809
+#: src/include/gnunet_common.h:831
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
 
-#: src/include/gnunet_common.h:836 src/include/gnunet_common.h:845
+#: src/include/gnunet_common.h:858 src/include/gnunet_common.h:867
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
-#~ msgid "Can not index file `%s': %s.\n"
-#~ msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
+#~ msgid "Unable to parse CRED record string `%s'\n"
+#~ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
 #, fuzzy
-#~ msgid "`%s' is not a valid domain name\n"
-#~ msgstr "»%s« ist keine gültige IP-Adresse.\n"
+#~ msgid "Issuer ego required\n"
+#~ msgstr "Gültiger Typ ist erforderlich\n"
 
 #, fuzzy
-#~ msgid "Specify a timeout for the lookup"
-#~ msgstr "Die Priorität des Inhalts angeben"
+#~ msgid "XT transport listening on port %llu\n"
+#~ msgstr "TCP-Transportdienst wartet auf Port %llu\n"
 
 #, fuzzy
-#~ msgid "Unable to parse CAA record string `%s'\n"
-#~ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+#~ msgid "XT transport not listening on any port (client only)\n"
+#~ msgstr "TCP-Transportdienst wartet auf Port %llu\n"
 
 #, fuzzy
-#~ msgid "reduce output"
-#~ msgstr "Ausführliche Ausgabe"
+#~ msgid "XT transport advertises itself as being on port %llu\n"
+#~ msgstr "TCP-Transportdienst wartet auf Port %llu\n"
 
 #, fuzzy
-#~ msgid "OpenID Connect REST API initialized\n"
-#~ msgstr " Verbindung fehlgeschlagen\n"
+#~ msgid "# XT sessions active"
+#~ msgstr "# aktive TCP-Sitzungen"
 
 #, fuzzy
-#~ msgid "CONFIG REST API initialized\n"
-#~ msgstr " Verbindung fehlgeschlagen\n"
+#~ msgid "Failed to bind XU socket to %s: %s\n"
+#~ msgstr "UDP-Sockets können nicht geöffnet werden\n"
+
+#, fuzzy
+#~ msgid "Failed to open XU sockets\n"
+#~ msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
 #, fuzzy
-#~ msgid "Option `%s' can't be used with other options.\n"
-#~ msgstr "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n"
+#~ msgid "Failed to create XU network sockets\n"
+#~ msgstr "UDP-Sockets können nicht geöffnet werden\n"
+
+#, fuzzy
+#~ msgid "Print information about DV state"
+#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
 #, fuzzy
 #~ msgid "Invalid tunnel owner `%s'\n"
@@ -9444,6 +9152,99 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. 
Fehler: %s\n"
 #~ msgid "Provide information about a particular tunnel"
 #~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
+#, fuzzy
+#~ msgid "Failed to store membership information!\n"
+#~ msgstr "Fehler beim Speichern der Konfiguration!"
+
+#, fuzzy
+#~ msgid "Failed to test membership!\n"
+#~ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#, fuzzy
+#~ msgid "Dropping invalid fragment\n"
+#~ msgstr "Ungültiges Argument »%s«\n"
+
+#, fuzzy
+#~ msgid "Failed to store fragment\n"
+#~ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#, fuzzy
+#~ msgid "Failed to get fragment!\n"
+#~ msgstr ""
+#~ "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to get message!\n"
+#~ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#, fuzzy
+#~ msgid "Failed to get message fragment!\n"
+#~ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#, fuzzy
+#~ msgid "Failed to get master counters!\n"
+#~ msgstr ""
+#~ "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to begin modifying state: %d\n"
+#~ msgstr ""
+#~ "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to modify state: %d\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to end modifying state!\n"
+#~ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#, fuzzy
+#~ msgid "Failed to begin synchronizing state!\n"
+#~ msgstr ""
+#~ "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to end synchronizing state!\n"
+#~ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#, fuzzy
+#~ msgid "Failed to reset state!\n"
+#~ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#, fuzzy
+#~ msgid "Failed to get state variable!\n"
+#~ msgstr ""
+#~ "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Mysql.\n"
+#~ msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
+
+#, fuzzy
+#~ msgid "Failed to run SQL statement `%s'\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#, fuzzy
+#~ msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+#~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#, fuzzy
+#~ msgid "SQLite database running\n"
+#~ msgstr "SQL Datenbank beschädigt, Ergebnis wird ignoriert.\n"
+
+#, fuzzy
+#~ msgid "--place missing or invalid.\n"
+#~ msgstr "Ungültige Antwort auf `%s'.\n"
+
+#, fuzzy
+#~ msgid "name or public key of ego"
+#~ msgstr "Ungültiger Parameter: `%s'\n"
+
+#, fuzzy
+#~ msgid "number of messages to replay from history"
+#~ msgstr "Anzahl an Durchläufen"
+
 #, fuzzy
 #~ msgid "Could not resolve `%s' (%s): %s\n"
 #~ msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
@@ -9498,6 +9299,9 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. 
Fehler: %s\n"
 #~ msgid "# Bytes received from other peers"
 #~ msgstr "# Bytes des Typs %d empfangen"
 
+#~ msgid "verbose output"
+#~ msgstr "Ausführliche Ausgabe"
+
 #, fuzzy
 #~ msgid "# UPDATE requests executed"
 #~ msgstr "# dht Anfragen weitergeleitet"
diff --git a/po/es.po b/po/es.po
index e1dd584c8..159a4c4fd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden\n"
-"POT-Creation-Date: 2019-02-09 22:07+0000\n"
+"POT-Creation-Date: 2019-09-04 12:56+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"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/arm/gnunet-arm.c:156
@@ -234,8 +234,7 @@ msgstr ""
 "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)"
 
 #: src/arm/gnunet-service-arm.c:388 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
+#: src/transport/tcp_service_legacy.c:557
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
@@ -246,13 +245,10 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3829
-#: src/transport/plugin_transport_xt.c:1139
-#: src/transport/plugin_transport_xt.c:1145
-#: src/transport/plugin_transport_xt.c:3833
+#: src/transport/plugin_transport_tcp.c:3835
 #: src/transport/tcp_service_legacy.c:576
-#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
-#: src/util/service.c:643
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1150
+#: src/util/service.c:1156
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -260,36 +256,32 @@ msgstr ""
 "configuración!\n"
 
 #: src/arm/gnunet-service-arm.c:457 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
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
+#: src/util/service.c:1195
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
 
 #: src/arm/gnunet-service-arm.c:462 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
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
+#: src/util/service.c:1200
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
 
 #: src/arm/gnunet-service-arm.c:495 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
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1236
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
-"Deshabilitando el soporte de dominio de «sockets» UNIX para el servicio «%"
-"s», no se pudo crear un «socket» UNIX: %s\n"
+"Deshabilitando el soporte de dominio de «sockets» UNIX para el servicio "
+"«%s», no se pudo crear un «socket» UNIX: %s\n"
 
 #: src/arm/gnunet-service-arm.c:517 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
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1254
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -299,8 +291,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:556
 #: src/transport/plugin_transport_http_server.c:2688
 #: 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
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1295
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
@@ -308,8 +299,7 @@ msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 #: src/arm/gnunet-service-arm.c:575
 #: src/transport/plugin_transport_http_server.c:2706
 #: 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
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1315
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "No se encontró la dirección %s para «%s».\n"
@@ -387,15 +377,161 @@ 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 "experimento para usar"
+
+#: 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 "guarda protocolo al fichero en disco"
+
+#: src/ats/gnunet-ats-solver-eval.c:3316
+msgid "disable normalization"
+msgstr "deshabilita normalización"
+
+#: src/ats/gnunet-service-ats-new.c:756
+#: 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/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/plugin_ats2_common.c:90
+#, 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"
+
+#: src/ats/plugin_ats_mlp.c:1274
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1870
+#, 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:1914
+#, 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:2476
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
+#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
+#: src/ats/plugin_ats_mlp.c:2602 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:2671
+#, 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:2680
+#, 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:2690
+#, 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:2699
+#, 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"
@@ -406,6 +542,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 ""
@@ -413,18 +558,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 "experimento para usar"
-
 # 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
@@ -559,151 +692,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 "guarda protocolo al fichero en disco"
-
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
-msgstr "deshabilita normalización"
-
-#: src/ats/gnunet-service-ats-new.c:733
-#: 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/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/plugin_ats2_common.c:90
-#, 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"
-
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1870
-#, 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:1914
-#, 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:2476
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
-#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
-#: src/ats/plugin_ats_mlp.c:2602 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:2671
-#, 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:2680
-#, 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:2690
-#, 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:2699
-#, 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 "descripción del elemento que está por vender"
@@ -841,28 +829,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:120
-#, 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:216
-#, 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:277
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1121,8 +1087,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:120
+#, 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:216
+#, 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 ""
@@ -1435,7 +1423,7 @@ msgid "# valid ephemeral keys received"
 msgstr "# mapas de tipos recibidos"
 
 #: src/core/gnunet-service-core_kx.c:1180
-#: src/transport/gnunet-service-transport_validation.c:1128
+#: src/transport/gnunet-service-transport_validation.c:1129
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
@@ -1457,7 +1445,7 @@ msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
 #: src/core/gnunet-service-core_kx.c:1351
-#: src/transport/gnunet-service-transport_validation.c:1461
+#: src/transport/gnunet-service-transport_validation.c:1462
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
@@ -1556,131 +1544,151 @@ msgstr "# mapas de tipos recibidos"
 msgid "# updates to my type map"
 msgstr "# actualizaciones de mi mapa de tipos"
 
-#: src/credential/credential_misc.c:88
-#, fuzzy, c-format
-msgid "Unable to parse CRED record string `%s'\n"
-msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
-
-#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:994
+#: src/credential/gnunet-credential.c:381 src/namestore/gnunet-namestore.c:994
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/credential/gnunet-credential.c:280
-#: src/credential/gnunet-credential.c:434
+#: src/credential/gnunet-credential.c:397
+#: src/credential/gnunet-credential.c:859
 #, fuzzy, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/credential/gnunet-credential.c:361
-#: src/credential/gnunet-credential.c:423
+#: src/credential/gnunet-credential.c:532
+#: src/credential/gnunet-service-credential.c:1728
+#: src/namestore/gnunet-namestore.c:1019
+#: src/namestore/gnunet-namestore-fcfsd.c:1138
+#, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
+
+#: src/credential/gnunet-credential.c:798
+#: src/credential/gnunet-credential.c:849
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/credential/gnunet-credential.c:372
-#: src/credential/gnunet-credential.c:444
+#: src/credential/gnunet-credential.c:807
+#: src/credential/gnunet-credential.c:868
 #, fuzzy, c-format
 msgid "Failed to connect to CREDENTIAL\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/credential/gnunet-credential.c:379
+#: src/credential/gnunet-credential.c:813
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:387
+#: src/credential/gnunet-credential.c:820
 #, fuzzy, c-format
 msgid "ego required\n"
 msgstr "Tipo requerido\n"
 
-#: src/credential/gnunet-credential.c:403
+#: src/credential/gnunet-credential.c:830
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:414
+#: src/credential/gnunet-credential.c:839
 #, fuzzy, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/credential/gnunet-credential.c:451
+#: src/credential/gnunet-credential.c:874
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:504
-#, fuzzy, c-format
-msgid "Issuer ego required\n"
-msgstr "Tipo requerido\n"
-
-#: src/credential/gnunet-credential.c:516
+#: src/credential/gnunet-credential.c:930
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:536
-msgid "create credential"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:540
+#: src/credential/gnunet-credential.c:951
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:545
+#: src/credential/gnunet-credential.c:958
 #, fuzzy
-msgid "The public key of the subject to lookup the credential for"
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/credential/gnunet-credential.c:550
-msgid "The name of the credential presented by the subject"
+#: src/credential/gnunet-credential.c:965
+msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:555
+#: src/credential/gnunet-credential.c:972
 #, fuzzy
 msgid "The public key of the authority to verify the credential against"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/credential/gnunet-credential.c:560
+#: src/credential/gnunet-credential.c:977
 #, fuzzy
-msgid "The ego to use"
+msgid "The ego/zone name to use"
 msgstr "tamaño del mensaje"
 
-#: src/credential/gnunet-credential.c:565
+#: src/credential/gnunet-credential.c:983
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:570
-msgid "The time to live for the credential"
+#: src/credential/gnunet-credential.c:989
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/credential/gnunet-credential.c:574
+#: src/credential/gnunet-credential.c:994
 msgid "collect credentials"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:588
+#: src/credential/gnunet-credential.c:999
+msgid "Create and issue a credential issuer side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1004
+msgid "Issue a credential subject side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1009
+msgid "Create, sign and return a credential subject side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1016
+msgid "Import signed credentials that should be issued to a zone/ego"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1020
+msgid "Create private record entry."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1026
+#: src/credential/gnunet-credential.c:1032
+msgid "Indicates that the collect/verify process is done via forward search."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1045
 #, fuzzy
 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:185
+#: src/credential/gnunet-service-credential.c:1723 src/gns/gnunet-gns.c:185
+#: 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:1138
-#: src/namestore/gnunet-namestore.c:1019
-#, c-format
-msgid "Failed to connect to namestore\n"
-msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
-
-#: src/credential/plugin_gnsrecord_credential.c:186
+#: src/credential/plugin_gnsrecord_credential.c:182
 #, fuzzy, c-format
 msgid "Unable to parse ATTR record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
 
+#: src/credential/plugin_rest_credential.c:1128
+#, fuzzy
+msgid "GNS REST API initialized\n"
+msgstr "Conexión fallida\n"
+
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:311
 #: src/datastore/gnunet-service-datastore.c:757
 msgid "# bytes stored"
@@ -1732,14 +1740,12 @@ msgstr "Caché de datos de montículo (heap) 
ejecutándose\n"
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_sqlite.c:53
 #: src/peerstore/plugin_peerstore_sqlite.c:52
-#: src/psycstore/plugin_psycstore_mysql.c:62
-#: src/reclaim/plugin_reclaim_sqlite.c:52
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:818 src/include/gnunet_common.h:827
+#: src/include/gnunet_common.h:840 src/include/gnunet_common.h:849
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1749,7 +1755,6 @@ msgstr "«%s» falló en %s: %d con el error: %s\n"
 #: src/datastore/plugin_datastore_sqlite.c:508
 #: src/namecache/plugin_namecache_sqlite.c:229
 #: src/namestore/plugin_namestore_sqlite.c:265
-#: src/reclaim/plugin_reclaim_sqlite.c:336
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 "Se intentó cerrar sqlite sin finalizar todas las sentencias preparadas.\n"
@@ -2068,21 +2073,19 @@ msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» para «%s» falló en %s: %d con error: %s\n"
 
 #: src/datastore/plugin_datastore_mysql.c:1180
-#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr "Base de datos Mysql ejecutándose\n"
 
-#: src/datastore/plugin_datastore_postgres.c:276
-#: src/datastore/plugin_datastore_postgres.c:893
+#: src/datastore/plugin_datastore_postgres.c:280
+#: src/datastore/plugin_datastore_postgres.c:897
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:854
+#: src/datastore/plugin_datastore_postgres.c:858
 msgid "Failed to drop table from database.\n"
 msgstr "Se produjo un fallo al borrar una tabla de la base de datos.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:952
-#: src/psycstore/plugin_psycstore_postgres.c:1506
+#: src/datastore/plugin_datastore_postgres.c:956
 msgid "Postgres database running\n"
 msgstr "Base de datos Postgres ejecutándose\n"
 
@@ -2098,8 +2101,6 @@ msgstr "«%s» falló en %s:%u con el error: %s"
 #: src/namecache/plugin_namecache_sqlite.c:173
 #: src/namestore/plugin_namestore_sqlite.c:206
 #: src/peerstore/plugin_peerstore_sqlite.c:535
-#: src/psycstore/plugin_psycstore_sqlite.c:325
-#: src/reclaim/plugin_reclaim_sqlite.c:212
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite: %s.\n"
@@ -2126,8 +2127,7 @@ msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1405
 #: src/namecache/plugin_namecache_sqlite.c:557
-#: src/namestore/plugin_namestore_sqlite.c:750
-#: src/reclaim/plugin_reclaim_sqlite.c:711
+#: src/namestore/plugin_namestore_sqlite.c:751
 msgid "Sqlite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
@@ -2185,23 +2185,72 @@ msgstr "¿cuánto tiempo se debe ejecutar esta consulta 
antes de abandonar?"
 msgid "use DHT's demultiplex everywhere option"
 msgstr "opción para usar el demultiplexado de la DHT siempre"
 
-#: src/dht/gnunet-dht-get.c:280
-msgid "Issue a GET request to the GNUnet DHT, prints results."
+#: src/dht/gnunet-dht-get.c:280
+msgid "Issue a GET request to the GNUnet DHT, prints results."
+msgstr ""
+"Iniciando una peticion «GET» a la DHT de GNUnet, imprimiendo resultados."
+
+#: src/dht/gnunet-dht-monitor.c:319
+msgid "how long should the monitor command run"
+msgstr "cuanto tiempo debe ejecutarse el comando de monitorización"
+
+#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372
+#: src/nse/gnunet-nse-profiler.c:878
+msgid "be verbose (print progress information)"
+msgstr "ser prolijo (imprime información de progreso)"
+
+#: src/dht/gnunet-dht-monitor.c:337
+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 src/rps/gnunet-rps-profiler.c:3083
+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:300
+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 ""
-"Iniciando una peticion «GET» a la DHT de GNUnet, imprimiendo resultados."
 
-#: src/dht/gnunet-dht-monitor.c:319
-msgid "how long should the monitor command run"
-msgstr "cuanto tiempo debe ejecutarse el comando de monitorización"
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "replication degree for DHT PUTs"
+msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372
-#: src/nse/gnunet-nse-profiler.c:878
-msgid "be verbose (print progress information)"
-msgstr "ser prolijo (imprime información de progreso)"
+#: src/dht/gnunet_dht_profiler.c:984
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:337
-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: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"
@@ -2467,55 +2516,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 src/rps/gnunet-rps-profiler.c:2953
-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"
@@ -2600,11 +2600,6 @@ msgstr "se necesita una dirección IPv4 o IPv6 válida\n"
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
 
-#: src/dv/gnunet-dv.c:175
-#, fuzzy
-msgid "Print information about DV state"
-msgstr "Imprime información acerca del estado del ATS"
-
 #: src/exit/gnunet-daemon-exit.c:960
 msgid "# TCP packets sent via TUN"
 msgstr "# Paquetes TCP enviados vía TUN"
@@ -2760,8 +2755,8 @@ msgstr ""
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
-"¡No se encontraron direcciones para el nombre de máquina «%s» del servicio «%"
-"s»!\n"
+"¡No se encontraron direcciones para el nombre de máquina «%s» del servicio "
+"«%s»!\n"
 
 #: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345
 #, c-format
@@ -2908,8 +2903,8 @@ msgstr "Se produjo un fallo al retomar la operación de 
publicación «%s»: %s\
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
-"Se produjo un fallo mientras se retomaba la operación de publicación «%s»: %"
-"s\n"
+"Se produjo un fallo mientras se retomaba la operación de publicación «%s»: "
+"%s\n"
 
 #: src/fs/fs_api.c:2332
 #, c-format
@@ -2949,8 +2944,8 @@ msgstr ""
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
-"Se produjo un fallo mientras se retomaba de la operación de descarga «%s»: %"
-"s\n"
+"Se produjo un fallo mientras se retomaba de la operación de descarga «%s»: "
+"%s\n"
 
 #: src/fs/fs_directory.c:213
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
@@ -2974,8 +2969,8 @@ msgstr ""
 msgid ""
 "Failed to access full directroy contents of `%s' for recursive download\n"
 msgstr ""
-"Se produjo un fallo al crear el directorio para la descarga recursiva de «%"
-"s»\n"
+"Se produjo un fallo al crear el directorio para la descarga recursiva de "
+"«%s»\n"
 
 #: src/fs/fs_download.c:534 src/fs/fs_download.c:546
 #, c-format
@@ -2986,8 +2981,8 @@ msgstr "Se produjo un fallo al abrir «%s» para escritura"
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
-"Se produjo un fallo al crear el directorio para la descarga recursiva de «%"
-"s»\n"
+"Se produjo un fallo al crear el directorio para la descarga recursiva de "
+"«%s»\n"
 
 #: src/fs/fs_download.c:1047
 #, c-format
@@ -3017,8 +3012,8 @@ msgstr ""
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
-"Se produjo un fallo al escribir el bloque de %u bytes en el desplazamiento %"
-"llu del fichero «%s»: %s"
+"Se produjo un fallo al escribir el bloque de %u bytes en el desplazamiento "
+"%llu del fichero «%s»: %s"
 
 #: src/fs/fs_download.c:1220
 msgid "internal error decoding tree"
@@ -3079,61 +3074,66 @@ msgstr "Se produjo un fallo al conectar con el almacén 
de datos."
 msgid "Publishing failed: %s"
 msgstr "Publicación fallida: %s"
 
-#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
-#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
+#: src/fs/fs_publish.c:725
+#, fuzzy, c-format
+msgid "Can not index file `%s': %s.\n"
+msgstr "Imposible abrir el fichero de configuración '%s'.\n"
+
+#: src/fs/fs_publish.c:782 src/fs/fs_publish.c:827 src/fs/fs_publish.c:848
+#: src/fs/fs_publish.c:878 src/fs/fs_publish.c:1144
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "No se pudo indexar el fichero «%s»: %s.  Se intentará insertar.\n"
 
-#: src/fs/fs_publish.c:780
+#: src/fs/fs_publish.c:784
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr ""
 "expiración del plazo en la petición de inicio de indexado (index-start) al "
 "servicio «fs»"
 
-#: src/fs/fs_publish.c:825
+#: src/fs/fs_publish.c:829
 msgid "failed to compute hash"
 msgstr "se produjo un fallo al calcular el hash"
 
-#: src/fs/fs_publish.c:845
+#: src/fs/fs_publish.c:849
 msgid "filename too long"
 msgstr "nombre de fichero demasiado largo"
 
-#: src/fs/fs_publish.c:876
+#: src/fs/fs_publish.c:880
 msgid "could not connect to `fs' service"
 msgstr "no se pudo conectar con el servicio «fs»"
 
-#: src/fs/fs_publish.c:902
+#: src/fs/fs_publish.c:906
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
+#: src/fs/fs_publish.c:995 src/fs/fs_publish.c:1031
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1094
+#: src/fs/fs_publish.c:1098
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "La subida recursiva falló en «%s»: %s"
 
-#: src/fs/fs_publish.c:1102
+#: src/fs/fs_publish.c:1106
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Subida recursiva fallida: %s"
 
-#: src/fs/fs_publish.c:1142
+#: src/fs/fs_publish.c:1146
 msgid "needs to be an actual file"
 msgstr "tiene que ser un fichero de verdad"
 
-#: src/fs/fs_publish.c:1381
+#: src/fs/fs_publish.c:1385
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/fs_publish.c:1472
+#: src/fs/fs_publish.c:1476
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Reservando espacio para %u entradas y %llu bytes para publicación\n"
@@ -3205,108 +3205,108 @@ msgid "Failed to compute hash of file."
 msgstr "Se produjo un fallo al calcular el hash del fichero."
 
 # Cadena erronea, corregida en SVN.
-#: src/fs/fs_uri.c:234
+#: src/fs/fs_uri.c:236
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "'%' debe ser seguido por un número hexadecimal"
 
-#: src/fs/fs_uri.c:293
+#: src/fs/fs_uri.c:295
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:311
+#: src/fs/fs_uri.c:313
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:318
+#: src/fs/fs_uri.c:320
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:388
+#: src/fs/fs_uri.c:390
 #, fuzzy
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:429
+#: src/fs/fs_uri.c:431
 #, fuzzy
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr "URI CHK mal formada"
 
-#: src/fs/fs_uri.c:444
+#: src/fs/fs_uri.c:446
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:523
+#: src/fs/fs_uri.c:525
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:538
+#: src/fs/fs_uri.c:540
 #, fuzzy
 msgid "LOC URI malformed (no CHK)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:548
+#: src/fs/fs_uri.c:550
 #, fuzzy
 msgid "LOC URI malformed (missing LOC)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:556
+#: src/fs/fs_uri.c:558
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:566
 #, fuzzy
 msgid "LOC URI malformed (could not decode public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:570
+#: src/fs/fs_uri.c:572
 #, fuzzy
 msgid "LOC URI malformed (could not find signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:576
+#: src/fs/fs_uri.c:578
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:587
 #, fuzzy
 msgid "LOC URI malformed (could not decode signature)"
 msgstr "URI SKS mal formada (no se pudo decodificar la firma)"
 
-#: src/fs/fs_uri.c:591
+#: src/fs/fs_uri.c:593
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:599
 #, fuzzy
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:609
+#: src/fs/fs_uri.c:611
 #, fuzzy
 msgid "LOC URI malformed (signature failed validation)"
 msgstr "URI SKS mal formada (se produjo un fallo al validar la firma)"
 
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:645
 #, fuzzy
 msgid "invalid argument"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/fs/fs_uri.c:655
+#: src/fs/fs_uri.c:657
 msgid "Unrecognized URI type"
 msgstr "Tipo de URI no reconocido"
 
-#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/fs/fs_uri.c:1092
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
@@ -3348,12 +3348,12 @@ msgstr ""
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del emisor"
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:907
+#: src/fs/gnunet-auto-share.c:772
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 "deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:907
 msgid "do not use libextractor to add keywords or metadata"
 msgstr "no usar libextractor para añadir palabras clave o metadatos"
 
@@ -3435,7 +3435,7 @@ msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Finalizada descarga «%s» (%s/s).\n"
 
 #: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:215 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Estado inesperado: %d\n"
@@ -3458,12 +3458,12 @@ msgid "Target filename must be specified.\n"
 msgstr "El nombre de fichero de destino debe ser especificado.\n"
 
 #: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:872
-#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:273 src/fs/gnunet-unindex.c:139
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "No se pudo inicializar el subsistema «%s».\n"
 
-#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:312
+#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:315
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del receptor"
 
@@ -3471,7 +3471,7 @@ msgstr "establece el nivel LEVEL deseado de anonimato del 
receptor"
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "borra descargas incompletas (cuando fueron abortadas con CTRL-C="
 
-#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:316
+#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr "únicamente buscar en el par local (no buscar en la red P2P)"
 
@@ -3499,6 +3499,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"
@@ -3519,14 +3527,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"
@@ -3615,7 +3615,7 @@ msgstr "La extracción de metadatos ha finalizado.\n"
 
 #: src/fs/gnunet-publish.c:687
 #, fuzzy
-msgid "Internal error scanning directory.\n"
+msgid "Error scanning directory.\n"
 msgstr "Error interno escaneando directorio.\n"
 
 #: src/fs/gnunet-publish.c:715
@@ -3662,6 +3662,12 @@ msgstr "La opción «%s» es obligatoria cuando se usa la 
opción «%s».\n"
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n"
 
+#: src/fs/gnunet-publish.c:911
+#, fuzzy
+msgid "enable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+"deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
+
 #: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
@@ -3738,32 +3744,32 @@ msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/fs/gnunet-search.c:204
+#: src/fs/gnunet-search.c:207
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr "Error buscando: %s.\n"
 
-#: src/fs/gnunet-search.c:260
+#: src/fs/gnunet-search.c:263
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "No se pudo crear URI de palabra clave a partir de los parámetros.\n"
 
-#: src/fs/gnunet-search.c:284
+#: src/fs/gnunet-search.c:287
 msgid "Could not start searching.\n"
 msgstr "No se pudo empezar a buscar.\n"
 
-#: src/fs/gnunet-search.c:321
+#: src/fs/gnunet-search.c:324
 msgid "write search results to file starting with PREFIX"
 msgstr "escribir resultados de búsqueda al fichero que empiecen por «PREFIX»"
 
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:329
 msgid "automatically terminate search after DELAY"
 msgstr "terminar búsqueda automáticamente después de «DELAY»"
 
-#: src/fs/gnunet-search.c:332
+#: src/fs/gnunet-search.c:335
 msgid "automatically terminate search after VALUE results are found"
 msgstr "terminar búsqueda después de «VALUE» resultados encontrados"
 
-#: src/fs/gnunet-search.c:348
+#: src/fs/gnunet-search.c:351
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr "Buscar en GNUnet ficheros que han sido publicados en GNUnet"
 
@@ -3945,8 +3951,8 @@ msgstr "# bloques de índice eliminados: fichero original 
inaccesible"
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
-"No se pudo acceder al fichero indexado «%s» (%s) en el desplazamiento %llu: %"
-"s\n"
+"No se pudo acceder al fichero indexado «%s» (%s) en el desplazamiento %llu: "
+"%s\n"
 
 #: src/fs/gnunet-service-fs_indexing.c:361
 msgid "not indexed"
@@ -4166,43 +4172,43 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:203
+#: src/gns/gnunet-dns2gns.c:214
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 "¡Se produjo un fallo al empaquetar una respuesta DNS en un paquete UDP!\n"
 
-#: src/gns/gnunet-dns2gns.c:405
+#: src/gns/gnunet-dns2gns.c:416
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "No se puede procesar la petición DNS de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:421
+#: src/gns/gnunet-dns2gns.c:432
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:429
+#: src/gns/gnunet-dns2gns.c:440
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Recibida petición DNS no soportada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:588
+#: src/gns/gnunet-dns2gns.c:600
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:688
+#: src/gns/gnunet-dns2gns.c:748
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "IP del resolvedor recursivo DNS a usar (requerido)"
 
-#: src/gns/gnunet-dns2gns.c:693
+#: src/gns/gnunet-dns2gns.c:753
 #, fuzzy
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 "Puerto UDP en el que escuchar para peticiones DNS entrantes; predeterminado: "
 "53"
 
-#: src/gns/gnunet-dns2gns.c:710
+#: src/gns/gnunet-dns2gns.c:770
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
@@ -4219,6 +4225,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
+#, 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 ""
@@ -4253,129 +4281,107 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
 
-#: src/gns/gnunet-gns-proxy.c:980
+#: src/gns/gnunet-gns-proxy.c:989
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:1005
+#: src/gns/gnunet-gns-proxy.c:1014
 #, 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:1026
+#: src/gns/gnunet-gns-proxy.c:1035
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/gns/gnunet-gns-proxy.c:1041
+#: src/gns/gnunet-gns-proxy.c:1050
 #, 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:1056
+#: src/gns/gnunet-gns-proxy.c:1065
 #, 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:1066
+#: src/gns/gnunet-gns-proxy.c:1075
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1090
+#: src/gns/gnunet-gns-proxy.c:1099
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1221
+#: src/gns/gnunet-gns-proxy.c:1230
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2121
+#: src/gns/gnunet-gns-proxy.c:2131
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2642
+#: src/gns/gnunet-gns-proxy.c:2652
 #, 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:2674
+#: src/gns/gnunet-gns-proxy.c:2684
 #, 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:2875
+#: src/gns/gnunet-gns-proxy.c:2885
 #, 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:2897 src/rest/gnunet-rest-server.c:658
+#: src/gns/gnunet-gns-proxy.c:2907 src/rest/gnunet-rest-server.c:668
 #, 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:3233
+#: src/gns/gnunet-gns-proxy.c:3243
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3262
+#: src/gns/gnunet-gns-proxy.c:3272
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3345
+#: src/gns/gnunet-gns-proxy.c:3355
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3635
+#: src/gns/gnunet-gns-proxy.c:3693
 #, 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:3763
+#: src/gns/gnunet-gns-proxy.c:3821
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3768
+#: src/gns/gnunet-gns-proxy.c:3826
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3772
+#: src/gns/gnunet-gns-proxy.c:3830
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3798
+#: src/gns/gnunet-gns-proxy.c:3856
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-gns.c:199
-#, 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:506
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4387,8 +4393,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:561
-#: 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"
 
@@ -4483,6 +4489,11 @@ msgstr "No se pudo procesar la cadena de registro VPN 
«%s»\n"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
 
+#: src/gns/plugin_rest_gns.c:452
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr "Conexión fallida\n"
+
 #: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4898,7 +4909,7 @@ msgid "# hostlist advertisements send"
 msgstr "# anuncios de listas de máquinas enviados"
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2814
+#: src/transport/gnunet-service-transport.c:2827
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
@@ -5039,15 +5050,16 @@ msgstr "Se produjo un fallo al borrar el fichero de 
configuración %s\n"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Se produjo un fallo al leer el directorio «%s»\n"
 
+#: src/identity/plugin_rest_identity.c:1297
+#, fuzzy
+msgid "Identity REST API initialized\n"
+msgstr "Conexión fallida\n"
+
 #: src/json/json.c:123
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
-msgid "This command doesn't do anything yet."
-msgstr ""
-
 #: src/my/my.c:196 src/my/my.c:215
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
@@ -5092,127 +5104,62 @@ msgstr "¡Debes especificar un receptor!\n"
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
-#: src/namecache/gnunet-namecache.c:238
-#, fuzzy
-msgid "spezifies the public key of the zone to look in"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1632
-msgid "GNUnet zone manipulation tool"
-msgstr "Herramienta de manipulación de zona de GNUnet"
-
-#: src/namecache/namecache_api.c:296
-#, fuzzy
-msgid "Namecache failed to cache block"
-msgstr "El almacén de nombres no pudo añadir el registro"
-
-# Miguel: ¿Conectar y conexión?
-#: src/namecache/namecache_api.c:383
-#, fuzzy
-msgid "Error communicating with namecache service"
-msgstr "Error al comunicar con el servicio ARM.\n"
-
-#: src/namecache/plugin_namecache_flat.c:121
-#: src/namecache/plugin_namecache_flat.c:255
-#: src/namestore/plugin_namestore_heap.c:148
-#: src/namestore/plugin_namestore_heap.c:395
-#: src/peerstore/plugin_peerstore_flat.c:379
-#: src/peerstore/plugin_peerstore_flat.c:538
-#, fuzzy, c-format
-msgid "Unable to initialize file: %s.\n"
-msgstr "Imposible inicializar SQLite: %s.\n"
-
-#: src/namecache/plugin_namecache_flat.c:132
-#: src/namestore/plugin_namestore_heap.c:159
-#: src/peerstore/plugin_peerstore_flat.c:394
-#, fuzzy, c-format
-msgid "Unable to get filesize: %s.\n"
-msgstr "Se produjo un fallo al crear los índices\n"
-
-#: src/namecache/plugin_namecache_flat.c:151
-#: src/namestore/plugin_namestore_heap.c:172
-#: src/peerstore/plugin_peerstore_flat.c:406
-#, fuzzy, c-format
-msgid "Unable to read file: %s.\n"
-msgstr "Se produjo un fallo al crear los índices\n"
-
-#: src/namecache/plugin_namecache_flat.c:410
-#, fuzzy
-msgid "flat plugin running\n"
-msgstr "Base de datos sqlite ejecutándose\n"
-
-#: src/namecache/plugin_namecache_sqlite.c:183
-#: src/namecache/plugin_namecache_sqlite.c:197
-#: src/namestore/plugin_namestore_sqlite.c:219
-#: src/namestore/plugin_namestore_sqlite.c:230
-#, fuzzy, c-format
-msgid "Failed to setup database at `%s'\n"
-msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
-
-# form??
-#: src/namestore/gnunet-namestore-fcfsd.c:549
-#, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Forma de valor no soportada «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:576
-#, 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:597
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:629
-#, 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:689
-#, 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:777
-#, 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:796
-#, 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:832
-msgid "Domain name must not contain `.'\n"
-msgstr "El nombre de dominio no puede contener «.»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:841
-msgid "Domain name must not contain `+'\n"
-msgstr "El nombre de dominio no puede contener «+»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1071
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
+#: src/namecache/gnunet-namecache.c:238
+#, fuzzy
+msgid "spezifies the public key of the zone to look in"
+msgstr "Especificar el tipo del registro a buscar"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1099
-msgid "Failed to start HTTP server\n"
-msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1632
+msgid "GNUnet zone manipulation tool"
+msgstr "Herramienta de manipulación de zona de GNUnet"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1147
+#: src/namecache/namecache_api.c:296
 #, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Se produjo un fallo al conectar con GNS\n"
+msgid "Namecache failed to cache block"
+msgstr "El almacén de nombres no pudo añadir el registro"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1173
-msgid "name of the zone that is to be managed by FCFSD"
-msgstr ""
+# Miguel: ¿Conectar y conexión?
+#: src/namecache/namecache_api.c:383
+#, fuzzy
+msgid "Error communicating with namecache service"
+msgstr "Error al comunicar con el servicio ARM.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1192
+#: src/namecache/plugin_namecache_flat.c:121
+#: src/namecache/plugin_namecache_flat.c:255
+#: src/namestore/plugin_namestore_heap.c:179
+#: src/namestore/plugin_namestore_heap.c:412
+#: src/peerstore/plugin_peerstore_flat.c:379
+#: src/peerstore/plugin_peerstore_flat.c:538
+#, fuzzy, c-format
+msgid "Unable to initialize file: %s.\n"
+msgstr "Imposible inicializar SQLite: %s.\n"
+
+#: src/namecache/plugin_namecache_flat.c:132
+#: src/namestore/plugin_namestore_heap.c:190
+#: src/peerstore/plugin_peerstore_flat.c:394
+#, fuzzy, c-format
+msgid "Unable to get filesize: %s.\n"
+msgstr "Se produjo un fallo al crear los índices\n"
+
+#: src/namecache/plugin_namecache_flat.c:151
+#: src/namestore/plugin_namestore_heap.c:203
+#: src/peerstore/plugin_peerstore_flat.c:406
+#, fuzzy, c-format
+msgid "Unable to read file: %s.\n"
+msgstr "Se produjo un fallo al crear los índices\n"
+
+#: src/namecache/plugin_namecache_flat.c:410
 #, fuzzy
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
+msgid "flat plugin running\n"
+msgstr "Base de datos sqlite ejecutándose\n"
+
+#: src/namecache/plugin_namecache_sqlite.c:183
+#: src/namecache/plugin_namecache_sqlite.c:197
+#: src/namestore/plugin_namestore_sqlite.c:219
+#: src/namestore/plugin_namestore_sqlite.c:230
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 
 #: src/namestore/gnunet-namestore.c:341
 #, c-format
@@ -5424,6 +5371,71 @@ 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:549
+#, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Forma de valor no soportada «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:576
+#, 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:597
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:629
+#, 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:689
+#, 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:777
+#, 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:796
+#, 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:832
+msgid "Domain name must not contain `.'\n"
+msgstr "El nombre de dominio no puede contener «.»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:841
+msgid "Domain name must not contain `+'\n"
+msgstr "El nombre de dominio no puede contener «+»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1099
+msgid "Failed to start HTTP server\n"
+msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1147
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1173
+msgid "name of the zone that is to be managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1192
+#, 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:900
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
@@ -5442,11 +5454,16 @@ msgstr ""
 msgid "Namestore failed to store record\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/namestore/plugin_namestore_heap.c:778
+#: src/namestore/plugin_namestore_heap.c:773
 #, fuzzy
 msgid "heap file database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
 
+#: src/namestore/plugin_rest_namestore.c:1079
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr "Conexión fallida\n"
+
 #: src/nat-auto/gnunet-nat-auto.c:193
 #, fuzzy
 msgid "Suggested configuration changes:\n"
@@ -5742,6 +5759,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"
@@ -5767,16 +5789,70 @@ 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 ""
+
+# 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
 msgid "%sPeer `%s'\n"
@@ -5788,7 +5864,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:299
-#: src/rest-plugins/plugin_rest_peerinfo.c:501
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n"
@@ -5861,70 +5937,16 @@ msgstr "Iniciando los módulos de transporte «%s»\n"
 msgid "Loading `%s' transport plugin\n"
 msgstr "Cargando el módulo de transporte «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:208
-#, c-format
-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 ""
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:208
+#, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\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/plugin_rest_peerinfo.c:796
+#, fuzzy
+msgid "Peerinfo REST API initialized\n"
+msgstr "Conexión fallida\n"
 
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
@@ -5935,22 +5957,21 @@ msgstr ""
 msgid "Could not load database backend `%s'\n"
 msgstr "No se pudo leer el fichero de la lista negra «%s»\n"
 
-#: src/peerstore/peerstore_api.c:532 src/peerstore/peerstore_api.c:581
+#: src/peerstore/peerstore_api.c:605 src/peerstore/peerstore_api.c:657
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
 
-#: src/peerstore/peerstore_api.c:595
+#: src/peerstore/peerstore_api.c:671
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/peerstore/peerstore_api.c:731
+#: src/peerstore/peerstore_api.c:807
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
 #: src/peerstore/plugin_peerstore_sqlite.c:453
-#: src/psycstore/plugin_psycstore_sqlite.c:282
 #, fuzzy, c-format
 msgid ""
 "Error executing SQL query: %s\n"
@@ -5958,8 +5979,6 @@ msgid ""
 msgstr "Error abriendo fichero «%s»: %s\n"
 
 #: src/peerstore/plugin_peerstore_sqlite.c:488
-#: src/psycstore/plugin_psycstore_mysql.c:250
-#: src/psycstore/plugin_psycstore_sqlite.c:259
 #, fuzzy, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
@@ -5976,114 +5995,6 @@ msgstr "Se produjo un fallo al crear los índices\n"
 msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
 msgstr "«%s» para «%s» falló en %s: %d con error: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:249
-#, fuzzy
-msgid "Failed to store membership information!\n"
-msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:271
-#, fuzzy
-msgid "Failed to test membership!\n"
-msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:300
-#, fuzzy
-msgid "Dropping invalid fragment\n"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:311
-#, fuzzy
-msgid "Failed to store fragment\n"
-msgstr "Se produjo un fallo al iniciar el demonio: %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:368
-#, fuzzy
-msgid "Failed to get fragment!\n"
-msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:434
-#, fuzzy
-msgid "Failed to get message!\n"
-msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:464
-#, fuzzy
-msgid "Failed to get message fragment!\n"
-msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:494
-#, fuzzy
-msgid "Failed to get master counters!\n"
-msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:675
-#, fuzzy, c-format
-msgid "Failed to begin modifying state: %d\n"
-msgstr "Se produjo un fallo al cargar el estado: %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:685
-#, fuzzy, c-format
-msgid "Failed to modify state: %d\n"
-msgstr "Se produjo un fallo al cargar el estado: %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:693
-#, fuzzy
-msgid "Failed to end modifying state!\n"
-msgstr "Se produjo un fallo al cargar el estado: %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:730
-#, fuzzy
-msgid "Tried to set invalid state variable name!\n"
-msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:744
-#, fuzzy
-msgid "Failed to begin synchronizing state!\n"
-msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:761
-#, fuzzy
-msgid "Failed to end synchronizing state!\n"
-msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:779
-#: src/psycstore/gnunet-service-psycstore.c:795
-#, fuzzy
-msgid "Failed to reset state!\n"
-msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:824
-#: src/psycstore/gnunet-service-psycstore.c:881
-#, fuzzy
-msgid "Tried to get invalid state variable name!\n"
-msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:851
-#: src/psycstore/gnunet-service-psycstore.c:896
-#, fuzzy
-msgid "Failed to get state variable!\n"
-msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
-
-#: src/psycstore/plugin_psycstore_mysql.c:281
-#, fuzzy
-msgid "Unable to initialize Mysql.\n"
-msgstr "Imposible inicializar SQLite: %s.\n"
-
-#: src/psycstore/plugin_psycstore_mysql.c:291
-#, fuzzy, c-format
-msgid "Failed to run SQL statement `%s'\n"
-msgstr "Se produjo un fallo al preparar la sentencia «%s»\n"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:61
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s (%d)\n"
-msgstr "«%s» falló en %s: %d con el error: %s\n"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:1924
-#, fuzzy
-msgid "SQLite database running\n"
-msgstr "Base de datos sqlite ejecutándose\n"
-
 #: src/pt/gnunet-daemon-pt.c:423
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Se produjo un fallo al empaquetar la petición DNS.  Omitiendo.\n"
@@ -6141,61 +6052,80 @@ msgid "Daemon to run to perform IP protocol translation 
to GNUnet"
 msgstr ""
 "Demonio a ejecutar para realizar la traducción de protocolo IP a GNUnet"
 
-#: src/reclaim/gnunet-reclaim.c:467
+#: src/reclaim/gnunet-reclaim.c:495
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "Las opción «%s» o «%s» es necesaria.\n"
 
-#: src/reclaim/gnunet-reclaim.c:475
+#: src/reclaim/gnunet-reclaim.c:501
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:483
+#: src/reclaim/gnunet-reclaim.c:507
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "el parámetro --section es necesario\n"
 
-#: src/reclaim/gnunet-reclaim.c:506
-msgid "Add attribute"
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "Add an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:512
-msgid "Attribute value"
+#: src/reclaim/gnunet-reclaim.c:527
+msgid "Add an attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:517
-msgid "Ego"
+#: src/reclaim/gnunet-reclaim.c:530
+msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:522
-msgid "Audience (relying party)"
+#: src/reclaim/gnunet-reclaim.c:533
+#, fuzzy
+msgid "The EGO to use"
+msgstr "tamaño del mensaje"
+
+#: src/reclaim/gnunet-reclaim.c:535
+msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:526
-msgid "List attributes for Ego"
+#: src/reclaim/gnunet-reclaim.c:538
+msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:531
-msgid "Issue a ticket"
+#: src/reclaim/gnunet-reclaim.c:542
+msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:536
+#: src/reclaim/gnunet-reclaim.c:545
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:541
+#: src/reclaim/gnunet-reclaim.c:548
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:546
+#: src/reclaim/gnunet-reclaim.c:551
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:551
+#: src/reclaim/gnunet-reclaim.c:553
+msgid "List tickets of ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:556
 msgid "Expiration interval of the attribute"
 msgstr ""
 
+#: src/reclaim/gnunet-reclaim.c:560
+msgid "re:claimID command line tool"
+msgstr ""
+
+#: src/reclaim/plugin_rest_openid_connect.c:2051
+#: src/reclaim/plugin_rest_reclaim.c:1018
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr "Conexión fallida\n"
+
 #: src/reclaim/reclaim_api.c:436
 #, fuzzy
 msgid "failed to store record\n"
@@ -6296,52 +6226,21 @@ msgstr "El servicio «%s» no está ejecutandose\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/rest-plugins/plugin_rest_copying.c:209
-#, fuzzy
-msgid "COPYING REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/rest-plugins/plugin_rest_credential.c:1128
-#, fuzzy
-msgid "GNS REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/rest-plugins/plugin_rest_gns.c:452
-#, fuzzy
-msgid "Gns REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/rest-plugins/plugin_rest_identity.c:1297
-#, fuzzy
-msgid "Identity REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/rest-plugins/plugin_rest_namestore.c:1079
-#, fuzzy
-msgid "Namestore REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/rest-plugins/plugin_rest_openid_connect.c:2245
-#: src/rest-plugins/plugin_rest_reclaim.c:1079
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/rest-plugins/plugin_rest_peerinfo.c:796
-#, fuzzy
-msgid "Peerinfo REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/rest/gnunet-rest-server.c:927
+#: src/rest/gnunet-rest-server.c:986
 #, fuzzy
 msgid "listen on specified port (default: 7776)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/rest/gnunet-rest-server.c:944
+#: src/rest/gnunet-rest-server.c:1003
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Herramienta de acceso GNUnet GNS"
 
+#: src/rest/plugin_rest_copying.c:209
+#, fuzzy
+msgid "COPYING REST API initialized\n"
+msgstr "Conexión fallida\n"
+
 #: src/revocation/gnunet-revocation.c:129
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
@@ -6405,7 +6304,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
+#: src/revocation/gnunet-revocation.c:437
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
@@ -6482,39 +6381,39 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/rps/gnunet-rps-profiler.c:2959
+#: src/rps/gnunet-rps.c:260
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:264
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:268
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:3088
 #, fuzzy
 msgid "duration of the profiling"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/rps/gnunet-rps-profiler.c:2965
+#: src/rps/gnunet-rps-profiler.c:3093
 #, fuzzy
 msgid "timeout for the profiling"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/rps/gnunet-rps-profiler.c:2971
+#: src/rps/gnunet-rps-profiler.c:3098
 #, fuzzy
 msgid "number of PeerIDs to request"
 msgstr "número de pares para empezar"
 
-#: src/rps/gnunet-rps-profiler.c:2986
+#: src/rps/gnunet-rps-profiler.c:3114
 #, fuzzy
 msgid "Measure quality and performance of the RPS service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/rps/gnunet-rps.c:260
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:264
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:268
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/scalarproduct/gnunet-scalarproduct.c:220
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6570,10 +6469,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"
@@ -6598,7 +6497,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2005
+#: src/set/gnunet-service-set.c:2008
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
@@ -6646,134 +6545,6 @@ msgstr ""
 msgid "element size"
 msgstr ""
 
-#: src/social/gnunet-social.c:1166
-#, fuzzy
-msgid "--place missing or invalid.\n"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/social/gnunet-social.c:1217
-msgid "assign --name in state to --data"
-msgstr ""
-
-#: src/social/gnunet-social.c:1222
-msgid "say good-bye and leave somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1227
-msgid "create a place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1232
-msgid "destroy a place we were hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1237
-msgid "enter somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1243
-msgid "find state matching name prefix"
-msgstr ""
-
-#: src/social/gnunet-social.c:1248
-msgid "replay history of messages up to the given --limit"
-msgstr ""
-
-#: src/social/gnunet-social.c:1253
-msgid "reconnect to a previously created place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1258
-msgid "publish something to a place we are hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1263
-msgid "reconnect to a previously entered place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1268
-msgid "search for state matching exact name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1273
-msgid "submit something to somebody's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1278
-msgid "list of egos and subscribed places"
-msgstr ""
-
-#: src/social/gnunet-social.c:1283
-msgid "extract and replay history between message IDs --start and --until"
-msgstr ""
-
-#: src/social/gnunet-social.c:1292
-msgid "application ID to use when connecting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1298
-msgid "message body or state value"
-msgstr ""
-
-#: src/social/gnunet-social.c:1304
-#, fuzzy
-msgid "name or public key of ego"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/social/gnunet-social.c:1309
-#, fuzzy
-msgid "wait for incoming messages"
-msgstr "Falló al entregar el mensaje '%s'.\n"
-
-#: src/social/gnunet-social.c:1315
-#, fuzzy
-msgid "GNS name"
-msgstr "Mostrar el _nombre"
-
-#: src/social/gnunet-social.c:1321
-msgid "peer ID for --guest-enter"
-msgstr ""
-
-#: src/social/gnunet-social.c:1327
-msgid "name (key) to query from state"
-msgstr ""
-
-#: src/social/gnunet-social.c:1333
-#, fuzzy
-msgid "method name"
-msgstr "Mostrar el _nombre"
-
-#: src/social/gnunet-social.c:1339
-#, fuzzy
-msgid "number of messages to replay from history"
-msgstr "número de mensajes a usar por iteración"
-
-#: src/social/gnunet-social.c:1345
-msgid "key address of place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1351
-msgid "start message ID for history replay"
-msgstr ""
-
-#: src/social/gnunet-social.c:1356
-msgid "respond to entry requests by admitting all guests"
-msgstr ""
-
-#: src/social/gnunet-social.c:1362
-msgid "end message ID for history replay"
-msgstr ""
-
-#: src/social/gnunet-social.c:1367
-msgid "respond to entry requests by refusing all guests"
-msgstr ""
-
-#: src/social/gnunet-social.c:1377
-msgid ""
-"gnunet-social - Interact with the social service: enter/leave, send/receive "
-"messages, access history and state.\n"
-msgstr ""
-
 #: src/sq/sq.c:54
 #, c-format
 msgid "Failure to bind %u-th SQL parameter\n"
@@ -6937,7 +6708,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Argumento no válido para '%s' en %s:%d.\n"
 
 #: src/testbed/generate-underlay-topology.c:342
-#: src/testbed/gnunet-testbed-profiler.c:283
+#: src/testbed/gnunet-testbed-profiler.c:282
 msgid "create COUNT number of peers"
 msgstr "crea «COUNT» número de pares"
 
@@ -7050,17 +6821,6 @@ 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-profiler.c:289
-msgid "tolerate COUNT number of continious timeout failures"
-msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo"
-
-#: 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"
@@ -7071,6 +6831,17 @@ msgstr "Esperando a los pares para conectar (%u ciclos 
restantes)...\n"
 msgid "Spawning process `%s'\n"
 msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
 
+#: src/testbed/gnunet-testbed-profiler.c:287
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo"
+
+#: src/testbed/gnunet-testbed-profiler.c:291
+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
 #, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -7258,7 +7029,7 @@ msgstr "El número de clave %u no existe\n"
 
 # Miguel: "testbed" lo he traducido como batería de pruebas, pero
 # no es una traducción muy literal.
-#: src/testing/testing.c:1159
+#: src/testing/testing.c:1161
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -7267,47 +7038,47 @@ msgstr ""
 "Se ha intentado crear una batería de pruebas con más de %u máquinas.  Por "
 "favor, pre-compute más claves de máquinas primero.\n"
 
-#: src/testing/testing.c:1168
+#: src/testing/testing.c:1170
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 "Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n"
 
-#: src/testing/testing.c:1178
+#: src/testing/testing.c:1180
 #, fuzzy
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr "¡Falta la opción «%s» en la sección «%s» de la configuración!\n"
 
-#: src/testing/testing.c:1191
+#: src/testing/testing.c:1193
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 "Se produjo un fallo al crear la configuración para el par (¿no hay "
 "suficientes puertos libres?)\n"
 
-#: src/testing/testing.c:1205
+#: src/testing/testing.c:1207
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "No se pudo abrir el fichero de claves de máquina: %s\n"
 
-#: src/testing/testing.c:1217
+#: src/testing/testing.c:1219
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 "Se produjo un fallo al escribir la clave de la máquina para el par %u: %s\n"
 
-#: src/testing/testing.c:1242
+#: src/testing/testing.c:1244
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 "Se produjo un fallo al escribir el fichero de configuración «%s» para el par "
 "%u: %s\n"
 
-#: src/testing/testing.c:1344
+#: src/testing/testing.c:1346
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1649
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
@@ -7391,22 +7162,22 @@ msgstr "# mensajes «HELLO» recibidos"
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2329
-#: src/transport/gnunet-communicator-udp.c:2883
-#: src/transport/gnunet-service-tng.c:4679
-#: src/transport/gnunet-service-transport.c:2782
+#: src/transport/gnunet-communicator-tcp.c:2334
+#: src/transport/gnunet-communicator-udp.c:2938
+#: src/transport/gnunet-service-tng.c:7070
+#: src/transport/gnunet-service-transport.c:2795
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 "El servicio de transporte carece de opciones de configuración de clave.  "
 "Saliendo.\n"
 
-#: src/transport/gnunet-communicator-tcp.c:2393
+#: src/transport/gnunet-communicator-tcp.c:2398
 #, fuzzy
 msgid "GNUnet TCP communicator"
 msgstr "Configurador Gtk de GNUnet"
 
-#: src/transport/gnunet-communicator-udp.c:2954
+#: src/transport/gnunet-communicator-udp.c:3016
 #, fuzzy
 msgid "GNUnet UDP communicator"
 msgstr "Configurador Gtk de GNUnet"
@@ -7417,61 +7188,61 @@ msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/transport/gnunet-communicator-unix.c:1073
+#: src/transport/gnunet-communicator-unix.c:1074
 #: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/transport/gnunet-communicator-unix.c:1162
+#: src/transport/gnunet-communicator-unix.c:1163
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:448
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:452
 msgid "# messages dropped due to slow client"
 msgstr "# mensajes omitidos debido a un cliente lento"
 
-#: src/transport/gnunet-service-transport.c:817
+#: src/transport/gnunet-service-transport.c:826
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr "# bytes de «payload» omitidos (el otro par no estaba conectado)"
 
-#: src/transport/gnunet-service-transport.c:1550
+#: src/transport/gnunet-service-transport.c:1563
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "# bytes de «payload» descartados debido a par no conectado"
 
-#: src/transport/gnunet-service-transport.c:1710
+#: src/transport/gnunet-service-transport.c:1723
 msgid "# bytes total received"
 msgstr "# total de bytes recibidos"
 
-#: src/transport/gnunet-service-transport.c:1807
+#: src/transport/gnunet-service-transport.c:1820
 msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
-#: src/transport/gnunet-service-transport.c:2124
-#: src/transport/gnunet-service-transport.c:2596
+#: src/transport/gnunet-service-transport.c:2137
+#: src/transport/gnunet-service-transport.c:2609
 msgid "# disconnects due to blacklist"
 msgstr "# desconexiones debido a la lista negra"
 
-#: src/transport/gnunet-service-transport.c:2600
+#: src/transport/gnunet-service-transport.c:2613
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/transport/gnunet-service-transport.c:2708
+#: src/transport/gnunet-service-transport.c:2721
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/transport/gnunet-service-transport.c:2717
+#: src/transport/gnunet-service-transport.c:2730
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\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 "# refrescos de mi «HELLO»"
@@ -7481,211 +7252,211 @@ msgstr "# refrescos de mi «HELLO»"
 msgid "# session creation failed"
 msgstr "# sesiones wlan creadas"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1052
+#: src/transport/gnunet-service-transport_neighbours.c:1053
 msgid "# DISCONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1175
+#: src/transport/gnunet-service-transport_neighbours.c:1176
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1323
-#: src/transport/gnunet-service-transport_neighbours.c:1784
+#: src/transport/gnunet-service-transport_neighbours.c:1324
+#: src/transport/gnunet-service-transport_neighbours.c:1785
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes en la cola de mensajes para otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1328
+#: src/transport/gnunet-service-transport_neighbours.c:1329
 msgid "# messages transmitted to other peers"
 msgstr "# mensajes transmitidos a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1334
+#: src/transport/gnunet-service-transport_neighbours.c:1335
 msgid "# transmission failures for messages to other peers"
 msgstr "# fallos de transmisión en mensajes a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1394
+#: src/transport/gnunet-service-transport_neighbours.c:1395
 msgid "# messages timed out while in transport queue"
 msgstr "# mensajes expirados mientras estaban en la cola de transporte"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1478
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1514
+#: src/transport/gnunet-service-transport_neighbours.c:1515
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1522
+#: src/transport/gnunet-service-transport_neighbours.c:1523
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1532
+#: src/transport/gnunet-service-transport_neighbours.c:1533
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1577
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1586
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1595
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1603
+#: src/transport/gnunet-service-transport_neighbours.c:1604
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1608
+#: src/transport/gnunet-service-transport_neighbours.c:1609
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1614
+#: src/transport/gnunet-service-transport_neighbours.c:1615
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1681
+#: src/transport/gnunet-service-transport_neighbours.c:1682
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes descartados debido a la falta de registro vecinal"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1715
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 msgid "# bandwidth quota violations by other peers"
 msgstr "# violaciones de la cuota de ancho de banda por otros pares"
 
 # throttling?
-#: src/transport/gnunet-service-transport_neighbours.c:1730
+#: src/transport/gnunet-service-transport_neighbours.c:1731
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1853
+#: src/transport/gnunet-service-transport_neighbours.c:1854
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr ""
-"Se produjo un fallo al procesar el mensaje interno del programa auxiliar «%"
-"s»\n"
+"Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
+"«%s»\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1873
+#: src/transport/gnunet-service-transport_neighbours.c:1874
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1913
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1929
+#: src/transport/gnunet-service-transport_neighbours.c:1930
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1959
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2027
+#: src/transport/gnunet-service-transport_neighbours.c:2028
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2081
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2098
+#: src/transport/gnunet-service-transport_neighbours.c:2099
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2261
+#: src/transport/gnunet-service-transport_neighbours.c:2262
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2266
+#: src/transport/gnunet-service-transport_neighbours.c:2267
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2653
+#: src/transport/gnunet-service-transport_neighbours.c:2654
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3139
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# mensajes SET QUOTA recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3146
+#: src/transport/gnunet-service-transport_neighbours.c:3147
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3165
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3200
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3225
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3238
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3411
+#: src/transport/gnunet-service-transport_neighbours.c:3412
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3447
+#: src/transport/gnunet-service-transport_neighbours.c:3448
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3535
+#: src/transport/gnunet-service-transport_neighbours.c:3536
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3543
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3583
 #, fuzzy
 msgid "# disconnect messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3589
+#: src/transport/gnunet-service-transport_neighbours.c:3590
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3600
+#: src/transport/gnunet-service-transport_neighbours.c:3601
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3735
+#: src/transport/gnunet-service-transport_neighbours.c:3736
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
@@ -7721,7 +7492,7 @@ msgstr "# revalidaciones de direcciones iniciadas"
 #: src/transport/gnunet-service-transport_validation.c:491
 #: src/transport/gnunet-service-transport_validation.c:677
 #: src/transport/gnunet-service-transport_validation.c:997
-#: src/transport/gnunet-service-transport_validation.c:1609
+#: src/transport/gnunet-service-transport_validation.c:1610
 #, fuzzy
 msgid "# validations running"
 msgstr "Base de datos sqlite ejecutándose\n"
@@ -7749,31 +7520,31 @@ msgstr ""
 msgid "# address revalidations started"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:1123
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PING message for different peer received"
 msgstr "# Mensajes PING recibidos para un par diferente"
 
-#: src/transport/gnunet-service-transport_validation.c:1174
+#: src/transport/gnunet-service-transport_validation.c:1175
 #, fuzzy, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 "No confirmando el PING con dirección «%s» ya que no puedo confirmar tener "
 "esa dirección.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1187
+#: src/transport/gnunet-service-transport_validation.c:1188
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1190
+#: src/transport/gnunet-service-transport_validation.c:1191
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1198
+#: src/transport/gnunet-service-transport_validation.c:1199
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1211
+#: src/transport/gnunet-service-transport_validation.c:1212
 #, fuzzy, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7782,75 +7553,36 @@ msgstr ""
 "No confirmando el PING con dirección «%s» ya que no puedo confirmar tener "
 "esa dirección.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1266
+#: src/transport/gnunet-service-transport_validation.c:1267
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1317
+#: src/transport/gnunet-service-transport_validation.c:1318
 msgid "# PONGs unicast via reliable transport"
 msgstr "# unicast de PONG vía transporte confiable"
 
-#: src/transport/gnunet-service-transport_validation.c:1326
+#: src/transport/gnunet-service-transport_validation.c:1327
 msgid "# PONGs multicast to all available addresses"
 msgstr "# multicast de PONG a todas las direcciones disponibles"
 
-#: src/transport/gnunet-service-transport_validation.c:1499
+#: src/transport/gnunet-service-transport_validation.c:1500
 msgid "# PONGs dropped, no matching pending validation"
 msgstr "# PONG omitidos, no hay una validación pendiente coincidente"
 
-#: src/transport/gnunet-service-transport_validation.c:1517
+#: src/transport/gnunet-service-transport_validation.c:1518
 msgid "# PONGs dropped, signature expired"
 msgstr "# Mensajes PONG omitidos, firma expirada"
 
-#: src/transport/gnunet-service-transport_validation.c:1572
-#, fuzzy
-msgid "# validations succeeded"
-msgstr "# revalidaciones de direcciones iniciadas"
-
-#: src/transport/gnunet-service-transport_validation.c:1627
-#, fuzzy
-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
+#: src/transport/gnunet-service-transport_validation.c:1573
 #, fuzzy
-msgid "number of messages to send"
-msgstr "número de mensajes a usar por iteración"
+msgid "# validations succeeded"
+msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-transport-profiler.c:636
+#: src/transport/gnunet-service-transport_validation.c:1628
 #, 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."
+msgid "# HELLOs given to peerinfo"
+msgstr "# «HELLO» obtenidos de «peerinfo»"
 
 #: src/transport/gnunet-transport.c:413
 #, c-format
@@ -7946,8 +7678,8 @@ msgstr ""
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
-"Ninguna operación introducida. Por favor, seleccione alguna operación: %s, %"
-"s, %s, %s, %s, %s\n"
+"Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
+"%s, %s, %s, %s, %s\n"
 
 #: src/transport/gnunet-transport.c:1294
 #, fuzzy
@@ -7996,6 +7728,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"
@@ -8005,13 +7742,45 @@ 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:3530
-#: src/transport/plugin_transport_tcp.c:3895
-#: src/transport/plugin_transport_tcp.c:3902
-#: src/transport/plugin_transport_xt.c:3899
-#: src/transport/plugin_transport_xt.c:3906
+#: src/transport/plugin_transport_tcp.c:3901
+#: src/transport/plugin_transport_tcp.c:3908
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -8091,7 +7860,6 @@ msgstr "Encontradas %u direcciones para comunicar al 
servicio NAT\n"
 
 #: src/transport/plugin_transport_http_server.c:2905
 #: src/transport/plugin_transport_udp.c:3627
-#: 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"
 
@@ -8197,127 +7965,118 @@ msgstr "# bytes enviados vía SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por SMTP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:1551
-#: src/transport/plugin_transport_tcp.c:2877
-#: src/transport/plugin_transport_xt.c:1553
-#: src/transport/plugin_transport_xt.c:2879
+#: src/transport/plugin_transport_tcp.c:1557
+#: src/transport/plugin_transport_tcp.c:2883
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Longitud de dirección inesperada: %u bytes\n"
 
-#: src/transport/plugin_transport_tcp.c:1734
-#: src/transport/plugin_transport_tcp.c:1958
-#: src/transport/plugin_transport_tcp.c:3141
-#: src/transport/plugin_transport_tcp.c:4018
-#: src/transport/plugin_transport_xt.c:1736
-#: src/transport/plugin_transport_xt.c:1960
-#: src/transport/plugin_transport_xt.c:3143
+#: src/transport/plugin_transport_tcp.c:1740
+#: src/transport/plugin_transport_tcp.c:1964
+#: src/transport/plugin_transport_tcp.c:3147
+#: src/transport/plugin_transport_tcp.c:4024
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
-#: src/transport/plugin_transport_tcp.c:1776
-#: src/transport/plugin_transport_tcp.c:1940
-#: src/transport/plugin_transport_tcp.c:2064
-#: src/transport/plugin_transport_tcp.c:2137
-#: src/transport/plugin_transport_tcp.c:2237
-#: src/transport/plugin_transport_tcp.c:2262
-#: 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
+#: src/transport/plugin_transport_tcp.c:1782
+#: src/transport/plugin_transport_tcp.c:1946
+#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2143
+#: src/transport/plugin_transport_tcp.c:2243
+#: src/transport/plugin_transport_tcp.c:2268
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes actualmente en los buffer TCP"
 
-#: src/transport/plugin_transport_tcp.c:1779
-#: src/transport/plugin_transport_xt.c:1781
+#: src/transport/plugin_transport_tcp.c:1785
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes descartados por TCP (desconectado)"
 
-#: src/transport/plugin_transport_tcp.c:2067
-#: src/transport/plugin_transport_xt.c:2069
+#: src/transport/plugin_transport_tcp.c:2073
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (expirados)"
 
-#: src/transport/plugin_transport_tcp.c:2141
-#: src/transport/plugin_transport_xt.c:2143
+#: src/transport/plugin_transport_tcp.c:2147
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2539
-#: src/transport/plugin_transport_xt.c:2541
+#: src/transport/plugin_transport_tcp.c:2545
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2715
-#: src/transport/plugin_transport_xt.c:2717
+#: src/transport/plugin_transport_tcp.c:2721
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
-#: src/transport/plugin_transport_tcp.c:3207
-#: src/transport/plugin_transport_xt.c:3209
+#: src/transport/plugin_transport_tcp.c:3213
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:3413
-#: src/transport/plugin_transport_xt.c:3415
+#: src/transport/plugin_transport_tcp.c:3419
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:3464
-#: src/transport/plugin_transport_tcp.c:3522
-#: src/transport/plugin_transport_xt.c:3466
-#: src/transport/plugin_transport_xt.c:3524
+#: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_tcp.c:3528
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# conexiones «stream» activas"
 
-#: src/transport/plugin_transport_tcp.c:3468
-#: src/transport/plugin_transport_xt.c:3470
+#: src/transport/plugin_transport_tcp.c:3474
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# Pares conectados"
 
-#: src/transport/plugin_transport_tcp.c:3474
-#: src/transport/plugin_transport_xt.c:3476
+#: src/transport/plugin_transport_tcp.c:3480
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3476
-#: src/transport/plugin_transport_xt.c:3478
+#: src/transport/plugin_transport_tcp.c:3482
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3516
-#: src/transport/plugin_transport_xt.c:3518
+#: src/transport/plugin_transport_tcp.c:3522
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3526
-#: src/transport/plugin_transport_xt.c:3528
+#: src/transport/plugin_transport_tcp.c:3532
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:3845
-#: src/transport/plugin_transport_xt.c:3849
+#: src/transport/plugin_transport_tcp.c:3851
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:4006
+#: src/transport/plugin_transport_tcp.c:4012
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Transporte TCP escuchando en el puerto %llu\n"
 
-#: src/transport/plugin_transport_tcp.c:4010
+#: src/transport/plugin_transport_tcp.c:4016
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n"
 
-#: src/transport/plugin_transport_tcp.c:4014
+#: src/transport/plugin_transport_tcp.c:4020
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
 
+#: src/transport/plugin_transport_udp_broadcasting.c: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:3371
 #, c-format
 msgid ""
@@ -8344,7 +8103,6 @@ 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:3721
-#: 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"
@@ -8355,19 +8113,15 @@ msgstr "Se produjo un fallo al abrir los «sockets» 
UDP\n"
 
 #: src/transport/plugin_transport_udp.c:3883
 #: src/transport/plugin_transport_udp.c:3897
-#: 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:3929
-#: 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:3956
-#: 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"
@@ -8377,23 +8131,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:1416
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
@@ -8474,61 +8211,6 @@ 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"
@@ -8539,17 +8221,17 @@ msgstr "Acceso denegado a «%s»\n"
 msgid "Accepting connection from `%s': %p\n"
 msgstr "Aceptando conexión desde «%s»: %p\n"
 
-#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1624
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "«%s» falló para el puerto %d (%s).\n"
 
-#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1634
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "«%s» falló para el puerto %d (%s): dirección en uso actualmente\n"
 
-#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127
+#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1640
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
@@ -8563,7 +8245,7 @@ msgstr ""
 "El código de procesado para el mensaje del tipo %u no llamó a "
 "«GNUNET_SERVER_receive_done» después de %s\n"
 
-#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2396
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:864
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr "Familia de direcciones %d desconocida\n"
@@ -8573,29 +8255,29 @@ msgstr "Familia de direcciones %d desconocida\n"
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr "Acceso denegado desde «%s» al servicio «%s»\n"
 
-#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:988
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr "No se pudo procesar la especificación de red IPv4 «%s» para «%s:%s»\n"
 
-#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:1031
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr "No se pudo procesar la especificación de red IPv6 «%s» para «%s:%s»\n"
 
-#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1555
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 "No se pudo acceder a un «socket» pre-ascociado, lo intentaré asociar yo "
 "mismo\n"
 
 #: src/transport/tcp_service_legacy.c:953
-#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1195
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1708
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr "El valor especificado «%s» para el servicio «%s» no es válido\n"
 
-#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1228
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1741
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8612,45 +8294,45 @@ msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 msgid "Service `%s' runs at %s\n"
 msgstr "El servicio «%s» se ejecuta en %s\n"
 
-#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1502
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:2015
 msgid "Service process failed to initialize\n"
 msgstr "No se pudo inicializar el proceso del servicio\n"
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1506
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:2019
 msgid "Service process could not initialize server function\n"
 msgstr ""
 "No se pudo inicializar la función del servidor en el proceso del servicio\n"
 
-#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1510
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:2023
 msgid "Service process failed to report status\n"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
-#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1525
-#: src/util/service.c:1380
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1535
+#: src/util/service.c:1893
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1382
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1895
 msgid "No such user"
 msgstr "No existe tal usuario"
 
-#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1401
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1914
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1762
+#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:2276
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
-#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:1826
-#: src/util/service.c:1841
+#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:2340
+#: src/util/service.c:2355
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:1853
+#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:2367
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
@@ -8693,11 +8375,11 @@ msgstr "Los metadatos serializados «%s» son mayores de 
lo permitido (%u>%u)"
 msgid "Metadata `%s' failed to deserialize"
 msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
 
-#: src/util/client.c:734
+#: src/util/client.c:749
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:925
+#: src/util/client.c:941
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr "Se necesita un nombre de máquina no vacío para el servicio «%s».\n"
@@ -8744,16 +8426,16 @@ msgstr "NO VÁLIDO"
 msgid "unknown address"
 msgstr "dirección desconocida"
 
-#: src/util/common_logging.c:1500
+#: src/util/common_logging.c:1513
 msgid "invalid address"
 msgstr "dirección no válida"
 
-#: src/util/common_logging.c:1518
+#: src/util/common_logging.c:1531
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "¡La configuración no especifica la opción «%s» en la sección «%s»!\n"
 
-#: src/util/common_logging.c:1539
+#: src/util/common_logging.c:1552
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8805,28 +8487,28 @@ msgstr ""
 #: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have %"
-"llu)\n"
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 "El tamaño del fichero en disco es incorrecto para este «Bloom "
 "filter» (esperado %llu, tiene %llu)\n"
 
-#: src/util/crypto_ecc.c:862
+#: src/util/crypto_ecc.c:887
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:917
+#: src/util/crypto_ecc.c:946
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:996
+#: src/util/crypto_ecc.c:1025
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:1057
+#: src/util/crypto_ecc.c:1086
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
@@ -8881,19 +8563,19 @@ msgstr "El firmado ECC falló en %s:%d: %s\n"
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
 
-#: src/util/disk.c:1255
+#: src/util/disk.c:1265
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/dnsparser.c:260
+#: src/util/dnsparser.c:264
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 "Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: "
 "%s\n"
 
-#: src/util/dnsparser.c:950
+#: src/util/dnsparser.c:954
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
@@ -9001,7 +8683,7 @@ msgstr ""
 msgid "print this help"
 msgstr "imprime esta ayuda"
 
-#: src/util/getopt_helpers.c:282
+#: src/util/getopt_helpers.c:282 src/util/gnunet-qr.c:300
 msgid "be verbose"
 msgstr ""
 
@@ -9049,54 +8731,54 @@ msgstr "Tienes que introducir un número en la opción 
«%s».\n"
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:160
+#: src/util/gnunet-config.c:161
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
 
-#: src/util/gnunet-config.c:173
+#: src/util/gnunet-config.c:174
 #, fuzzy, c-format
 msgid "%s or %s argument is required\n"
 msgstr "el parámetro --section es necesario\n"
 
-#: src/util/gnunet-config.c:181
+#: src/util/gnunet-config.c:182
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:232
+#: src/util/gnunet-config.c:234
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr "el parámetro --option es necesario para establecer un valor\n"
 
-#: src/util/gnunet-config.c:286
+#: src/util/gnunet-config.c:288
 #, fuzzy
-msgid "obtain option of value as a filename (with $-expansion)"
+msgid "interpret option value as a filename (with $-expansion)"
 msgstr ""
 "obtener la opción del valor como un nombre de fichero (con expansión del $)"
 
-#: src/util/gnunet-config.c:291
+#: src/util/gnunet-config.c:293
 msgid "name of the section to access"
 msgstr "nombre de la sección a la que acceder"
 
-#: src/util/gnunet-config.c:296
+#: src/util/gnunet-config.c:298
 msgid "name of the option to access"
 msgstr "nombre de la opción a la que acceder"
 
-#: src/util/gnunet-config.c:301
+#: src/util/gnunet-config.c:303
 msgid "value to set"
 msgstr "valor a establecer"
 
-#: src/util/gnunet-config.c:305
+#: src/util/gnunet-config.c:307
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "Falta configuración sobre las opciones de claves.\n"
 
-#: src/util/gnunet-config.c:309
+#: src/util/gnunet-config.c:311
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:322
+#: src/util/gnunet-config.c:324
 msgid "Manipulate GNUnet configuration files"
 msgstr "Manipular ficheros de configuración de GNUnet"
 
@@ -9191,6 +8873,33 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
+#: src/util/gnunet-qr.c:108 src/util/gnunet-uri.c:91
+#, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "URI no válida: no comienza con «%s»\n"
+
+#: src/util/gnunet-qr.c:116 src/util/gnunet-uri.c:98
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr "URI no válida: falla al especificar el subsistema\n"
+
+#: src/util/gnunet-qr.c:127 src/util/gnunet-uri.c:108
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr "No hay un manejador conocido para el subsistema «%s»\n"
+
+#: src/util/gnunet-qr.c:297
+msgid "use video-device DEVICE (default: /dev/video0"
+msgstr ""
+
+#: src/util/gnunet-qr.c:303
+msgid "do not show preview windows"
+msgstr ""
+
+#: src/util/gnunet-qr.c:311
+msgid "Scan a QR code using a video device and import the uri read"
+msgstr ""
+
 #: src/util/gnunet-resolver.c:168
 msgid "perform a reverse lookup"
 msgstr "realizar una búsqueda inversa"
@@ -9225,7 +8934,7 @@ msgstr ""
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
-#: src/util/gnunet-service-resolver.c:1443
+#: src/util/gnunet-service-resolver.c:1424
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
@@ -9234,21 +8943,6 @@ msgstr ""
 msgid "No URI specified on command line\n"
 msgstr "No se ha especificado una URI en la línea de comandos. Saliendo.\n"
 
-#: src/util/gnunet-uri.c:91
-#, c-format
-msgid "Invalid URI: does not start with `%s'\n"
-msgstr "URI no válida: no comienza con «%s»\n"
-
-#: src/util/gnunet-uri.c:98
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
-msgstr "URI no válida: falla al especificar el subsistema\n"
-
-#: src/util/gnunet-uri.c:108
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
-msgstr "No hay un manejador conocido para el subsistema «%s»\n"
-
 #: src/util/gnunet-uri.c:170
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
@@ -9262,20 +8956,20 @@ msgstr "Error leyendo de «%s»: %s\n"
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
-"Se produjo un fallo al procesar el mensaje interno del programa auxiliar «%"
-"s»\n"
+"Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
+"«%s»\n"
 
 #: src/util/helper.c:606
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Error escribiendo a «%s»: %s\n"
 
-#: src/util/network.c:136
+#: src/util/network.c:176
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
 
-#: src/util/network.c:1795 src/util/network.c:1979
+#: src/util/network.c:1835 src/util/network.c:2019
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9391,12 +9085,7 @@ msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
 "No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n"
 
-#: src/util/service.c:1307
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
-msgstr ""
-
-#: src/util/service.c:2141
+#: src/util/service.c:668
 #, fuzzy, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9405,6 +9094,11 @@ msgstr ""
 "El código de procesado para el mensaje del tipo %u no llamó a "
 "«GNUNET_SERVER_receive_done» después de %s\n"
 
+#: src/util/service.c:1820
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
 #: src/util/signal.c:89
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
@@ -9540,14 +9234,14 @@ msgstr "Formato «%s» erroneo para máscara de red\n"
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato «%s» erroneo para red\n"
 
-#: src/util/time.c:828 src/util/time.c:860
+#: src/util/time.c:844 src/util/time.c:876
 #, fuzzy, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 "Se produjo un fallo al recuperar el espacio de nombres «%s», no se pudo "
 "retomar la operación de publicación.\n"
 
-#: src/util/time.c:866
+#: src/util/time.c:882
 #, c-format
 msgid ""
 "Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
@@ -9729,76 +9423,90 @@ 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"
 
-#: src/include/gnunet_common.h:772 src/include/gnunet_common.h:779
-#: src/include/gnunet_common.h:789
+#: src/include/gnunet_common.h:794 src/include/gnunet_common.h:801
+#: src/include/gnunet_common.h:811
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d. Aborting.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:797
+#: src/include/gnunet_common.h:819
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:809
+#: src/include/gnunet_common.h:831
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Violación externa del protocolo detectada en %s:%d.\n"
 
-#: src/include/gnunet_common.h:836 src/include/gnunet_common.h:845
+#: src/include/gnunet_common.h:858 src/include/gnunet_common.h:867
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 
 #, fuzzy
-#~ msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
-#~ msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
+#~ msgid "Unable to parse CRED record string `%s'\n"
+#~ msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
 
 #, fuzzy
-#~ msgid "Can not index file `%s': %s.\n"
-#~ msgstr "Imposible abrir el fichero de configuración '%s'.\n"
+#~ msgid "Issuer ego required\n"
+#~ msgstr "Tipo requerido\n"
+
+#, fuzzy
+#~ msgid "XT transport listening on port %llu\n"
+#~ msgstr "Transporte TCP escuchando en el puerto %llu\n"
 
 #, fuzzy
-#~ msgid "enable adding the creation time to the metadata of the uploaded file"
+#~ msgid "XT transport not listening on any port (client only)\n"
 #~ msgstr ""
-#~ "deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
+#~ "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n"
 
 #, fuzzy
-#~ msgid "`%s' is not a valid domain name\n"
-#~ msgstr "«%s» no es una dirección IP válida.\n"
+#~ msgid "XT transport advertises itself as being on port %llu\n"
+#~ msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
 
 #, fuzzy
-#~ msgid "Specify a timeout for the lookup"
-#~ msgstr "Especificar el tipo del registro a buscar"
+#~ msgid "# XT sessions active"
+#~ msgstr "# Sesiones TCP activas"
 
 #, fuzzy
-#~ msgid "Unable to parse CAA record string `%s'\n"
-#~ msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
+#~ 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"
 
 #, fuzzy
-#~ msgid "reduce output"
-#~ msgstr "Sin salida innecesaria"
+#~ 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"
 
 #, fuzzy
-#~ msgid "The EGO to use"
-#~ msgstr "tamaño del mensaje"
+#~ msgid "Failed to bind XU socket to %s: %s\n"
+#~ msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
 #, fuzzy
-#~ msgid "OpenID Connect REST API initialized\n"
-#~ msgstr "Conexión fallida\n"
+#~ msgid "Failed to open XU sockets\n"
+#~ msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
 #, fuzzy
-#~ msgid "CONFIG REST API initialized\n"
-#~ msgstr "Conexión fallida\n"
+#~ msgid "Failed to create XU network sockets\n"
+#~ msgstr "Se produjo un fallo al crear una nueva firma"
 
 #, fuzzy
-#~ msgid "Option `%s' can't be used with other options.\n"
-#~ msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n"
+#~ msgid "Print information about DV state"
+#~ msgstr "Imprime información acerca del estado del ATS"
 
 #, fuzzy
 #~ msgid "Invalid tunnel owner `%s'\n"
@@ -9808,6 +9516,107 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #~ msgid "Provide information about a particular tunnel"
 #~ msgstr "proveer información acerca de un túnel en particular"
 
+#, fuzzy
+#~ msgid "Failed to store membership information!\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to test membership!\n"
+#~ msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
+
+#, fuzzy
+#~ msgid "Dropping invalid fragment\n"
+#~ msgstr "Parámetro no válido «%s»\n"
+
+#, fuzzy
+#~ msgid "Failed to store fragment\n"
+#~ msgstr "Se produjo un fallo al iniciar el demonio: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to get fragment!\n"
+#~ msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#, fuzzy
+#~ msgid "Failed to get message!\n"
+#~ msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#, fuzzy
+#~ msgid "Failed to get message fragment!\n"
+#~ msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
+
+#, fuzzy
+#~ msgid "Failed to get master counters!\n"
+#~ msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#, fuzzy
+#~ msgid "Failed to begin modifying state: %d\n"
+#~ msgstr "Se produjo un fallo al cargar el estado: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to modify state: %d\n"
+#~ msgstr "Se produjo un fallo al cargar el estado: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to end modifying state!\n"
+#~ msgstr "Se produjo un fallo al cargar el estado: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to begin synchronizing state!\n"
+#~ msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#, fuzzy
+#~ msgid "Failed to end synchronizing state!\n"
+#~ msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#, fuzzy
+#~ msgid "Failed to reset state!\n"
+#~ msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#, fuzzy
+#~ msgid "Failed to get state variable!\n"
+#~ msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Mysql.\n"
+#~ msgstr "Imposible inicializar SQLite: %s.\n"
+
+#, fuzzy
+#~ msgid "Failed to run SQL statement `%s'\n"
+#~ msgstr "Se produjo un fallo al preparar la sentencia «%s»\n"
+
+#, fuzzy
+#~ msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+#~ msgstr "«%s» falló en %s: %d con el error: %s\n"
+
+#, fuzzy
+#~ msgid "SQLite database running\n"
+#~ msgstr "Base de datos sqlite ejecutándose\n"
+
+#, fuzzy
+#~ msgid "--place missing or invalid.\n"
+#~ msgstr "Parámetro no válido «%s»\n"
+
+#, fuzzy
+#~ msgid "name or public key of ego"
+#~ msgstr "Parámetro no válido «%s»\n"
+
+#, fuzzy
+#~ msgid "wait for incoming messages"
+#~ msgstr "Falló al entregar el mensaje '%s'.\n"
+
+#, fuzzy
+#~ msgid "GNS name"
+#~ msgstr "Mostrar el _nombre"
+
+#, fuzzy
+#~ msgid "method name"
+#~ msgstr "Mostrar el _nombre"
+
+#, fuzzy
+#~ msgid "number of messages to replay from history"
+#~ msgstr "número de mensajes a usar por iteración"
+
 #~ msgid "Could not resolve `%s' (%s): %s\n"
 #~ msgstr "No se pudo resolver «%s» (%s): %s\n"
 
@@ -9932,8 +9741,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #, fuzzy
 #~ msgid "Failed to run upnp client for port %u\n"
 #~ msgstr ""
-#~ "Se produjo un fallo al inicializar la clave de la máquina desde el par %"
-#~ "u\n"
+#~ "Se produjo un fallo al inicializar la clave de la máquina desde el par "
+#~ "%u\n"
 
 #~ msgid "malformed"
 #~ msgstr "mal formado"
@@ -10566,6 +10375,9 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #~ msgid "Template datacache running\n"
 #~ msgstr "Caché de datos de plantilla en ejecución\n"
 
+#~ msgid "`%s' must be installed SUID, refusing to run\n"
+#~ msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
+
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
 #~ msgid "Outbound quota configure for network `%s' is %llu\n"
 #~ msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
@@ -11008,8 +10820,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #~ msgstr "Imprimir información acerca de tuneles mesh y pares."
 
 #~ msgid ""
-#~ "%s service is lacking key configuration settings (%s). Using default (%"
-#~ "u).\n"
+#~ "%s service is lacking key configuration settings (%s). Using default "
+#~ "(%u).\n"
 #~ msgstr ""
 #~ "El servicio %s carece de opciones de configuración de clave (%s). Usando "
 #~ "predeterminada (%u).\n"
@@ -11085,15 +10897,15 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #~ msgid ""
 #~ "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 #~ msgstr ""
-#~ "Error de sintaxis en la especificación de topología en el desplazamiento %"
-#~ "llu, omitiendo bytes.\n"
+#~ "Error de sintaxis en la especificación de topología en el desplazamiento "
+#~ "%llu, omitiendo bytes.\n"
 
 #~ msgid ""
-#~ "Syntax error in topology specification at offset %llu, skipping bytes `%"
-#~ "s'.\n"
+#~ "Syntax error in topology specification at offset %llu, skipping bytes `"
+#~ "%s'.\n"
 #~ msgstr ""
-#~ "Error de sintaxis en la especificación de topología en el desplazamiento %"
-#~ "llu, omitiendo bytes «%s».\n"
+#~ "Error de sintaxis en la especificación de topología en el desplazamiento "
+#~ "%llu, omitiendo bytes «%s».\n"
 
 #~ msgid "ECC signature verification failed at %s:%d: %s\n"
 #~ msgstr "La verificación de firma ECC falló en %s:%d: %s\n"
@@ -11333,8 +11145,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #~ "File `%s' does not contain a valid private key (too long, %llu bytes).  "
 #~ "Deleting it.\n"
 #~ msgstr ""
-#~ "El fichero «%s» no contiene una clave privada válida (demasiado grande, %"
-#~ "llu bytes).  Borrándolo.\n"
+#~ "El fichero «%s» no contiene una clave privada válida (demasiado grande, "
+#~ "%llu bytes).  Borrándolo.\n"
 
 #~ msgid ""
 #~ "File `%s' does not contain a valid private key (failed decode, %llu "
@@ -11357,8 +11169,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #~ "File `%s' does not contain a valid private key (too long, %llu bytes).  "
 #~ "Renaming it.\n"
 #~ msgstr ""
-#~ "El fichero «%s» no contiene una clave privada válida (demasiado grande, %"
-#~ "llu bytes).  Renombrándolo.\n"
+#~ "El fichero «%s» no contiene una clave privada válida (demasiado grande, "
+#~ "%llu bytes).  Renombrándolo.\n"
 
 #~ msgid "gnunet-rsa failed"
 #~ msgstr "«gnunet-rsa» falló"
@@ -11459,13 +11271,13 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 
 #~ msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 #~ msgstr ""
-#~ "¡Error de sintaxis en el fichero de la lista negra en el desplazamiento %"
-#~ "llu, rindiendose!\n"
+#~ "¡Error de sintaxis en el fichero de la lista negra en el desplazamiento "
+#~ "%llu, rindiendose!\n"
 
 #~ msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 #~ msgstr ""
-#~ "Error de sintaxis en el fichero de la lista negra en el desplazamiento %"
-#~ "llu, omitiendo bytes.\n"
+#~ "Error de sintaxis en el fichero de la lista negra en el desplazamiento "
+#~ "%llu, omitiendo bytes.\n"
 
 #~ msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 #~ msgstr "Me he encontrado «%s» en mi lista negra (inútil, ignorado)\n"
@@ -11529,8 +11341,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 
 #~ msgid "Failed to open named pipe `%s' for writing: %s\n"
 #~ msgstr ""
-#~ "Se produjo un fallo al abrir el fichero (tubería) «%s» para escritura: %"
-#~ "s\n"
+#~ "Se produjo un fallo al abrir el fichero (tubería) «%s» para escritura: "
+#~ "%s\n"
 
 #~ msgid "session identifier"
 #~ msgstr "identificador de sesión"
@@ -11593,8 +11405,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 
 #~ msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 #~ msgstr ""
-#~ "Error recibiendo respuesta a la petición «%s» del ARM para el servicio «%"
-#~ "s»\n"
+#~ "Error recibiendo respuesta a la petición «%s» del ARM para el servicio "
+#~ "«%s»\n"
 
 #~ msgid "Requesting termination of service `%s'.\n"
 #~ msgstr "Solicitando finalización del servicio «%s».\n"
@@ -11691,8 +11503,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "(%s) `%s' was confirmed that you and only you received from him or her: %"
-#~ "s\n"
+#~ "(%s) `%s' was confirmed that you and only you received from him or her: "
+#~ "%s\n"
 #~ msgstr ""
 #~ "(%s) «%s» confirmó que usted y sólo usted recibió de él o ella: %s\n"
 
@@ -12018,8 +11830,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #~ "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 #~ "greater than 0\n"
 #~ msgstr ""
-#~ "Valor «%s» no válido para la opción «%s» en la sección «%s»: se obtuvo %"
-#~ "f, se necesitaba un valor mayor que 0\n"
+#~ "Valor «%s» no válido para la opción «%s» en la sección «%s»: se obtuvo "
+#~ "%f, se necesitaba un valor mayor que 0\n"
 
 #~ msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 #~ msgstr ""
@@ -12825,8 +12637,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #, fuzzy
 #~ msgid "Configuration unchanged, no need to save.\n"
 #~ msgstr ""
-#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%"
-#~ "s'!\n"
+#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
+#~ "'%s'!\n"
 
 #, fuzzy
 #~ msgid "Do you wish to save your new configuration?"
@@ -12857,8 +12669,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #, fuzzy
 #~ msgid "Configuration changed. Save?"
 #~ msgstr ""
-#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%"
-#~ "s'!\n"
+#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
+#~ "'%s'!\n"
 
 #, fuzzy
 #~ msgid "Error saving configuration."
@@ -12915,8 +12727,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #, fuzzy
 #~ msgid "Configuration was unchanged, no need to save.\n"
 #~ msgstr ""
-#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%"
-#~ "s'!\n"
+#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
+#~ "'%s'!\n"
 
 #~ msgid "Can't open Service Control Manager"
 #~ msgstr "Imposible abrir el Service Control Manager"
@@ -13176,8 +12988,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #, fuzzy
 #~ msgid "Existing key in file `%s' failed format check, creating new key.\n"
 #~ msgstr ""
-#~ "Se produjo un fallo al comprobar la clave local existente en el fichero '%"
-#~ "s', creando nueva clave local.\n"
+#~ "Se produjo un fallo al comprobar la clave local existente en el fichero "
+#~ "'%s', creando nueva clave local.\n"
 
 #, fuzzy
 #~ msgid "Creating new key for this nickname (this may take a while).\n"
@@ -13228,8 +13040,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #~ msgid ""
 #~ "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 #~ msgstr ""
-#~ "Se produjo un fallo al comprobar la clave local existente en el fichero '%"
-#~ "s', creando nueva clave local.\n"
+#~ "Se produjo un fallo al comprobar la clave local existente en el fichero "
+#~ "'%s', creando nueva clave local.\n"
 
 #~ msgid "Done creating hostkey.\n"
 #~ msgstr "Correcto al crear la clave local.\n"
@@ -13461,8 +13273,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #~ "Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 #~ msgstr ""
 #~ "\n"
-#~ "El desindexado de '%s' se completó, %llu bytes tomaron %llu segundos (%"
-#~ "8.3f kbps).\n"
+#~ "El desindexado de '%s' se completó, %llu bytes tomaron %llu segundos "
+#~ "(%8.3f kbps).\n"
 
 #, fuzzy
 #~ msgid "Not enough arguments. You must specify a filename.\n"
@@ -13487,8 +13299,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #, fuzzy
 #~ msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 #~ msgstr ""
-#~ "Descarga del fichero '%s' completada. La velocidad media fue %"
-#~ "8.3fkilobytes por segundo.\n"
+#~ "Descarga del fichero '%s' completada. La velocidad media fue "
+#~ "%8.3fkilobytes por segundo.\n"
 
 #~ msgid "Not enough arguments. You must specify a GNUnet file URI\n"
 #~ msgstr ""
@@ -13696,8 +13508,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 
 #~ msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 #~ msgstr ""
-#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%"
-#~ "s'!\n"
+#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
+#~ "'%s'!\n"
 
 #~ msgid "The `%s' request received from client is malformed.\n"
 #~ msgstr "La petición '%s' recibida del cliente esta mal formada.\n"
@@ -13859,14 +13671,14 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #, fuzzy
 #~ msgid "Configuration file that specifies the MySQL username and password"
 #~ msgstr ""
-#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%"
-#~ "s'!\n"
+#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
+#~ "'%s'!\n"
 
 #, fuzzy
 #~ msgid "Configuration of the MySQL database"
 #~ msgstr ""
-#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%"
-#~ "s'!\n"
+#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
+#~ "'%s'!\n"
 
 #, fuzzy
 #~ msgid "MB of diskspace GNUnet can use for anonymous file sharing"
@@ -14564,8 +14376,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 
 #~ msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
 #~ msgstr ""
-#~ "%s: Conexión rechazada de una dirección de la \"lista negra\" %u.%u.%u.%"
-#~ "u.\n"
+#~ "%s: Conexión rechazada de una dirección de la \"lista negra\" %u.%u.%u."
+#~ "%u.\n"
 
 #~ msgid "Unexpected reply to `%s' operation.\n"
 #~ msgstr "Respuesta inesperada a la operación '%s'.\n"
@@ -14887,8 +14699,8 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 
 #~ msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
 #~ msgstr ""
-#~ "gnunet-setup debe tener acceso de escritura al fichero de configuración '%"
-#~ "s'\n"
+#~ "gnunet-setup debe tener acceso de escritura al fichero de configuración "
+#~ "'%s'\n"
 
 #, fuzzy
 #~ msgid ""
diff --git a/po/fr.po b/po/fr.po
index acc22f286..20b68f62d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden\n"
-"POT-Creation-Date: 2019-02-09 22:07+0000\n"
+"POT-Creation-Date: 2019-09-04 12:56+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"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 
 #: src/arm/gnunet-arm.c:156
 #, c-format
@@ -221,8 +221,7 @@ msgid "Control services and the Automated Restart Manager 
(ARM)"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:388 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
+#: src/transport/tcp_service_legacy.c:557
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
@@ -231,36 +230,30 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3829
-#: src/transport/plugin_transport_xt.c:1139
-#: src/transport/plugin_transport_xt.c:1145
-#: src/transport/plugin_transport_xt.c:3833
+#: src/transport/plugin_transport_tcp.c:3835
 #: src/transport/tcp_service_legacy.c:576
-#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
-#: src/util/service.c:643
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1150
+#: src/util/service.c:1156
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:457 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
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
+#: src/util/service.c:1195
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:462 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
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
+#: src/util/service.c:1200
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:495 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
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1236
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -268,8 +261,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:517 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
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1254
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -277,8 +269,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:556
 #: src/transport/plugin_transport_http_server.c:2688
 #: 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
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1295
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
@@ -286,8 +277,7 @@ msgstr "Résolution de « %s » échouée : %s\n"
 #: src/arm/gnunet-service-arm.c:575
 #: src/transport/plugin_transport_http_server.c:2706
 #: 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
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1315
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
@@ -358,14 +348,139 @@ 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-new.c:756
+#: src/ats/gnunet-service-ats_plugins.c:451
+#, c-format
+msgid "Failed to initialize solver `%s'!\n"
+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/plugin_ats2_common.c:90
+#, c-format
+msgid ""
+"Could not load %s quota for network `%s': `%s', assigning default bandwidth "
+"%llu\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:1870
+#, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1914
+#, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2476
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
+#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
+#: src/ats/plugin_ats_mlp.c:2602 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:2671
+#, 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:2680
+#, 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:2690
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2699
+#, 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
@@ -377,6 +492,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 ""
@@ -384,17 +508,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"
@@ -510,208 +623,83 @@ 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"
+#: src/auction/gnunet-auction-create.c:163
+msgid "description of the item to be sold"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth %"
-"llu\n"
+#: src/auction/gnunet-auction-create.c:169
+msgid "mapping of possible prices"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth %"
-"llu\n"
+#: src/auction/gnunet-auction-create.c:175
+msgid "max duration per round"
 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"
+#: src/auction/gnunet-auction-create.c:181
+msgid "duration until auction starts"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
+#: src/auction/gnunet-auction-create.c:186
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-new.c:733
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, c-format
-msgid "Failed to initialize solver `%s'!\n"
+#: src/auction/gnunet-auction-create.c:193
+msgid "public auction outcome"
 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"
+#: src/auction/gnunet-auction-create.c:198
+msgid "keep running in foreground until auction completes"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:314
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
+#: src/auction/gnunet-auction-create.c:209
+msgid "create a new auction and start listening for bidders"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:359
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
+#: src/conversation/gnunet-conversation-test.c:254
+#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76
+msgid "help text"
 msgstr ""
 
-#: src/ats/plugin_ats2_common.c:90
+#: src/cadet/gnunet-cadet.c:631
 #, c-format
-msgid ""
-"Could not load %s quota for network `%s': `%s', assigning default bandwidth %"
-"llu\n"
+msgid "Invalid peer ID `%s'\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
+#: src/cadet/gnunet-cadet.c:718
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1870
+#: src/cadet/gnunet-cadet.c:795
 #, c-format
-msgid "Adding address for peer `%s' multiple times\n"
+msgid "Invalid target `%s'\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1914
-#, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
+#: src/cadet/gnunet-cadet.c:832
+msgid "No action requested\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2476
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
+#: src/cadet/gnunet-cadet.c:857
+msgid "Provide information about a particular connection"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
-#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
-#: src/ats/plugin_ats_mlp.c:2602 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/cadet/gnunet-cadet.c:861
+msgid "Activate echo mode"
+msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2671
-#, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is %"
-"llu must be at least %llu\n"
+#: src/cadet/gnunet-cadet.c:866
+msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2680
-#, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
+#: src/cadet/gnunet-cadet.c:871
+msgid "Provide information about a patricular peer"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2690
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2699
-#, 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 ""
-
-#: src/auction/gnunet-auction-create.c:169
-msgid "mapping of possible prices"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:175
-msgid "max duration per round"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:181
-msgid "duration until auction starts"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:186
-msgid ""
-"number of items to sell\n"
-"0 for first price auction\n"
-">0 for vickrey/M+1st price auction"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:193
-msgid "public auction outcome"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:198
-msgid "keep running in foreground until auction completes"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:209
-msgid "create a new auction and start listening for bidders"
-msgstr ""
-
-#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
-#: src/conversation/gnunet-conversation-test.c:254
-#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76
-msgid "help text"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:631
-#, c-format
-msgid "Invalid peer ID `%s'\n"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:718
-msgid "Extra arguments are not applicable in combination with this option.\n"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:795
-#, c-format
-msgid "Invalid target `%s'\n"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:832
-msgid "No action requested\n"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:857
-msgid "Provide information about a particular connection"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:861
-msgid "Activate echo mode"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:866
-msgid "Listen for connections using a shared secret among sender and recipient"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:871
-msgid "Provide information about a patricular peer"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:875
-msgid "Provide information about all peers"
+#: src/cadet/gnunet-cadet.c:875
+msgid "Provide information about all peers"
 msgstr ""
 
 #: src/cadet/gnunet-cadet.c:879
@@ -760,28 +748,6 @@ msgstr ""
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:120
-#, 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:216
-#, 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:277
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1035,8 +1001,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:120
+#, 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:216
+#, 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 ""
@@ -1323,7 +1311,7 @@ msgid "# valid ephemeral keys received"
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1180
-#: src/transport/gnunet-service-transport_validation.c:1128
+#: src/transport/gnunet-service-transport_validation.c:1129
 msgid "# PING messages received"
 msgstr ""
 
@@ -1344,7 +1332,7 @@ msgid "# keepalive messages sent"
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1351
-#: src/transport/gnunet-service-transport_validation.c:1461
+#: src/transport/gnunet-service-transport_validation.c:1462
 msgid "# PONG messages received"
 msgstr ""
 
@@ -1436,127 +1424,146 @@ msgstr ""
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/credential/credential_misc.c:88
+#: src/credential/gnunet-credential.c:381 src/namestore/gnunet-namestore.c:994
 #, c-format
-msgid "Unable to parse CRED record string `%s'\n"
+msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:994
+#: src/credential/gnunet-credential.c:397
+#: src/credential/gnunet-credential.c:859
 #, c-format
-msgid "Ego `%s' not known to identity service\n"
+msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:280
-#: src/credential/gnunet-credential.c:434
+#: src/credential/gnunet-credential.c:532
+#: src/credential/gnunet-service-credential.c:1728
+#: src/namestore/gnunet-namestore.c:1019
+#: src/namestore/gnunet-namestore-fcfsd.c:1138
 #, c-format
-msgid "Issuer public key `%s' is not well-formed\n"
+msgid "Failed to connect to namestore\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:361
-#: src/credential/gnunet-credential.c:423
+#: src/credential/gnunet-credential.c:798
+#: src/credential/gnunet-credential.c:849
 #, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:372
-#: src/credential/gnunet-credential.c:444
+#: src/credential/gnunet-credential.c:807
+#: src/credential/gnunet-credential.c:868
 #, fuzzy, c-format
 msgid "Failed to connect to CREDENTIAL\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/credential/gnunet-credential.c:379
+#: src/credential/gnunet-credential.c:813
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:387
+#: src/credential/gnunet-credential.c:820
 #, c-format
 msgid "ego required\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:403
+#: src/credential/gnunet-credential.c:830
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:414
+#: src/credential/gnunet-credential.c:839
 #, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:451
+#: src/credential/gnunet-credential.c:874
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:504
-#, c-format
-msgid "Issuer ego required\n"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:516
+#: src/credential/gnunet-credential.c:930
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:536
-msgid "create credential"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:540
+#: src/credential/gnunet-credential.c:951
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:545
-msgid "The public key of the subject to lookup the credential for"
+#: src/credential/gnunet-credential.c:958
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:550
-msgid "The name of the credential presented by the subject"
+#: src/credential/gnunet-credential.c:965
+msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:555
+#: src/credential/gnunet-credential.c:972
 msgid "The public key of the authority to verify the credential against"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:560
-msgid "The ego to use"
+#: src/credential/gnunet-credential.c:977
+msgid "The ego/zone name to use"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:565
+#: src/credential/gnunet-credential.c:983
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:570
-msgid "The time to live for the credential"
+#: src/credential/gnunet-credential.c:989
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/credential/gnunet-credential.c:574
+#: src/credential/gnunet-credential.c:994
 msgid "collect credentials"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:588
-msgid "GNUnet credential resolver tool"
+#: src/credential/gnunet-credential.c:999
+msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/credential/gnunet-service-credential.c:1138
-#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:185
-#, c-format
-msgid "Failed to connect to GNS\n"
+#: src/credential/gnunet-credential.c:1004
+msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/credential/gnunet-service-credential.c:1144
-#: src/namestore/gnunet-namestore-fcfsd.c:1138
-#: src/namestore/gnunet-namestore.c:1019
+#: src/credential/gnunet-credential.c:1009
+msgid "Create, sign and return a credential subject side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1016
+msgid "Import signed credentials that should be issued to a zone/ego"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1020
+msgid "Create private record entry."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1026
+#: src/credential/gnunet-credential.c:1032
+msgid "Indicates that the collect/verify process is done via forward search."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1045
+msgid "GNUnet credential resolver tool"
+msgstr ""
+
+#: src/credential/gnunet-service-credential.c:1723 src/gns/gnunet-gns.c:185
+#: src/gns/gnunet-gns-helper-service-w32.c:727
 #, c-format
-msgid "Failed to connect to namestore\n"
+msgid "Failed to connect to GNS\n"
 msgstr ""
 
-#: src/credential/plugin_gnsrecord_credential.c:186
+#: src/credential/plugin_gnsrecord_credential.c:182
 #, fuzzy, c-format
 msgid "Unable to parse ATTR record string `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
 
+#: src/credential/plugin_rest_credential.c:1128
+msgid "GNS REST API initialized\n"
+msgstr ""
+
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:311
 #: src/datastore/gnunet-service-datastore.c:757
 msgid "# bytes stored"
@@ -1605,14 +1612,12 @@ msgstr ""
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_sqlite.c:53
 #: src/peerstore/plugin_peerstore_sqlite.c:52
-#: src/psycstore/plugin_psycstore_mysql.c:62
-#: src/reclaim/plugin_reclaim_sqlite.c:52
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:818 src/include/gnunet_common.h:827
+#: src/include/gnunet_common.h:840 src/include/gnunet_common.h:849
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1622,7 +1627,6 @@ msgstr ""
 #: src/datastore/plugin_datastore_sqlite.c:508
 #: src/namecache/plugin_namecache_sqlite.c:229
 #: src/namestore/plugin_namestore_sqlite.c:265
-#: src/reclaim/plugin_reclaim_sqlite.c:336
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1918,21 +1922,19 @@ msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
 #: src/datastore/plugin_datastore_mysql.c:1180
-#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:276
-#: src/datastore/plugin_datastore_postgres.c:893
+#: src/datastore/plugin_datastore_postgres.c:280
+#: src/datastore/plugin_datastore_postgres.c:897
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:854
+#: src/datastore/plugin_datastore_postgres.c:858
 msgid "Failed to drop table from database.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:952
-#: src/psycstore/plugin_psycstore_postgres.c:1506
+#: src/datastore/plugin_datastore_postgres.c:956
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1948,8 +1950,6 @@ msgstr ""
 #: src/namecache/plugin_namecache_sqlite.c:173
 #: src/namestore/plugin_namestore_sqlite.c:206
 #: src/peerstore/plugin_peerstore_sqlite.c:535
-#: src/psycstore/plugin_psycstore_sqlite.c:325
-#: src/reclaim/plugin_reclaim_sqlite.c:212
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
@@ -1971,8 +1971,7 @@ msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1405
 #: src/namecache/plugin_namecache_sqlite.c:557
-#: src/namestore/plugin_namestore_sqlite.c:750
-#: src/reclaim/plugin_reclaim_sqlite.c:711
+#: src/namestore/plugin_namestore_sqlite.c:751
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -2046,6 +2045,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 src/rps/gnunet-rps-profiler.c:3083
+#, 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:300
+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 ""
@@ -2291,89 +2337,42 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
+#: src/dht/plugin_block_dht.c:189
 #, c-format
-msgid "Exiting as the number of peers is %u\n"
+msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:949 src/rps/gnunet-rps-profiler.c:2953
-#, 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"
+#: src/dht/plugin_block_dht.c:198
+msgid "Size mismatch for block\n"
 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"
+#: src/dht/plugin_block_dht.c:209
+#, c-format
+msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:964
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
+#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:969
-msgid "delay to start doing PUTs (default: 1 sec)"
+#: src/dns/gnunet-dns-monitor.c:370
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:974
-msgid "delay to start doing GETs (default: 5 min)"
+#: src/dns/gnunet-dns-redirector.c:237
+msgid "set A records"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:979
-msgid "replication degree for DHT PUTs"
+#: src/dns/gnunet-dns-redirector.c:243
+msgid "set AAAA records"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:984
-msgid "chance that a peer is selected at random for PUTs"
+#: src/dns/gnunet-dns-redirector.c:256
+msgid "Change DNS replies to point elsewhere."
 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"
-msgstr ""
-
-#: src/dht/plugin_block_dht.c:198
-msgid "Size mismatch for block\n"
-msgstr ""
-
-#: src/dht/plugin_block_dht.c:209
-#, c-format
-msgid "Block of type %u is malformed\n"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
-msgid "only monitor DNS queries"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:370
-msgid "Monitor DNS queries."
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:237
-msgid "set A records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:243
-msgid "set AAAA records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:256
-msgid "Change DNS replies to point elsewhere."
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:462
-msgid "# DNS requests answered via TUN interface"
+#: src/dns/gnunet-service-dns.c:462
+msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
 #: src/dns/gnunet-service-dns.c:610
@@ -2422,10 +2421,6 @@ msgstr ""
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:175
-msgid "Print information about DV state"
-msgstr ""
-
 #: src/exit/gnunet-daemon-exit.c:960
 msgid "# TCP packets sent via TUN"
 msgstr ""
@@ -2849,57 +2844,62 @@ msgstr ""
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
-#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
+#: src/fs/fs_publish.c:725
+#, fuzzy, c-format
+msgid "Can not index file `%s': %s.\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/fs/fs_publish.c:782 src/fs/fs_publish.c:827 src/fs/fs_publish.c:848
+#: src/fs/fs_publish.c:878 src/fs/fs_publish.c:1144
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:780
+#: src/fs/fs_publish.c:784
 msgid "error on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:825
+#: src/fs/fs_publish.c:829
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:845
+#: src/fs/fs_publish.c:849
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:876
+#: src/fs/fs_publish.c:880
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:902
+#: src/fs/fs_publish.c:906
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
+#: src/fs/fs_publish.c:995 src/fs/fs_publish.c:1031
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1094
+#: src/fs/fs_publish.c:1098
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1102
+#: src/fs/fs_publish.c:1106
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1142
+#: src/fs/fs_publish.c:1146
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1381
+#: src/fs/fs_publish.c:1385
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "pa_stream_new() échoué : %s\n"
 
-#: src/fs/fs_publish.c:1472
+#: src/fs/fs_publish.c:1476
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2964,93 +2964,93 @@ msgstr ""
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:234
+#: src/fs/fs_uri.c:236
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:293
+#: src/fs/fs_uri.c:295
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:311
+#: src/fs/fs_uri.c:313
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:318
+#: src/fs/fs_uri.c:320
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:388
+#: src/fs/fs_uri.c:390
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:429
+#: src/fs/fs_uri.c:431
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:444
+#: src/fs/fs_uri.c:446
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:523
+#: src/fs/fs_uri.c:525
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:538
+#: src/fs/fs_uri.c:540
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:548
+#: src/fs/fs_uri.c:550
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:556
+#: src/fs/fs_uri.c:558
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:566
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:570
+#: src/fs/fs_uri.c:572
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:576
+#: src/fs/fs_uri.c:578
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:587
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:591
+#: src/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:609
+#: src/fs/fs_uri.c:611
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:645
 #, fuzzy
 msgid "invalid argument"
 msgstr "Argument invalide « %s »\n"
 
-#: src/fs/fs_uri.c:655
+#: src/fs/fs_uri.c:657
 msgid "Unrecognized URI type"
 msgstr "Type d’URI non reconnu"
 
-#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1092
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3090,11 +3090,11 @@ msgstr ""
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:907
+#: src/fs/gnunet-auto-share.c:772
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:907
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
@@ -3174,7 +3174,7 @@ msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:215 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3197,12 +3197,12 @@ msgid "Target filename must be specified.\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:872
-#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:273 src/fs/gnunet-unindex.c:139
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:312
+#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:315
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
@@ -3210,7 +3210,7 @@ msgstr ""
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:316
+#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3236,6 +3236,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 ""
@@ -3252,14 +3260,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"
@@ -3344,9 +3344,8 @@ msgid "Meta data extraction has finished.\n"
 msgstr ""
 
 #: src/fs/gnunet-publish.c:687
-#, fuzzy
-msgid "Internal error scanning directory.\n"
-msgstr "Erreur interne."
+msgid "Error scanning directory.\n"
+msgstr ""
 
 #: src/fs/gnunet-publish.c:715
 #, c-format
@@ -3390,6 +3389,10 @@ msgstr ""
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
+#: src/fs/gnunet-publish.c:911
+msgid "enable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
 #: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
@@ -3448,32 +3451,32 @@ msgstr ""
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:204
+#: src/fs/gnunet-search.c:207
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:260
+#: src/fs/gnunet-search.c:263
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:284
+#: src/fs/gnunet-search.c:287
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:321
+#: src/fs/gnunet-search.c:324
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:329
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:332
+#: src/fs/gnunet-search.c:335
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:348
+#: src/fs/gnunet-search.c:351
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -3855,38 +3858,38 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:203
+#: src/gns/gnunet-dns2gns.c:214
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:405
+#: src/gns/gnunet-dns2gns.c:416
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:421
+#: src/gns/gnunet-dns2gns.c:432
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:429
+#: src/gns/gnunet-dns2gns.c:440
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:588
+#: src/gns/gnunet-dns2gns.c:600
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:688
+#: src/gns/gnunet-dns2gns.c:748
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:693
+#: src/gns/gnunet-dns2gns.c:753
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:710
+#: src/gns/gnunet-dns2gns.c:770
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3902,6 +3905,27 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:199
+#, 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 ""
@@ -3936,127 +3960,106 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:980
+#: src/gns/gnunet-gns-proxy.c:989
 #, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1005
+#: src/gns/gnunet-gns-proxy.c:1014
 #, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1026
+#: src/gns/gnunet-gns-proxy.c:1035
 #, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1041
+#: src/gns/gnunet-gns-proxy.c:1050
 #, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1056
+#: src/gns/gnunet-gns-proxy.c:1065
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1066
+#: src/gns/gnunet-gns-proxy.c:1075
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1090
+#: src/gns/gnunet-gns-proxy.c:1099
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1221
+#: src/gns/gnunet-gns-proxy.c:1230
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2121
+#: src/gns/gnunet-gns-proxy.c:2131
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2642
+#: src/gns/gnunet-gns-proxy.c:2652
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2674
+#: src/gns/gnunet-gns-proxy.c:2684
 #, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2875
+#: src/gns/gnunet-gns-proxy.c:2885
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2897 src/rest/gnunet-rest-server.c:658
+#: src/gns/gnunet-gns-proxy.c:2907 src/rest/gnunet-rest-server.c:668
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3233
+#: src/gns/gnunet-gns-proxy.c:3243
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3262
+#: src/gns/gnunet-gns-proxy.c:3272
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3345
+#: src/gns/gnunet-gns-proxy.c:3355
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3635
+#: src/gns/gnunet-gns-proxy.c:3693
 #, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3763
+#: src/gns/gnunet-gns-proxy.c:3821
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3768
+#: src/gns/gnunet-gns-proxy.c:3826
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3772
+#: src/gns/gnunet-gns-proxy.c:3830
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3798
+#: src/gns/gnunet-gns-proxy.c:3856
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199
-#, 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:506
 msgid "Properly base32-encoded public key required"
 msgstr ""
@@ -4066,8 +4069,8 @@ msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
 #: src/gns/gnunet-service-gns.c:561
-#: 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 ""
 
@@ -4157,6 +4160,10 @@ msgstr ""
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr ""
 
+#: src/gns/plugin_rest_gns.c:452
+msgid "Gns REST API initialized\n"
+msgstr ""
+
 #: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4534,7 +4541,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2814
+#: src/transport/gnunet-service-transport.c:2827
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -4663,15 +4670,15 @@ msgstr ""
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
+#: src/identity/plugin_rest_identity.c:1297
+msgid "Identity REST API initialized\n"
+msgstr ""
+
 #: src/json/json.c:123
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
-msgid "This command doesn't do anything yet."
-msgstr ""
-
 #: src/my/my.c:196 src/my/my.c:215
 #, c-format
 msgid "%s failed at %s:%d with error: %s\n"
@@ -4734,8 +4741,8 @@ msgstr ""
 
 #: src/namecache/plugin_namecache_flat.c:121
 #: src/namecache/plugin_namecache_flat.c:255
-#: src/namestore/plugin_namestore_heap.c:148
-#: src/namestore/plugin_namestore_heap.c:395
+#: src/namestore/plugin_namestore_heap.c:179
+#: src/namestore/plugin_namestore_heap.c:412
 #: src/peerstore/plugin_peerstore_flat.c:379
 #: src/peerstore/plugin_peerstore_flat.c:538
 #, c-format
@@ -4743,14 +4750,14 @@ msgid "Unable to initialize file: %s.\n"
 msgstr ""
 
 #: src/namecache/plugin_namecache_flat.c:132
-#: src/namestore/plugin_namestore_heap.c:159
+#: src/namestore/plugin_namestore_heap.c:190
 #: src/peerstore/plugin_peerstore_flat.c:394
 #, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr ""
 
 #: src/namecache/plugin_namecache_flat.c:151
-#: src/namestore/plugin_namestore_heap.c:172
+#: src/namestore/plugin_namestore_heap.c:203
 #: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
@@ -4768,68 +4775,6 @@ msgstr ""
 msgid "Failed to setup database at `%s'\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:549
-#, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:576
-#, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:597
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:629
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:689
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:777
-#, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:796
-#, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:832
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:841
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1071
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1099
-msgid "Failed to start HTTP server\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1147
-msgid "Failed to connect to identity\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1173
-msgid "name of the zone that is to be managed by FCFSD"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1192
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
-
 #: src/namestore/gnunet-namestore.c:341
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -5034,6 +4979,68 @@ msgstr ""
 msgid "name of the ego controlling the zone"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-fcfsd.c:549
+#, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:576
+#, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:597
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:629
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:689
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:777
+#, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:796
+#, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:832
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:841
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1099
+msgid "Failed to start HTTP server\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1147
+msgid "Failed to connect to identity\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1173
+msgid "name of the zone that is to be managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1192
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
 #: src/namestore/gnunet-service-namestore.c:900
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
@@ -5051,10 +5058,14 @@ msgstr ""
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_heap.c:778
+#: src/namestore/plugin_namestore_heap.c:773
 msgid "heap file database running\n"
 msgstr ""
 
+#: src/namestore/plugin_rest_namestore.c:1079
+msgid "Namestore REST API initialized\n"
+msgstr ""
+
 #: src/nat-auto/gnunet-nat-auto.c:193
 msgid "Suggested configuration changes:\n"
 msgstr ""
@@ -5326,6 +5337,10 @@ 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 ""
@@ -5350,16 +5365,66 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-nse.c:122
-msgid "Show network size estimates from 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-tool/gnunet-peerinfo.c:239
+#: 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/peerinfo-tool/gnunet-peerinfo.c:239
 #, c-format
 msgid "%sPeer `%s'\n"
 msgstr ""
@@ -5370,7 +5435,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:299
-#: src/rest-plugins/plugin_rest_peerinfo.c:501
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
 #, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr ""
@@ -5449,58 +5514,8 @@ 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."
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:796
+msgid "Peerinfo REST API initialized\n"
 msgstr ""
 
 #: src/peerstore/gnunet-peerstore.c:91
@@ -5512,20 +5527,19 @@ msgstr ""
 msgid "Could not load database backend `%s'\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/peerstore/peerstore_api.c:532 src/peerstore/peerstore_api.c:581
+#: src/peerstore/peerstore_api.c:605 src/peerstore/peerstore_api.c:657
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:595
+#: src/peerstore/peerstore_api.c:671
 msgid "Received a malformed response from service."
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:731
+#: src/peerstore/peerstore_api.c:807
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
 #: src/peerstore/plugin_peerstore_sqlite.c:453
-#: src/psycstore/plugin_psycstore_sqlite.c:282
 #, c-format
 msgid ""
 "Error executing SQL query: %s\n"
@@ -5533,8 +5547,6 @@ msgid ""
 msgstr ""
 
 #: src/peerstore/plugin_peerstore_sqlite.c:488
-#: src/psycstore/plugin_psycstore_mysql.c:250
-#: src/psycstore/plugin_psycstore_sqlite.c:259
 #, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
@@ -5551,111 +5563,6 @@ msgstr ""
 msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:249
-#, fuzzy
-msgid "Failed to store membership information!\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:271
-#, fuzzy
-msgid "Failed to test membership!\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:300
-#, fuzzy
-msgid "Dropping invalid fragment\n"
-msgstr "Argument invalide « %s »\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:311
-#, fuzzy
-msgid "Failed to store fragment\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:368
-#, fuzzy
-msgid "Failed to get fragment!\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:434
-#, fuzzy
-msgid "Failed to get message!\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:464
-#, fuzzy
-msgid "Failed to get message fragment!\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:494
-#, fuzzy
-msgid "Failed to get master counters!\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:675
-#, fuzzy, c-format
-msgid "Failed to begin modifying state: %d\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:685
-#, fuzzy, c-format
-msgid "Failed to modify state: %d\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:693
-#, fuzzy
-msgid "Failed to end modifying state!\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:730
-msgid "Tried to set invalid state variable name!\n"
-msgstr ""
-
-#: src/psycstore/gnunet-service-psycstore.c:744
-#, fuzzy
-msgid "Failed to begin synchronizing state!\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:761
-#, fuzzy
-msgid "Failed to end synchronizing state!\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:779
-#: src/psycstore/gnunet-service-psycstore.c:795
-#, fuzzy
-msgid "Failed to reset state!\n"
-msgstr "Résolution de « %s » échouée\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:824
-#: src/psycstore/gnunet-service-psycstore.c:881
-msgid "Tried to get invalid state variable name!\n"
-msgstr ""
-
-#: src/psycstore/gnunet-service-psycstore.c:851
-#: src/psycstore/gnunet-service-psycstore.c:896
-#, fuzzy
-msgid "Failed to get state variable!\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/psycstore/plugin_psycstore_mysql.c:281
-#, fuzzy
-msgid "Unable to initialize Mysql.\n"
-msgstr "Résolution de « %s » échouée\n"
-
-#: src/psycstore/plugin_psycstore_mysql.c:291
-#, fuzzy, c-format
-msgid "Failed to run SQL statement `%s'\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:61
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s (%d)\n"
-msgstr ""
-
-#: src/psycstore/plugin_psycstore_sqlite.c:1924
-msgid "SQLite database running\n"
-msgstr ""
-
 #: src/pt/gnunet-daemon-pt.c:423
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
@@ -5711,61 +5618,78 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:467
+#: src/reclaim/gnunet-reclaim.c:495
 #, c-format
 msgid "Ego is required\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:475
+#: src/reclaim/gnunet-reclaim.c:501
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:483
+#: src/reclaim/gnunet-reclaim.c:507
 #, c-format
 msgid "Requesting party key is required!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:506
-msgid "Add attribute"
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "Add an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:512
-msgid "Attribute value"
+#: src/reclaim/gnunet-reclaim.c:527
+msgid "Add an attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:517
-msgid "Ego"
+#: src/reclaim/gnunet-reclaim.c:530
+msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:522
-msgid "Audience (relying party)"
+#: src/reclaim/gnunet-reclaim.c:533
+msgid "The EGO to use"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:526
-msgid "List attributes for Ego"
+#: src/reclaim/gnunet-reclaim.c:535
+msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:531
-msgid "Issue a ticket"
+#: src/reclaim/gnunet-reclaim.c:538
+msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:536
+#: src/reclaim/gnunet-reclaim.c:542
+msgid "Issue a ticket for a set of attributes separated by comma"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:545
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:541
+#: src/reclaim/gnunet-reclaim.c:548
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:546
+#: src/reclaim/gnunet-reclaim.c:551
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:551
+#: src/reclaim/gnunet-reclaim.c:553
+msgid "List tickets of ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:556
 msgid "Expiration interval of the attribute"
 msgstr ""
 
+#: src/reclaim/gnunet-reclaim.c:560
+msgid "re:claimID command line tool"
+msgstr ""
+
+#: src/reclaim/plugin_rest_openid_connect.c:2051
+#: src/reclaim/plugin_rest_reclaim.c:1018
+msgid "Identity Provider REST API initialized\n"
+msgstr ""
+
 #: src/reclaim/reclaim_api.c:436
 #, fuzzy
 msgid "failed to store record\n"
@@ -5855,43 +5779,18 @@ msgstr ""
 msgid "Search string `%s' is too long!\n"
 msgstr ""
 
-#: src/rest-plugins/plugin_rest_copying.c:209
-msgid "COPYING REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_credential.c:1128
-msgid "GNS REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_gns.c:452
-msgid "Gns REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_identity.c:1297
-msgid "Identity REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_namestore.c:1079
-msgid "Namestore REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_openid_connect.c:2245
-#: src/rest-plugins/plugin_rest_reclaim.c:1079
-msgid "Identity Provider REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_peerinfo.c:796
-msgid "Peerinfo REST API initialized\n"
-msgstr ""
-
-#: src/rest/gnunet-rest-server.c:927
+#: src/rest/gnunet-rest-server.c:986
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:944
+#: src/rest/gnunet-rest-server.c:1003
 msgid "GNUnet REST server"
 msgstr ""
 
+#: src/rest/plugin_rest_copying.c:209
+msgid "COPYING REST API initialized\n"
+msgstr ""
+
 #: src/revocation/gnunet-revocation.c:129
 #, c-format
 msgid "Key `%s' is valid\n"
@@ -5951,7 +5850,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
+#: src/revocation/gnunet-revocation.c:437
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
@@ -6021,35 +5920,35 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2959
+#: src/rps/gnunet-rps.c:260
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:264
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:268
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:3088
 msgid "duration of the profiling"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2965
+#: src/rps/gnunet-rps-profiler.c:3093
 msgid "timeout for the profiling"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2971
+#: src/rps/gnunet-rps-profiler.c:3098
 #, fuzzy
 msgid "number of PeerIDs to request"
 msgstr "nombre de valeurs"
 
-#: src/rps/gnunet-rps-profiler.c:2986
+#: src/rps/gnunet-rps-profiler.c:3114
 msgid "Measure quality and performance of the RPS service."
 msgstr ""
 
-#: src/rps/gnunet-rps.c:260
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:264
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:268
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/scalarproduct/gnunet-scalarproduct.c:220
 msgid "You must specify at least one message ID to check!\n"
 msgstr ""
@@ -6104,10 +6003,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 ""
 
@@ -6127,176 +6026,53 @@ msgstr ""
 msgid "threshold"
 msgstr "threshold"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:633
-msgid "also profile decryption"
-msgstr ""
-
-#: src/set/gnunet-service-set.c:2005
-#, fuzzy
-msgid "Could not connect to CADET service\n"
-msgstr "Impossible d’ouvrir « %s ».\n"
-
-#: src/set/gnunet-set-ibf-profiler.c:252
-msgid "number of element in set A-B"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:258
-msgid "number of element in set B-A"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:264
-msgid "number of common elements in A and B"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:270
-msgid "hash num"
-msgstr "numéro de hash"
-
-#: src/set/gnunet-set-ibf-profiler.c:276
-msgid "ibf size"
-msgstr "taille ibz"
-
-#: src/set/gnunet-set-profiler.c:444
-msgid "use byzantine mode"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:450
-msgid "force sending full set"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:456
-msgid "number delta operation"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:468
-msgid "operation to execute"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:474
-msgid "element size"
-msgstr ""
-
-#: src/social/gnunet-social.c:1166
-msgid "--place missing or invalid.\n"
-msgstr ""
-
-#: src/social/gnunet-social.c:1217
-msgid "assign --name in state to --data"
-msgstr ""
-
-#: src/social/gnunet-social.c:1222
-msgid "say good-bye and leave somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1227
-msgid "create a place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1232
-msgid "destroy a place we were hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1237
-msgid "enter somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1243
-msgid "find state matching name prefix"
-msgstr ""
-
-#: src/social/gnunet-social.c:1248
-msgid "replay history of messages up to the given --limit"
-msgstr ""
-
-#: src/social/gnunet-social.c:1253
-msgid "reconnect to a previously created place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1258
-msgid "publish something to a place we are hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1263
-msgid "reconnect to a previously entered place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1268
-msgid "search for state matching exact name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1273
-msgid "submit something to somebody's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1278
-msgid "list of egos and subscribed places"
-msgstr ""
-
-#: src/social/gnunet-social.c:1283
-msgid "extract and replay history between message IDs --start and --until"
-msgstr ""
-
-#: src/social/gnunet-social.c:1292
-msgid "application ID to use when connecting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1298
-msgid "message body or state value"
-msgstr ""
-
-#: src/social/gnunet-social.c:1304
-msgid "name or public key of ego"
-msgstr ""
-
-#: src/social/gnunet-social.c:1309
-msgid "wait for incoming messages"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:633
+msgid "also profile decryption"
 msgstr ""
 
-#: src/social/gnunet-social.c:1315
-msgid "GNS name"
-msgstr ""
+#: src/set/gnunet-service-set.c:2008
+#, fuzzy
+msgid "Could not connect to CADET service\n"
+msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/social/gnunet-social.c:1321
-msgid "peer ID for --guest-enter"
+#: src/set/gnunet-set-ibf-profiler.c:252
+msgid "number of element in set A-B"
 msgstr ""
 
-#: src/social/gnunet-social.c:1327
-msgid "name (key) to query from state"
+#: src/set/gnunet-set-ibf-profiler.c:258
+msgid "number of element in set B-A"
 msgstr ""
 
-#: src/social/gnunet-social.c:1333
-msgid "method name"
+#: src/set/gnunet-set-ibf-profiler.c:264
+msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/social/gnunet-social.c:1339
-#, fuzzy
-msgid "number of messages to replay from history"
-msgstr "nombre de valeurs"
+#: src/set/gnunet-set-ibf-profiler.c:270
+msgid "hash num"
+msgstr "numéro de hash"
 
-#: src/social/gnunet-social.c:1345
-msgid "key address of place"
-msgstr ""
+#: src/set/gnunet-set-ibf-profiler.c:276
+msgid "ibf size"
+msgstr "taille ibz"
 
-#: src/social/gnunet-social.c:1351
-msgid "start message ID for history replay"
+#: src/set/gnunet-set-profiler.c:444
+msgid "use byzantine mode"
 msgstr ""
 
-#: src/social/gnunet-social.c:1356
-msgid "respond to entry requests by admitting all guests"
+#: src/set/gnunet-set-profiler.c:450
+msgid "force sending full set"
 msgstr ""
 
-#: src/social/gnunet-social.c:1362
-msgid "end message ID for history replay"
+#: src/set/gnunet-set-profiler.c:456
+msgid "number delta operation"
 msgstr ""
 
-#: src/social/gnunet-social.c:1367
-msgid "respond to entry requests by refusing all guests"
+#: src/set/gnunet-set-profiler.c:468
+msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1377
-msgid ""
-"gnunet-social - Interact with the social service: enter/leave, send/receive "
-"messages, access history and state.\n"
+#: src/set/gnunet-set-profiler.c:474
+msgid "element size"
 msgstr ""
 
 #: src/sq/sq.c:54
@@ -6459,7 +6235,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr ""
 
 #: src/testbed/generate-underlay-topology.c:342
-#: src/testbed/gnunet-testbed-profiler.c:283
+#: src/testbed/gnunet-testbed-profiler.c:282
 msgid "create COUNT number of peers"
 msgstr ""
 
@@ -6568,17 +6344,6 @@ msgstr ""
 msgid "%.s Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
 
-#: 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
 msgid "Waiting for child to exit.\n"
 msgstr ""
@@ -6588,6 +6353,17 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr ""
 
+#: src/testbed/gnunet-testbed-profiler.c:287
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:291
+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
 #, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -6761,47 +6537,47 @@ msgstr ""
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1159
+#: src/testing/testing.c:1161
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1168
+#: src/testing/testing.c:1170
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 
-#: src/testing/testing.c:1178
+#: src/testing/testing.c:1180
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1191
+#: src/testing/testing.c:1193
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/testing/testing.c:1205
+#: src/testing/testing.c:1207
 #, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1217
+#: src/testing/testing.c:1219
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1242
+#: src/testing/testing.c:1244
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1344
+#: src/testing/testing.c:1346
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1649
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr ""
@@ -6875,18 +6651,18 @@ msgstr ""
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2329
-#: src/transport/gnunet-communicator-udp.c:2883
-#: src/transport/gnunet-service-tng.c:4679
-#: src/transport/gnunet-service-transport.c:2782
+#: src/transport/gnunet-communicator-tcp.c:2334
+#: src/transport/gnunet-communicator-udp.c:2938
+#: src/transport/gnunet-service-tng.c:7070
+#: src/transport/gnunet-service-transport.c:2795
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2393
+#: src/transport/gnunet-communicator-tcp.c:2398
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2954
+#: src/transport/gnunet-communicator-udp.c:3016
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -6895,60 +6671,60 @@ msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1073
+#: src/transport/gnunet-communicator-unix.c:1074
 #: src/transport/plugin_transport_unix.c:1403
 #, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1162
+#: src/transport/gnunet-communicator-unix.c:1163
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:448
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:452
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:817
+#: src/transport/gnunet-service-transport.c:826
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1550
+#: src/transport/gnunet-service-transport.c:1563
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1710
+#: src/transport/gnunet-service-transport.c:1723
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1807
+#: src/transport/gnunet-service-transport.c:1820
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2124
-#: src/transport/gnunet-service-transport.c:2596
+#: src/transport/gnunet-service-transport.c:2137
+#: src/transport/gnunet-service-transport.c:2609
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2600
+#: src/transport/gnunet-service-transport.c:2613
 #, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2708
+#: src/transport/gnunet-service-transport.c:2721
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2717
+#: src/transport/gnunet-service-transport.c:2730
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\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 ""
@@ -6958,186 +6734,186 @@ msgstr ""
 msgid "# session creation failed"
 msgstr "# Session TCP active"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1052
+#: src/transport/gnunet-service-transport_neighbours.c:1053
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1175
+#: src/transport/gnunet-service-transport_neighbours.c:1176
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1323
-#: src/transport/gnunet-service-transport_neighbours.c:1784
+#: src/transport/gnunet-service-transport_neighbours.c:1324
+#: src/transport/gnunet-service-transport_neighbours.c:1785
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1328
+#: src/transport/gnunet-service-transport_neighbours.c:1329
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1334
+#: src/transport/gnunet-service-transport_neighbours.c:1335
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1394
+#: src/transport/gnunet-service-transport_neighbours.c:1395
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1478
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1514
+#: src/transport/gnunet-service-transport_neighbours.c:1515
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1522
+#: src/transport/gnunet-service-transport_neighbours.c:1523
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1532
+#: src/transport/gnunet-service-transport_neighbours.c:1533
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1577
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1586
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1595
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1603
+#: src/transport/gnunet-service-transport_neighbours.c:1604
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1608
+#: src/transport/gnunet-service-transport_neighbours.c:1609
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1614
+#: src/transport/gnunet-service-transport_neighbours.c:1615
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1681
+#: src/transport/gnunet-service-transport_neighbours.c:1682
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1715
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1730
+#: src/transport/gnunet-service-transport_neighbours.c:1731
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1853
+#: src/transport/gnunet-service-transport_neighbours.c:1854
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1873
+#: src/transport/gnunet-service-transport_neighbours.c:1874
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1913
 msgid "# SYN messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1929
+#: src/transport/gnunet-service-transport_neighbours.c:1930
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1959
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2027
+#: src/transport/gnunet-service-transport_neighbours.c:2028
 #, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2081
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2098
+#: src/transport/gnunet-service-transport_neighbours.c:2099
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2261
+#: src/transport/gnunet-service-transport_neighbours.c:2262
 msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2266
+#: src/transport/gnunet-service-transport_neighbours.c:2267
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2653
+#: src/transport/gnunet-service-transport_neighbours.c:2654
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3139
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3146
+#: src/transport/gnunet-service-transport_neighbours.c:3147
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3165
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3200
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3225
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3238
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3411
+#: src/transport/gnunet-service-transport_neighbours.c:3412
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3447
+#: src/transport/gnunet-service-transport_neighbours.c:3448
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3535
+#: src/transport/gnunet-service-transport_neighbours.c:3536
 msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3543
 msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3583
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3589
+#: src/transport/gnunet-service-transport_neighbours.c:3590
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3600
+#: src/transport/gnunet-service-transport_neighbours.c:3601
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3735
+#: src/transport/gnunet-service-transport_neighbours.c:3736
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7172,7 +6948,7 @@ msgstr ""
 #: src/transport/gnunet-service-transport_validation.c:491
 #: src/transport/gnunet-service-transport_validation.c:677
 #: src/transport/gnunet-service-transport_validation.c:997
-#: src/transport/gnunet-service-transport_validation.c:1609
+#: src/transport/gnunet-service-transport_validation.c:1610
 msgid "# validations running"
 msgstr ""
 
@@ -7196,100 +6972,64 @@ msgstr ""
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1123
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1174
+#: src/transport/gnunet-service-transport_validation.c:1175
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1187
+#: src/transport/gnunet-service-transport_validation.c:1188
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1190
+#: src/transport/gnunet-service-transport_validation.c:1191
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1198
+#: src/transport/gnunet-service-transport_validation.c:1199
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1211
+#: src/transport/gnunet-service-transport_validation.c:1212
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1266
+#: src/transport/gnunet-service-transport_validation.c:1267
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1317
+#: src/transport/gnunet-service-transport_validation.c:1318
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1326
+#: src/transport/gnunet-service-transport_validation.c:1327
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1499
+#: src/transport/gnunet-service-transport_validation.c:1500
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1517
+#: src/transport/gnunet-service-transport_validation.c:1518
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1572
+#: src/transport/gnunet-service-transport_validation.c:1573
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1627
+#: src/transport/gnunet-service-transport_validation.c:1628
 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"
@@ -7419,6 +7159,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 ""
@@ -7427,13 +7172,42 @@ 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:3530
-#: src/transport/plugin_transport_tcp.c:3895
-#: src/transport/plugin_transport_tcp.c:3902
-#: src/transport/plugin_transport_xt.c:3899
-#: src/transport/plugin_transport_xt.c:3906
+#: src/transport/plugin_transport_tcp.c:3901
+#: src/transport/plugin_transport_tcp.c:3908
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7503,7 +7277,6 @@ msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2905
 #: src/transport/plugin_transport_udp.c:3627
-#: src/transport/plugin_transport_xu.c:2049
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7601,126 +7374,114 @@ msgstr ""
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1551
-#: src/transport/plugin_transport_tcp.c:2877
-#: src/transport/plugin_transport_xt.c:1553
-#: src/transport/plugin_transport_xt.c:2879
+#: src/transport/plugin_transport_tcp.c:1557
+#: src/transport/plugin_transport_tcp.c:2883
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1734
-#: src/transport/plugin_transport_tcp.c:1958
-#: src/transport/plugin_transport_tcp.c:3141
-#: src/transport/plugin_transport_tcp.c:4018
-#: src/transport/plugin_transport_xt.c:1736
-#: src/transport/plugin_transport_xt.c:1960
-#: src/transport/plugin_transport_xt.c:3143
+#: src/transport/plugin_transport_tcp.c:1740
+#: src/transport/plugin_transport_tcp.c:1964
+#: src/transport/plugin_transport_tcp.c:3147
+#: src/transport/plugin_transport_tcp.c:4024
 msgid "# TCP sessions active"
 msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_tcp.c:1776
-#: src/transport/plugin_transport_tcp.c:1940
-#: src/transport/plugin_transport_tcp.c:2064
-#: src/transport/plugin_transport_tcp.c:2137
-#: src/transport/plugin_transport_tcp.c:2237
-#: src/transport/plugin_transport_tcp.c:2262
-#: 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
+#: src/transport/plugin_transport_tcp.c:1782
+#: src/transport/plugin_transport_tcp.c:1946
+#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2143
+#: src/transport/plugin_transport_tcp.c:2243
+#: src/transport/plugin_transport_tcp.c:2268
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1779
-#: src/transport/plugin_transport_xt.c:1781
+#: src/transport/plugin_transport_tcp.c:1785
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2067
-#: src/transport/plugin_transport_xt.c:2069
+#: src/transport/plugin_transport_tcp.c:2073
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2141
-#: src/transport/plugin_transport_xt.c:2143
+#: src/transport/plugin_transport_tcp.c:2147
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2539
-#: src/transport/plugin_transport_xt.c:2541
+#: src/transport/plugin_transport_tcp.c:2545
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2715
-#: src/transport/plugin_transport_xt.c:2717
+#: src/transport/plugin_transport_tcp.c:2721
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3207
-#: src/transport/plugin_transport_xt.c:3209
+#: src/transport/plugin_transport_tcp.c:3213
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3413
-#: src/transport/plugin_transport_xt.c:3415
+#: src/transport/plugin_transport_tcp.c:3419
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3464
-#: src/transport/plugin_transport_tcp.c:3522
-#: src/transport/plugin_transport_xt.c:3466
-#: src/transport/plugin_transport_xt.c:3524
+#: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_tcp.c:3528
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_tcp.c:3468
-#: src/transport/plugin_transport_xt.c:3470
+#: src/transport/plugin_transport_tcp.c:3474
 msgid "# TCP server connect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3474
-#: src/transport/plugin_transport_xt.c:3476
+#: src/transport/plugin_transport_tcp.c:3480
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3476
-#: src/transport/plugin_transport_xt.c:3478
+#: src/transport/plugin_transport_tcp.c:3482
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3516
-#: src/transport/plugin_transport_xt.c:3518
+#: src/transport/plugin_transport_tcp.c:3522
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3526
-#: src/transport/plugin_transport_xt.c:3528
+#: src/transport/plugin_transport_tcp.c:3532
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3845
-#: src/transport/plugin_transport_xt.c:3849
+#: src/transport/plugin_transport_tcp.c:3851
 msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4006
+#: src/transport/plugin_transport_tcp.c:4012
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4010
+#: src/transport/plugin_transport_tcp.c:4016
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4014
+#: src/transport/plugin_transport_tcp.c:4020
 #, c-format
 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:3371
 #, c-format
 msgid ""
@@ -7741,7 +7502,6 @@ 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:3721
-#: src/transport/plugin_transport_xu.c:2143
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7751,19 +7511,15 @@ msgstr ""
 
 #: src/transport/plugin_transport_udp.c:3883
 #: src/transport/plugin_transport_udp.c:3897
-#: 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:3929
-#: src/transport/plugin_transport_xu.c:2347
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "adresse invalide"
 
 #: src/transport/plugin_transport_udp.c:3956
-#: src/transport/plugin_transport_xu.c:2374
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "adresse invalide"
@@ -7772,20 +7528,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:1416
 #, c-format
 msgid "Cannot bind to `%s'\n"
@@ -7853,54 +7595,6 @@ 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"
@@ -7911,17 +7605,17 @@ msgstr ""
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1624
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1634
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127
+#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1640
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
@@ -7933,7 +7627,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2396
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:864
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7943,27 +7637,27 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:988
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:1031
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1555
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:953
-#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1195
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1708
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1228
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1741
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -7978,44 +7672,44 @@ msgstr ""
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1502
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:2015
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1506
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:2019
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1510
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:2023
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1525
-#: src/util/service.c:1380
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1535
+#: src/util/service.c:1893
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1382
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1895
 msgid "No such user"
 msgstr "Aucun utilisateur trouvé"
 
-#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1401
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1914
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1762
+#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:2276
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:1826
-#: src/util/service.c:1841
+#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:2340
+#: src/util/service.c:2355
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:1853
+#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:2367
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
@@ -8057,11 +7751,11 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:734
+#: src/util/client.c:749
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:925
+#: src/util/client.c:941
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8108,16 +7802,16 @@ msgstr "INVALIDE"
 msgid "unknown address"
 msgstr "adresse inconnue"
 
-#: src/util/common_logging.c:1500
+#: src/util/common_logging.c:1513
 msgid "invalid address"
 msgstr "adresse invalide"
 
-#: src/util/common_logging.c:1518
+#: src/util/common_logging.c:1531
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1539
+#: src/util/common_logging.c:1552
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8164,26 +7858,26 @@ msgstr ""
 #: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have %"
-"llu)\n"
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:862
+#: src/util/crypto_ecc.c:887
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:917
+#: src/util/crypto_ecc.c:946
 #, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:996
+#: src/util/crypto_ecc.c:1025
 #, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1057
+#: src/util/crypto_ecc.c:1086
 #, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
@@ -8231,17 +7925,17 @@ msgstr ""
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:1255
+#: src/util/disk.c:1265
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/dnsparser.c:260
+#: src/util/dnsparser.c:264
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/util/dnsparser.c:950
+#: src/util/dnsparser.c:954
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
@@ -8345,7 +8039,7 @@ msgstr ""
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:282
+#: src/util/getopt_helpers.c:282 src/util/gnunet-qr.c:300
 msgid "be verbose"
 msgstr ""
 
@@ -8393,51 +8087,51 @@ msgstr ""
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:160
+#: src/util/gnunet-config.c:161
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/gnunet-config.c:173
+#: src/util/gnunet-config.c:174
 #, c-format
 msgid "%s or %s argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:181
+#: src/util/gnunet-config.c:182
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:232
+#: src/util/gnunet-config.c:234
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:286
-msgid "obtain option of value as a filename (with $-expansion)"
+#: src/util/gnunet-config.c:288
+msgid "interpret option value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:291
+#: src/util/gnunet-config.c:293
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:296
+#: src/util/gnunet-config.c:298
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:301
+#: src/util/gnunet-config.c:303
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:305
+#: src/util/gnunet-config.c:307
 msgid "print available configuration sections"
 msgstr ""
 
-#: src/util/gnunet-config.c:309
+#: src/util/gnunet-config.c:311
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:322
+#: src/util/gnunet-config.c:324
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
@@ -8530,6 +8224,33 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
+#: src/util/gnunet-qr.c:108 src/util/gnunet-uri.c:91
+#, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:116 src/util/gnunet-uri.c:98
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:127 src/util/gnunet-uri.c:108
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:297
+msgid "use video-device DEVICE (default: /dev/video0"
+msgstr ""
+
+#: src/util/gnunet-qr.c:303
+msgid "do not show preview windows"
+msgstr ""
+
+#: src/util/gnunet-qr.c:311
+msgid "Scan a QR code using a video device and import the uri read"
+msgstr ""
+
 #: src/util/gnunet-resolver.c:168
 msgid "perform a reverse lookup"
 msgstr ""
@@ -8563,7 +8284,7 @@ msgstr ""
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:1443
+#: src/util/gnunet-service-resolver.c:1424
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
@@ -8572,21 +8293,6 @@ msgstr ""
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:91
-#, c-format
-msgid "Invalid URI: does not start with `%s'\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:98
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:108
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
-msgstr ""
-
 #: src/util/gnunet-uri.c:170
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
@@ -8606,12 +8312,12 @@ msgstr ""
 msgid "Error writing to `%s': %s\n"
 msgstr ""
 
-#: src/util/network.c:136
+#: src/util/network.c:176
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1795 src/util/network.c:1979
+#: src/util/network.c:1835 src/util/network.c:2019
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8716,18 +8422,18 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/util/service.c:1307
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
-msgstr ""
-
-#: src/util/service.c:2141
+#: src/util/service.c:668
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
+#: src/util/service.c:1820
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
 #: src/util/signal.c:89
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
@@ -8857,12 +8563,12 @@ msgstr ""
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/util/time.c:828 src/util/time.c:860
+#: src/util/time.c:844 src/util/time.c:876
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:866
+#: src/util/time.c:882
 #, c-format
 msgid ""
 "Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
@@ -9032,43 +8738,75 @@ 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 ""
 
-#: src/include/gnunet_common.h:772 src/include/gnunet_common.h:779
-#: src/include/gnunet_common.h:789
+#: src/include/gnunet_common.h:794 src/include/gnunet_common.h:801
+#: src/include/gnunet_common.h:811
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d. Aborting.\n"
 msgstr "opus_encode_float() échoué : %s. Annulation\n"
 
-#: src/include/gnunet_common.h:797
+#: src/include/gnunet_common.h:819
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:809
+#: src/include/gnunet_common.h:831
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:836 src/include/gnunet_common.h:845
+#: src/include/gnunet_common.h:858 src/include/gnunet_common.h:867
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Can not index file `%s': %s.\n"
+#~ msgid "# XT sessions active"
+#~ msgstr "# Session TCP active"
+
+#, fuzzy
+#~ msgid "Failed to bind XU socket to %s: %s\n"
 #~ msgstr "Résolution de « %s » échouée : %s\n"
 
 #, fuzzy
-#~ msgid "Unable to parse CAA record string `%s'\n"
+#~ msgid "Failed to open XU sockets\n"
+#~ msgstr "Résolution de « %s » échouée : %s\n"
+
+#, fuzzy
+#~ msgid "Failed to create XU network sockets\n"
+#~ msgstr "Résolution de « %s » échouée : %s\n"
+
+#, fuzzy
+#~ msgid "Dropping invalid fragment\n"
+#~ msgstr "Argument invalide « %s »\n"
+
+#, fuzzy
+#~ msgid "Failed to store fragment\n"
+#~ msgstr "Échec du démarrage de %s\n"
+
+#, fuzzy
+#~ msgid "Failed to begin modifying state: %d\n"
+#~ msgstr "Échec du démarrage de %s\n"
+
+#, fuzzy
+#~ msgid "Failed to modify state: %d\n"
+#~ msgstr "Échec du démarrage de %s\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Mysql.\n"
 #~ msgstr "Résolution de « %s » échouée\n"
 
 #, fuzzy
-#~ msgid "reduce output"
-#~ msgstr "sortie verbeuse"
+#~ msgid "Failed to run SQL statement `%s'\n"
+#~ msgstr "Échec du démarrage de %s\n"
+
+#, fuzzy
+#~ msgid "number of messages to replay from history"
+#~ msgstr "nombre de valeurs"
 
 #, fuzzy
 #~ msgid "Unable to connect to Postgres database '%s': %s\n"
@@ -9141,9 +8879,16 @@ msgstr ""
 #~ "\n"
 #~ "SUPU %s, %s, %d,my_identity = %s"
 
+#~ msgid "verbose output"
+#~ msgstr "sortie verbeuse"
+
 #~ msgid "malformed"
 #~ msgstr "malformé"
 
+#, fuzzy
+#~ msgid "Failed to start resolver!\n"
+#~ msgstr "Échec du démarrage de %s\n"
+
 #~ msgid "Benchmarking done\n"
 #~ msgstr "Benchmark terminé\n"
 
@@ -9153,3 +8898,7 @@ msgstr ""
 
 #~ msgid "unknown error"
 #~ msgstr "erreur unconnue."
+
+#, fuzzy
+#~ msgid "Failed to setup cadet channel!\n"
+#~ msgstr "Échec du démarrage de %s\n"
diff --git a/po/it.po b/po/it.po
index cbadc2375..866c0299e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,23 +1,23 @@
 # Italian translations for GNUnet package.
 # Copyright (C) 2018 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GNUnet package.
-#
-# Sebastiano Pistore <address@hidden>, 2018-2019.
+# Sebastiano Pistore <address@hidden>, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden\n"
-"POT-Creation-Date: 2019-02-09 22:07+0000\n"
-"PO-Revision-Date: 2019-04-23 20:58+0200\n"
+"POT-Creation-Date: 2019-09-04 12:56+0200\n"
+"PO-Revision-Date: 2018-08-29 13:48+0200\n"
 "Last-Translator: Sebastiano Pistore <address@hidden>\n"
 "Language-Team: Italian <address@hidden>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Poedit 2.2.1\n"
+"\n"
+"X-Generator: Poedit 2.0.7\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/arm/gnunet-arm.c:156
@@ -52,27 +52,24 @@ msgid "is starting"
 msgstr ""
 
 #: src/arm/gnunet-arm.c:246
-#, fuzzy
 msgid "is stopping"
-msgstr "# elementi memorizzati"
+msgstr ""
 
 #: src/arm/gnunet-arm.c:248
 msgid "is starting already"
 msgstr ""
 
 #: src/arm/gnunet-arm.c:250
-#, fuzzy
 msgid "is stopping already"
-msgstr "# elementi memorizzati"
+msgstr ""
 
 #: src/arm/gnunet-arm.c:252
 msgid "is started already"
 msgstr ""
 
 #: src/arm/gnunet-arm.c:254
-#, fuzzy
 msgid "is stopped already"
-msgstr "# elementi memorizzati"
+msgstr ""
 
 #: src/arm/gnunet-arm.c:256
 msgid "service is not known to ARM"
@@ -87,9 +84,8 @@ msgid "service cannot be manipulated because ARM is shutting 
down"
 msgstr ""
 
 #: src/arm/gnunet-arm.c:262
-#, fuzzy
 msgid "Unknown result code."
-msgstr "Comando `%s' sconosciuto.\n"
+msgstr ""
 
 #: src/arm/gnunet-arm.c:295
 msgid "Fatal error initializing ARM API.\n"
@@ -111,9 +107,9 @@ msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
 
 #: src/arm/gnunet-arm.c:419
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+msgstr ""
 
 #: src/arm/gnunet-arm.c:429
 #, c-format
@@ -221,8 +217,7 @@ msgid "Control services and the Automated Restart Manager 
(ARM)"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:388 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
+#: src/transport/tcp_service_legacy.c:557
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
@@ -231,36 +226,30 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3829
-#: src/transport/plugin_transport_xt.c:1139
-#: src/transport/plugin_transport_xt.c:1145
-#: src/transport/plugin_transport_xt.c:3833
+#: src/transport/plugin_transport_tcp.c:3835
 #: src/transport/tcp_service_legacy.c:576
-#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
-#: src/util/service.c:643
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1150
+#: src/util/service.c:1156
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:457 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
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
+#: src/util/service.c:1195
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:462 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
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
+#: src/util/service.c:1200
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:495 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
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1236
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -268,8 +257,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:517 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
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1254
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -277,8 +265,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:556
 #: src/transport/plugin_transport_http_server.c:2688
 #: 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
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1295
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr ""
@@ -286,8 +273,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:575
 #: src/transport/plugin_transport_http_server.c:2706
 #: 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
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1315
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
@@ -295,7 +281,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:986
 #, c-format
 msgid "Failed to start service `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+msgstr ""
 
 #: src/arm/gnunet-service-arm.c:997
 #, c-format
@@ -358,13 +344,138 @@ 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
+#: src/ats/gnunet-ats-solver-eval.c:2799
 #, c-format
-msgid "Start logging `%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 ""
+
+#: 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-new.c:756
+#: src/ats/gnunet-service-ats_plugins.c:451
+#, c-format
+msgid "Failed to initialize solver `%s'!\n"
+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/plugin_ats2_common.c:90
+#, c-format
+msgid ""
+"Could not load %s quota for network `%s': `%s', assigning default bandwidth "
+"%llu\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:1870
+#, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1914
+#, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2476
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
+#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
+#: src/ats/plugin_ats_mlp.c:2602 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
+#, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2671
+#, 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:2680
+#, 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:2690
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2699
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1164
+#, c-format
+msgid "Invalid %s configuration %f\n"
 msgstr ""
 
 #: src/ats-tests/ats-testing.c:422
@@ -377,6 +488,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 ""
+
+#: src/ats-tests/ats-testing-log.c:892
+#, c-format
+msgid "Start logging `%s'\n"
+msgstr ""
+
 #: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
@@ -384,17 +504,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"
@@ -413,13 +522,12 @@ msgid ""
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:402
-#, fuzzy
 msgid "active "
-msgstr "non attivo"
+msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:402
 msgid "inactive "
-msgstr "non attivo"
+msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:512
 #, c-format
@@ -471,9 +579,8 @@ msgid "get list of all active addresses"
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:960
-#, fuzzy
 msgid "connect to PEER"
-msgstr "# amici connessi"
+msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:964
 msgid "do not resolve IP addresses to hostnames"
@@ -481,7 +588,7 @@ msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:969
 msgid "monitor mode"
-msgstr "modalità monitor"
+msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:974
 msgid "set preference for the given peer"
@@ -511,131 +618,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 ""
-
-#: 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-new.c:733
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, c-format
-msgid "Failed to initialize solver `%s'!\n"
-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/plugin_ats2_common.c:90
-#, c-format
-msgid ""
-"Could not load %s quota for network `%s': `%s', assigning default bandwidth %"
-"llu\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:1870
-#, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1914
-#, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2476
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
-#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
-#: src/ats/plugin_ats_mlp.c:2602 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
-#, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2671
-#, 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:2680
-#, 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:2690
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2699
-#, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1164
-#, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr ""
-
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
@@ -761,28 +743,6 @@ msgstr ""
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:120
-#, 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:216
-#, 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:277
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1036,8 +996,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:120
+#, 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:216
+#, 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 ""
@@ -1157,9 +1139,9 @@ msgid "ogg_stream_init() failed.\n"
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-record.c:740
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to allocate %u bytes for second packet\n"
-msgstr "Generazione statistiche fallita\n"
+msgstr ""
 
 #: src/conversation/gnunet-service-conversation.c:1305
 #, c-format
@@ -1188,37 +1170,37 @@ msgstr ""
 #: src/core/gnunet-core.c:90
 #, fuzzy
 msgid "fresh connection"
-msgstr "# amici connessi"
+msgstr "# connessioni attive"
 
 #: src/core/gnunet-core.c:93
 msgid "key sent"
 msgstr ""
 
 #: src/core/gnunet-core.c:96
-#, fuzzy
 msgid "key received"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/core/gnunet-core.c:99
+#, fuzzy
 msgid "connection established"
-msgstr "connessione stabilita"
+msgstr "Connessione stabilita con `%s'\n"
 
 #: src/core/gnunet-core.c:102
 msgid "rekeying"
 msgstr ""
 
 #: src/core/gnunet-core.c:105
-#, fuzzy
 msgid "disconnected"
-msgstr "# amici connessi"
+msgstr ""
 
 #: src/core/gnunet-core.c:112
 msgid "Connection to CORE service lost (reconnecting)"
 msgstr ""
 
 #: src/core/gnunet-core.c:115
+#, fuzzy
 msgid "unknown state"
-msgstr "stato sconosciuto"
+msgstr "indirizzo sconosciuto"
 
 #: src/core/gnunet-core.c:120
 #, c-format
@@ -1294,22 +1276,21 @@ msgid "# key exchanges stopped"
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:925
+#, fuzzy
 msgid "# PING messages transmitted"
-msgstr "# Messaggi PING trasmessi"
+msgstr "# messaggi PONG ricevuti"
 
 #: src/core/gnunet-service-core_kx.c:992
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1005
-#, fuzzy
 msgid "# duplicate ephemeral keys ignored"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1040
-#, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
-msgstr "# messaggi SYN ricevuti"
+msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1054
 #, c-format
@@ -1319,9 +1300,8 @@ msgid ""
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1060
-#, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
-msgstr "# messaggi SYN ricevuti"
+msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1080
 #, fuzzy
@@ -1329,7 +1309,7 @@ msgid "# valid ephemeral keys received"
 msgstr "# messaggi PONG ricevuti"
 
 #: src/core/gnunet-service-core_kx.c:1180
-#: src/transport/gnunet-service-transport_validation.c:1128
+#: src/transport/gnunet-service-transport_validation.c:1129
 msgid "# PING messages received"
 msgstr ""
 
@@ -1350,7 +1330,7 @@ msgid "# keepalive messages sent"
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1351
-#: src/transport/gnunet-service-transport_validation.c:1461
+#: src/transport/gnunet-service-transport_validation.c:1462
 msgid "# PONG messages received"
 msgstr "# messaggi PONG ricevuti"
 
@@ -1442,126 +1422,145 @@ msgstr ""
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/credential/credential_misc.c:88
-#, fuzzy, c-format
-msgid "Unable to parse CRED record string `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
-
-#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:994
+#: src/credential/gnunet-credential.c:381 src/namestore/gnunet-namestore.c:994
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:280
-#: src/credential/gnunet-credential.c:434
+#: src/credential/gnunet-credential.c:397
+#: src/credential/gnunet-credential.c:859
 #, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:361
-#: src/credential/gnunet-credential.c:423
+#: src/credential/gnunet-credential.c:532
+#: src/credential/gnunet-service-credential.c:1728
+#: src/namestore/gnunet-namestore.c:1019
+#: src/namestore/gnunet-namestore-fcfsd.c:1138
+#, c-format
+msgid "Failed to connect to namestore\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:798
+#: src/credential/gnunet-credential.c:849
 #, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:372
-#: src/credential/gnunet-credential.c:444
-#, fuzzy, c-format
+#: src/credential/gnunet-credential.c:807
+#: src/credential/gnunet-credential.c:868
+#, c-format
 msgid "Failed to connect to CREDENTIAL\n"
-msgstr "Impossibile avviare il servizio.\n"
+msgstr ""
 
-#: src/credential/gnunet-credential.c:379
+#: src/credential/gnunet-credential.c:813
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:387
+#: src/credential/gnunet-credential.c:820
 #, c-format
 msgid "ego required\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:403
+#: src/credential/gnunet-credential.c:830
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:414
+#: src/credential/gnunet-credential.c:839
 #, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:451
+#: src/credential/gnunet-credential.c:874
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:504
-#, c-format
-msgid "Issuer ego required\n"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:516
+#: src/credential/gnunet-credential.c:930
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:536
-msgid "create credential"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:540
+#: src/credential/gnunet-credential.c:951
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:545
-msgid "The public key of the subject to lookup the credential for"
+#: src/credential/gnunet-credential.c:958
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:550
-msgid "The name of the credential presented by the subject"
+#: src/credential/gnunet-credential.c:965
+msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:555
+#: src/credential/gnunet-credential.c:972
 msgid "The public key of the authority to verify the credential against"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:560
-msgid "The ego to use"
+#: src/credential/gnunet-credential.c:977
+msgid "The ego/zone name to use"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:565
+#: src/credential/gnunet-credential.c:983
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:570
-msgid "The time to live for the credential"
+#: src/credential/gnunet-credential.c:989
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/credential/gnunet-credential.c:574
+#: src/credential/gnunet-credential.c:994
 msgid "collect credentials"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:588
+#: src/credential/gnunet-credential.c:999
+msgid "Create and issue a credential issuer side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1004
+msgid "Issue a credential subject side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1009
+msgid "Create, sign and return a credential subject side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1016
+msgid "Import signed credentials that should be issued to a zone/ego"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1020
+msgid "Create private record entry."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1026
+#: src/credential/gnunet-credential.c:1032
+msgid "Indicates that the collect/verify process is done via forward search."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1045
 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:185
+#: src/credential/gnunet-service-credential.c:1723 src/gns/gnunet-gns.c:185
+#: 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:1138
-#: src/namestore/gnunet-namestore.c:1019
+#: src/credential/plugin_gnsrecord_credential.c:182
 #, c-format
-msgid "Failed to connect to namestore\n"
+msgid "Unable to parse ATTR record string `%s'\n"
 msgstr ""
 
-#: src/credential/plugin_gnsrecord_credential.c:186
-#, fuzzy, c-format
-msgid "Unable to parse ATTR record string `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/credential/plugin_rest_credential.c:1128
+msgid "GNS REST API initialized\n"
+msgstr ""
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:311
 #: src/datastore/gnunet-service-datastore.c:757
@@ -1591,14 +1590,12 @@ msgid "# requests filtered by bloom filter"
 msgstr ""
 
 #: src/datacache/datacache.c:385
-#, fuzzy
 msgid "# requests for random value received"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/datacache/datacache.c:417
-#, fuzzy
 msgid "# proximity search requests received"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/datacache/plugin_datacache_heap.c:553
 msgid "Heap datacache running\n"
@@ -1613,14 +1610,12 @@ msgstr ""
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_sqlite.c:53
 #: src/peerstore/plugin_peerstore_sqlite.c:52
-#: src/psycstore/plugin_psycstore_mysql.c:62
-#: src/reclaim/plugin_reclaim_sqlite.c:52
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:818 src/include/gnunet_common.h:827
+#: src/include/gnunet_common.h:840 src/include/gnunet_common.h:849
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1630,7 +1625,6 @@ msgstr ""
 #: src/datastore/plugin_datastore_sqlite.c:508
 #: src/namecache/plugin_namecache_sqlite.c:229
 #: src/namestore/plugin_namestore_sqlite.c:265
-#: src/reclaim/plugin_reclaim_sqlite.c:336
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1705,9 +1699,9 @@ msgid "Error queueing datastore GET operation\n"
 msgstr ""
 
 #: src/datastore/gnunet-datastore.c:287 src/datastore/gnunet-datastore.c:412
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open dump file: %s\n"
-msgstr "Generazione statistiche fallita\n"
+msgstr ""
 
 #: src/datastore/gnunet-datastore.c:326
 #, c-format
@@ -1733,9 +1727,8 @@ msgid "Input file is not of a supported format\n"
 msgstr ""
 
 #: src/datastore/gnunet-datastore.c:458
-#, fuzzy
 msgid "Failed connecting to the datastore.\n"
-msgstr "Impossibile avviare il servizio.\n"
+msgstr ""
 
 #: src/datastore/gnunet-datastore.c:470
 #, c-format
@@ -1747,9 +1740,8 @@ msgid "Dump all records from the datastore"
 msgstr ""
 
 #: src/datastore/gnunet-datastore.c:497
-#, fuzzy
 msgid "Insert records into the datastore"
-msgstr "# byte inviati via SMTP"
+msgstr ""
 
 #: src/datastore/gnunet-datastore.c:502
 msgid "File to dump or insert"
@@ -1927,21 +1919,19 @@ msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
 #: src/datastore/plugin_datastore_mysql.c:1180
-#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:276
-#: src/datastore/plugin_datastore_postgres.c:893
+#: src/datastore/plugin_datastore_postgres.c:280
+#: src/datastore/plugin_datastore_postgres.c:897
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:854
+#: src/datastore/plugin_datastore_postgres.c:858
 msgid "Failed to drop table from database.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:952
-#: src/psycstore/plugin_psycstore_postgres.c:1506
+#: src/datastore/plugin_datastore_postgres.c:956
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1957,8 +1947,6 @@ msgstr ""
 #: src/namecache/plugin_namecache_sqlite.c:173
 #: src/namestore/plugin_namestore_sqlite.c:206
 #: src/peerstore/plugin_peerstore_sqlite.c:535
-#: src/psycstore/plugin_psycstore_sqlite.c:325
-#: src/reclaim/plugin_reclaim_sqlite.c:212
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
@@ -1980,8 +1968,7 @@ msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1405
 #: src/namecache/plugin_namecache_sqlite.c:557
-#: src/namestore/plugin_namestore_sqlite.c:750
-#: src/reclaim/plugin_reclaim_sqlite.c:711
+#: src/namestore/plugin_namestore_sqlite.c:751
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -2051,14 +2038,59 @@ 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 src/rps/gnunet-rps-profiler.c:3083
+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:300
+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 ""
 
 #: src/dht/gnunet-dht-put.c:142
-#, fuzzy
 msgid "Could not connect to DHT service!\n"
-msgstr "Impossibile avviare il servizio.\n"
+msgstr ""
 
 #: src/dht/gnunet-dht-put.c:153
 #, c-format
@@ -2257,89 +2289,43 @@ msgid "# P2P RESULTS received"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:2371
-msgid "# P2P RESULT bytes received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_nse.c:59
-msgid "# Network size estimates received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:223
-msgid "# Good REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:237
-msgid "# Duplicate REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:243
-msgid "# Invalid REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:249
-msgid "# Irrelevant REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:261
-msgid "# Unsupported REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:339
-msgid "# Entries removed from routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:415
-msgid "# Entries added to routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:437
-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 src/rps/gnunet-rps-profiler.c:2953
-msgid "number of peers to start"
+msgid "# P2P RESULT bytes received"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:954
-msgid "number of PUTs to perform per peer"
+#: src/dht/gnunet-service-dht_nse.c:59
+msgid "# Network size estimates received"
 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"
+#: src/dht/gnunet-service-dht_routing.c:223
+msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:964
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
+#: src/dht/gnunet-service-dht_routing.c:237
+msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:969
-msgid "delay to start doing PUTs (default: 1 sec)"
+#: src/dht/gnunet-service-dht_routing.c:243
+msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:974
-msgid "delay to start doing GETs (default: 5 min)"
+#: src/dht/gnunet-service-dht_routing.c:249
+msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:979
-msgid "replication degree for DHT PUTs"
+#: src/dht/gnunet-service-dht_routing.c:261
+msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:984
-msgid "chance that a peer is selected at random for PUTs"
+#: src/dht/gnunet-service-dht_routing.c:339
+msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:989
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+#: src/dht/gnunet-service-dht_routing.c:415
+msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1009
-msgid "Measure quality and performance of the DHT service."
+#: src/dht/gnunet-service-dht_routing.c:437
+msgid "# DHT requests combined"
 msgstr ""
 
 #: src/dht/plugin_block_dht.c:189
@@ -2426,10 +2412,6 @@ msgstr ""
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:175
-msgid "Print information about DV state"
-msgstr ""
-
 #: src/exit/gnunet-daemon-exit.c:960
 msgid "# TCP packets sent via TUN"
 msgstr ""
@@ -2450,38 +2432,32 @@ msgid "# Bytes received from CADET"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1467
-#, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1575
-#, fuzzy
 msgid "# UDP service requests received via cadet"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1615
-#, fuzzy
 msgid "# TCP service creation requests received via cadet"
-msgstr "# connessioni attive"
+msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1704
-#, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
-msgstr "# connessioni attive"
+msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1788
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1825
-#, fuzzy
 msgid "# TCP data requests received via cadet"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1956
-#, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279
 #: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828
@@ -2496,9 +2472,8 @@ msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2210
-#, fuzzy
 msgid "# ICMP service requests received via cadet"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985
 #: src/vpn/gnunet-service-vpn.c:2096
@@ -2511,9 +2486,8 @@ msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068
-#, fuzzy
 msgid "# Inbound CADET channels created"
-msgstr "# messaggi PONG decrittati"
+msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2522
 #, c-format
@@ -2521,9 +2495,8 @@ msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2541
-#, fuzzy
 msgid "# Messages transmitted via cadet channels"
-msgstr "# Messaggi PING trasmessi"
+msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2719
 msgid "# ICMP packets dropped (not allowed)"
@@ -2619,7 +2592,7 @@ msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:3690
 msgid "Must be a number"
-msgstr "Deve essere un numero"
+msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:3805
 #, c-format
@@ -2824,9 +2797,9 @@ msgid ""
 msgstr ""
 
 #: src/fs/fs_list_indexed.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to receive response from `%s' service.\n"
-msgstr "Generazione statistiche fallita\n"
+msgstr ""
 
 #: src/fs/fs_list_indexed.c:196
 #, c-format
@@ -2862,58 +2835,62 @@ msgstr ""
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
-#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
+#: src/fs/fs_publish.c:725
+#, fuzzy, c-format
+msgid "Can not index file `%s': %s.\n"
+msgstr "Connessione stabilita con `%s'\n"
+
+#: src/fs/fs_publish.c:782 src/fs/fs_publish.c:827 src/fs/fs_publish.c:848
+#: src/fs/fs_publish.c:878 src/fs/fs_publish.c:1144
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:780
-#, fuzzy
+#: src/fs/fs_publish.c:784
 msgid "error on index-start request to `fs' service"
-msgstr "Impossibile avviare il servizio.\n"
+msgstr ""
 
-#: src/fs/fs_publish.c:825
+#: src/fs/fs_publish.c:829
 msgid "failed to compute hash"
-msgstr "impossibile calcolare l'hash"
+msgstr ""
 
-#: src/fs/fs_publish.c:845
+#: src/fs/fs_publish.c:849
 msgid "filename too long"
-msgstr "nome file troppo lungo"
+msgstr ""
 
-#: src/fs/fs_publish.c:876
+#: src/fs/fs_publish.c:880
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:902
+#: src/fs/fs_publish.c:906
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
+#: src/fs/fs_publish.c:995 src/fs/fs_publish.c:1031
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1094
+#: src/fs/fs_publish.c:1098
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1102
+#: src/fs/fs_publish.c:1106
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1142
+#: src/fs/fs_publish.c:1146
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1381
+#: src/fs/fs_publish.c:1385
 #, c-format
 msgid "Datastore failure: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1472
+#: src/fs/fs_publish.c:1476
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2924,7 +2901,7 @@ msgstr ""
 
 #: src/fs/fs_publish_ublock.c:241
 msgid "Internal error."
-msgstr "Errore interno."
+msgstr ""
 
 #: src/fs/fs_search.c:822 src/fs/fs_search.c:892
 #, c-format
@@ -2942,7 +2919,7 @@ msgstr ""
 
 #: src/fs/fs_unindex.c:68
 msgid "Failed to read file"
-msgstr "Impossibile leggere il file"
+msgstr ""
 
 #: src/fs/fs_unindex.c:275
 msgid "Error communicating with `fs' service."
@@ -2976,94 +2953,94 @@ msgstr ""
 
 #: src/fs/fs_unindex.c:704
 msgid "Failed to compute hash of file."
-msgstr "Impossibile calcolare l'hash del file."
+msgstr ""
 
-#: src/fs/fs_uri.c:234
+#: src/fs/fs_uri.c:236
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:293
+#: src/fs/fs_uri.c:295
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:311
+#: src/fs/fs_uri.c:313
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:318
+#: src/fs/fs_uri.c:320
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:388
+#: src/fs/fs_uri.c:390
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:429
+#: src/fs/fs_uri.c:431
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:444
+#: src/fs/fs_uri.c:446
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:523
+#: src/fs/fs_uri.c:525
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:538
+#: src/fs/fs_uri.c:540
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:548
+#: src/fs/fs_uri.c:550
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:556
+#: src/fs/fs_uri.c:558
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:566
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:570
+#: src/fs/fs_uri.c:572
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:576
+#: src/fs/fs_uri.c:578
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:587
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:591
+#: src/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:609
+#: src/fs/fs_uri.c:611
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:645
 msgid "invalid argument"
-msgstr "argomento non valido"
+msgstr ""
 
-#: src/fs/fs_uri.c:655
+#: src/fs/fs_uri.c:657
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1092
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3103,11 +3080,11 @@ msgstr ""
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:907
+#: src/fs/gnunet-auto-share.c:772
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:907
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
@@ -3187,7 +3164,7 @@ msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:215 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3210,12 +3187,12 @@ msgid "Target filename must be specified.\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:872
-#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:273 src/fs/gnunet-unindex.c:139
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:312
+#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:315
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
@@ -3223,7 +3200,7 @@ msgstr ""
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:316
+#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3249,6 +3226,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 ""
@@ -3265,14 +3250,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"
@@ -3361,9 +3338,8 @@ msgid "Meta data extraction has finished.\n"
 msgstr ""
 
 #: src/fs/gnunet-publish.c:687
-#, fuzzy
-msgid "Internal error scanning directory.\n"
-msgstr "Errore interno."
+msgid "Error scanning directory.\n"
+msgstr ""
 
 #: src/fs/gnunet-publish.c:715
 #, c-format
@@ -3407,6 +3383,10 @@ msgstr ""
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
+#: src/fs/gnunet-publish.c:911
+msgid "enable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
 #: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
@@ -3465,32 +3445,32 @@ msgstr ""
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:204
+#: src/fs/gnunet-search.c:207
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:260
+#: src/fs/gnunet-search.c:263
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:284
+#: src/fs/gnunet-search.c:287
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:321
+#: src/fs/gnunet-search.c:324
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:329
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:332
+#: src/fs/gnunet-search.c:335
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:348
+#: src/fs/gnunet-search.c:351
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -3534,14 +3514,12 @@ msgid "Failed to connect to `%s' service.\n"
 msgstr ""
 
 #: src/fs/gnunet-service-fs_cadet_client.c:370
-#, fuzzy
 msgid "# replies received via cadet"
-msgstr "# ACK ricevuti"
+msgstr ""
 
 #: src/fs/gnunet-service-fs_cadet_client.c:384
-#, fuzzy
 msgid "# replies received via cadet dropped"
-msgstr "# ACK ricevuti"
+msgstr ""
 
 #: src/fs/gnunet-service-fs_cadet_server.c:265
 msgid "# queries received via CADET not answered"
@@ -3552,9 +3530,8 @@ msgid "# Blocks transferred via cadet"
 msgstr ""
 
 #: src/fs/gnunet-service-fs_cadet_server.c:346
-#, fuzzy
 msgid "# queries received via cadet"
-msgstr "# ACK ricevuti"
+msgstr ""
 
 #: src/fs/gnunet-service-fs_cadet_server.c:388
 #, fuzzy
@@ -3649,7 +3626,7 @@ msgstr ""
 #: src/fs/gnunet-service-fs_indexing.c:151
 #, c-format
 msgid "Error writing `%s'.\n"
-msgstr "Errore durante la scrittura di `%s'.\n"
+msgstr ""
 
 #: src/fs/gnunet-service-fs_indexing.c:253
 #, c-format
@@ -3876,38 +3853,38 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:203
+#: src/gns/gnunet-dns2gns.c:214
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:405
+#: src/gns/gnunet-dns2gns.c:416
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:421
+#: src/gns/gnunet-dns2gns.c:432
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:429
+#: src/gns/gnunet-dns2gns.c:440
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:588
+#: src/gns/gnunet-dns2gns.c:600
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:688
+#: src/gns/gnunet-dns2gns.c:748
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:693
+#: src/gns/gnunet-dns2gns.c:753
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:710
+#: src/gns/gnunet-dns2gns.c:770
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3923,6 +3900,27 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:199
+#, 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 ""
@@ -3957,139 +3955,117 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:980
+#: src/gns/gnunet-gns-proxy.c:989
 #, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1005
+#: src/gns/gnunet-gns-proxy.c:1014
 #, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1026
+#: src/gns/gnunet-gns-proxy.c:1035
 #, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1041
+#: src/gns/gnunet-gns-proxy.c:1050
 #, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1056
+#: src/gns/gnunet-gns-proxy.c:1065
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1066
+#: src/gns/gnunet-gns-proxy.c:1075
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1090
+#: src/gns/gnunet-gns-proxy.c:1099
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1221
+#: src/gns/gnunet-gns-proxy.c:1230
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2121
+#: src/gns/gnunet-gns-proxy.c:2131
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2642
+#: src/gns/gnunet-gns-proxy.c:2652
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2674
-#, fuzzy, c-format
+#: src/gns/gnunet-gns-proxy.c:2684
+#, c-format
 msgid "Unable to import certificate from `%s'\n"
-msgstr "Generazione statistiche fallita\n"
+msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2875
+#: src/gns/gnunet-gns-proxy.c:2885
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2897 src/rest/gnunet-rest-server.c:658
+#: src/gns/gnunet-gns-proxy.c:2907 src/rest/gnunet-rest-server.c:668
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3233
+#: src/gns/gnunet-gns-proxy.c:3243
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3262
+#: src/gns/gnunet-gns-proxy.c:3272
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3345
+#: src/gns/gnunet-gns-proxy.c:3355
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3635
+#: src/gns/gnunet-gns-proxy.c:3693
 #, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3763
+#: src/gns/gnunet-gns-proxy.c:3821
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3768
+#: src/gns/gnunet-gns-proxy.c:3826
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3772
+#: src/gns/gnunet-gns-proxy.c:3830
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3798
+#: src/gns/gnunet-gns-proxy.c:3856
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199
-#, 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:506
-#, fuzzy
 msgid "Properly base32-encoded public key required"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/gns/gnunet-service-gns.c:542
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
 #: src/gns/gnunet-service-gns.c:561
-#: 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 ""
 
@@ -4175,9 +4151,13 @@ msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
 #: src/gns/plugin_gnsrecord_gns.c:294
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse BOX record string `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+msgstr ""
+
+#: src/gns/plugin_rest_gns.c:452
+msgid "Gns REST API initialized\n"
+msgstr ""
 
 #: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, c-format
@@ -4225,14 +4205,14 @@ msgid "Failed to serialize MX record with hostname 
`%s'\n"
 msgstr ""
 
 #: src/gnsrecord/plugin_gnsrecord_dns.c:630
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse SRV record `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+msgstr ""
 
 #: src/gnsrecord/plugin_gnsrecord_dns.c:646
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+msgstr ""
 
 #: src/gnsrecord/plugin_gnsrecord_dns.c:663
 #, c-format
@@ -4556,7 +4536,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2814
+#: src/transport/gnunet-service-transport.c:2827
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -4576,14 +4556,12 @@ msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:731
-#, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
-msgstr "`%s' non è un indirizzo IP valido.\n"
+msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:748
-#, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
-msgstr "`%s' non è un indirizzo IP valido.\n"
+msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:769
 #, fuzzy, c-format
@@ -4687,13 +4665,13 @@ msgstr ""
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
+#: src/identity/plugin_rest_identity.c:1297
+msgid "Identity REST API initialized\n"
+msgstr ""
+
 #: src/json/json.c:123
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
-
-#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
-msgid "This command doesn't do anything yet."
 msgstr ""
 
 #: src/my/my.c:196 src/my/my.c:215
@@ -4727,9 +4705,9 @@ msgid "You must specify which zone should be accessed\n"
 msgstr ""
 
 #: src/namecache/gnunet-namecache.c:193
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid public key for zone `%s'\n"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/namecache/gnunet-namecache.c:201
 #, c-format
@@ -4758,27 +4736,27 @@ msgstr ""
 
 #: src/namecache/plugin_namecache_flat.c:121
 #: src/namecache/plugin_namecache_flat.c:255
-#: src/namestore/plugin_namestore_heap.c:148
-#: src/namestore/plugin_namestore_heap.c:395
+#: src/namestore/plugin_namestore_heap.c:179
+#: src/namestore/plugin_namestore_heap.c:412
 #: src/peerstore/plugin_peerstore_flat.c:379
 #: src/peerstore/plugin_peerstore_flat.c:538
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initialize file: %s.\n"
-msgstr "Generazione statistiche fallita\n"
+msgstr ""
 
 #: src/namecache/plugin_namecache_flat.c:132
-#: src/namestore/plugin_namestore_heap.c:159
+#: src/namestore/plugin_namestore_heap.c:190
 #: src/peerstore/plugin_peerstore_flat.c:394
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to get filesize: %s.\n"
-msgstr "Generazione statistiche fallita\n"
+msgstr ""
 
 #: src/namecache/plugin_namecache_flat.c:151
-#: src/namestore/plugin_namestore_heap.c:172
+#: src/namestore/plugin_namestore_heap.c:203
 #: src/peerstore/plugin_peerstore_flat.c:406
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to read file: %s.\n"
-msgstr "Impossibile leggere il file"
+msgstr ""
 
 #: src/namecache/plugin_namecache_flat.c:410
 msgid "flat plugin running\n"
@@ -4788,70 +4766,8 @@ msgstr ""
 #: src/namecache/plugin_namecache_sqlite.c:197
 #: src/namestore/plugin_namestore_sqlite.c:219
 #: src/namestore/plugin_namestore_sqlite.c:230
-#, fuzzy, c-format
-msgid "Failed to setup database at `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:549
-#, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:576
-#, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:597
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:629
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:689
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:777
-#, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:796
 #, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:832
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:841
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1071
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1099
-msgid "Failed to start HTTP server\n"
-msgstr "Impossibile avviare il server HTTP\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1147
-msgid "Failed to connect to identity\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1173
-msgid "name of the zone that is to be managed by FCFSD"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1192
-msgid "GNU Name System First Come First Serve name registration service"
+msgid "Failed to setup database at `%s'\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:341
@@ -4897,9 +4813,9 @@ msgid ""
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:965
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to replace records: %s\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+msgstr ""
 
 #: src/namestore/gnunet-namestore.c:1009
 #, c-format
@@ -4993,9 +4909,9 @@ msgid "Unknown record type `%s'\n"
 msgstr "Comando `%s' sconosciuto.\n"
 
 #: src/namestore/gnunet-namestore.c:1484
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "deve essere un indirizzo IPv6 valido"
+msgstr ""
 
 #: src/namestore/gnunet-namestore.c:1548
 msgid "add record"
@@ -5058,6 +4974,68 @@ msgstr ""
 msgid "name of the ego controlling the zone"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-fcfsd.c:549
+#, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:576
+#, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:597
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:629
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:689
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:777
+#, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:796
+#, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:832
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:841
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1099
+msgid "Failed to start HTTP server\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1147
+msgid "Failed to connect to identity\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1173
+msgid "name of the zone that is to be managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1192
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
 #: src/namestore/gnunet-service-namestore.c:900
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
@@ -5075,18 +5053,22 @@ msgstr ""
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_heap.c:778
+#: src/namestore/plugin_namestore_heap.c:773
 msgid "heap file database running\n"
 msgstr ""
 
+#: src/namestore/plugin_rest_namestore.c:1079
+msgid "Namestore REST API initialized\n"
+msgstr ""
+
 #: src/nat-auto/gnunet-nat-auto.c:193
 msgid "Suggested configuration changes:\n"
 msgstr ""
 
 #: src/nat-auto/gnunet-nat-auto.c:219
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write configuration to `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+msgstr ""
 
 #: src/nat-auto/gnunet-nat-auto.c:226
 #, c-format
@@ -5130,9 +5112,8 @@ msgstr ""
 
 #: src/nat-auto/gnunet-nat-auto_legacy.c:568
 #: src/nat-auto/nat_auto_api_test.c:575
-#, fuzzy
 msgid "NAT test failed to start NAT library\n"
-msgstr "Impossibile avviare il server HTTP\n"
+msgstr ""
 
 #: src/nat-auto/gnunet-service-nat-auto.c:342
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
@@ -5272,9 +5253,9 @@ msgid "Failed to find valid PORT in section `%s'\n"
 msgstr ""
 
 #: src/nat-auto/nat_auto_api_test.c:526
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
-msgstr "Generazione statistiche fallita\n"
+msgstr ""
 
 #: src/nat/gnunet-nat.c:437
 msgid "which IP and port are we locally using to bind/listen to"
@@ -5350,6 +5331,10 @@ 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 ""
@@ -5374,15 +5359,65 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-nse.c:122
-msgid "Show network size estimates from 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 "# peer conosciuti"
+
+#: 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/peerinfo-tool/gnunet-peerinfo.c:239
 #, c-format
 msgid "%sPeer `%s'\n"
@@ -5394,10 +5429,10 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:299
-#: src/rest-plugins/plugin_rest_peerinfo.c:501
-#, fuzzy, c-format
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
+#, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:466
 #, c-format
@@ -5473,58 +5508,8 @@ 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 "# peer conosciuti"
-
-#: 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."
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:796
+msgid "Peerinfo REST API initialized\n"
 msgstr ""
 
 #: src/peerstore/gnunet-peerstore.c:91
@@ -5536,150 +5521,40 @@ msgstr ""
 msgid "Could not load database backend `%s'\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:532 src/peerstore/peerstore_api.c:581
+#: src/peerstore/peerstore_api.c:605 src/peerstore/peerstore_api.c:657
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:595
-msgid "Received a malformed response from service."
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:731
-msgid "Received a watch result for a non existing watch.\n"
-msgstr ""
-
-#: src/peerstore/plugin_peerstore_sqlite.c:453
-#: src/psycstore/plugin_psycstore_sqlite.c:282
-#, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
-msgstr ""
-
-#: src/peerstore/plugin_peerstore_sqlite.c:488
-#: src/psycstore/plugin_psycstore_mysql.c:250
-#: src/psycstore/plugin_psycstore_sqlite.c:259
-#, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
-msgstr ""
-
-#: src/peerstore/plugin_peerstore_sqlite.c:570
-#, fuzzy, c-format
-msgid "Unable to create indices: %s.\n"
-msgstr "Generazione statistiche fallita\n"
-
-#: src/pq/pq_prepare.c:84
-#, c-format
-msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
-msgstr ""
-
-#: src/psycstore/gnunet-service-psycstore.c:249
-#, fuzzy
-msgid "Failed to store membership information!\n"
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:271
-#, fuzzy
-msgid "Failed to test membership!\n"
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:300
-#, fuzzy
-msgid "Dropping invalid fragment\n"
-msgstr "argomento non valido"
-
-#: src/psycstore/gnunet-service-psycstore.c:311
-#, fuzzy
-msgid "Failed to store fragment\n"
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:368
-#, fuzzy
-msgid "Failed to get fragment!\n"
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:434
-#, fuzzy
-msgid "Failed to get message!\n"
-msgstr "Impossibile leggere il file"
-
-#: src/psycstore/gnunet-service-psycstore.c:464
-#, fuzzy
-msgid "Failed to get message fragment!\n"
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:494
-#, fuzzy
-msgid "Failed to get master counters!\n"
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:675
-#, fuzzy, c-format
-msgid "Failed to begin modifying state: %d\n"
-msgstr "Impossibile leggere il file"
-
-#: src/psycstore/gnunet-service-psycstore.c:685
-#, fuzzy, c-format
-msgid "Failed to modify state: %d\n"
-msgstr "Impossibile leggere il file"
-
-#: src/psycstore/gnunet-service-psycstore.c:693
-#, fuzzy
-msgid "Failed to end modifying state!\n"
-msgstr "Impossibile leggere il file"
-
-#: src/psycstore/gnunet-service-psycstore.c:730
-#, fuzzy
-msgid "Tried to set invalid state variable name!\n"
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:744
-#, fuzzy
-msgid "Failed to begin synchronizing state!\n"
-msgstr "Impossibile leggere il file"
-
-#: src/psycstore/gnunet-service-psycstore.c:761
-#, fuzzy
-msgid "Failed to end synchronizing state!\n"
-msgstr "Impossibile leggere il file"
-
-#: src/psycstore/gnunet-service-psycstore.c:779
-#: src/psycstore/gnunet-service-psycstore.c:795
-#, fuzzy
-msgid "Failed to reset state!\n"
-msgstr "Impossibile leggere il file"
-
-#: src/psycstore/gnunet-service-psycstore.c:824
-#: src/psycstore/gnunet-service-psycstore.c:881
-#, fuzzy
-msgid "Tried to get invalid state variable name!\n"
-msgstr "Impossibile avviare il servizio.\n"
+#: src/peerstore/peerstore_api.c:671
+msgid "Received a malformed response from service."
+msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:851
-#: src/psycstore/gnunet-service-psycstore.c:896
-#, fuzzy
-msgid "Failed to get state variable!\n"
-msgstr "Impossibile avviare il servizio.\n"
+#: src/peerstore/peerstore_api.c:807
+msgid "Received a watch result for a non existing watch.\n"
+msgstr ""
 
-#: src/psycstore/plugin_psycstore_mysql.c:281
-#, fuzzy
-msgid "Unable to initialize Mysql.\n"
-msgstr "Generazione statistiche fallita\n"
+#: src/peerstore/plugin_peerstore_sqlite.c:453
+#, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr ""
 
-#: src/psycstore/plugin_psycstore_mysql.c:291
-#, fuzzy, c-format
-msgid "Failed to run SQL statement `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/peerstore/plugin_peerstore_sqlite.c:488
+#, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:61
+#: src/peerstore/plugin_peerstore_sqlite.c:570
 #, c-format
-msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+msgid "Unable to create indices: %s.\n"
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1924
-msgid "SQLite database running\n"
+#: src/pq/pq_prepare.c:84
+#, c-format
+msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
 msgstr ""
 
 #: src/pt/gnunet-daemon-pt.c:423
@@ -5737,65 +5612,81 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:467
+#: src/reclaim/gnunet-reclaim.c:495
 #, c-format
 msgid "Ego is required\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:475
+#: src/reclaim/gnunet-reclaim.c:501
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:483
+#: src/reclaim/gnunet-reclaim.c:507
 #, c-format
 msgid "Requesting party key is required!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:506
-msgid "Add attribute"
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "Add an attribute NAME"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:527
+msgid "Add an attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:512
-msgid "Attribute value"
+#: src/reclaim/gnunet-reclaim.c:530
+msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:517
-msgid "Ego"
+#: src/reclaim/gnunet-reclaim.c:533
+msgid "The EGO to use"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:522
-msgid "Audience (relying party)"
+#: src/reclaim/gnunet-reclaim.c:535
+msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:526
-msgid "List attributes for Ego"
+#: src/reclaim/gnunet-reclaim.c:538
+msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:531
-msgid "Issue a ticket"
+#: src/reclaim/gnunet-reclaim.c:542
+msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:536
+#: src/reclaim/gnunet-reclaim.c:545
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:541
+#: src/reclaim/gnunet-reclaim.c:548
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:546
+#: src/reclaim/gnunet-reclaim.c:551
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:551
+#: src/reclaim/gnunet-reclaim.c:553
+msgid "List tickets of ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:556
 msgid "Expiration interval of the attribute"
 msgstr ""
 
+#: src/reclaim/gnunet-reclaim.c:560
+msgid "re:claimID command line tool"
+msgstr ""
+
+#: src/reclaim/plugin_rest_openid_connect.c:2051
+#: src/reclaim/plugin_rest_reclaim.c:1018
+msgid "Identity Provider REST API initialized\n"
+msgstr ""
+
 #: src/reclaim/reclaim_api.c:436
-#, fuzzy
 msgid "failed to store record\n"
-msgstr "Impossibile avviare il servizio.\n"
+msgstr ""
 
 #: src/regex/gnunet-daemon-regexprofiler.c:267
 #, c-format
@@ -5881,43 +5772,18 @@ msgstr ""
 msgid "Search string `%s' is too long!\n"
 msgstr ""
 
-#: src/rest-plugins/plugin_rest_copying.c:209
-msgid "COPYING REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_credential.c:1128
-msgid "GNS REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_gns.c:452
-msgid "Gns REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_identity.c:1297
-msgid "Identity REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_namestore.c:1079
-msgid "Namestore REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_openid_connect.c:2245
-#: src/rest-plugins/plugin_rest_reclaim.c:1079
-msgid "Identity Provider REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_peerinfo.c:796
-msgid "Peerinfo REST API initialized\n"
-msgstr ""
-
-#: src/rest/gnunet-rest-server.c:927
+#: src/rest/gnunet-rest-server.c:986
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:944
+#: src/rest/gnunet-rest-server.c:1003
 msgid "GNUnet REST server"
 msgstr ""
 
+#: src/rest/plugin_rest_copying.c:209
+msgid "COPYING REST API initialized\n"
+msgstr ""
+
 #: src/revocation/gnunet-revocation.c:129
 #, c-format
 msgid "Key `%s' is valid\n"
@@ -5977,7 +5843,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
+#: src/revocation/gnunet-revocation.c:437
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
@@ -6023,9 +5889,8 @@ msgid "# unsupported revocations received via set union"
 msgstr ""
 
 #: src/revocation/gnunet-service-revocation.c:468
-#, fuzzy
 msgid "# revocation messages received via set union"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/revocation/gnunet-service-revocation.c:473
 #, c-format
@@ -6048,32 +5913,32 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2959
-msgid "duration of the profiling"
+#: src/rps/gnunet-rps.c:260
+msgid "Seed a PeerID"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2965
-msgid "timeout for the profiling"
+#: src/rps/gnunet-rps.c:264
+msgid "Get updates of view (0 for infinite updates)"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2971
-msgid "number of PeerIDs to request"
+#: src/rps/gnunet-rps.c:268
+msgid "Get peers from biased stream"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2986
-msgid "Measure quality and performance of the RPS service."
+#: src/rps/gnunet-rps-profiler.c:3088
+msgid "duration of the profiling"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:260
-msgid "Seed a PeerID"
+#: src/rps/gnunet-rps-profiler.c:3093
+msgid "timeout for the profiling"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:264
-msgid "Get updates of view (0 for infinite updates)"
+#: src/rps/gnunet-rps-profiler.c:3098
+msgid "number of PeerIDs to request"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:268
-msgid "Get peers from biased stream"
+#: src/rps/gnunet-rps-profiler.c:3114
+msgid "Measure quality and performance of the RPS service."
 msgstr ""
 
 #: src/scalarproduct/gnunet-scalarproduct.c:220
@@ -6130,10 +5995,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 ""
 
@@ -6157,10 +6022,9 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2005
-#, fuzzy
+#: src/set/gnunet-service-set.c:2008
 msgid "Could not connect to CADET service\n"
-msgstr "Impossibile avviare il servizio.\n"
+msgstr ""
 
 #: src/set/gnunet-set-ibf-profiler.c:252
 msgid "number of element in set A-B"
@@ -6202,128 +6066,6 @@ msgstr ""
 msgid "element size"
 msgstr ""
 
-#: src/social/gnunet-social.c:1166
-msgid "--place missing or invalid.\n"
-msgstr ""
-
-#: src/social/gnunet-social.c:1217
-msgid "assign --name in state to --data"
-msgstr ""
-
-#: src/social/gnunet-social.c:1222
-msgid "say good-bye and leave somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1227
-msgid "create a place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1232
-msgid "destroy a place we were hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1237
-msgid "enter somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1243
-msgid "find state matching name prefix"
-msgstr ""
-
-#: src/social/gnunet-social.c:1248
-msgid "replay history of messages up to the given --limit"
-msgstr ""
-
-#: src/social/gnunet-social.c:1253
-msgid "reconnect to a previously created place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1258
-msgid "publish something to a place we are hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1263
-msgid "reconnect to a previously entered place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1268
-msgid "search for state matching exact name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1273
-msgid "submit something to somebody's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1278
-msgid "list of egos and subscribed places"
-msgstr ""
-
-#: src/social/gnunet-social.c:1283
-msgid "extract and replay history between message IDs --start and --until"
-msgstr ""
-
-#: src/social/gnunet-social.c:1292
-msgid "application ID to use when connecting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1298
-msgid "message body or state value"
-msgstr ""
-
-#: src/social/gnunet-social.c:1304
-msgid "name or public key of ego"
-msgstr ""
-
-#: src/social/gnunet-social.c:1309
-msgid "wait for incoming messages"
-msgstr ""
-
-#: src/social/gnunet-social.c:1315
-msgid "GNS name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1321
-msgid "peer ID for --guest-enter"
-msgstr ""
-
-#: src/social/gnunet-social.c:1327
-msgid "name (key) to query from state"
-msgstr ""
-
-#: src/social/gnunet-social.c:1333
-msgid "method name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1339
-msgid "number of messages to replay from history"
-msgstr ""
-
-#: src/social/gnunet-social.c:1345
-msgid "key address of place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1351
-msgid "start message ID for history replay"
-msgstr ""
-
-#: src/social/gnunet-social.c:1356
-msgid "respond to entry requests by admitting all guests"
-msgstr ""
-
-#: src/social/gnunet-social.c:1362
-msgid "end message ID for history replay"
-msgstr ""
-
-#: src/social/gnunet-social.c:1367
-msgid "respond to entry requests by refusing all guests"
-msgstr ""
-
-#: src/social/gnunet-social.c:1377
-msgid ""
-"gnunet-social - Interact with the social service: enter/leave, send/receive "
-"messages, access history and state.\n"
-msgstr ""
-
 #: src/sq/sq.c:54
 #, c-format
 msgid "Failure to bind %u-th SQL parameter\n"
@@ -6334,9 +6076,9 @@ msgid "Failure in sqlite3_reset (!)\n"
 msgstr ""
 
 #: src/sq/sq.c:139
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to reset sqlite statement with error: %s\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+msgstr ""
 
 #: src/statistics/gnunet-service-statistics.c:338
 #, c-format
@@ -6442,9 +6184,8 @@ msgid "Could not save some persistent statistics\n"
 msgstr ""
 
 #: src/testbed/generate-underlay-topology.c:225
-#, fuzzy
 msgid "Need at least 2 arguments\n"
-msgstr "Impossibile leggere il file"
+msgstr ""
 
 #: src/testbed/generate-underlay-topology.c:230
 msgid "Database filename missing\n"
@@ -6485,7 +6226,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr ""
 
 #: src/testbed/generate-underlay-topology.c:342
-#: src/testbed/gnunet-testbed-profiler.c:283
+#: src/testbed/gnunet-testbed-profiler.c:282
 msgid "create COUNT number of peers"
 msgstr ""
 
@@ -6594,17 +6335,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
 msgid "Waiting for child to exit.\n"
 msgstr ""
@@ -6614,6 +6344,17 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr ""
 
+#: src/testbed/gnunet-testbed-profiler.c:287
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:291
+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
 #, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -6787,47 +6528,47 @@ msgstr ""
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1159
+#: src/testing/testing.c:1161
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1168
+#: src/testing/testing.c:1170
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 
-#: src/testing/testing.c:1178
+#: src/testing/testing.c:1180
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1191
+#: src/testing/testing.c:1193
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/testing/testing.c:1205
+#: src/testing/testing.c:1207
 #, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1217
+#: src/testing/testing.c:1219
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1242
+#: src/testing/testing.c:1244
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1344
+#: src/testing/testing.c:1346
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1649
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr ""
@@ -6844,7 +6585,7 @@ msgstr ""
 
 #: src/topology/gnunet-daemon-topology.c:230
 msgid "# peers blacklisted"
-msgstr "# nodi in blacklist"
+msgstr ""
 
 #: src/topology/gnunet-daemon-topology.c:344
 msgid "# connect requests issued to ATS"
@@ -6857,7 +6598,7 @@ msgstr ""
 #: src/topology/gnunet-daemon-topology.c:640
 #: src/topology/gnunet-daemon-topology.c:726
 msgid "# friends connected"
-msgstr "# amici connessi"
+msgstr ""
 
 #: src/topology/gnunet-daemon-topology.c:923
 msgid "Failed to connect to core service, can not manage topology!\n"
@@ -6901,18 +6642,18 @@ msgstr ""
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2329
-#: src/transport/gnunet-communicator-udp.c:2883
-#: src/transport/gnunet-service-tng.c:4679
-#: src/transport/gnunet-service-transport.c:2782
+#: src/transport/gnunet-communicator-tcp.c:2334
+#: src/transport/gnunet-communicator-udp.c:2938
+#: src/transport/gnunet-service-tng.c:7070
+#: src/transport/gnunet-service-transport.c:2795
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2393
+#: src/transport/gnunet-communicator-tcp.c:2398
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2954
+#: src/transport/gnunet-communicator-udp.c:3016
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -6921,261 +6662,254 @@ msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1073
+#: src/transport/gnunet-communicator-unix.c:1074
 #: src/transport/plugin_transport_unix.c:1403
 #, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1162
+#: src/transport/gnunet-communicator-unix.c:1163
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:448
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:452
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:817
+#: src/transport/gnunet-service-transport.c:826
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1550
+#: src/transport/gnunet-service-transport.c:1563
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1710
+#: src/transport/gnunet-service-transport.c:1723
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1807
+#: src/transport/gnunet-service-transport.c:1820
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2124
-#: src/transport/gnunet-service-transport.c:2596
+#: src/transport/gnunet-service-transport.c:2137
+#: src/transport/gnunet-service-transport.c:2609
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2600
+#: src/transport/gnunet-service-transport.c:2613
 #, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2708
+#: src/transport/gnunet-service-transport.c:2721
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2717
+#: src/transport/gnunet-service-transport.c:2730
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\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 ""
 
 #: src/transport/gnunet-service-transport_neighbours.c:805
-#, fuzzy
 msgid "# session creation failed"
-msgstr "# connessioni attive"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1052
+#: src/transport/gnunet-service-transport_neighbours.c:1053
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1175
+#: src/transport/gnunet-service-transport_neighbours.c:1176
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1323
-#: src/transport/gnunet-service-transport_neighbours.c:1784
+#: src/transport/gnunet-service-transport_neighbours.c:1324
+#: src/transport/gnunet-service-transport_neighbours.c:1785
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1328
+#: src/transport/gnunet-service-transport_neighbours.c:1329
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1334
+#: src/transport/gnunet-service-transport_neighbours.c:1335
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1394
+#: src/transport/gnunet-service-transport_neighbours.c:1395
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1478
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1514
+#: src/transport/gnunet-service-transport_neighbours.c:1515
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1522
+#: src/transport/gnunet-service-transport_neighbours.c:1523
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1532
+#: src/transport/gnunet-service-transport_neighbours.c:1533
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1577
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1586
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1595
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1603
+#: src/transport/gnunet-service-transport_neighbours.c:1604
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1608
+#: src/transport/gnunet-service-transport_neighbours.c:1609
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1614
+#: src/transport/gnunet-service-transport_neighbours.c:1615
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1681
+#: src/transport/gnunet-service-transport_neighbours.c:1682
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1715
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1730
+#: src/transport/gnunet-service-transport_neighbours.c:1731
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1853
-#, fuzzy, c-format
+#: src/transport/gnunet-service-transport_neighbours.c:1854
+#, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
-msgstr "Generazione statistiche fallita\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1873
+#: src/transport/gnunet-service-transport_neighbours.c:1874
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1913
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# messaggi PONG decrittati"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1929
-#, fuzzy, c-format
+#: src/transport/gnunet-service-transport_neighbours.c:1930
+#, c-format
 msgid "Failed to transmit SYN message to %s\n"
-msgstr "Impossibile avviare il servizio.\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1959
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2027
-#, fuzzy, c-format
+#: src/transport/gnunet-service-transport_neighbours.c:2028
+#, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
-msgstr "Impossibile avviare il servizio.\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2081
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# messaggi PONG decrittati"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2098
-#, fuzzy, c-format
+#: src/transport/gnunet-service-transport_neighbours.c:2099
+#, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2261
+#: src/transport/gnunet-service-transport_neighbours.c:2262
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2266
+#: src/transport/gnunet-service-transport_neighbours.c:2267
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2653
+#: src/transport/gnunet-service-transport_neighbours.c:2654
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3139
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3146
-#, fuzzy
+#: src/transport/gnunet-service-transport_neighbours.c:3147
 msgid "# unexpected SYN_ACK messages (no peer)"
-msgstr "# messaggi PONG decrittati"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-#: src/transport/gnunet-service-transport_neighbours.c:3188
-#, fuzzy
+#: src/transport/gnunet-service-transport_neighbours.c:3165
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 msgid "# unexpected SYN_ACK messages (not ready)"
-msgstr "# messaggi PONG decrittati"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3200
-#, fuzzy
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
-msgstr "# messaggi PONG decrittati"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3225
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3238
-#, fuzzy
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 msgid "# unexpected SYN_ACK messages (disconnecting)"
-msgstr "# messaggi PONG decrittati"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3411
+#: src/transport/gnunet-service-transport_neighbours.c:3412
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3447
-#, fuzzy
+#: src/transport/gnunet-service-transport_neighbours.c:3448
 msgid "# unexpected ACK messages"
-msgstr "# messaggi PONG decrittati"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3535
-#, fuzzy
+#: src/transport/gnunet-service-transport_neighbours.c:3536
 msgid "# quota messages ignored (malformed)"
-msgstr "# messaggi PONG decrittati"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3543
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3583
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3589
+#: src/transport/gnunet-service-transport_neighbours.c:3590
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3600
+#: src/transport/gnunet-service-transport_neighbours.c:3601
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3735
+#: src/transport/gnunet-service-transport_neighbours.c:3736
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7210,7 +6944,7 @@ msgstr ""
 #: src/transport/gnunet-service-transport_validation.c:491
 #: src/transport/gnunet-service-transport_validation.c:677
 #: src/transport/gnunet-service-transport_validation.c:997
-#: src/transport/gnunet-service-transport_validation.c:1609
+#: src/transport/gnunet-service-transport_validation.c:1610
 msgid "# validations running"
 msgstr ""
 
@@ -7234,99 +6968,64 @@ msgstr ""
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1123
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1174
+#: src/transport/gnunet-service-transport_validation.c:1175
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1187
+#: src/transport/gnunet-service-transport_validation.c:1188
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1190
+#: src/transport/gnunet-service-transport_validation.c:1191
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1198
+#: src/transport/gnunet-service-transport_validation.c:1199
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1211
+#: src/transport/gnunet-service-transport_validation.c:1212
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1266
+#: src/transport/gnunet-service-transport_validation.c:1267
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1317
+#: src/transport/gnunet-service-transport_validation.c:1318
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1326
+#: src/transport/gnunet-service-transport_validation.c:1327
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1499
+#: src/transport/gnunet-service-transport_validation.c:1500
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1517
+#: src/transport/gnunet-service-transport_validation.c:1518
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1572
+#: src/transport/gnunet-service-transport_validation.c:1573
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1627
-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
-msgid "number of messages to send"
-msgstr ""
-
-#: 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-service-transport_validation.c:1628
+msgid "# HELLOs given to peerinfo"
+msgstr ""
+
 #: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7353,9 +7052,9 @@ msgid "Failed to list connections, timeout occurred\n"
 msgstr "# connessioni attive"
 
 #: src/transport/gnunet-transport.c:527
-#, fuzzy, c-format
+#, c-format
 msgid "Transmitting %u bytes\n"
-msgstr "Avvio del servizio '%s' in corso\n"
+msgstr ""
 
 #: src/transport/gnunet-transport.c:561
 #, c-format
@@ -7398,9 +7097,8 @@ msgid "Peer `%s': %s %s\n"
 msgstr ""
 
 #: src/transport/gnunet-transport.c:1144
-#, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
-msgstr "Impossibile avviare il servizio.\n"
+msgstr ""
 
 #: src/transport/gnunet-transport.c:1251
 #, c-format
@@ -7416,9 +7114,8 @@ msgid ""
 msgstr ""
 
 #: src/transport/gnunet-transport.c:1294
-#, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
-msgstr "Impossibile avviare il servizio.\n"
+msgstr ""
 
 #: src/transport/gnunet-transport.c:1300
 msgid "Blacklisting request in place, stop with CTRL-C\n"
@@ -7442,9 +7139,8 @@ msgid "measure how fast we are receiving data from all 
peers (until CTRL-C)"
 msgstr ""
 
 #: src/transport/gnunet-transport.c:1441
-#, fuzzy
 msgid "disconnect from a peer"
-msgstr "# amici connessi"
+msgstr ""
 
 #: src/transport/gnunet-transport.c:1445
 msgid "provide information about all current connections (once)"
@@ -7459,6 +7155,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 ""
@@ -7467,13 +7168,41 @@ 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
+msgid "number of messages to send"
+msgstr ""
+
+#: 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:3530
-#: src/transport/plugin_transport_tcp.c:3895
-#: src/transport/plugin_transport_tcp.c:3902
-#: src/transport/plugin_transport_xt.c:3899
-#: src/transport/plugin_transport_xt.c:3906
+#: src/transport/plugin_transport_tcp.c:3901
+#: src/transport/plugin_transport_tcp.c:3908
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7543,7 +7272,6 @@ msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2905
 #: src/transport/plugin_transport_udp.c:3627
-#: src/transport/plugin_transport_xu.c:2049
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7641,126 +7369,114 @@ msgstr "# byte inviati via SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1551
-#: src/transport/plugin_transport_tcp.c:2877
-#: src/transport/plugin_transport_xt.c:1553
-#: src/transport/plugin_transport_xt.c:2879
+#: src/transport/plugin_transport_tcp.c:1557
+#: src/transport/plugin_transport_tcp.c:2883
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1734
-#: src/transport/plugin_transport_tcp.c:1958
-#: src/transport/plugin_transport_tcp.c:3141
-#: src/transport/plugin_transport_tcp.c:4018
-#: src/transport/plugin_transport_xt.c:1736
-#: src/transport/plugin_transport_xt.c:1960
-#: src/transport/plugin_transport_xt.c:3143
+#: src/transport/plugin_transport_tcp.c:1740
+#: src/transport/plugin_transport_tcp.c:1964
+#: src/transport/plugin_transport_tcp.c:3147
+#: src/transport/plugin_transport_tcp.c:4024
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1776
-#: src/transport/plugin_transport_tcp.c:1940
-#: src/transport/plugin_transport_tcp.c:2064
-#: src/transport/plugin_transport_tcp.c:2137
-#: src/transport/plugin_transport_tcp.c:2237
-#: src/transport/plugin_transport_tcp.c:2262
-#: 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
+#: src/transport/plugin_transport_tcp.c:1782
+#: src/transport/plugin_transport_tcp.c:1946
+#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2143
+#: src/transport/plugin_transport_tcp.c:2243
+#: src/transport/plugin_transport_tcp.c:2268
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1779
-#: src/transport/plugin_transport_xt.c:1781
+#: src/transport/plugin_transport_tcp.c:1785
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2067
-#: src/transport/plugin_transport_xt.c:2069
+#: src/transport/plugin_transport_tcp.c:2073
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2141
-#: src/transport/plugin_transport_xt.c:2143
+#: src/transport/plugin_transport_tcp.c:2147
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2539
-#: src/transport/plugin_transport_xt.c:2541
+#: src/transport/plugin_transport_tcp.c:2545
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2715
-#: src/transport/plugin_transport_xt.c:2717
+#: src/transport/plugin_transport_tcp.c:2721
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3207
-#: src/transport/plugin_transport_xt.c:3209
+#: src/transport/plugin_transport_tcp.c:3213
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3413
-#: src/transport/plugin_transport_xt.c:3415
+#: src/transport/plugin_transport_tcp.c:3419
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3464
-#: src/transport/plugin_transport_tcp.c:3522
-#: src/transport/plugin_transport_xt.c:3466
-#: src/transport/plugin_transport_xt.c:3524
+#: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_tcp.c:3528
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# connessioni attive"
 
-#: src/transport/plugin_transport_tcp.c:3468
-#: src/transport/plugin_transport_xt.c:3470
+#: src/transport/plugin_transport_tcp.c:3474
 msgid "# TCP server connect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3474
-#: src/transport/plugin_transport_xt.c:3476
+#: src/transport/plugin_transport_tcp.c:3480
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3476
-#: src/transport/plugin_transport_xt.c:3478
+#: src/transport/plugin_transport_tcp.c:3482
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3516
-#: src/transport/plugin_transport_xt.c:3518
+#: src/transport/plugin_transport_tcp.c:3522
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3526
-#: src/transport/plugin_transport_xt.c:3528
+#: src/transport/plugin_transport_tcp.c:3532
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3845
-#: src/transport/plugin_transport_xt.c:3849
+#: src/transport/plugin_transport_tcp.c:3851
 msgid "Failed to start service.\n"
-msgstr "Impossibile avviare il servizio.\n"
+msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4006
+#: src/transport/plugin_transport_tcp.c:4012
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4010
+#: src/transport/plugin_transport_tcp.c:4016
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4014
+#: src/transport/plugin_transport_tcp.c:4020
 #, c-format
 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:3371
 #, c-format
 msgid ""
@@ -7776,12 +7492,11 @@ msgstr ""
 
 #: src/transport/plugin_transport_udp.c:3703
 #: src/transport/plugin_transport_udp.c:3802
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
-msgstr "Generazione statistiche fallita\n"
+msgstr ""
 
 #: src/transport/plugin_transport_udp.c:3721
-#: src/transport/plugin_transport_xu.c:2143
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7791,40 +7506,21 @@ msgstr ""
 
 #: src/transport/plugin_transport_udp.c:3883
 #: src/transport/plugin_transport_udp.c:3897
-#: 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:3929
-#: src/transport/plugin_transport_xu.c:2347
+#, fuzzy
 msgid "must be valid IPv4 address"
-msgstr "deve essere un indirizzo IPv4 valido"
+msgstr "`%s' non è un indirizzo IP valido.\n"
 
 #: src/transport/plugin_transport_udp.c:3956
-#: src/transport/plugin_transport_xu.c:2374
 #, fuzzy
 msgid "must be valid IPv6 address"
-msgstr "deve essere un indirizzo IPv4 valido"
+msgstr "`%s' non è un indirizzo IP valido.\n"
 
 #: src/transport/plugin_transport_udp.c:4020
-#, fuzzy
 msgid "Failed to create UDP network sockets\n"
-msgstr "Generazione statistiche fallita\n"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:168
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# messaggi PONG ricevuti"
-
-#: 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:1416
@@ -7837,9 +7533,8 @@ msgid "Failed to open UNIX listen socket\n"
 msgstr ""
 
 #: src/transport/plugin_transport_wlan.c:768
-#, fuzzy
 msgid "# ACKs sent"
-msgstr "# messaggi PONG decrittati"
+msgstr ""
 
 #: src/transport/plugin_transport_wlan.c:788
 #, fuzzy
@@ -7852,9 +7547,8 @@ msgid "# Sessions allocated"
 msgstr ""
 
 #: src/transport/plugin_transport_wlan.c:1035
-#, fuzzy
 msgid "# message fragments sent"
-msgstr "# messaggi SYN inviati"
+msgstr ""
 
 #: src/transport/plugin_transport_wlan.c:1064
 msgid "# messages pending (with fragmentation)"
@@ -7869,17 +7563,15 @@ msgstr ""
 #: src/transport/plugin_transport_wlan.c:1567
 #, fuzzy
 msgid "# ACKs received"
-msgstr "# ACK ricevuti"
+msgstr "# messaggi PONG ricevuti"
 
 #: src/transport/plugin_transport_wlan.c:1636
-#, fuzzy
 msgid "# DATA messages discarded due to CRC32 error"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/transport/plugin_transport_wlan.c:1740
-#, fuzzy
 msgid "# HELLO beacons sent"
-msgstr "# byte inviati via SMTP"
+msgstr ""
 
 #: src/transport/plugin_transport_wlan.c:1856
 #, fuzzy
@@ -7900,54 +7592,6 @@ 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 "# connessioni attive"
-
-#: 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 "Generazione statistiche fallita\n"
-
-#: src/transport/plugin_transport_xu.c:2234
-#, fuzzy
-msgid "Failed to open XU sockets\n"
-msgstr "Generazione statistiche fallita\n"
-
-#: src/transport/plugin_transport_xu.c:2398
-#, fuzzy
-msgid "Failed to create XU network sockets\n"
-msgstr "Generazione statistiche fallita\n"
-
 #: src/transport/tcp_connection_legacy.c:452
 #, c-format
 msgid "Access denied to `%s'\n"
@@ -7958,17 +7602,17 @@ msgstr ""
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1624
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1634
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127
+#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1640
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
@@ -7980,7 +7624,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2396
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:864
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7990,27 +7634,27 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:988
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:1031
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1555
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:953
-#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1195
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1708
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1228
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1741
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8025,44 +7669,44 @@ msgstr ""
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1502
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:2015
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1506
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:2019
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1510
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:2023
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1525
-#: src/util/service.c:1380
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1535
+#: src/util/service.c:1893
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1382
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1895
 msgid "No such user"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1401
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1914
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1762
+#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:2276
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:1826
-#: src/util/service.c:1841
+#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:2340
+#: src/util/service.c:2355
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:1853
+#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:2367
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
@@ -8104,11 +7748,11 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:734
+#: src/util/client.c:749
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:925
+#: src/util/client.c:941
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8119,7 +7763,7 @@ msgstr "DEBUG"
 
 #: src/util/common_logging.c:261 src/util/common_logging.c:1160
 msgid "INFO"
-msgstr "INFO"
+msgstr ""
 
 #: src/util/common_logging.c:263 src/util/common_logging.c:1158
 msgid "MESSAGE"
@@ -8155,16 +7799,16 @@ msgstr "NON VALIDO"
 msgid "unknown address"
 msgstr "indirizzo sconosciuto"
 
-#: src/util/common_logging.c:1500
+#: src/util/common_logging.c:1513
 msgid "invalid address"
-msgstr "indirizzo non valido"
+msgstr ""
 
-#: src/util/common_logging.c:1518
+#: src/util/common_logging.c:1531
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1539
+#: src/util/common_logging.c:1552
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8178,7 +7822,7 @@ msgstr ""
 #: src/util/configuration.c:398
 #, c-format
 msgid "Error while reading file `%s'\n"
-msgstr "Errore di lettura del file `%s'\n"
+msgstr ""
 
 #: src/util/configuration.c:1016
 msgid "Not a valid relative time specification"
@@ -8211,26 +7855,26 @@ msgstr ""
 #: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have %"
-"llu)\n"
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:862
+#: src/util/crypto_ecc.c:887
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:917
+#: src/util/crypto_ecc.c:946
 #, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:996
+#: src/util/crypto_ecc.c:1025
 #, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1057
+#: src/util/crypto_ecc.c:1086
 #, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
@@ -8278,17 +7922,17 @@ msgstr ""
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:1255
+#: src/util/disk.c:1265
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/dnsparser.c:260
+#: src/util/dnsparser.c:264
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/util/dnsparser.c:950
+#: src/util/dnsparser.c:954
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
@@ -8304,9 +7948,9 @@ msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
 #: src/util/dnsstub.c:509
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to send DNS request to %s: %s\n"
-msgstr "Generazione statistiche fallita\n"
+msgstr ""
 
 #: src/util/dnsstub.c:515
 #, c-format
@@ -8392,7 +8036,7 @@ msgstr ""
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:282
+#: src/util/getopt_helpers.c:282 src/util/gnunet-qr.c:300
 msgid "be verbose"
 msgstr ""
 
@@ -8439,51 +8083,51 @@ msgstr ""
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:160
+#: src/util/gnunet-config.c:161
 #, c-format
 msgid "failed to load configuration defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:173
+#: src/util/gnunet-config.c:174
 #, c-format
 msgid "%s or %s argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:181
+#: src/util/gnunet-config.c:182
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:232
+#: src/util/gnunet-config.c:234
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:286
-msgid "obtain option of value as a filename (with $-expansion)"
+#: src/util/gnunet-config.c:288
+msgid "interpret option value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:291
+#: src/util/gnunet-config.c:293
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:296
+#: src/util/gnunet-config.c:298
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:301
+#: src/util/gnunet-config.c:303
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:305
+#: src/util/gnunet-config.c:307
 msgid "print available configuration sections"
 msgstr ""
 
-#: src/util/gnunet-config.c:309
+#: src/util/gnunet-config.c:311
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:322
+#: src/util/gnunet-config.c:324
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
@@ -8576,6 +8220,33 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
+#: src/util/gnunet-qr.c:108 src/util/gnunet-uri.c:91
+#, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:116 src/util/gnunet-uri.c:98
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:127 src/util/gnunet-uri.c:108
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:297
+msgid "use video-device DEVICE (default: /dev/video0"
+msgstr ""
+
+#: src/util/gnunet-qr.c:303
+msgid "do not show preview windows"
+msgstr ""
+
+#: src/util/gnunet-qr.c:311
+msgid "Scan a QR code using a video device and import the uri read"
+msgstr ""
+
 #: src/util/gnunet-resolver.c:168
 msgid "perform a reverse lookup"
 msgstr ""
@@ -8609,7 +8280,7 @@ msgstr ""
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:1443
+#: src/util/gnunet-service-resolver.c:1424
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
@@ -8618,21 +8289,6 @@ msgstr ""
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:91
-#, c-format
-msgid "Invalid URI: does not start with `%s'\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:98
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:108
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
-msgstr ""
-
 #: src/util/gnunet-uri.c:170
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
@@ -8640,7 +8296,7 @@ msgstr ""
 #: src/util/helper.c:335
 #, c-format
 msgid "Error reading from `%s': %s\n"
-msgstr "Errore di lettura da '%s': %s\n"
+msgstr ""
 
 #: src/util/helper.c:386
 #, c-format
@@ -8652,12 +8308,12 @@ msgstr ""
 msgid "Error writing to `%s': %s\n"
 msgstr ""
 
-#: src/util/network.c:136
+#: src/util/network.c:176
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1795 src/util/network.c:1979
+#: src/util/network.c:1835 src/util/network.c:2019
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8761,18 +8417,18 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
 
-#: src/util/service.c:1307
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
-msgstr ""
-
-#: src/util/service.c:2141
+#: src/util/service.c:668
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
+#: src/util/service.c:1820
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
 #: src/util/signal.c:89
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
@@ -8902,12 +8558,12 @@ msgstr ""
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/util/time.c:828 src/util/time.c:860
+#: src/util/time.c:844 src/util/time.c:876
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:866
+#: src/util/time.c:882
 #, c-format
 msgid ""
 "Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
@@ -8922,24 +8578,20 @@ msgid "# Messages dropped in cadet queue (overflow)"
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:753
-#, fuzzy
 msgid "# ICMP packets received from cadet"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:1096
-#, fuzzy
 msgid "# UDP packets received from cadet"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:1255
-#, fuzzy
 msgid "# TCP packets received from cadet"
-msgstr "# messaggi PONG ricevuti"
+msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:1467
-#, fuzzy
 msgid "# Cadet channels created"
-msgstr "# messaggi PONG decrittati"
+msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:1687
 #, c-format
@@ -9081,209 +8733,34 @@ 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
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:772 src/include/gnunet_common.h:779
-#: src/include/gnunet_common.h:789
+#: src/include/gnunet_common.h:794 src/include/gnunet_common.h:801
+#: src/include/gnunet_common.h:811
 #, c-format
 msgid "Assertion failed at %s:%d. Aborting.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:797
+#: src/include/gnunet_common.h:819
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:809
+#: src/include/gnunet_common.h:831
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:836 src/include/gnunet_common.h:845
+#: src/include/gnunet_common.h:858 src/include/gnunet_common.h:867
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Can not index file `%s': %s.\n"
-#~ msgstr "Connessione stabilita con `%s'\n"
-
-#, fuzzy
-#~ msgid "`%s' is not a valid domain name\n"
-#~ msgstr "`%s' non è un indirizzo IP valido.\n"
-
-#, fuzzy
-#~ msgid "Unable to parse CAA record string `%s'\n"
-#~ msgstr "Impossibile avviare il servizio ' %s'\n"
-
-#~ msgid "Request timed out"
-#~ msgstr "Richiesta scaduta"
-
-#, fuzzy
-#~| msgid "Starting service `%s'\n"
-#~ msgid "Starting default services `%s'\n"
-#~ msgstr "Avvio del servizio '%s' in corso\n"
-
-#, fuzzy
-#~| msgid "Failed to start HTTP server\n"
-#~ msgid "Failed to initialize solver!\n"
-#~ msgstr "Impossibile avviare il server HTTP\n"
-
 #~ msgid "Benchmarking done\n"
 #~ msgstr "Benchmark completato\n"
 
-#, fuzzy
-#~| msgid "Failed to create statistics!\n"
-#~ msgid "Failed to connect peer 0 and %u\n"
-#~ msgstr "Generazione statistiche fallita\n"
-
 #~ msgid "Peer `%s'\n"
 #~ msgstr "Peer `%s'\n"
-
-#, fuzzy
-#~| msgid "Failed to create statistics!\n"
-#~ msgid "Failed to transmit request to drop database.\n"
-#~ msgstr "Generazione statistiche fallita\n"
-
-#, fuzzy
-#~| msgid "Request timed out"
-#~ msgid "# queue entry timeouts"
-#~ msgstr "Richiesta scaduta"
-
-#, fuzzy
-#~| msgid "Error reading from `%s': %s\n"
-#~ msgid "Error reading response from datastore service"
-#~ msgstr "Errore di lettura da '%s': %s\n"
-
-#, fuzzy
-#~| msgid "# PONG messages received"
-#~ msgid "# UPDATE requests executed"
-#~ msgstr "# messaggi PONG ricevuti"
-
-#, fuzzy
-#~| msgid "Failed to create statistics!\n"
-#~ msgid "Failed to create statistics!\n"
-#~ msgstr "Generazione statistiche fallita\n"
-
-#, fuzzy
-#~| msgid "Connection established to `%s'\n"
-#~ msgid "Connected to peer %s\n"
-#~ msgstr "Connessione stabilita con `%s'\n"
-
-#, fuzzy
-#~| msgid "unknown"
-#~ msgid "unknown error"
-#~ msgstr "sconosciuto"
-
-#, fuzzy
-#~| msgid "`%s' is not a valid IP address.\n"
-#~ msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
-#~ msgstr "`%s' non è un indirizzo IP valido.\n"
-
-#, fuzzy
-#~| msgid "Failed to start service.\n"
-#~ msgid "failed to transmit request (service down?)"
-#~ msgstr "Impossibile avviare il servizio.\n"
-
-#, fuzzy
-#~| msgid "Failed to create statistics!\n"
-#~ msgid "Failure: Did not receive %s\n"
-#~ msgstr "Generazione statistiche fallita\n"
-
-#, fuzzy
-#~| msgid "Unknown command `%s'\n"
-#~ msgid "Unknown operator: %c\n"
-#~ msgstr "Comando `%s' sconosciuto.\n"
-
-#, fuzzy
-#~| msgid "# SYN messages received"
-#~ msgid "# SUC responder result messages received"
-#~ msgstr "# messaggi SYN ricevuti"
-
-#, fuzzy
-#~| msgid "# bytes encrypted"
-#~ msgid "# bytes sent to scalarproduct"
-#~ msgstr "# byte crittografati"
-
-#, fuzzy
-#~| msgid "Failed to start service.\n"
-#~ msgid "Failed to connect to the scalarproduct service\n"
-#~ msgstr "Impossibile avviare il servizio.\n"
-
-#, fuzzy
-#~| msgid "Failed to start service.\n"
-#~ msgid "Failed to send a message to the scalarproduct service\n"
-#~ msgstr "Impossibile avviare il servizio.\n"
-
-#, fuzzy
-#~| msgid "# PONG messages received"
-#~ msgid "# REQUEST CONNECT messages received"
-#~ msgstr "# messaggi PONG ricevuti"
-
-#, fuzzy
-#~| msgid "# PONG messages received"
-#~ msgid "# REQUEST DISCONNECT messages received"
-#~ msgstr "# messaggi PONG ricevuti"
-
-#, fuzzy
-#~| msgid "# SYN messages sent"
-#~ msgid "# keepalives sent"
-#~ msgstr "# messaggi SYN inviati"
-
-#, fuzzy
-#~| msgid "# PONG messages decrypted"
-#~ msgid "# SESSION_CONNECT messages sent"
-#~ msgstr "# messaggi PONG decrittati"
-
-#, fuzzy
-#~| msgid "# PONG messages received"
-#~ msgid "# CONNECT messages received"
-#~ msgstr "# messaggi PONG ricevuti"
-
-#, fuzzy
-#~| msgid "# PONG messages received"
-#~ msgid "# SET QUOTA messages ignored (no such peer)"
-#~ msgstr "# messaggi PONG ricevuti"
-
-#, fuzzy
-#~| msgid "# SYN messages sent"
-#~ msgid "# PING without HELLO messages sent"
-#~ msgstr "# messaggi SYN inviati"
-
-#, fuzzy
-#~| msgid "Peer `%s'\n"
-#~ msgid "Peer `%s' %s `%s' \n"
-#~ msgstr "Peer `%s'\n"
-
-#, fuzzy
-#~| msgid "Failed to start service.\n"
-#~ msgid "Failed to send connect request to transport service\n"
-#~ msgstr "Impossibile avviare il servizio.\n"
-
-#, fuzzy
-#~| msgid "# PONG messages decrypted"
-#~ msgid "# Bluetooth message fragments sent"
-#~ msgstr "# messaggi PONG decrittati"
-
-#, fuzzy
-#~| msgid "# PONG messages received"
-#~ msgid "# HELLO messages received via Bluetooth"
-#~ msgstr "# messaggi PONG ricevuti"
-
-#, fuzzy
-#~| msgid "# PONG messages received"
-#~ msgid "# Bluetooth DATA messages processed"
-#~ msgstr "# messaggi PONG ricevuti"
-
-#, fuzzy
-#~| msgid "Failed to create statistics!\n"
-#~ msgid "Failed to create network sockets, plugin failed\n"
-#~ msgstr "Generazione statistiche fallita\n"
-
-#, fuzzy
-#~| msgid "Failed to create statistics!\n"
-#~ msgid "Failed to setup mesh channel!\n"
-#~ msgstr "Generazione statistiche fallita\n"
diff --git a/po/sv.po b/po/sv.po
index 8603e31d9..b60945fba 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden\n"
-"POT-Creation-Date: 2019-02-09 22:07+0000\n"
+"POT-Creation-Date: 2019-09-04 12:56+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"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 
 #: src/arm/gnunet-arm.c:156
 #, fuzzy, c-format
@@ -227,8 +227,7 @@ msgid "Control services and the Automated Restart Manager 
(ARM)"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:388 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
+#: src/transport/tcp_service_legacy.c:557
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
@@ -237,36 +236,30 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3829
-#: src/transport/plugin_transport_xt.c:1139
-#: src/transport/plugin_transport_xt.c:1145
-#: src/transport/plugin_transport_xt.c:3833
+#: src/transport/plugin_transport_tcp.c:3835
 #: src/transport/tcp_service_legacy.c:576
-#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
-#: src/util/service.c:643
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1150
+#: src/util/service.c:1156
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:457 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
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
+#: src/util/service.c:1195
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:462 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
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
+#: src/util/service.c:1200
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
 #: src/arm/gnunet-service-arm.c:495 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
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1236
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -274,8 +267,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:517 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
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1254
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -283,8 +275,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:556
 #: src/transport/plugin_transport_http_server.c:2688
 #: 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
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1295
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -292,8 +283,7 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 #: src/arm/gnunet-service-arm.c:575
 #: src/transport/plugin_transport_http_server.c:2706
 #: 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
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1315
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
@@ -365,15 +355,141 @@ 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-new.c:756
+#: 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/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/plugin_ats2_common.c:90
+#, c-format
+msgid ""
+"Could not load %s quota for network `%s': `%s', assigning default bandwidth "
+"%llu\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:1870
+#, 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:1914
+#, 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:2476
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
+#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
+#: src/ats/plugin_ats_mlp.c:2602 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:2671
+#, 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:2680
+#, 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:2690
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2699
+#, 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"
@@ -384,6 +500,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 ""
@@ -391,17 +516,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"
@@ -523,200 +637,74 @@ 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"
+#: src/auction/gnunet-auction-create.c:163
+msgid "description of the item to be sold"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth %"
-"llu\n"
+#: src/auction/gnunet-auction-create.c:169
+msgid "mapping of possible prices"
 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"
+#: src/auction/gnunet-auction-create.c:175
+msgid "max duration per round"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
+#: src/auction/gnunet-auction-create.c:181
+msgid "duration until auction starts"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-new.c:733
-#: 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/gnunet-service-ats_plugins.c:304
-#, c-format
+#: src/auction/gnunet-auction-create.c:186
 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"
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:359
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+#: src/auction/gnunet-auction-create.c:193
+msgid "public auction outcome"
 msgstr ""
 
-#: src/ats/plugin_ats2_common.c:90
-#, c-format
-msgid ""
-"Could not load %s quota for network `%s': `%s', assigning default bandwidth %"
-"llu\n"
+#: src/auction/gnunet-auction-create.c:198
+msgid "keep running in foreground until auction completes"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
+#: src/auction/gnunet-auction-create.c:209
+msgid "create a new auction and start listening for bidders"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1870
-#, fuzzy, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
+#: src/conversation/gnunet-conversation-test.c:254
+#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76
+#, fuzzy
+msgid "help text"
+msgstr "hjälptext för -t"
 
-#: src/ats/plugin_ats_mlp.c:1914
+#: src/cadet/gnunet-cadet.c:631
 #, 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"
+msgid "Invalid peer ID `%s'\n"
+msgstr "Ogiltiga argument: "
 
-#: src/ats/plugin_ats_mlp.c:2476
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
+#: src/cadet/gnunet-cadet.c:718
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
-#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
-#: src/ats/plugin_ats_mlp.c:2602 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
+#: src/cadet/gnunet-cadet.c:795
 #, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+msgid "Invalid target `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/ats/plugin_ats_mlp.c:2671
-#, 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:2680
-#, 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:2690
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2699
-#, 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 ""
-
-#: src/auction/gnunet-auction-create.c:169
-msgid "mapping of possible prices"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:175
-msgid "max duration per round"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:181
-msgid "duration until auction starts"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:186
-msgid ""
-"number of items to sell\n"
-"0 for first price auction\n"
-">0 for vickrey/M+1st price auction"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:193
-msgid "public auction outcome"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:198
-msgid "keep running in foreground until auction completes"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:209
-msgid "create a new auction and start listening for bidders"
-msgstr ""
-
-#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
-#: src/conversation/gnunet-conversation-test.c:254
-#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76
-#, fuzzy
-msgid "help text"
-msgstr "hjälptext för -t"
-
-#: src/cadet/gnunet-cadet.c:631
-#, fuzzy, c-format
-msgid "Invalid peer ID `%s'\n"
-msgstr "Ogiltiga argument: "
-
-#: src/cadet/gnunet-cadet.c:718
-msgid "Extra arguments are not applicable in combination with this option.\n"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:795
-#, fuzzy, c-format
-msgid "Invalid target `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/cadet/gnunet-cadet.c:832
-#, fuzzy
-msgid "No action requested\n"
-msgstr "Samling stoppad.\n"
-
-#: src/cadet/gnunet-cadet.c:857
-#, fuzzy
-msgid "Provide information about a particular connection"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/cadet/gnunet-cadet.c:861
-msgid "Activate echo mode"
+#: src/cadet/gnunet-cadet.c:832
+#, fuzzy
+msgid "No action requested\n"
+msgstr "Samling stoppad.\n"
+
+#: src/cadet/gnunet-cadet.c:857
+#, fuzzy
+msgid "Provide information about a particular connection"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cadet/gnunet-cadet.c:861
+msgid "Activate echo mode"
 msgstr ""
 
 #: src/cadet/gnunet-cadet.c:866
@@ -783,28 +771,6 @@ msgstr ""
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:120
-#, 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:216
-#, 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:277
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1062,8 +1028,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:120
+#, 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:216
+#, 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 ""
@@ -1374,7 +1362,7 @@ msgid "# valid ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
 #: src/core/gnunet-service-core_kx.c:1180
-#: src/transport/gnunet-service-transport_validation.c:1128
+#: src/transport/gnunet-service-transport_validation.c:1129
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
@@ -1400,7 +1388,7 @@ msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
 #: src/core/gnunet-service-core_kx.c:1351
-#: src/transport/gnunet-service-transport_validation.c:1461
+#: src/transport/gnunet-service-transport_validation.c:1462
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -1509,131 +1497,151 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/credential/credential_misc.c:88
-#, fuzzy, c-format
-msgid "Unable to parse CRED record string `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:994
+#: src/credential/gnunet-credential.c:381 src/namestore/gnunet-namestore.c:994
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/credential/gnunet-credential.c:280
-#: src/credential/gnunet-credential.c:434
+#: src/credential/gnunet-credential.c:397
+#: src/credential/gnunet-credential.c:859
 #, fuzzy, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/credential/gnunet-credential.c:361
-#: src/credential/gnunet-credential.c:423
+#: src/credential/gnunet-credential.c:532
+#: src/credential/gnunet-service-credential.c:1728
+#: src/namestore/gnunet-namestore.c:1019
+#: src/namestore/gnunet-namestore-fcfsd.c:1138
+#, fuzzy, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/credential/gnunet-credential.c:798
+#: src/credential/gnunet-credential.c:849
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/credential/gnunet-credential.c:372
-#: src/credential/gnunet-credential.c:444
+#: src/credential/gnunet-credential.c:807
+#: src/credential/gnunet-credential.c:868
 #, fuzzy, c-format
 msgid "Failed to connect to CREDENTIAL\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/credential/gnunet-credential.c:379
+#: src/credential/gnunet-credential.c:813
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:387
+#: src/credential/gnunet-credential.c:820
 #, c-format
 msgid "ego required\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:403
+#: src/credential/gnunet-credential.c:830
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:414
+#: src/credential/gnunet-credential.c:839
 #, fuzzy, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/credential/gnunet-credential.c:451
+#: src/credential/gnunet-credential.c:874
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:504
-#, c-format
-msgid "Issuer ego required\n"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:516
+#: src/credential/gnunet-credential.c:930
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:536
-msgid "create credential"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:540
+#: src/credential/gnunet-credential.c:951
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:545
+#: src/credential/gnunet-credential.c:958
 #, fuzzy
-msgid "The public key of the subject to lookup the credential for"
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
 msgstr "ange prioritet för innehållet"
 
-#: src/credential/gnunet-credential.c:550
-msgid "The name of the credential presented by the subject"
+#: src/credential/gnunet-credential.c:965
+msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:555
+#: src/credential/gnunet-credential.c:972
 #, fuzzy
 msgid "The public key of the authority to verify the credential against"
 msgstr "ange prioritet för innehållet"
 
-#: src/credential/gnunet-credential.c:560
+#: src/credential/gnunet-credential.c:977
 #, fuzzy
-msgid "The ego to use"
+msgid "The ego/zone name to use"
 msgstr "meddelandestorlek"
 
-#: src/credential/gnunet-credential.c:565
+#: src/credential/gnunet-credential.c:983
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:570
-msgid "The time to live for the credential"
+#: src/credential/gnunet-credential.c:989
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/credential/gnunet-credential.c:574
+#: src/credential/gnunet-credential.c:994
 msgid "collect credentials"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:588
+#: src/credential/gnunet-credential.c:999
+msgid "Create and issue a credential issuer side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1004
+msgid "Issue a credential subject side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1009
+msgid "Create, sign and return a credential subject side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1016
+msgid "Import signed credentials that should be issued to a zone/ego"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1020
+msgid "Create private record entry."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1026
+#: src/credential/gnunet-credential.c:1032
+msgid "Indicates that the collect/verify process is done via forward search."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1045
 #, fuzzy
 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:185
+#: src/credential/gnunet-service-credential.c:1723 src/gns/gnunet-gns.c:185
+#: 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:1138
-#: src/namestore/gnunet-namestore.c:1019
-#, fuzzy, c-format
-msgid "Failed to connect to namestore\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/credential/plugin_gnsrecord_credential.c:186
+#: src/credential/plugin_gnsrecord_credential.c:182
 #, fuzzy, c-format
 msgid "Unable to parse ATTR record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
+#: src/credential/plugin_rest_credential.c:1128
+#, fuzzy
+msgid "GNS REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:311
 #: src/datastore/gnunet-service-datastore.c:757
 #, fuzzy
@@ -1687,14 +1695,12 @@ msgstr ""
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_sqlite.c:53
 #: src/peerstore/plugin_peerstore_sqlite.c:52
-#: src/psycstore/plugin_psycstore_mysql.c:62
-#: src/reclaim/plugin_reclaim_sqlite.c:52
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:818 src/include/gnunet_common.h:827
+#: src/include/gnunet_common.h:840 src/include/gnunet_common.h:849
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1704,7 +1710,6 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 #: src/datastore/plugin_datastore_sqlite.c:508
 #: src/namecache/plugin_namecache_sqlite.c:229
 #: src/namestore/plugin_namestore_sqlite.c:265
-#: src/reclaim/plugin_reclaim_sqlite.c:336
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -2017,22 +2022,20 @@ msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
 
 #: src/datastore/plugin_datastore_mysql.c:1180
-#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:276
-#: src/datastore/plugin_datastore_postgres.c:893
+#: src/datastore/plugin_datastore_postgres.c:280
+#: src/datastore/plugin_datastore_postgres.c:897
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:854
+#: src/datastore/plugin_datastore_postgres.c:858
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/plugin_datastore_postgres.c:952
-#: src/psycstore/plugin_psycstore_postgres.c:1506
+#: src/datastore/plugin_datastore_postgres.c:956
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -2048,8 +2051,6 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 #: src/namecache/plugin_namecache_sqlite.c:173
 #: src/namestore/plugin_namestore_sqlite.c:206
 #: src/peerstore/plugin_peerstore_sqlite.c:535
-#: src/psycstore/plugin_psycstore_sqlite.c:325
-#: src/reclaim/plugin_reclaim_sqlite.c:212
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -2071,8 +2072,7 @@ msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1405
 #: src/namecache/plugin_namecache_sqlite.c:557
-#: src/namestore/plugin_namestore_sqlite.c:750
-#: src/reclaim/plugin_reclaim_sqlite.c:711
+#: src/namestore/plugin_namestore_sqlite.c:751
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -2143,6 +2143,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 src/rps/gnunet-rps-profiler.c:3083
+#, 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:300
+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 ""
@@ -2413,82 +2461,34 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
+#: src/dht/plugin_block_dht.c:189
 #, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "Maximalt antal chattklienter uppnått.\n"
+msgid "Block not of type %u\n"
+msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/dht/gnunet_dht_profiler.c:949 src/rps/gnunet-rps-profiler.c:2953
-#, fuzzy
-msgid "number of peers to start"
-msgstr "antal iterationer"
+#: src/dht/plugin_block_dht.c:198
+msgid "Size mismatch for block\n"
+msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:954
-msgid "number of PUTs to perform per peer"
+#: src/dht/plugin_block_dht.c:209
+#, c-format
+msgid "Block of type %u is malformed\n"
 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"
+#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:964
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
+#: src/dns/gnunet-dns-monitor.c:370
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:969
-msgid "delay to start doing PUTs (default: 1 sec)"
+#: src/dns/gnunet-dns-redirector.c:237
+msgid "set A records"
 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"
-msgstr "Ingen transport av typ %d är känd.\n"
-
-#: src/dht/plugin_block_dht.c:198
-msgid "Size mismatch for block\n"
-msgstr ""
-
-#: src/dht/plugin_block_dht.c:209
-#, c-format
-msgid "Block of type %u is malformed\n"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
-msgid "only monitor DNS queries"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:370
-msgid "Monitor DNS queries."
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:237
-msgid "set A records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:243
-msgid "set AAAA records"
+#: src/dns/gnunet-dns-redirector.c:243
+msgid "set AAAA records"
 msgstr ""
 
 #: src/dns/gnunet-dns-redirector.c:256
@@ -2547,11 +2547,6 @@ msgstr "Ogiltigt svar på \"%s\".\n"
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:175
-#, fuzzy
-msgid "Print information about DV state"
-msgstr "Skriv ut information om GNUnets motparter."
-
 #: src/exit/gnunet-daemon-exit.c:960
 #, fuzzy
 msgid "# TCP packets sent via TUN"
@@ -3003,61 +2998,66 @@ msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
-#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
+#: src/fs/fs_publish.c:725
+#, fuzzy, c-format
+msgid "Can not index file `%s': %s.\n"
+msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
+
+#: src/fs/fs_publish.c:782 src/fs/fs_publish.c:827 src/fs/fs_publish.c:848
+#: src/fs/fs_publish.c:878 src/fs/fs_publish.c:1144
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/fs/fs_publish.c:780
+#: src/fs/fs_publish.c:784
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:825
+#: src/fs/fs_publish.c:829
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:845
+#: src/fs/fs_publish.c:849
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:876
+#: src/fs/fs_publish.c:880
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:902
+#: src/fs/fs_publish.c:906
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
+#: src/fs/fs_publish.c:995 src/fs/fs_publish.c:1031
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1094
+#: src/fs/fs_publish.c:1098
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_publish.c:1102
+#: src/fs/fs_publish.c:1106
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:1142
+#: src/fs/fs_publish.c:1146
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1381
+#: src/fs/fs_publish.c:1385
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/fs/fs_publish.c:1472
+#: src/fs/fs_publish.c:1476
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3131,96 +3131,96 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_uri.c:234
+#: src/fs/fs_uri.c:236
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:293
+#: src/fs/fs_uri.c:295
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:311
+#: src/fs/fs_uri.c:313
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:318
+#: src/fs/fs_uri.c:320
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:388
+#: src/fs/fs_uri.c:390
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:429
+#: src/fs/fs_uri.c:431
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:444
+#: src/fs/fs_uri.c:446
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:523
+#: src/fs/fs_uri.c:525
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:538
+#: src/fs/fs_uri.c:540
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:548
+#: src/fs/fs_uri.c:550
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:556
+#: src/fs/fs_uri.c:558
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:566
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:570
+#: src/fs/fs_uri.c:572
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:576
+#: src/fs/fs_uri.c:578
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:587
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:591
+#: src/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:609
+#: src/fs/fs_uri.c:611
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:645
 #, fuzzy
 msgid "invalid argument"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/fs/fs_uri.c:655
+#: src/fs/fs_uri.c:657
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1092
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3262,11 +3262,11 @@ msgstr "Du måste ange en och endast en fil att 
avindexera.\n"
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:907
+#: src/fs/gnunet-auto-share.c:772
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:907
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
@@ -3349,7 +3349,7 @@ msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Uppladdning vägrades!"
 
 #: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:215 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3373,12 +3373,12 @@ msgid "Target filename must be specified.\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:872
-#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:273 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:312
+#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:315
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
@@ -3386,7 +3386,7 @@ msgstr ""
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:316
+#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3412,6 +3412,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 ""
@@ -3428,15 +3437,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"
@@ -3528,7 +3528,7 @@ msgstr ""
 
 #: src/fs/gnunet-publish.c:687
 #, fuzzy
-msgid "Internal error scanning directory.\n"
+msgid "Error scanning directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
 #: src/fs/gnunet-publish.c:715
@@ -3573,6 +3573,10 @@ msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
+#: src/fs/gnunet-publish.c:911
+msgid "enable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
 #: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
@@ -3631,34 +3635,34 @@ msgstr ""
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:204
+#: src/fs/gnunet-search.c:207
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/fs/gnunet-search.c:260
+#: src/fs/gnunet-search.c:263
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:284
+#: src/fs/gnunet-search.c:287
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:321
+#: src/fs/gnunet-search.c:324
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:329
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:332
+#: src/fs/gnunet-search.c:335
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:348
+#: src/fs/gnunet-search.c:351
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -4070,40 +4074,40 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:203
+#: src/gns/gnunet-dns2gns.c:214
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:405
+#: src/gns/gnunet-dns2gns.c:416
 #, fuzzy, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:421
+#: src/gns/gnunet-dns2gns.c:432
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/gns/gnunet-dns2gns.c:429
+#: src/gns/gnunet-dns2gns.c:440
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:588
+#: src/gns/gnunet-dns2gns.c:600
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:688
+#: src/gns/gnunet-dns2gns.c:748
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:693
+#: src/gns/gnunet-dns2gns.c:753
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:710
+#: src/gns/gnunet-dns2gns.c:770
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4119,6 +4123,29 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:199
+#, 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 ""
@@ -4153,130 +4180,107 @@ 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:980
+#: src/gns/gnunet-gns-proxy.c:989
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1005
+#: src/gns/gnunet-gns-proxy.c:1014
 #, 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:1026
+#: src/gns/gnunet-gns-proxy.c:1035
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1041
+#: src/gns/gnunet-gns-proxy.c:1050
 #, 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:1056
+#: src/gns/gnunet-gns-proxy.c:1065
 #, 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:1066
+#: src/gns/gnunet-gns-proxy.c:1075
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1090
+#: src/gns/gnunet-gns-proxy.c:1099
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1221
+#: src/gns/gnunet-gns-proxy.c:1230
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2121
+#: src/gns/gnunet-gns-proxy.c:2131
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2642
+#: src/gns/gnunet-gns-proxy.c:2652
 #, 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:2674
+#: src/gns/gnunet-gns-proxy.c:2684
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:2875
+#: src/gns/gnunet-gns-proxy.c:2885
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2897 src/rest/gnunet-rest-server.c:658
+#: src/gns/gnunet-gns-proxy.c:2907 src/rest/gnunet-rest-server.c:668
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3233
+#: src/gns/gnunet-gns-proxy.c:3243
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3262
+#: src/gns/gnunet-gns-proxy.c:3272
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3345
+#: src/gns/gnunet-gns-proxy.c:3355
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3635
+#: src/gns/gnunet-gns-proxy.c:3693
 #, 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:3763
+#: src/gns/gnunet-gns-proxy.c:3821
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3768
+#: src/gns/gnunet-gns-proxy.c:3826
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3772
+#: src/gns/gnunet-gns-proxy.c:3830
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3798
+#: src/gns/gnunet-gns-proxy.c:3856
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199
-#, 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:506
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4288,8 +4292,8 @@ msgid "Failed to connect to the namecache!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/gns/gnunet-service-gns.c:561
-#: 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"
@@ -4382,6 +4386,11 @@ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
+#: src/gns/plugin_rest_gns.c:452
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
 #: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4767,7 +4776,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2814
+#: src/transport/gnunet-service-transport.c:2827
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -4899,15 +4908,16 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
+#: src/identity/plugin_rest_identity.c:1297
+#, fuzzy
+msgid "Identity REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
 #: src/json/json.c:123
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
-msgid "This command doesn't do anything yet."
-msgstr ""
-
 #: src/my/my.c:196 src/my/my.c:215
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
@@ -4973,8 +4983,8 @@ msgstr "Skriv ut information om GNUnets motparter."
 
 #: src/namecache/plugin_namecache_flat.c:121
 #: src/namecache/plugin_namecache_flat.c:255
-#: src/namestore/plugin_namestore_heap.c:148
-#: src/namestore/plugin_namestore_heap.c:395
+#: src/namestore/plugin_namestore_heap.c:179
+#: src/namestore/plugin_namestore_heap.c:412
 #: src/peerstore/plugin_peerstore_flat.c:379
 #: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
@@ -4982,14 +4992,14 @@ msgid "Unable to initialize file: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
 #: src/namecache/plugin_namecache_flat.c:132
-#: src/namestore/plugin_namestore_heap.c:159
+#: src/namestore/plugin_namestore_heap.c:190
 #: src/peerstore/plugin_peerstore_flat.c:394
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
 #: src/namecache/plugin_namecache_flat.c:151
-#: src/namestore/plugin_namestore_heap.c:172
+#: src/namestore/plugin_namestore_heap.c:203
 #: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
@@ -5007,70 +5017,6 @@ msgstr ""
 msgid "Failed to setup database at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:549
-#, fuzzy, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:576
-#, 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:597
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:629
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:689
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:777
-#, 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:796
-#, 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:832
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:841
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1071
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1099
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1147
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1173
-msgid "name of the zone that is to be managed by FCFSD"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1192
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
-
 #: src/namestore/gnunet-namestore.c:341
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
@@ -5285,6 +5231,70 @@ msgstr ""
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
 
+#: src/namestore/gnunet-namestore-fcfsd.c:549
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:576
+#, 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:597
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:629
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:689
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:777
+#, 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:796
+#, 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:832
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:841
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1099
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1147
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1173
+msgid "name of the zone that is to be managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1192
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
 #: src/namestore/gnunet-service-namestore.c:900
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
@@ -5302,10 +5312,15 @@ msgstr ""
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_heap.c:778
+#: src/namestore/plugin_namestore_heap.c:773
 msgid "heap file database running\n"
 msgstr ""
 
+#: src/namestore/plugin_rest_namestore.c:1079
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
 #: src/nat-auto/gnunet-nat-auto.c:193
 #, fuzzy
 msgid "Suggested configuration changes:\n"
@@ -5592,6 +5607,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"
@@ -5618,16 +5638,66 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-nse.c:122
-#, 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 ""
 
+#: 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/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
@@ -5639,7 +5709,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:299
-#: src/rest-plugins/plugin_rest_peerinfo.c:501
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
@@ -5707,229 +5777,69 @@ msgstr "Skriv ut information om GNUnets motparter."
 msgid "Starting transport plugins `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:173
-#, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Testar transport(er) %s\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:208
-#, fuzzy, c-format
-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 ""
-
-#: src/peerstore/gnunet-service-peerstore.c:598
-#, fuzzy, c-format
-msgid "Could not load database backend `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/peerstore/peerstore_api.c:532 src/peerstore/peerstore_api.c:581
-#, fuzzy
-msgid "Unexpected iteration response, this should not happen.\n"
-msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
-
-#: src/peerstore/peerstore_api.c:595
-#, fuzzy
-msgid "Received a malformed response from service."
-msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
-
-#: src/peerstore/peerstore_api.c:731
-msgid "Received a watch result for a non existing watch.\n"
-msgstr ""
-
-#: src/peerstore/plugin_peerstore_sqlite.c:453
-#: src/psycstore/plugin_psycstore_sqlite.c:282
-#, fuzzy, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
-msgstr "Fel vid skapandet av användare"
-
-#: src/peerstore/plugin_peerstore_sqlite.c:488
-#: src/psycstore/plugin_psycstore_mysql.c:250
-#: src/psycstore/plugin_psycstore_sqlite.c:259
-#, fuzzy, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
-msgstr "Fel vid skapandet av användare"
-
-#: src/peerstore/plugin_peerstore_sqlite.c:570
-#, fuzzy, c-format
-msgid "Unable to create indices: %s.\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/pq/pq_prepare.c:84
-#, fuzzy, c-format
-msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
-msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:249
-#, fuzzy
-msgid "Failed to store membership information!\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:271
-#, fuzzy
-msgid "Failed to test membership!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:300
-#, fuzzy
-msgid "Dropping invalid fragment\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:311
-#, fuzzy
-msgid "Failed to store fragment\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:368
-#, fuzzy
-msgid "Failed to get fragment!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:434
-#, fuzzy
-msgid "Failed to get message!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:464
-#, fuzzy
-msgid "Failed to get message fragment!\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:494
-#, fuzzy
-msgid "Failed to get master counters!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:675
-#, fuzzy, c-format
-msgid "Failed to begin modifying state: %d\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:685
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:173
 #, fuzzy, c-format
-msgid "Failed to modify state: %d\n"
-msgstr "Misslyckades att starta samling.\n"
+msgid "Loading `%s' transport plugin\n"
+msgstr "Testar transport(er) %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:693
-#, fuzzy
-msgid "Failed to end modifying state!\n"
-msgstr "Misslyckades att starta samling.\n"
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:208
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:730
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:796
 #, fuzzy
-msgid "Tried to set invalid state variable name!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
+msgid "Peerinfo REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:744
-#, fuzzy
-msgid "Failed to begin synchronizing state!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
+#: src/peerstore/gnunet-peerstore.c:91
+msgid "peerstore"
+msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:761
-#, fuzzy
-msgid "Failed to end synchronizing state!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
+#: src/peerstore/gnunet-service-peerstore.c:598
+#, fuzzy, c-format
+msgid "Could not load database backend `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:779
-#: src/psycstore/gnunet-service-psycstore.c:795
+#: src/peerstore/peerstore_api.c:605 src/peerstore/peerstore_api.c:657
 #, fuzzy
-msgid "Failed to reset state!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
+msgid "Unexpected iteration response, this should not happen.\n"
+msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:824
-#: src/psycstore/gnunet-service-psycstore.c:881
+#: src/peerstore/peerstore_api.c:671
 #, fuzzy
-msgid "Tried to get invalid state variable name!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
+msgid "Received a malformed response from service."
+msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:851
-#: src/psycstore/gnunet-service-psycstore.c:896
-#, fuzzy
-msgid "Failed to get state variable!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
+#: src/peerstore/peerstore_api.c:807
+msgid "Received a watch result for a non existing watch.\n"
+msgstr ""
 
-#: src/psycstore/plugin_psycstore_mysql.c:281
-#, fuzzy
-msgid "Unable to initialize Mysql.\n"
-msgstr "Kunde inte initiera SQLite.\n"
+#: src/peerstore/plugin_peerstore_sqlite.c:453
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "Fel vid skapandet av användare"
 
-#: src/psycstore/plugin_psycstore_mysql.c:291
+#: src/peerstore/plugin_peerstore_sqlite.c:488
 #, fuzzy, c-format
-msgid "Failed to run SQL statement `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "Fel vid skapandet av användare"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:61
+#: src/peerstore/plugin_peerstore_sqlite.c:570
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s (%d)\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+msgid "Unable to create indices: %s.\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1924
-msgid "SQLite database running\n"
-msgstr ""
+#: src/pq/pq_prepare.c:84
+#, fuzzy, c-format
+msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
+msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
 
 #: src/pt/gnunet-daemon-pt.c:423
 #, fuzzy
@@ -5995,61 +5905,80 @@ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:467
+#: src/reclaim/gnunet-reclaim.c:495
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/reclaim/gnunet-reclaim.c:475
+#: src/reclaim/gnunet-reclaim.c:501
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:483
+#: src/reclaim/gnunet-reclaim.c:507
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/reclaim/gnunet-reclaim.c:506
-msgid "Add attribute"
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "Add an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:512
-msgid "Attribute value"
+#: src/reclaim/gnunet-reclaim.c:527
+msgid "Add an attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:517
-msgid "Ego"
+#: src/reclaim/gnunet-reclaim.c:530
+msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:522
-msgid "Audience (relying party)"
+#: src/reclaim/gnunet-reclaim.c:533
+#, fuzzy
+msgid "The EGO to use"
+msgstr "meddelandestorlek"
+
+#: src/reclaim/gnunet-reclaim.c:535
+msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:526
-msgid "List attributes for Ego"
+#: src/reclaim/gnunet-reclaim.c:538
+msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:531
-msgid "Issue a ticket"
+#: src/reclaim/gnunet-reclaim.c:542
+msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:536
+#: src/reclaim/gnunet-reclaim.c:545
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:541
+#: src/reclaim/gnunet-reclaim.c:548
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:546
+#: src/reclaim/gnunet-reclaim.c:551
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:551
+#: src/reclaim/gnunet-reclaim.c:553
+msgid "List tickets of ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:556
 msgid "Expiration interval of the attribute"
 msgstr ""
 
+#: src/reclaim/gnunet-reclaim.c:560
+msgid "re:claimID command line tool"
+msgstr ""
+
+#: src/reclaim/plugin_rest_openid_connect.c:2051
+#: src/reclaim/plugin_rest_reclaim.c:1018
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
 #: src/reclaim/reclaim_api.c:436
 #, fuzzy
 msgid "failed to store record\n"
@@ -6145,51 +6074,20 @@ msgstr "\"%s\" är inte en fil.\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/rest-plugins/plugin_rest_copying.c:209
-#, fuzzy
-msgid "COPYING REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/rest-plugins/plugin_rest_credential.c:1128
-#, fuzzy
-msgid "GNS REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/rest-plugins/plugin_rest_gns.c:452
-#, fuzzy
-msgid "Gns REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/rest-plugins/plugin_rest_identity.c:1297
-#, fuzzy
-msgid "Identity REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/rest-plugins/plugin_rest_namestore.c:1079
-#, fuzzy
-msgid "Namestore REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/rest-plugins/plugin_rest_openid_connect.c:2245
-#: src/rest-plugins/plugin_rest_reclaim.c:1079
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/rest-plugins/plugin_rest_peerinfo.c:796
-#, fuzzy
-msgid "Peerinfo REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/rest/gnunet-rest-server.c:927
+#: src/rest/gnunet-rest-server.c:986
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:944
+#: src/rest/gnunet-rest-server.c:1003
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Spåra GNUnets nätverkstopologi."
 
+#: src/rest/plugin_rest_copying.c:209
+#, fuzzy
+msgid "COPYING REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
 #: src/revocation/gnunet-revocation.c:129
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
@@ -6251,7 +6149,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
+#: src/revocation/gnunet-revocation.c:437
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
@@ -6328,37 +6226,37 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/rps/gnunet-rps-profiler.c:2959
+#: src/rps/gnunet-rps.c:260
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:264
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:268
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:3088
 msgid "duration of the profiling"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2965
+#: src/rps/gnunet-rps-profiler.c:3093
 #, fuzzy
 msgid "timeout for the profiling"
 msgstr "ange prioritet för innehållet"
 
-#: src/rps/gnunet-rps-profiler.c:2971
+#: src/rps/gnunet-rps-profiler.c:3098
 #, fuzzy
 msgid "number of PeerIDs to request"
 msgstr "antal iterationer"
 
-#: src/rps/gnunet-rps-profiler.c:2986
+#: src/rps/gnunet-rps-profiler.c:3114
 #, fuzzy
 msgid "Measure quality and performance of the RPS service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/rps/gnunet-rps.c:260
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:264
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:268
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/scalarproduct/gnunet-scalarproduct.c:220
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6414,10 +6312,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"
@@ -6442,7 +6340,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2005
+#: src/set/gnunet-service-set.c:2008
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -6489,134 +6387,6 @@ msgstr ""
 msgid "element size"
 msgstr ""
 
-#: src/social/gnunet-social.c:1166
-#, fuzzy
-msgid "--place missing or invalid.\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/social/gnunet-social.c:1217
-msgid "assign --name in state to --data"
-msgstr ""
-
-#: src/social/gnunet-social.c:1222
-msgid "say good-bye and leave somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1227
-msgid "create a place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1232
-msgid "destroy a place we were hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1237
-msgid "enter somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1243
-msgid "find state matching name prefix"
-msgstr ""
-
-#: src/social/gnunet-social.c:1248
-msgid "replay history of messages up to the given --limit"
-msgstr ""
-
-#: src/social/gnunet-social.c:1253
-msgid "reconnect to a previously created place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1258
-msgid "publish something to a place we are hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1263
-msgid "reconnect to a previously entered place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1268
-msgid "search for state matching exact name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1273
-msgid "submit something to somebody's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1278
-msgid "list of egos and subscribed places"
-msgstr ""
-
-#: src/social/gnunet-social.c:1283
-msgid "extract and replay history between message IDs --start and --until"
-msgstr ""
-
-#: src/social/gnunet-social.c:1292
-msgid "application ID to use when connecting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1298
-msgid "message body or state value"
-msgstr ""
-
-#: src/social/gnunet-social.c:1304
-#, fuzzy
-msgid "name or public key of ego"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/social/gnunet-social.c:1309
-#, fuzzy
-msgid "wait for incoming messages"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/social/gnunet-social.c:1315
-#, fuzzy
-msgid "GNS name"
-msgstr "Visa _namn"
-
-#: src/social/gnunet-social.c:1321
-msgid "peer ID for --guest-enter"
-msgstr ""
-
-#: src/social/gnunet-social.c:1327
-msgid "name (key) to query from state"
-msgstr ""
-
-#: src/social/gnunet-social.c:1333
-#, fuzzy
-msgid "method name"
-msgstr "Visa _namn"
-
-#: src/social/gnunet-social.c:1339
-#, fuzzy
-msgid "number of messages to replay from history"
-msgstr "antal meddelanden att använda per iteration"
-
-#: src/social/gnunet-social.c:1345
-msgid "key address of place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1351
-msgid "start message ID for history replay"
-msgstr ""
-
-#: src/social/gnunet-social.c:1356
-msgid "respond to entry requests by admitting all guests"
-msgstr ""
-
-#: src/social/gnunet-social.c:1362
-msgid "end message ID for history replay"
-msgstr ""
-
-#: src/social/gnunet-social.c:1367
-msgid "respond to entry requests by refusing all guests"
-msgstr ""
-
-#: src/social/gnunet-social.c:1377
-msgid ""
-"gnunet-social - Interact with the social service: enter/leave, send/receive "
-"messages, access history and state.\n"
-msgstr ""
-
 #: src/sq/sq.c:54
 #, c-format
 msgid "Failure to bind %u-th SQL parameter\n"
@@ -6780,7 +6550,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
 #: src/testbed/generate-underlay-topology.c:342
-#: src/testbed/gnunet-testbed-profiler.c:283
+#: src/testbed/gnunet-testbed-profiler.c:282
 msgid "create COUNT number of peers"
 msgstr ""
 
@@ -6889,17 +6659,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"
@@ -6910,6 +6669,17 @@ msgstr "Väntar på att motparter ska ansluta (%u 
iterationer kvar)...\n"
 msgid "Spawning process `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
+#: src/testbed/gnunet-testbed-profiler.c:287
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:291
+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"
@@ -7086,49 +6856,49 @@ msgstr ""
 msgid "Key number %u does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/testing/testing.c:1159
+#: src/testing/testing.c:1161
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1168
+#: src/testing/testing.c:1170
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/testing/testing.c:1178
+#: src/testing/testing.c:1180
 #, fuzzy
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/testing/testing.c:1191
+#: src/testing/testing.c:1193
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/testing/testing.c:1205
+#: src/testing/testing.c:1207
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:1217
+#: src/testing/testing.c:1219
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/testing/testing.c:1242
+#: src/testing/testing.c:1244
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/testing/testing.c:1344
+#: src/testing/testing.c:1346
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1649
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -7206,19 +6976,19 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2329
-#: src/transport/gnunet-communicator-udp.c:2883
-#: src/transport/gnunet-service-tng.c:4679
-#: src/transport/gnunet-service-transport.c:2782
+#: src/transport/gnunet-communicator-tcp.c:2334
+#: src/transport/gnunet-communicator-udp.c:2938
+#: src/transport/gnunet-service-tng.c:7070
+#: src/transport/gnunet-service-transport.c:2795
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/transport/gnunet-communicator-tcp.c:2393
+#: src/transport/gnunet-communicator-tcp.c:2398
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2954
+#: src/transport/gnunet-communicator-udp.c:3016
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7228,63 +6998,63 @@ msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/transport/gnunet-communicator-unix.c:1073
+#: src/transport/gnunet-communicator-unix.c:1074
 #: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/gnunet-communicator-unix.c:1162
+#: src/transport/gnunet-communicator-unix.c:1163
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:448
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:452
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:817
+#: src/transport/gnunet-service-transport.c:826
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1550
+#: src/transport/gnunet-service-transport.c:1563
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:1710
+#: src/transport/gnunet-service-transport.c:1723
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport.c:1807
+#: src/transport/gnunet-service-transport.c:1820
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:2124
-#: src/transport/gnunet-service-transport.c:2596
+#: src/transport/gnunet-service-transport.c:2137
+#: src/transport/gnunet-service-transport.c:2609
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2600
+#: src/transport/gnunet-service-transport.c:2613
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport.c:2708
+#: src/transport/gnunet-service-transport.c:2721
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-service-transport.c:2717
+#: src/transport/gnunet-service-transport.c:2730
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\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 ""
@@ -7294,213 +7064,213 @@ msgstr ""
 msgid "# session creation failed"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1052
+#: src/transport/gnunet-service-transport_neighbours.c:1053
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1175
+#: src/transport/gnunet-service-transport_neighbours.c:1176
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1323
-#: src/transport/gnunet-service-transport_neighbours.c:1784
+#: src/transport/gnunet-service-transport_neighbours.c:1324
+#: src/transport/gnunet-service-transport_neighbours.c:1785
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1328
+#: src/transport/gnunet-service-transport_neighbours.c:1329
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1334
+#: src/transport/gnunet-service-transport_neighbours.c:1335
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1394
+#: src/transport/gnunet-service-transport_neighbours.c:1395
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1478
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1514
+#: src/transport/gnunet-service-transport_neighbours.c:1515
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1522
+#: src/transport/gnunet-service-transport_neighbours.c:1523
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1532
+#: src/transport/gnunet-service-transport_neighbours.c:1533
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1577
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1586
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1595
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1603
+#: src/transport/gnunet-service-transport_neighbours.c:1604
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1608
+#: src/transport/gnunet-service-transport_neighbours.c:1609
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1614
+#: src/transport/gnunet-service-transport_neighbours.c:1615
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1681
+#: src/transport/gnunet-service-transport_neighbours.c:1682
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1715
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1730
+#: src/transport/gnunet-service-transport_neighbours.c:1731
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1853
+#: src/transport/gnunet-service-transport_neighbours.c:1854
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1873
+#: src/transport/gnunet-service-transport_neighbours.c:1874
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1913
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1929
+#: src/transport/gnunet-service-transport_neighbours.c:1930
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1959
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2027
+#: src/transport/gnunet-service-transport_neighbours.c:2028
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2081
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2098
+#: src/transport/gnunet-service-transport_neighbours.c:2099
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2261
+#: src/transport/gnunet-service-transport_neighbours.c:2262
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2266
+#: src/transport/gnunet-service-transport_neighbours.c:2267
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2653
+#: src/transport/gnunet-service-transport_neighbours.c:2654
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3139
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3146
+#: src/transport/gnunet-service-transport_neighbours.c:3147
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3165
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3200
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3225
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3238
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3411
+#: src/transport/gnunet-service-transport_neighbours.c:3412
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3447
+#: src/transport/gnunet-service-transport_neighbours.c:3448
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3535
+#: src/transport/gnunet-service-transport_neighbours.c:3536
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3543
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3583
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3589
+#: src/transport/gnunet-service-transport_neighbours.c:3590
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3600
+#: src/transport/gnunet-service-transport_neighbours.c:3601
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3735
+#: src/transport/gnunet-service-transport_neighbours.c:3736
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -7536,7 +7306,7 @@ msgstr ""
 #: src/transport/gnunet-service-transport_validation.c:491
 #: src/transport/gnunet-service-transport_validation.c:677
 #: src/transport/gnunet-service-transport_validation.c:997
-#: src/transport/gnunet-service-transport_validation.c:1609
+#: src/transport/gnunet-service-transport_validation.c:1610
 msgid "# validations running"
 msgstr ""
 
@@ -7561,105 +7331,65 @@ msgstr ""
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1123
+#: src/transport/gnunet-service-transport_validation.c:1124
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_validation.c:1174
+#: src/transport/gnunet-service-transport_validation.c:1175
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1187
+#: src/transport/gnunet-service-transport_validation.c:1188
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1190
+#: src/transport/gnunet-service-transport_validation.c:1191
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1198
+#: src/transport/gnunet-service-transport_validation.c:1199
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1211
+#: src/transport/gnunet-service-transport_validation.c:1212
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1266
+#: src/transport/gnunet-service-transport_validation.c:1267
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1317
-msgid "# PONGs unicast via reliable transport"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1326
-msgid "# PONGs multicast to all available addresses"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1499
-msgid "# PONGs dropped, no matching pending validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1517
-msgid "# PONGs dropped, signature expired"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1572
-msgid "# validations succeeded"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1627
-#, fuzzy
-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-service-transport_validation.c:1318
+msgid "# PONGs unicast via reliable transport"
+msgstr ""
 
-#: 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-service-transport_validation.c:1327
+msgid "# PONGs multicast to all available addresses"
+msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:636
-#, fuzzy
-msgid "message size to use"
-msgstr "meddelandestorlek"
+#: src/transport/gnunet-service-transport_validation.c:1500
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:641
-#: src/transport/gnunet-transport.c:1462
-msgid "peer identity"
+#: src/transport/gnunet-service-transport_validation.c:1518
+msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:652
-#: src/transport/gnunet-transport.c:1482
+#: src/transport/gnunet-service-transport_validation.c:1573
+msgid "# validations succeeded"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1628
 #, fuzzy
-msgid "Direct access to transport service."
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "# HELLOs given to peerinfo"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/transport/gnunet-transport.c:413
 #, fuzzy, c-format
@@ -7800,6 +7530,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 ""
@@ -7808,13 +7543,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 "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:3530
-#: src/transport/plugin_transport_tcp.c:3895
-#: src/transport/plugin_transport_tcp.c:3902
-#: src/transport/plugin_transport_xt.c:3899
-#: src/transport/plugin_transport_xt.c:3906
+#: src/transport/plugin_transport_tcp.c:3901
+#: src/transport/plugin_transport_tcp.c:3908
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7886,7 +7654,6 @@ msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2905
 #: src/transport/plugin_transport_udp.c:3627
-#: src/transport/plugin_transport_xu.c:2049
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7996,134 +7763,123 @@ msgstr "# byte skickades via TCP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1551
-#: src/transport/plugin_transport_tcp.c:2877
-#: src/transport/plugin_transport_xt.c:1553
-#: src/transport/plugin_transport_xt.c:2879
+#: src/transport/plugin_transport_tcp.c:1557
+#: src/transport/plugin_transport_tcp.c:2883
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1734
-#: src/transport/plugin_transport_tcp.c:1958
-#: src/transport/plugin_transport_tcp.c:3141
-#: src/transport/plugin_transport_tcp.c:4018
-#: src/transport/plugin_transport_xt.c:1736
-#: src/transport/plugin_transport_xt.c:1960
-#: src/transport/plugin_transport_xt.c:3143
+#: src/transport/plugin_transport_tcp.c:1740
+#: src/transport/plugin_transport_tcp.c:1964
+#: src/transport/plugin_transport_tcp.c:3147
+#: src/transport/plugin_transport_tcp.c:4024
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:1776
-#: src/transport/plugin_transport_tcp.c:1940
-#: src/transport/plugin_transport_tcp.c:2064
-#: src/transport/plugin_transport_tcp.c:2137
-#: src/transport/plugin_transport_tcp.c:2237
-#: src/transport/plugin_transport_tcp.c:2262
-#: 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
+#: src/transport/plugin_transport_tcp.c:1782
+#: src/transport/plugin_transport_tcp.c:1946
+#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2143
+#: src/transport/plugin_transport_tcp.c:2243
+#: src/transport/plugin_transport_tcp.c:2268
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:1779
-#: src/transport/plugin_transport_xt.c:1781
+#: src/transport/plugin_transport_tcp.c:1785
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:2067
-#: src/transport/plugin_transport_xt.c:2069
+#: src/transport/plugin_transport_tcp.c:2073
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:2141
-#: src/transport/plugin_transport_xt.c:2143
+#: src/transport/plugin_transport_tcp.c:2147
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:2539
-#: src/transport/plugin_transport_xt.c:2541
+#: src/transport/plugin_transport_tcp.c:2545
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2715
-#: src/transport/plugin_transport_xt.c:2717
+#: src/transport/plugin_transport_tcp.c:2721
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3207
-#: src/transport/plugin_transport_xt.c:3209
+#: src/transport/plugin_transport_tcp.c:3213
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:3413
-#: src/transport/plugin_transport_xt.c:3415
+#: src/transport/plugin_transport_tcp.c:3419
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:3464
-#: src/transport/plugin_transport_tcp.c:3522
-#: src/transport/plugin_transport_xt.c:3466
-#: src/transport/plugin_transport_xt.c:3524
+#: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_tcp.c:3528
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "Nätverksanslutning"
 
-#: src/transport/plugin_transport_tcp.c:3468
-#: src/transport/plugin_transport_xt.c:3470
+#: src/transport/plugin_transport_tcp.c:3474
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# av anslutna parter"
 
-#: src/transport/plugin_transport_tcp.c:3474
-#: src/transport/plugin_transport_xt.c:3476
+#: src/transport/plugin_transport_tcp.c:3480
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3476
-#: src/transport/plugin_transport_xt.c:3478
+#: src/transport/plugin_transport_tcp.c:3482
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3516
-#: src/transport/plugin_transport_xt.c:3518
+#: src/transport/plugin_transport_tcp.c:3522
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3526
-#: src/transport/plugin_transport_xt.c:3528
+#: src/transport/plugin_transport_tcp.c:3532
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3845
-#: src/transport/plugin_transport_xt.c:3849
+#: src/transport/plugin_transport_tcp.c:3851
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:4006
+#: src/transport/plugin_transport_tcp.c:4012
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4010
+#: src/transport/plugin_transport_tcp.c:4016
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4014
+#: src/transport/plugin_transport_tcp.c:4020
 #, c-format
 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:3371
 #, c-format
 msgid ""
@@ -8144,7 +7900,6 @@ 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:3721
-#: src/transport/plugin_transport_xu.c:2143
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
@@ -8155,19 +7910,15 @@ msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
 #: src/transport/plugin_transport_udp.c:3883
 #: src/transport/plugin_transport_udp.c:3897
-#: 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:3929
-#: 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:3956
-#: src/transport/plugin_transport_xu.c:2374
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
@@ -8177,21 +7928,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:1416
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
@@ -8269,54 +8005,6 @@ 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"
@@ -8328,17 +8016,17 @@ msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1624
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1634
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127
+#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1640
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
@@ -8350,7 +8038,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2396
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:864
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
@@ -8360,27 +8048,27 @@ msgstr "Okänd operation \"%s\"\n"
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:988
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:1031
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1555
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:953
-#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1195
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1708
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1228
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1741
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8395,44 +8083,44 @@ msgstr "Fel vid %s:%d.\n"
 msgid "Service `%s' runs at %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1502
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:2015
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1506
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:2019
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1510
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:2023
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1525
-#: src/util/service.c:1380
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1535
+#: src/util/service.c:1893
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1382
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1895
 msgid "No such user"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1401
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1914
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1762
+#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:2276
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:1826
-#: src/util/service.c:1841
+#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:2340
+#: src/util/service.c:2355
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:1853
+#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:2367
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -8476,11 +8164,11 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:734
+#: src/util/client.c:749
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:925
+#: src/util/client.c:941
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8527,16 +8215,16 @@ msgstr ""
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1500
+#: src/util/common_logging.c:1513
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1518
+#: src/util/common_logging.c:1531
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/common_logging.c:1539
+#: src/util/common_logging.c:1552
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8584,26 +8272,26 @@ msgstr ""
 #: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have %"
-"llu)\n"
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:862
+#: src/util/crypto_ecc.c:887
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:917
+#: src/util/crypto_ecc.c:946
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:996
+#: src/util/crypto_ecc.c:1025
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:1057
+#: src/util/crypto_ecc.c:1086
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -8653,17 +8341,17 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: 
\"%s\".\n"
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/disk.c:1255
+#: src/util/disk.c:1265
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/dnsparser.c:260
+#: src/util/dnsparser.c:264
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/dnsparser.c:950
+#: src/util/dnsparser.c:954
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -8769,7 +8457,7 @@ msgstr ""
 msgid "print this help"
 msgstr "skriv ut denna hjälp"
 
-#: src/util/getopt_helpers.c:282
+#: src/util/getopt_helpers.c:282 src/util/gnunet-qr.c:300
 msgid "be verbose"
 msgstr "var informativ"
 
@@ -8817,53 +8505,53 @@ msgstr "Du måste skicka med ett nummer till flaggan 
\"%s\".\n"
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:160
+#: src/util/gnunet-config.c:161
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/gnunet-config.c:173
+#: src/util/gnunet-config.c:174
 #, fuzzy, c-format
 msgid "%s or %s argument is required\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/util/gnunet-config.c:181
+#: src/util/gnunet-config.c:182
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:232
+#: src/util/gnunet-config.c:234
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:286
-msgid "obtain option of value as a filename (with $-expansion)"
+#: src/util/gnunet-config.c:288
+msgid "interpret option value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:291
+#: src/util/gnunet-config.c:293
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:296
+#: src/util/gnunet-config.c:298
 #, fuzzy
 msgid "name of the option to access"
 msgstr "Visa värde av alternativet"
 
-#: src/util/gnunet-config.c:301
+#: src/util/gnunet-config.c:303
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:305
+#: src/util/gnunet-config.c:307
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "GNUnet-konfiguration"
 
-#: src/util/gnunet-config.c:309
+#: src/util/gnunet-config.c:311
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:322
+#: src/util/gnunet-config.c:324
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -8956,6 +8644,33 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
+#: src/util/gnunet-qr.c:108 src/util/gnunet-uri.c:91
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
+
+#: src/util/gnunet-qr.c:116 src/util/gnunet-uri.c:98
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:127 src/util/gnunet-uri.c:108
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:297
+msgid "use video-device DEVICE (default: /dev/video0"
+msgstr ""
+
+#: src/util/gnunet-qr.c:303
+msgid "do not show preview windows"
+msgstr ""
+
+#: src/util/gnunet-qr.c:311
+msgid "Scan a QR code using a video device and import the uri read"
+msgstr ""
+
 #: src/util/gnunet-resolver.c:168
 msgid "perform a reverse lookup"
 msgstr ""
@@ -8990,7 +8705,7 @@ msgstr ""
 msgid "Manipulate GNUnet proof of work files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-service-resolver.c:1443
+#: src/util/gnunet-service-resolver.c:1424
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
@@ -8999,21 +8714,6 @@ msgstr ""
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:91
-#, fuzzy, c-format
-msgid "Invalid URI: does not start with `%s'\n"
-msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
-
-#: src/util/gnunet-uri.c:98
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:108
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
-msgstr ""
-
 #: src/util/gnunet-uri.c:170
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
@@ -9033,12 +8733,12 @@ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/network.c:136
+#: src/util/network.c:176
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1795 src/util/network.c:1979
+#: src/util/network.c:1835 src/util/network.c:2019
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9147,18 +8847,18 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/service.c:1307
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
-msgstr ""
-
-#: src/util/service.c:2141
+#: src/util/service.c:668
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
+#: src/util/service.c:1820
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
 #: src/util/signal.c:89
 #, fuzzy, c-format
 msgid "signal (%d, %p) returned %d.\n"
@@ -9290,12 +8990,12 @@ msgstr "Fel format \"%s\" för nätmask: %s\n"
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
 
-#: src/util/time.c:828 src/util/time.c:860
+#: src/util/time.c:844 src/util/time.c:876
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:866
+#: src/util/time.c:882
 #, c-format
 msgid ""
 "Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
@@ -9479,72 +9179,160 @@ 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"
 
-#: src/include/gnunet_common.h:772 src/include/gnunet_common.h:779
-#: src/include/gnunet_common.h:789
+#: src/include/gnunet_common.h:794 src/include/gnunet_common.h:801
+#: src/include/gnunet_common.h:811
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d. Aborting.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:797
+#: src/include/gnunet_common.h:819
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:809
+#: src/include/gnunet_common.h:831
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:836 src/include/gnunet_common.h:845
+#: src/include/gnunet_common.h:858 src/include/gnunet_common.h:867
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
-#~ msgid "Can not index file `%s': %s.\n"
-#~ msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
+#~ msgid "Unable to parse CRED record string `%s'\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
 #, fuzzy
-#~ msgid "`%s' is not a valid domain name\n"
-#~ msgstr "\"%s\" är inte tillgänglig."
+#~ msgid "# XT sessions active"
+#~ msgstr "# sessionsnycklar accepterade"
 
 #, fuzzy
-#~ msgid "Specify a timeout for the lookup"
-#~ msgstr "ange prioritet för innehållet"
+#~ msgid "Failed to bind XU socket to %s: %s\n"
+#~ msgstr "Misslyckades att binda till UDP6-port %d.\n"
+
+#, fuzzy
+#~ msgid "Failed to open XU sockets\n"
+#~ msgstr "Misslyckades att binda till UDP6-port %d.\n"
+
+#, fuzzy
+#~ msgid "Failed to create XU network sockets\n"
+#~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#, fuzzy
+#~ msgid "Print information about DV state"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "Invalid tunnel owner `%s'\n"
+#~ msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Provide information about a particular tunnel"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "Failed to store membership information!\n"
+#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#, fuzzy
+#~ msgid "Failed to test membership!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "Dropping invalid fragment\n"
+#~ msgstr "Ogiltigt argument: \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Failed to store fragment\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "Failed to get fragment!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "Failed to get message!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
 
 #, fuzzy
-#~ msgid "Unable to parse CAA record string `%s'\n"
+#~ msgid "Failed to get message fragment!\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
 #, fuzzy
-#~ msgid "The EGO to use"
-#~ msgstr "meddelandestorlek"
+#~ msgid "Failed to get master counters!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
 
 #, fuzzy
-#~ msgid "OpenID Connect REST API initialized\n"
-#~ msgstr " Anslutning misslyckades\n"
+#~ msgid "Failed to begin modifying state: %d\n"
+#~ msgstr "Misslyckades att starta samling.\n"
 
 #, fuzzy
-#~ msgid "CONFIG REST API initialized\n"
-#~ msgstr " Anslutning misslyckades\n"
+#~ msgid "Failed to modify state: %d\n"
+#~ msgstr "Misslyckades att starta samling.\n"
 
 #, fuzzy
-#~ msgid "Option `%s' can't be used with other options.\n"
-#~ msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
+#~ msgid "Failed to end modifying state!\n"
+#~ msgstr "Misslyckades att starta samling.\n"
 
 #, fuzzy
-#~ msgid "Invalid tunnel owner `%s'\n"
-#~ msgstr "Ogiltigt format för IP: \"%s\"\n"
+#~ msgid "Failed to begin synchronizing state!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
 
 #, fuzzy
-#~ msgid "Provide information about a particular tunnel"
-#~ msgstr "Skriv ut information om GNUnets motparter."
+#~ msgid "Failed to end synchronizing state!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "Failed to reset state!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "Failed to get state variable!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Mysql.\n"
+#~ msgstr "Kunde inte initiera SQLite.\n"
+
+#, fuzzy
+#~ msgid "Failed to run SQL statement `%s'\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#, fuzzy
+#~ msgid "--place missing or invalid.\n"
+#~ msgstr "Ogiltigt argument: \"%s\"\n"
+
+#, fuzzy
+#~ msgid "name or public key of ego"
+#~ msgstr "Ogiltigt argument: \"%s\"\n"
+
+#, fuzzy
+#~ msgid "wait for incoming messages"
+#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#, fuzzy
+#~ msgid "GNS name"
+#~ msgstr "Visa _namn"
+
+#, fuzzy
+#~ msgid "method name"
+#~ msgstr "Visa _namn"
+
+#, fuzzy
+#~ msgid "number of messages to replay from history"
+#~ msgstr "antal meddelanden att använda per iteration"
 
 #, fuzzy
 #~ msgid "Could not resolve `%s' (%s): %s\n"
@@ -10393,8 +10181,8 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d 
med fel: %s\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "%s service is lacking key configuration settings (%s). Using default (%"
-#~ "u).\n"
+#~ "%s service is lacking key configuration settings (%s). Using default "
+#~ "(%u).\n"
 #~ msgstr "GNUnet-konfiguration"
 
 #, fuzzy
@@ -11267,8 +11055,8 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d 
med fel: %s\n"
 #, fuzzy
 #~ msgid "No interface specified in section `%s' under `%s'!\n"
 #~ msgstr ""
-#~ "Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under \"%"
-#~ "s\"!\n"
+#~ "Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under "
+#~ "\"%s\"!\n"
 
 #, fuzzy
 #~ msgid "`%s' returned with error code %u"
@@ -11286,8 +11074,8 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d 
med fel: %s\n"
 #~ msgid ""
 #~ "No network interfaces defined in configuration section `%s' under `%s'!\n"
 #~ msgstr ""
-#~ "Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under \"%"
-#~ "s\"!\n"
+#~ "Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under "
+#~ "\"%s\"!\n"
 
 #, fuzzy
 #~ msgid "Command `%s' failed with error code %u\n"
@@ -12149,8 +11937,8 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d 
med fel: %s\n"
 #~ msgstr "Kunde inte slå upp namnet för SMTP-server \"%s\": %s"
 
 #~ msgid ""
-#~ "You must specify the name of a pipe for the SMTP transport in section `%"
-#~ "s' under `%s'.\n"
+#~ "You must specify the name of a pipe for the SMTP transport in section `"
+#~ "%s' under `%s'.\n"
 #~ msgstr ""
 #~ "Du måste ange ett namn på röret för SMTP-transporten i sektion \"%s\" "
 #~ "under \"%s\".\n"
diff --git a/po/vi.po b/po/vi.po
index 58f55cebb..7b90e2874 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden\n"
-"POT-Creation-Date: 2019-02-09 22:07+0000\n"
+"POT-Creation-Date: 2019-09-04 12:56+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"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
@@ -234,8 +234,7 @@ msgid "Control services and the Automated Restart Manager 
(ARM)"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:388 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
+#: src/transport/tcp_service_legacy.c:557
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
@@ -244,36 +243,30 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3829
-#: src/transport/plugin_transport_xt.c:1139
-#: src/transport/plugin_transport_xt.c:1145
-#: src/transport/plugin_transport_xt.c:3833
+#: src/transport/plugin_transport_tcp.c:3835
 #: src/transport/tcp_service_legacy.c:576
-#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
-#: src/util/service.c:643
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1150
+#: src/util/service.c:1156
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:457 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
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
+#: src/util/service.c:1195
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:462 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
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
+#: src/util/service.c:1200
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
 #: src/arm/gnunet-service-arm.c:495 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
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1236
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -281,8 +274,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:517 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
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1254
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -290,8 +282,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:556
 #: src/transport/plugin_transport_http_server.c:2688
 #: 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
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1295
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -299,8 +290,7 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 #: src/arm/gnunet-service-arm.c:575
 #: src/transport/plugin_transport_http_server.c:2706
 #: 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
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1315
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
@@ -372,15 +362,140 @@ 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-new.c:756
+#: 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/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/plugin_ats2_common.c:90
+#, c-format
+msgid ""
+"Could not load %s quota for network `%s': `%s', assigning default bandwidth "
+"%llu\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:1870
+#, 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:1914
+#, 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:2476
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
+#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
+#: src/ats/plugin_ats_mlp.c:2602 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:2671
+#, 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:2680
+#, 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:2690
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2699
+#, 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
@@ -392,6 +507,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 ""
@@ -399,17 +524,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"
@@ -532,132 +646,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-new.c:733
-#: 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/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/plugin_ats2_common.c:90
-#, c-format
-msgid ""
-"Could not load %s quota for network `%s': `%s', assigning default bandwidth %"
-"llu\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:1870
-#, 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:1914
-#, 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:2476
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
-#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
-#: src/ats/plugin_ats_mlp.c:2602 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:2671
-#, 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:2680
-#, 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:2690
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2699
-#, 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 ""
@@ -779,39 +767,17 @@ msgstr ""
 msgid "write statistics to file"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:559
-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:120
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
+#: src/consensus/gnunet-consensus-profiler.c:559
+msgid "distribute elements to a static subset of good peers"
 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:216
-#, 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:277
@@ -1071,8 +1037,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:120
+#, 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:216
+#, 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 ""
@@ -1382,7 +1370,7 @@ msgid "# valid ephemeral keys received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
 #: src/core/gnunet-service-core_kx.c:1180
-#: src/transport/gnunet-service-transport_validation.c:1128
+#: src/transport/gnunet-service-transport_validation.c:1129
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
@@ -1408,7 +1396,7 @@ msgid "# keepalive messages sent"
 msgstr "# các thông báo PING nhập thô được gửi"
 
 #: src/core/gnunet-service-core_kx.c:1351
-#: src/transport/gnunet-service-transport_validation.c:1461
+#: src/transport/gnunet-service-transport_validation.c:1462
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -1518,131 +1506,151 @@ msgstr "# các thông báo phát hiện dht được nhận"
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/credential/credential_misc.c:88
-#, fuzzy, c-format
-msgid "Unable to parse CRED record string `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:994
+#: src/credential/gnunet-credential.c:381 src/namestore/gnunet-namestore.c:994
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:280
-#: src/credential/gnunet-credential.c:434
+#: src/credential/gnunet-credential.c:397
+#: src/credential/gnunet-credential.c:859
 #, fuzzy, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/credential/gnunet-credential.c:361
-#: src/credential/gnunet-credential.c:423
+#: src/credential/gnunet-credential.c:532
+#: src/credential/gnunet-service-credential.c:1728
+#: src/namestore/gnunet-namestore.c:1019
+#: src/namestore/gnunet-namestore-fcfsd.c:1138
+#, fuzzy, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/credential/gnunet-credential.c:798
+#: src/credential/gnunet-credential.c:849
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/credential/gnunet-credential.c:372
-#: src/credential/gnunet-credential.c:444
+#: src/credential/gnunet-credential.c:807
+#: src/credential/gnunet-credential.c:868
 #, fuzzy, c-format
 msgid "Failed to connect to CREDENTIAL\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/credential/gnunet-credential.c:379
+#: src/credential/gnunet-credential.c:813
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:387
+#: src/credential/gnunet-credential.c:820
 #, c-format
 msgid "ego required\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:403
+#: src/credential/gnunet-credential.c:830
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:414
+#: src/credential/gnunet-credential.c:839
 #, fuzzy, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/credential/gnunet-credential.c:451
+#: src/credential/gnunet-credential.c:874
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:504
-#, c-format
-msgid "Issuer ego required\n"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:516
+#: src/credential/gnunet-credential.c:930
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:536
-msgid "create credential"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:540
+#: src/credential/gnunet-credential.c:951
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:545
+#: src/credential/gnunet-credential.c:958
 #, fuzzy
-msgid "The public key of the subject to lookup the credential for"
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/credential/gnunet-credential.c:550
-msgid "The name of the credential presented by the subject"
+#: src/credential/gnunet-credential.c:965
+msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:555
+#: src/credential/gnunet-credential.c:972
 #, fuzzy
 msgid "The public key of the authority to verify the credential against"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/credential/gnunet-credential.c:560
+#: src/credential/gnunet-credential.c:977
 #, fuzzy
-msgid "The ego to use"
+msgid "The ego/zone name to use"
 msgstr "kích cỡ tin nhắn"
 
-#: src/credential/gnunet-credential.c:565
+#: src/credential/gnunet-credential.c:983
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:570
-msgid "The time to live for the credential"
+#: src/credential/gnunet-credential.c:989
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/credential/gnunet-credential.c:574
+#: src/credential/gnunet-credential.c:994
 msgid "collect credentials"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:588
+#: src/credential/gnunet-credential.c:999
+msgid "Create and issue a credential issuer side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1004
+msgid "Issue a credential subject side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1009
+msgid "Create, sign and return a credential subject side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1016
+msgid "Import signed credentials that should be issued to a zone/ego"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1020
+msgid "Create private record entry."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1026
+#: src/credential/gnunet-credential.c:1032
+msgid "Indicates that the collect/verify process is done via forward search."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1045
 #, fuzzy
 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:185
+#: src/credential/gnunet-service-credential.c:1723 src/gns/gnunet-gns.c:185
+#: 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:1138
-#: src/namestore/gnunet-namestore.c:1019
-#, fuzzy, c-format
-msgid "Failed to connect to namestore\n"
-msgstr "Không kết nối được đến trình nền gnunetd."
-
-#: src/credential/plugin_gnsrecord_credential.c:186
+#: src/credential/plugin_gnsrecord_credential.c:182
 #, fuzzy, c-format
 msgid "Unable to parse ATTR record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
+#: src/credential/plugin_rest_credential.c:1128
+#, fuzzy
+msgid "GNS REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:311
 #: src/datastore/gnunet-service-datastore.c:757
 #, fuzzy
@@ -1697,14 +1705,12 @@ msgstr "kho dữ liệu sqlite"
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_sqlite.c:53
 #: src/peerstore/plugin_peerstore_sqlite.c:52
-#: src/psycstore/plugin_psycstore_mysql.c:62
-#: src/reclaim/plugin_reclaim_sqlite.c:52
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:818 src/include/gnunet_common.h:827
+#: src/include/gnunet_common.h:840 src/include/gnunet_common.h:849
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1714,7 +1720,6 @@ msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 #: src/datastore/plugin_datastore_sqlite.c:508
 #: src/namecache/plugin_namecache_sqlite.c:229
 #: src/namestore/plugin_namestore_sqlite.c:265
-#: src/reclaim/plugin_reclaim_sqlite.c:336
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -2036,24 +2041,22 @@ msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
 #: src/datastore/plugin_datastore_mysql.c:1180
-#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:276
-#: src/datastore/plugin_datastore_postgres.c:893
+#: src/datastore/plugin_datastore_postgres.c:280
+#: src/datastore/plugin_datastore_postgres.c:897
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:854
+#: src/datastore/plugin_datastore_postgres.c:858
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:952
-#: src/psycstore/plugin_psycstore_postgres.c:1506
+#: src/datastore/plugin_datastore_postgres.c:956
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -2069,8 +2072,6 @@ msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 #: src/namecache/plugin_namecache_sqlite.c:173
 #: src/namestore/plugin_namestore_sqlite.c:206
 #: src/peerstore/plugin_peerstore_sqlite.c:535
-#: src/psycstore/plugin_psycstore_sqlite.c:325
-#: src/reclaim/plugin_reclaim_sqlite.c:212
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -2092,8 +2093,7 @@ msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1405
 #: src/namecache/plugin_namecache_sqlite.c:557
-#: src/namestore/plugin_namestore_sqlite.c:750
-#: src/reclaim/plugin_reclaim_sqlite.c:711
+#: src/namestore/plugin_namestore_sqlite.c:751
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -2165,6 +2165,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 src/rps/gnunet-rps-profiler.c:3083
+#, 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:300
+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 ""
@@ -2436,54 +2484,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 src/rps/gnunet-rps-profiler.c:2953
-#, 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"
@@ -2570,11 +2570,6 @@ msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:175
-#, fuzzy
-msgid "Print information about DV state"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
-
 #: src/exit/gnunet-daemon-exit.c:960
 #, fuzzy
 msgid "# TCP packets sent via TUN"
@@ -3029,59 +3024,64 @@ msgstr "Không kết nối được đến trình nền gnunetd."
 msgid "Publishing failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
-#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
+#: src/fs/fs_publish.c:725
+#, fuzzy, c-format
+msgid "Can not index file `%s': %s.\n"
+msgstr "Không thể mở tập tin « %s »: « %s »"
+
+#: src/fs/fs_publish.c:782 src/fs/fs_publish.c:827 src/fs/fs_publish.c:848
+#: src/fs/fs_publish.c:878 src/fs/fs_publish.c:1144
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n"
 
-#: src/fs/fs_publish.c:780
+#: src/fs/fs_publish.c:784
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/fs/fs_publish.c:825
+#: src/fs/fs_publish.c:829
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:845
+#: src/fs/fs_publish.c:849
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:876
+#: src/fs/fs_publish.c:880
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:902
+#: src/fs/fs_publish.c:906
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
+#: src/fs/fs_publish.c:995 src/fs/fs_publish.c:1031
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1094
+#: src/fs/fs_publish.c:1098
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/fs/fs_publish.c:1102
+#: src/fs/fs_publish.c:1106
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:1142
+#: src/fs/fs_publish.c:1146
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1381
+#: src/fs/fs_publish.c:1385
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "Kho dữ liệu đầy.\n"
 
-#: src/fs/fs_publish.c:1472
+#: src/fs/fs_publish.c:1476
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3155,93 +3155,93 @@ msgstr "Không kết nối được đến trình nền gnunetd."
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_uri.c:234
+#: src/fs/fs_uri.c:236
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:293
+#: src/fs/fs_uri.c:295
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:311
+#: src/fs/fs_uri.c:313
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:318
+#: src/fs/fs_uri.c:320
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:388
+#: src/fs/fs_uri.c:390
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:429
+#: src/fs/fs_uri.c:431
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:444
+#: src/fs/fs_uri.c:446
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:523
+#: src/fs/fs_uri.c:525
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:538
+#: src/fs/fs_uri.c:540
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:548
+#: src/fs/fs_uri.c:550
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:556
+#: src/fs/fs_uri.c:558
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:566
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:570
+#: src/fs/fs_uri.c:572
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:576
+#: src/fs/fs_uri.c:578
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:587
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:591
+#: src/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:609
+#: src/fs/fs_uri.c:611
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:645
 #, fuzzy
 msgid "invalid argument"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/fs_uri.c:655
+#: src/fs/fs_uri.c:657
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1092
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -3281,11 +3281,11 @@ msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:907
+#: src/fs/gnunet-auto-share.c:772
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:907
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
@@ -3369,7 +3369,7 @@ msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
 
 #: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:215 src/fs/gnunet-unindex.c:107
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
@@ -3393,12 +3393,12 @@ msgid "Target filename must be specified.\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:872
-#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:273 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:312
+#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:315
 #, fuzzy
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
@@ -3407,7 +3407,7 @@ msgstr "đặt CẤP mong muốn của tình trạng nặc danh của 
người g
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
 
-#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:316
+#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3435,6 +3435,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 ""
@@ -3451,15 +3460,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"
@@ -3550,7 +3550,7 @@ msgstr ""
 
 #: src/fs/gnunet-publish.c:687
 #, fuzzy
-msgid "Internal error scanning directory.\n"
+msgid "Error scanning directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
 #: src/fs/gnunet-publish.c:715
@@ -3595,6 +3595,11 @@ msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s 
».\n"
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
+#: src/fs/gnunet-publish.c:911
+#, fuzzy
+msgid "enable adding the creation time to the metadata of the uploaded file"
+msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
+
 #: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
@@ -3667,34 +3672,34 @@ msgstr ""
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:204
+#: src/fs/gnunet-search.c:207
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-search.c:260
+#: src/fs/gnunet-search.c:263
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:284
+#: src/fs/gnunet-search.c:287
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:321
+#: src/fs/gnunet-search.c:324
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:329
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:332
+#: src/fs/gnunet-search.c:335
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:348
+#: src/fs/gnunet-search.c:351
 #, fuzzy
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chúng ta tải lên"
@@ -4116,40 +4121,40 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:203
+#: src/gns/gnunet-dns2gns.c:214
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-dns2gns.c:405
+#: src/gns/gnunet-dns2gns.c:416
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:421
+#: src/gns/gnunet-dns2gns.c:432
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:429
+#: src/gns/gnunet-dns2gns.c:440
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:588
+#: src/gns/gnunet-dns2gns.c:600
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:688
+#: src/gns/gnunet-dns2gns.c:748
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:693
+#: src/gns/gnunet-dns2gns.c:753
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:710
+#: src/gns/gnunet-dns2gns.c:770
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4165,6 +4170,29 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:199
+#, 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 ""
@@ -4199,130 +4227,107 @@ 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:980
+#: src/gns/gnunet-gns-proxy.c:989
 #, 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:1005
+#: src/gns/gnunet-gns-proxy.c:1014
 #, 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:1026
+#: src/gns/gnunet-gns-proxy.c:1035
 #, 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:1041
+#: src/gns/gnunet-gns-proxy.c:1050
 #, 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:1056
+#: src/gns/gnunet-gns-proxy.c:1065
 #, 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:1066
+#: src/gns/gnunet-gns-proxy.c:1075
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1090
+#: src/gns/gnunet-gns-proxy.c:1099
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1221
+#: src/gns/gnunet-gns-proxy.c:1230
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2121
+#: src/gns/gnunet-gns-proxy.c:2131
 #, 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:2642
+#: src/gns/gnunet-gns-proxy.c:2652
 #, 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:2674
+#: src/gns/gnunet-gns-proxy.c:2684
 #, fuzzy, c-format
 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:2875
+#: src/gns/gnunet-gns-proxy.c:2885
 #, 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:2897 src/rest/gnunet-rest-server.c:658
+#: src/gns/gnunet-gns-proxy.c:2907 src/rest/gnunet-rest-server.c:668
 #, 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:3233
+#: src/gns/gnunet-gns-proxy.c:3243
 #, 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:3262
+#: src/gns/gnunet-gns-proxy.c:3272
 #, 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:3345
+#: src/gns/gnunet-gns-proxy.c:3355
 #, 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:3635
+#: src/gns/gnunet-gns-proxy.c:3693
 #, 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:3763
+#: src/gns/gnunet-gns-proxy.c:3821
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3768
+#: src/gns/gnunet-gns-proxy.c:3826
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3772
+#: src/gns/gnunet-gns-proxy.c:3830
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3798
+#: src/gns/gnunet-gns-proxy.c:3856
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199
-#, 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:506
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4334,8 +4339,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:561
-#: 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"
@@ -4429,6 +4434,11 @@ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
+#: src/gns/plugin_rest_gns.c:452
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
 #: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4826,7 +4836,7 @@ msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2814
+#: src/transport/gnunet-service-transport.c:2827
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
@@ -4958,15 +4968,16 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
+#: src/identity/plugin_rest_identity.c:1297
+#, fuzzy
+msgid "Identity REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
 #: src/json/json.c:123
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
-msgid "This command doesn't do anything yet."
-msgstr ""
-
 #: src/my/my.c:196 src/my/my.c:215
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
@@ -5032,8 +5043,8 @@ msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
 #: src/namecache/plugin_namecache_flat.c:121
 #: src/namecache/plugin_namecache_flat.c:255
-#: src/namestore/plugin_namestore_heap.c:148
-#: src/namestore/plugin_namestore_heap.c:395
+#: src/namestore/plugin_namestore_heap.c:179
+#: src/namestore/plugin_namestore_heap.c:412
 #: src/peerstore/plugin_peerstore_flat.c:379
 #: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
@@ -5041,14 +5052,14 @@ msgid "Unable to initialize file: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
 #: src/namecache/plugin_namecache_flat.c:132
-#: src/namestore/plugin_namestore_heap.c:159
+#: src/namestore/plugin_namestore_heap.c:190
 #: src/peerstore/plugin_peerstore_flat.c:394
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "Không thể tạo miền tên.\n"
 
 #: src/namecache/plugin_namecache_flat.c:151
-#: src/namestore/plugin_namestore_heap.c:172
+#: src/namestore/plugin_namestore_heap.c:203
 #: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
@@ -5067,70 +5078,6 @@ msgstr "kho dữ liệu sqlite"
 msgid "Failed to setup database at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:549
-#, 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:576
-#, 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:597
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:629
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:689
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:777
-#, 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:796
-#, 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:832
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:841
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1071
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1099
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1147
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1173
-msgid "name of the zone that is to be managed by FCFSD"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1192
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
-
 #: src/namestore/gnunet-namestore.c:341
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
@@ -5338,6 +5285,70 @@ msgstr ""
 msgid "name of the ego controlling the zone"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-fcfsd.c:549
+#, 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:576
+#, 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:597
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:629
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:689
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:777
+#, 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:796
+#, 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:832
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:841
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1099
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1147
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1173
+msgid "name of the zone that is to be managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1192
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
 #: src/namestore/gnunet-service-namestore.c:900
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
@@ -5355,11 +5366,16 @@ msgstr ""
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_heap.c:778
+#: src/namestore/plugin_namestore_heap.c:773
 #, fuzzy
 msgid "heap file database running\n"
 msgstr "kho dữ liệu sqlite"
 
+#: src/namestore/plugin_rest_namestore.c:1079
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
 #: src/nat-auto/gnunet-nat-auto.c:193
 #, fuzzy
 msgid "Suggested configuration changes:\n"
@@ -5642,6 +5658,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"
@@ -5668,17 +5689,71 @@ msgstr ""
 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
 #, 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/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/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
@@ -5690,7 +5765,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:299
-#: src/rest-plugins/plugin_rest_peerinfo.c:501
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
@@ -5767,68 +5842,14 @@ msgstr "Đang nạp các truyền tải « %s »\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
 #: src/transport/gnunet-service-transport_plugins.c:208
-#, fuzzy, c-format
-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 ""
+#, fuzzy, c-format
+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/peerinfo_api.c:220
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:796
 #, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
+msgid "Peerinfo REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
 
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
@@ -5839,22 +5860,21 @@ msgstr ""
 msgid "Could not load database backend `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/peerstore/peerstore_api.c:532 src/peerstore/peerstore_api.c:581
+#: src/peerstore/peerstore_api.c:605 src/peerstore/peerstore_api.c:657
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "Định dạng kết xuất không rõ, điều này không nên xảy ra.\n"
 
-#: src/peerstore/peerstore_api.c:595
+#: src/peerstore/peerstore_api.c:671
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/peerstore/peerstore_api.c:731
+#: src/peerstore/peerstore_api.c:807
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
 #: src/peerstore/plugin_peerstore_sqlite.c:453
-#: src/psycstore/plugin_psycstore_sqlite.c:282
 #, fuzzy, c-format
 msgid ""
 "Error executing SQL query: %s\n"
@@ -5862,8 +5882,6 @@ msgid ""
 msgstr "Gặp lỗi khi tạo người dùng"
 
 #: src/peerstore/plugin_peerstore_sqlite.c:488
-#: src/psycstore/plugin_psycstore_mysql.c:250
-#: src/psycstore/plugin_psycstore_sqlite.c:259
 #, fuzzy, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
@@ -5880,114 +5898,6 @@ msgstr "Không thể tạo miền tên.\n"
 msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:249
-#, fuzzy
-msgid "Failed to store membership information!\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:271
-#, fuzzy
-msgid "Failed to test membership!\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:300
-#, fuzzy
-msgid "Dropping invalid fragment\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:311
-#, fuzzy
-msgid "Failed to store fragment\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:368
-#, fuzzy
-msgid "Failed to get fragment!\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:434
-#, fuzzy
-msgid "Failed to get message!\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:464
-#, fuzzy
-msgid "Failed to get message fragment!\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:494
-#, fuzzy
-msgid "Failed to get master counters!\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:675
-#, fuzzy, c-format
-msgid "Failed to begin modifying state: %d\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:685
-#, fuzzy, c-format
-msgid "Failed to modify state: %d\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:693
-#, fuzzy
-msgid "Failed to end modifying state!\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:730
-#, fuzzy
-msgid "Tried to set invalid state variable name!\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:744
-#, fuzzy
-msgid "Failed to begin synchronizing state!\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:761
-#, fuzzy
-msgid "Failed to end synchronizing state!\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:779
-#: src/psycstore/gnunet-service-psycstore.c:795
-#, fuzzy
-msgid "Failed to reset state!\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:824
-#: src/psycstore/gnunet-service-psycstore.c:881
-#, fuzzy
-msgid "Tried to get invalid state variable name!\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:851
-#: src/psycstore/gnunet-service-psycstore.c:896
-#, fuzzy
-msgid "Failed to get state variable!\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/psycstore/plugin_psycstore_mysql.c:281
-#, fuzzy
-msgid "Unable to initialize Mysql.\n"
-msgstr "Không thể sơ khởi SQLite: %s.\n"
-
-#: src/psycstore/plugin_psycstore_mysql.c:291
-#, fuzzy, c-format
-msgid "Failed to run SQL statement `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:61
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s (%d)\n"
-msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:1924
-#, fuzzy
-msgid "SQLite database running\n"
-msgstr "kho dữ liệu sqlite"
-
 #: src/pt/gnunet-daemon-pt.c:423
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
@@ -6051,61 +5961,80 @@ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:467
+#: src/reclaim/gnunet-reclaim.c:495
 #, fuzzy, c-format
 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/reclaim/gnunet-reclaim.c:475
+#: src/reclaim/gnunet-reclaim.c:501
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:483
+#: src/reclaim/gnunet-reclaim.c:507
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "đặt tên hiệu cần dùng (cần thiết)"
 
-#: src/reclaim/gnunet-reclaim.c:506
-msgid "Add attribute"
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "Add an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:512
-msgid "Attribute value"
+#: src/reclaim/gnunet-reclaim.c:527
+msgid "Add an attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:517
-msgid "Ego"
+#: src/reclaim/gnunet-reclaim.c:530
+msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:522
-msgid "Audience (relying party)"
+#: src/reclaim/gnunet-reclaim.c:533
+#, fuzzy
+msgid "The EGO to use"
+msgstr "kích cỡ tin nhắn"
+
+#: src/reclaim/gnunet-reclaim.c:535
+msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:526
-msgid "List attributes for Ego"
+#: src/reclaim/gnunet-reclaim.c:538
+msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:531
-msgid "Issue a ticket"
+#: src/reclaim/gnunet-reclaim.c:542
+msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:536
+#: src/reclaim/gnunet-reclaim.c:545
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:541
+#: src/reclaim/gnunet-reclaim.c:548
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:546
+#: src/reclaim/gnunet-reclaim.c:551
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:551
+#: src/reclaim/gnunet-reclaim.c:553
+msgid "List tickets of ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:556
 msgid "Expiration interval of the attribute"
 msgstr ""
 
+#: src/reclaim/gnunet-reclaim.c:560
+msgid "re:claimID command line tool"
+msgstr ""
+
+#: src/reclaim/plugin_rest_openid_connect.c:2051
+#: src/reclaim/plugin_rest_reclaim.c:1018
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
 #: src/reclaim/reclaim_api.c:436
 #, fuzzy
 msgid "failed to store record\n"
@@ -6200,51 +6129,20 @@ msgstr "« %s » không phải là một tập tin.\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/rest-plugins/plugin_rest_copying.c:209
-#, fuzzy
-msgid "COPYING REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/rest-plugins/plugin_rest_credential.c:1128
-#, fuzzy
-msgid "GNS REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/rest-plugins/plugin_rest_gns.c:452
-#, fuzzy
-msgid "Gns REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/rest-plugins/plugin_rest_identity.c:1297
-#, fuzzy
-msgid "Identity REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/rest-plugins/plugin_rest_namestore.c:1079
-#, fuzzy
-msgid "Namestore REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/rest-plugins/plugin_rest_openid_connect.c:2245
-#: src/rest-plugins/plugin_rest_reclaim.c:1079
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/rest-plugins/plugin_rest_peerinfo.c:796
-#, fuzzy
-msgid "Peerinfo REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/rest/gnunet-rest-server.c:927
+#: src/rest/gnunet-rest-server.c:986
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:944
+#: src/rest/gnunet-rest-server.c:1003
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Bản ghi lỗi GNUnet"
 
+#: src/rest/plugin_rest_copying.c:209
+#, fuzzy
+msgid "COPYING REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
 #: src/revocation/gnunet-revocation.c:129
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
@@ -6306,7 +6204,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
+#: src/revocation/gnunet-revocation.c:437
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
@@ -6383,37 +6281,37 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/rps/gnunet-rps-profiler.c:2959
+#: src/rps/gnunet-rps.c:260
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:264
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:268
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:3088
 msgid "duration of the profiling"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2965
+#: src/rps/gnunet-rps-profiler.c:3093
 #, fuzzy
 msgid "timeout for the profiling"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/rps/gnunet-rps-profiler.c:2971
+#: src/rps/gnunet-rps-profiler.c:3098
 #, fuzzy
 msgid "number of PeerIDs to request"
 msgstr "số lần lặp lại"
 
-#: src/rps/gnunet-rps-profiler.c:2986
+#: src/rps/gnunet-rps-profiler.c:3114
 #, fuzzy
 msgid "Measure quality and performance of the RPS service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/rps/gnunet-rps.c:260
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:264
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:268
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/scalarproduct/gnunet-scalarproduct.c:220
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6469,10 +6367,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"
@@ -6497,7 +6395,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2005
+#: src/set/gnunet-service-set.c:2008
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -6544,132 +6442,6 @@ msgstr ""
 msgid "element size"
 msgstr ""
 
-#: src/social/gnunet-social.c:1166
-#, fuzzy
-msgid "--place missing or invalid.\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/social/gnunet-social.c:1217
-msgid "assign --name in state to --data"
-msgstr ""
-
-#: src/social/gnunet-social.c:1222
-msgid "say good-bye and leave somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1227
-msgid "create a place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1232
-msgid "destroy a place we were hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1237
-msgid "enter somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1243
-msgid "find state matching name prefix"
-msgstr ""
-
-#: src/social/gnunet-social.c:1248
-msgid "replay history of messages up to the given --limit"
-msgstr ""
-
-#: src/social/gnunet-social.c:1253
-msgid "reconnect to a previously created place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1258
-msgid "publish something to a place we are hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1263
-msgid "reconnect to a previously entered place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1268
-msgid "search for state matching exact name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1273
-msgid "submit something to somebody's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1278
-msgid "list of egos and subscribed places"
-msgstr ""
-
-#: src/social/gnunet-social.c:1283
-msgid "extract and replay history between message IDs --start and --until"
-msgstr ""
-
-#: src/social/gnunet-social.c:1292
-msgid "application ID to use when connecting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1298
-msgid "message body or state value"
-msgstr ""
-
-#: src/social/gnunet-social.c:1304
-#, fuzzy
-msgid "name or public key of ego"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/social/gnunet-social.c:1309
-#, fuzzy
-msgid "wait for incoming messages"
-msgstr "Lỗi gửi tin nhẳn.\n"
-
-#: src/social/gnunet-social.c:1315
-msgid "GNS name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1321
-msgid "peer ID for --guest-enter"
-msgstr ""
-
-#: src/social/gnunet-social.c:1327
-msgid "name (key) to query from state"
-msgstr ""
-
-#: src/social/gnunet-social.c:1333
-msgid "method name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1339
-#, fuzzy
-msgid "number of messages to replay from history"
-msgstr "số tin nhắn cần dùng mỗi lần lặp"
-
-#: src/social/gnunet-social.c:1345
-msgid "key address of place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1351
-msgid "start message ID for history replay"
-msgstr ""
-
-#: src/social/gnunet-social.c:1356
-msgid "respond to entry requests by admitting all guests"
-msgstr ""
-
-#: src/social/gnunet-social.c:1362
-msgid "end message ID for history replay"
-msgstr ""
-
-#: src/social/gnunet-social.c:1367
-msgid "respond to entry requests by refusing all guests"
-msgstr ""
-
-#: src/social/gnunet-social.c:1377
-msgid ""
-"gnunet-social - Interact with the social service: enter/leave, send/receive "
-"messages, access history and state.\n"
-msgstr ""
-
 #: src/sq/sq.c:54
 #, c-format
 msgid "Failure to bind %u-th SQL parameter\n"
@@ -6833,7 +6605,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
 #: src/testbed/generate-underlay-topology.c:342
-#: src/testbed/gnunet-testbed-profiler.c:283
+#: src/testbed/gnunet-testbed-profiler.c:282
 msgid "create COUNT number of peers"
 msgstr ""
 
@@ -6942,17 +6714,6 @@ msgstr "« %s » đang tắt.\n"
 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"
@@ -6963,6 +6724,17 @@ msgstr "Đang đợi các đồng đẳng kết nối"
 msgid "Spawning process `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
+#: src/testbed/gnunet-testbed-profiler.c:287
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:291
+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"
@@ -7139,48 +6911,48 @@ msgstr ""
 msgid "Key number %u does not exist\n"
 msgstr "đặt số trình nền cần khởi chạy"
 
-#: src/testing/testing.c:1159
+#: src/testing/testing.c:1161
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1168
+#: src/testing/testing.c:1170
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/testing/testing.c:1178
+#: src/testing/testing.c:1180
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1191
+#: src/testing/testing.c:1193
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/testing/testing.c:1205
+#: src/testing/testing.c:1207
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/testing.c:1217
+#: src/testing/testing.c:1219
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/testing/testing.c:1242
+#: src/testing/testing.c:1244
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/testing/testing.c:1344
+#: src/testing/testing.c:1346
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1649
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -7265,19 +7037,19 @@ msgstr "# các thông báo PONG đã mật mã được nhận"
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2329
-#: src/transport/gnunet-communicator-udp.c:2883
-#: src/transport/gnunet-service-tng.c:4679
-#: src/transport/gnunet-service-transport.c:2782
+#: src/transport/gnunet-communicator-tcp.c:2334
+#: src/transport/gnunet-communicator-udp.c:2938
+#: src/transport/gnunet-service-tng.c:7070
+#: src/transport/gnunet-service-transport.c:2795
 #, fuzzy
 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-communicator-tcp.c:2393
+#: src/transport/gnunet-communicator-tcp.c:2398
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2954
+#: src/transport/gnunet-communicator-udp.c:3016
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7287,64 +7059,64 @@ msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/transport/gnunet-communicator-unix.c:1073
+#: src/transport/gnunet-communicator-unix.c:1074
 #: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/gnunet-communicator-unix.c:1162
+#: src/transport/gnunet-communicator-unix.c:1163
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:448
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:452
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport.c:817
+#: src/transport/gnunet-service-transport.c:826
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1550
+#: src/transport/gnunet-service-transport.c:1563
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/transport/gnunet-service-transport.c:1710
+#: src/transport/gnunet-service-transport.c:1723
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/transport/gnunet-service-transport.c:1807
+#: src/transport/gnunet-service-transport.c:1820
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:2124
-#: src/transport/gnunet-service-transport.c:2596
+#: src/transport/gnunet-service-transport.c:2137
+#: src/transport/gnunet-service-transport.c:2609
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2600
+#: src/transport/gnunet-service-transport.c:2613
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport.c:2708
+#: src/transport/gnunet-service-transport.c:2721
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-service-transport.c:2717
+#: src/transport/gnunet-service-transport.c:2730
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\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 ""
@@ -7354,215 +7126,215 @@ msgstr ""
 msgid "# session creation failed"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1052
+#: src/transport/gnunet-service-transport_neighbours.c:1053
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1175
+#: src/transport/gnunet-service-transport_neighbours.c:1176
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1323
-#: src/transport/gnunet-service-transport_neighbours.c:1784
+#: src/transport/gnunet-service-transport_neighbours.c:1324
+#: src/transport/gnunet-service-transport_neighbours.c:1785
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1328
+#: src/transport/gnunet-service-transport_neighbours.c:1329
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1334
+#: src/transport/gnunet-service-transport_neighbours.c:1335
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1394
+#: src/transport/gnunet-service-transport_neighbours.c:1395
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1478
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1514
+#: src/transport/gnunet-service-transport_neighbours.c:1515
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1522
+#: src/transport/gnunet-service-transport_neighbours.c:1523
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1532
+#: src/transport/gnunet-service-transport_neighbours.c:1533
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1577
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1586
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1595
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1603
+#: src/transport/gnunet-service-transport_neighbours.c:1604
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1608
+#: src/transport/gnunet-service-transport_neighbours.c:1609
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1614
+#: src/transport/gnunet-service-transport_neighbours.c:1615
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1681
+#: src/transport/gnunet-service-transport_neighbours.c:1682
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1715
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "theo dõi gnunetd sử dụng dải thông"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1730
+#: src/transport/gnunet-service-transport_neighbours.c:1731
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1853
+#: src/transport/gnunet-service-transport_neighbours.c:1854
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1873
+#: src/transport/gnunet-service-transport_neighbours.c:1874
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1913
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1929
+#: src/transport/gnunet-service-transport_neighbours.c:1930
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1959
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2027
+#: src/transport/gnunet-service-transport_neighbours.c:2028
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2081
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2098
+#: src/transport/gnunet-service-transport_neighbours.c:2099
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2261
+#: src/transport/gnunet-service-transport_neighbours.c:2262
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2266
+#: src/transport/gnunet-service-transport_neighbours.c:2267
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2653
+#: src/transport/gnunet-service-transport_neighbours.c:2654
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3139
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3146
+#: src/transport/gnunet-service-transport_neighbours.c:3147
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3165
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3200
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3225
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3238
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3411
+#: src/transport/gnunet-service-transport_neighbours.c:3412
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3447
+#: src/transport/gnunet-service-transport_neighbours.c:3448
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# các thông báo PONG đã mật mã được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3535
+#: src/transport/gnunet-service-transport_neighbours.c:3536
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3543
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3583
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3589
+#: src/transport/gnunet-service-transport_neighbours.c:3590
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3600
+#: src/transport/gnunet-service-transport_neighbours.c:3601
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3735
+#: src/transport/gnunet-service-transport_neighbours.c:3736
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
@@ -7598,7 +7370,7 @@ msgstr ""
 #: src/transport/gnunet-service-transport_validation.c:491
 #: src/transport/gnunet-service-transport_validation.c:677
 #: src/transport/gnunet-service-transport_validation.c:997
-#: src/transport/gnunet-service-transport_validation.c:1609
+#: src/transport/gnunet-service-transport_validation.c:1610
 #, fuzzy
 msgid "# validations running"
 msgstr "kho dữ liệu sqlite"
@@ -7624,105 +7396,65 @@ msgstr ""
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1123
+#: src/transport/gnunet-service-transport_validation.c:1124
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_validation.c:1174
+#: src/transport/gnunet-service-transport_validation.c:1175
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1187
+#: src/transport/gnunet-service-transport_validation.c:1188
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1190
+#: src/transport/gnunet-service-transport_validation.c:1191
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1198
+#: src/transport/gnunet-service-transport_validation.c:1199
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1211
+#: src/transport/gnunet-service-transport_validation.c:1212
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1266
+#: src/transport/gnunet-service-transport_validation.c:1267
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1317
-msgid "# PONGs unicast via reliable transport"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1326
-msgid "# PONGs multicast to all available addresses"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1499
-msgid "# PONGs dropped, no matching pending validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1517
-msgid "# PONGs dropped, signature expired"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1572
-msgid "# validations succeeded"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1627
-#, fuzzy
-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"
+#: src/transport/gnunet-service-transport_validation.c:1318
+msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
+#: src/transport/gnunet-service-transport_validation.c:1327
+msgid "# PONGs multicast to all available addresses"
 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-service-transport_validation.c:1500
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:636
-#, fuzzy
-msgid "message size to use"
-msgstr "kích cỡ tin nhắn"
+#: src/transport/gnunet-service-transport_validation.c:1518
+msgid "# PONGs dropped, signature expired"
+msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:641
-#: src/transport/gnunet-transport.c:1462
-msgid "peer identity"
+#: src/transport/gnunet-service-transport_validation.c:1573
+msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:652
-#: src/transport/gnunet-transport.c:1482
+#: src/transport/gnunet-service-transport_validation.c:1628
 #, fuzzy
-msgid "Direct access to transport service."
-msgstr "Lỗi kết nối đến gnunetd.\n"
+msgid "# HELLOs given to peerinfo"
+msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
 #: src/transport/gnunet-transport.c:413
 #, fuzzy, c-format
@@ -7863,6 +7595,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 ""
@@ -7871,13 +7608,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 "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:3530
-#: src/transport/plugin_transport_tcp.c:3895
-#: src/transport/plugin_transport_tcp.c:3902
-#: src/transport/plugin_transport_xt.c:3899
-#: src/transport/plugin_transport_xt.c:3906
+#: src/transport/plugin_transport_tcp.c:3901
+#: src/transport/plugin_transport_tcp.c:3908
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7948,7 +7718,6 @@ msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2905
 #: src/transport/plugin_transport_udp.c:3627
-#: src/transport/plugin_transport_xu.c:2049
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -8050,134 +7819,123 @@ msgstr "# các byte đã gửi qua SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1551
-#: src/transport/plugin_transport_tcp.c:2877
-#: src/transport/plugin_transport_xt.c:1553
-#: src/transport/plugin_transport_xt.c:2879
+#: src/transport/plugin_transport_tcp.c:1557
+#: src/transport/plugin_transport_tcp.c:2883
 #, fuzzy, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:1734
-#: src/transport/plugin_transport_tcp.c:1958
-#: src/transport/plugin_transport_tcp.c:3141
-#: src/transport/plugin_transport_tcp.c:4018
-#: src/transport/plugin_transport_xt.c:1736
-#: src/transport/plugin_transport_xt.c:1960
-#: src/transport/plugin_transport_xt.c:3143
+#: src/transport/plugin_transport_tcp.c:1740
+#: src/transport/plugin_transport_tcp.c:1964
+#: src/transport/plugin_transport_tcp.c:3147
+#: src/transport/plugin_transport_tcp.c:4024
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:1776
-#: src/transport/plugin_transport_tcp.c:1940
-#: src/transport/plugin_transport_tcp.c:2064
-#: src/transport/plugin_transport_tcp.c:2137
-#: src/transport/plugin_transport_tcp.c:2237
-#: src/transport/plugin_transport_tcp.c:2262
-#: 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
+#: src/transport/plugin_transport_tcp.c:1782
+#: src/transport/plugin_transport_tcp.c:1946
+#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2143
+#: src/transport/plugin_transport_tcp.c:2243
+#: src/transport/plugin_transport_tcp.c:2268
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:1779
-#: src/transport/plugin_transport_xt.c:1781
+#: src/transport/plugin_transport_tcp.c:1785
 #, 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:2067
-#: src/transport/plugin_transport_xt.c:2069
+#: src/transport/plugin_transport_tcp.c:2073
 #, 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:2141
-#: src/transport/plugin_transport_xt.c:2143
+#: src/transport/plugin_transport_tcp.c:2147
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:2539
-#: src/transport/plugin_transport_xt.c:2541
+#: src/transport/plugin_transport_tcp.c:2545
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2715
-#: src/transport/plugin_transport_xt.c:2717
+#: src/transport/plugin_transport_tcp.c:2721
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3207
-#: src/transport/plugin_transport_xt.c:3209
+#: src/transport/plugin_transport_tcp.c:3213
 #, 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:3413
-#: src/transport/plugin_transport_xt.c:3415
+#: src/transport/plugin_transport_tcp.c:3419
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:3464
-#: src/transport/plugin_transport_tcp.c:3522
-#: src/transport/plugin_transport_xt.c:3466
-#: src/transport/plugin_transport_xt.c:3524
+#: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_tcp.c:3528
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# các kết nối dht"
 
-#: src/transport/plugin_transport_tcp.c:3468
-#: src/transport/plugin_transport_xt.c:3470
+#: src/transport/plugin_transport_tcp.c:3474
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/plugin_transport_tcp.c:3474
-#: src/transport/plugin_transport_xt.c:3476
+#: src/transport/plugin_transport_tcp.c:3480
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3476
-#: src/transport/plugin_transport_xt.c:3478
+#: src/transport/plugin_transport_tcp.c:3482
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3516
-#: src/transport/plugin_transport_xt.c:3518
+#: src/transport/plugin_transport_tcp.c:3522
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3526
-#: src/transport/plugin_transport_xt.c:3528
+#: src/transport/plugin_transport_tcp.c:3532
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3845
-#: src/transport/plugin_transport_xt.c:3849
+#: src/transport/plugin_transport_tcp.c:3851
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:4006
+#: src/transport/plugin_transport_tcp.c:4012
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4010
+#: src/transport/plugin_transport_tcp.c:4016
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4014
+#: src/transport/plugin_transport_tcp.c:4020
 #, c-format
 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:3371
 #, c-format
 msgid ""
@@ -8198,7 +7956,6 @@ 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:3721
-#: src/transport/plugin_transport_xu.c:2143
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
@@ -8209,19 +7966,15 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
 #: src/transport/plugin_transport_udp.c:3883
 #: src/transport/plugin_transport_udp.c:3897
-#: 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:3929
-#: 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:3956
-#: src/transport/plugin_transport_xu.c:2374
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
@@ -8231,21 +7984,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:1416
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
@@ -8323,54 +8061,6 @@ 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"
@@ -8381,17 +8071,17 @@ msgstr "Không đủ quyền cho « %s ».\n"
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1624
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1634
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127
+#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1640
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
@@ -8403,7 +8093,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2396
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:864
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
@@ -8413,27 +8103,27 @@ msgstr "\tKhông rõ miền tên « %s »\n"
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:988
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:1031
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1555
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:953
-#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1195
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1708
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1228
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1741
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8448,44 +8138,44 @@ msgstr "Lỗi chạy %s: %s %d\n"
 msgid "Service `%s' runs at %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
 
-#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1502
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:2015
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1506
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:2019
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1510
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:2023
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1525
-#: src/util/service.c:1380
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1535
+#: src/util/service.c:1893
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1382
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1895
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1401
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1914
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1762
+#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:2276
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:1826
-#: src/util/service.c:1841
+#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:2340
+#: src/util/service.c:2355
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:1853
+#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:2367
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -8528,11 +8218,11 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:734
+#: src/util/client.c:749
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:925
+#: src/util/client.c:941
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8579,17 +8269,17 @@ msgstr ""
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1500
+#: src/util/common_logging.c:1513
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1518
+#: src/util/common_logging.c:1531
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/util/common_logging.c:1539
+#: src/util/common_logging.c:1552
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8640,26 +8330,26 @@ msgstr ""
 #: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have %"
-"llu)\n"
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:862
+#: src/util/crypto_ecc.c:887
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_ecc.c:917
+#: src/util/crypto_ecc.c:946
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_ecc.c:996
+#: src/util/crypto_ecc.c:1025
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:1057
+#: src/util/crypto_ecc.c:1086
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
@@ -8709,17 +8399,17 @@ msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/disk.c:1255
+#: src/util/disk.c:1265
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/util/dnsparser.c:260
+#: src/util/dnsparser.c:264
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/dnsparser.c:950
+#: src/util/dnsparser.c:954
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -8826,7 +8516,7 @@ msgstr ""
 msgid "print this help"
 msgstr "hiển thị trợ giúp này"
 
-#: src/util/getopt_helpers.c:282
+#: src/util/getopt_helpers.c:282 src/util/gnunet-qr.c:300
 msgid "be verbose"
 msgstr "xuất chi tiết"
 
@@ -8875,52 +8565,52 @@ msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:160
+#: src/util/gnunet-config.c:161
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/gnunet-config.c:173
+#: src/util/gnunet-config.c:174
 #, fuzzy, c-format
 msgid "%s or %s argument is required\n"
 msgstr "đặt tên hiệu cần dùng (cần thiết)"
 
-#: src/util/gnunet-config.c:181
+#: src/util/gnunet-config.c:182
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:232
+#: src/util/gnunet-config.c:234
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:286
-msgid "obtain option of value as a filename (with $-expansion)"
+#: src/util/gnunet-config.c:288
+msgid "interpret option value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:291
+#: src/util/gnunet-config.c:293
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:296
+#: src/util/gnunet-config.c:298
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:301
+#: src/util/gnunet-config.c:303
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:305
+#: src/util/gnunet-config.c:307
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/util/gnunet-config.c:309
+#: src/util/gnunet-config.c:311
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:322
+#: src/util/gnunet-config.c:324
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -9013,6 +8703,33 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
+#: src/util/gnunet-qr.c:108 src/util/gnunet-uri.c:91
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
+
+#: src/util/gnunet-qr.c:116 src/util/gnunet-uri.c:98
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:127 src/util/gnunet-uri.c:108
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:297
+msgid "use video-device DEVICE (default: /dev/video0"
+msgstr ""
+
+#: src/util/gnunet-qr.c:303
+msgid "do not show preview windows"
+msgstr ""
+
+#: src/util/gnunet-qr.c:311
+msgid "Scan a QR code using a video device and import the uri read"
+msgstr ""
+
 #: src/util/gnunet-resolver.c:168
 msgid "perform a reverse lookup"
 msgstr ""
@@ -9047,7 +8764,7 @@ msgstr ""
 msgid "Manipulate GNUnet proof of work files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/gnunet-service-resolver.c:1443
+#: src/util/gnunet-service-resolver.c:1424
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
@@ -9056,21 +8773,6 @@ msgstr ""
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:91
-#, fuzzy, c-format
-msgid "Invalid URI: does not start with `%s'\n"
-msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
-
-#: src/util/gnunet-uri.c:98
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:108
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
-msgstr ""
-
 #: src/util/gnunet-uri.c:170
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
@@ -9090,12 +8792,12 @@ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/network.c:136
+#: src/util/network.c:176
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1795 src/util/network.c:1979
+#: src/util/network.c:1835 src/util/network.c:2019
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9201,18 +8903,18 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/service.c:1307
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
-msgstr ""
-
-#: src/util/service.c:2141
+#: src/util/service.c:668
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
+#: src/util/service.c:1820
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
 #: src/util/signal.c:89
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
@@ -9345,12 +9047,12 @@ msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/time.c:828 src/util/time.c:860
+#: src/util/time.c:844 src/util/time.c:876
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:866
+#: src/util/time.c:882
 #, c-format
 msgid ""
 "Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
@@ -9534,80 +9236,156 @@ 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."
 
-#: src/include/gnunet_common.h:772 src/include/gnunet_common.h:779
-#: src/include/gnunet_common.h:789
+#: src/include/gnunet_common.h:794 src/include/gnunet_common.h:801
+#: src/include/gnunet_common.h:811
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d. Aborting.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:797
+#: src/include/gnunet_common.h:819
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:809
+#: src/include/gnunet_common.h:831
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:836 src/include/gnunet_common.h:845
+#: src/include/gnunet_common.h:858 src/include/gnunet_common.h:867
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
-#~ msgid "Can not index file `%s': %s.\n"
-#~ msgstr "Không thể mở tập tin « %s »: « %s »"
+#~ msgid "Unable to parse CRED record string `%s'\n"
+#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#, fuzzy
+#~ msgid "# XT sessions active"
+#~ msgstr "# các khoá phiên chạy được chấp nhận"
 
 #, fuzzy
-#~ msgid "enable adding the creation time to the metadata of the uploaded file"
-#~ msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
+#~ msgid "Failed to bind XU socket to %s: %s\n"
+#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
 #, fuzzy
-#~ msgid "`%s' is not a valid domain name\n"
-#~ msgstr "« %s » không sẵn sàng.\n"
+#~ msgid "Failed to open XU sockets\n"
+#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
 #, fuzzy
-#~ msgid "Specify a timeout for the lookup"
-#~ msgstr "xác định mức ưu tiên của nội dung"
+#~ msgid "Failed to create XU network sockets\n"
+#~ msgstr "Không thể tạo miền tên.\n"
+
+#, fuzzy
+#~ msgid "Print information about DV state"
+#~ msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
 #, fuzzy
-#~ msgid "Unable to parse CAA record string `%s'\n"
+#~ msgid "Invalid tunnel owner `%s'\n"
+#~ msgstr "Địa chỉ IP định dạng sai: %s\n"
+
+#, fuzzy
+#~ msgid "Provide information about a particular tunnel"
+#~ msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#, fuzzy
+#~ msgid "Failed to store membership information!\n"
+#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to test membership!\n"
+#~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#, fuzzy
+#~ msgid "Dropping invalid fragment\n"
+#~ msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#, fuzzy
+#~ msgid "Failed to store fragment\n"
+#~ msgstr "Lỗi bắt đầu thu thập.\n"
+
+#, fuzzy
+#~ msgid "Failed to get fragment!\n"
+#~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#, fuzzy
+#~ msgid "Failed to get message!\n"
+#~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#, fuzzy
+#~ msgid "Failed to get message fragment!\n"
 #~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
 #, fuzzy
-#~ msgid "display private keys as well"
-#~ msgstr "hiển thị giá trị tổng kiểm của tập tin"
+#~ msgid "Failed to get master counters!\n"
+#~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
 #, fuzzy
-#~ msgid "The EGO to use"
-#~ msgstr "kích cỡ tin nhắn"
+#~ msgid "Failed to begin modifying state: %d\n"
+#~ msgstr "Lỗi bắt đầu thu thập.\n"
+
+#, fuzzy
+#~ msgid "Failed to modify state: %d\n"
+#~ msgstr "Lỗi bắt đầu thu thập.\n"
 
 #, fuzzy
-#~ msgid "OpenID Connect REST API initialized\n"
-#~ msgstr "Lỗi sơ khởi lõi.\n"
+#~ msgid "Failed to end modifying state!\n"
+#~ msgstr "Lỗi bắt đầu thu thập.\n"
 
 #, fuzzy
-#~ msgid "CONFIG REST API initialized\n"
-#~ msgstr "Lỗi sơ khởi lõi.\n"
+#~ msgid "Failed to begin synchronizing state!\n"
+#~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
 #, fuzzy
-#~ msgid "Option `%s' can't be used with other options.\n"
-#~ msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
+#~ msgid "Failed to end synchronizing state!\n"
+#~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
 #, fuzzy
-#~ msgid "Invalid tunnel owner `%s'\n"
-#~ msgstr "Địa chỉ IP định dạng sai: %s\n"
+#~ msgid "Failed to reset state!\n"
+#~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
 #, fuzzy
-#~ msgid "Provide information about a particular tunnel"
-#~ msgstr "In ra thông tin về các đồng đẳng GNUnet."
+#~ msgid "Failed to get state variable!\n"
+#~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Mysql.\n"
+#~ msgstr "Không thể sơ khởi SQLite: %s.\n"
+
+#, fuzzy
+#~ msgid "Failed to run SQL statement `%s'\n"
+#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#, fuzzy
+#~ msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+#~ msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
+
+#, fuzzy
+#~ msgid "SQLite database running\n"
+#~ msgstr "kho dữ liệu sqlite"
+
+#, fuzzy
+#~ msgid "--place missing or invalid.\n"
+#~ msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#, fuzzy
+#~ msgid "name or public key of ego"
+#~ msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#, fuzzy
+#~ msgid "wait for incoming messages"
+#~ msgstr "Lỗi gửi tin nhẳn.\n"
+
+#, fuzzy
+#~ msgid "number of messages to replay from history"
+#~ msgstr "số tin nhắn cần dùng mỗi lần lặp"
 
 #~ msgid "Could not resolve `%s' (%s): %s\n"
 #~ msgstr "Không thể giải quyết « %s » (%s): %s\n"
@@ -10505,8 +10283,8 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 
 #, fuzzy
 #~ msgid ""
-#~ "%s service is lacking key configuration settings (%s). Using default (%"
-#~ "u).\n"
+#~ "%s service is lacking key configuration settings (%s). Using default "
+#~ "(%u).\n"
 #~ msgstr "Lưu cấu hình ngay bây giờ không?"
 
 #, fuzzy
@@ -10556,8 +10334,8 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 
 #, fuzzy
 #~ msgid ""
-#~ "Syntax error in topology specification at offset %llu, skipping bytes `%"
-#~ "s'.\n"
+#~ "Syntax error in topology specification at offset %llu, skipping bytes `"
+#~ "%s'.\n"
 #~ msgstr ""
 #~ "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
@@ -10911,8 +10689,8 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 
 #, fuzzy
 #~ msgid ""
-#~ "(%s) `%s' was confirmed that you and only you received from him or her: %"
-#~ "s\n"
+#~ "(%s) `%s' was confirmed that you and only you received from him or her: "
+#~ "%s\n"
 #~ msgstr "« %s » xác nhận mà chỉ bạn đa nhận được từ họ : %s\n"
 
 #, fuzzy
@@ -11635,6 +11413,9 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 #~ msgid "install GNUnet as Windows service"
 #~ msgstr "cài đặt GNUnet như là một dịch vụ Windows"
 
+#~ msgid "display a file's hash value"
+#~ msgstr "hiển thị giá trị tổng kiểm của tập tin"
+
 #~ msgid "This version of Windows doesn't support services.\n"
 #~ msgstr "Phiên bản Windows này không hỗ trợ dịch vụ.\n"
 
@@ -11881,8 +11662,8 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 
 #~ msgid "No interface specified in section `%s' under `%s'!\n"
 #~ msgstr ""
-#~ "Không có giao diện mạng được xác định trong cấu hình phần « %s » dưới « %"
-#~ "s ».\n"
+#~ "Không có giao diện mạng được xác định trong cấu hình phần « %s » dưới « "
+#~ "%s ».\n"
 
 #~ msgid ""
 #~ "Could not find interface `%s' using `%s', trying to find another "
@@ -11933,8 +11714,8 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 #~ msgid ""
 #~ "No network interfaces defined in configuration section `%s' under `%s'!\n"
 #~ msgstr ""
-#~ "Không có giao diện mạng được xác định trong cấu hình phần « %s » dưới « %"
-#~ "s ».\n"
+#~ "Không có giao diện mạng được xác định trong cấu hình phần « %s » dưới « "
+#~ "%s ».\n"
 
 #~ msgid "Setting open descriptor limit not supported.\n"
 #~ msgstr "Không hỗ trợ chức năng đặt giới hạn bộ mô tả còn mở.\n"
@@ -12302,8 +12083,8 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 
 #~ msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 #~ msgstr ""
-#~ "Kiểm tra CRC setkey « %s » từ « %s » không thành công (có %u, còn muốn %"
-#~ "u).\n"
+#~ "Kiểm tra CRC setkey « %s » từ « %s » không thành công (có %u, còn muốn "
+#~ "%u).\n"
 
 #~ msgid ""
 #~ "Error parsing encrypted session key from `%s', given message part size is "
@@ -12446,8 +12227,8 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 #~ msgid ""
 #~ "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 #~ msgstr ""
-#~ "đã chèn %16llu trên %16llu byte (sẽ hoàn thành trong khoảng %6s giây) - %"
-#~ "s\n"
+#~ "đã chèn %16llu trên %16llu byte (sẽ hoàn thành trong khoảng %6s giây) - "
+#~ "%s\n"
 
 #~ msgid ""
 #~ "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
@@ -12598,8 +12379,8 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 #~ "`%s' registering client handlers %d %d %d %d %d %d %d %d and P2P handlers "
 #~ "%d %d\n"
 #~ msgstr ""
-#~ "« %s » đang đăng ký các trình điều khiển kiểu ứng dụng khách %d %d %d %d %"
-#~ "d %d %d %d và kiểu P2P %d %d\n"
+#~ "« %s » đang đăng ký các trình điều khiển kiểu ứng dụng khách %d %d %d %d "
+#~ "%d %d %d %d và kiểu P2P %d %d\n"
 
 #~ msgid "enables (anonymous) file-sharing"
 #~ msgstr "hiệu lực chia sẻ tập tin (nặc danh)"
@@ -13085,8 +12866,8 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 #~ "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
 #~ "each.\n"
 #~ msgstr ""
-#~ "« %s » truyền tải OK.  Cần %u miligiây để truyền đi %llu thông báo với %"
-#~ "llu byte mỗi cái.\n"
+#~ "« %s » truyền tải OK.  Cần %u miligiây để truyền đi %llu thông báo với "
+#~ "%llu byte mỗi cái.\n"
 
 #~ msgid " Transport %d is not being tested\n"
 #~ msgstr " Truyền tải %d không đang thử\n"
@@ -13139,8 +12920,8 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 
 #~ msgid "%s failed for url `%s' and post-data `%s' at %s:%d: `%s'\n"
 #~ msgstr ""
-#~ "%s bị lỗi đối với địa chỉ URL « %s » và dữ liệu cuối « %s » tại %s:%d: « %"
-#~ "s »\n"
+#~ "%s bị lỗi đối với địa chỉ URL « %s » và dữ liệu cuối « %s » tại %s:%d: « "
+#~ "%s »\n"
 
 #~ msgid "upnp: NAT Returned IP: %s\n"
 #~ msgstr "upnp: địa chỉ IP được NAT trả về: %s\n"
@@ -14325,8 +14106,8 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 #~ "insert sử dụng libextractor để trích các từ khoá khỏi tập tin. "
 #~ "libextractor cũng có thể mở rộng động để quản lý định dạng tập tin bổ "
 #~ "sung. Muốn sử dụng bộ trích bên ngoài tập hợp mặc định thì ghi rõ ở đây "
-#~ "những thư viện trích bổ sung. Định dạng là « [[-]tên_thư_viện[:[-]"
-#~ "tên_thư_viện]*] ».\n"
+#~ "những thư viện trích bổ sung. Định dạng là « [[-]tên_thư_viện[:"
+#~ "[-]tên_thư_viện]*] ».\n"
 #~ "\n"
 #~ "Mặc định là dùng tên tập tin, và ngắt từ lớn ở dấu cách, dấu gạch dưới v."
 #~ "v. Đây nên ổn cho phần lớn người dùng. Dấu gạch nối « - » đằng trước một "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9a33b90d1..d592a836c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden\n"
-"POT-Creation-Date: 2019-02-09 22:07+0000\n"
+"POT-Creation-Date: 2019-09-04 12:56+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"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 
 #: src/arm/gnunet-arm.c:156
 #, fuzzy, c-format
@@ -221,8 +221,7 @@ msgid "Control services and the Automated Restart Manager 
(ARM)"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:388 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
+#: src/transport/tcp_service_legacy.c:557
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
@@ -231,36 +230,30 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3829
-#: src/transport/plugin_transport_xt.c:1139
-#: src/transport/plugin_transport_xt.c:1145
-#: src/transport/plugin_transport_xt.c:3833
+#: src/transport/plugin_transport_tcp.c:3835
 #: src/transport/tcp_service_legacy.c:576
-#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
-#: src/util/service.c:643
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1150
+#: src/util/service.c:1156
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:457 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
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
+#: src/util/service.c:1195
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:462 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
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
+#: src/util/service.c:1200
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s:选项“%s”有歧义\n"
 
 #: src/arm/gnunet-service-arm.c:495 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
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1236
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -268,8 +261,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:517 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
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1254
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -277,8 +269,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:556
 #: src/transport/plugin_transport_http_server.c:2688
 #: 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
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1295
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -286,8 +277,7 @@ msgstr "打开日志文件“%s”失败:%s\n"
 #: src/arm/gnunet-service-arm.c:575
 #: src/transport/plugin_transport_http_server.c:2706
 #: 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
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1315
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -359,15 +349,141 @@ 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-new.c:756
+#: src/ats/gnunet-service-ats_plugins.c:451
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "无法初始化 SQLite:%s。\n"
+
+#: 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/plugin_ats2_common.c:90
+#, c-format
+msgid ""
+"Could not load %s quota for network `%s': `%s', assigning default bandwidth "
+"%llu\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:1870
+#, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1914
+#, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2476
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
+#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
+#: src/ats/plugin_ats_mlp.c:2602 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:2671
+#, 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:2680
+#, 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:2690
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2699
+#, 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"
@@ -378,6 +494,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 ""
@@ -385,17 +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 ""
-
-#: 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"
@@ -517,132 +631,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-new.c:733
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "无法初始化 SQLite:%s。\n"
-
-#: 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/plugin_ats2_common.c:90
-#, c-format
-msgid ""
-"Could not load %s quota for network `%s': `%s', assigning default bandwidth %"
-"llu\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:1870
-#, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1914
-#, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2476
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
-#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
-#: src/ats/plugin_ats_mlp.c:2602 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:2671
-#, 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:2680
-#, 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:2690
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2699
-#, 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 ""
@@ -774,28 +762,6 @@ msgstr ""
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:120
-#, 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:216
-#, 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:277
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1052,8 +1018,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:120
+#, 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:216
+#, 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 ""
@@ -1351,7 +1339,7 @@ msgid "# valid ephemeral keys received"
 msgstr "保存配置失败。"
 
 #: src/core/gnunet-service-core_kx.c:1180
-#: src/transport/gnunet-service-transport_validation.c:1128
+#: src/transport/gnunet-service-transport_validation.c:1129
 msgid "# PING messages received"
 msgstr ""
 
@@ -1372,7 +1360,7 @@ msgid "# keepalive messages sent"
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1351
-#: src/transport/gnunet-service-transport_validation.c:1461
+#: src/transport/gnunet-service-transport_validation.c:1462
 msgid "# PONG messages received"
 msgstr ""
 
@@ -1466,129 +1454,148 @@ msgstr ""
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/credential/credential_misc.c:88
-#, fuzzy, c-format
-msgid "Unable to parse CRED record string `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:994
+#: src/credential/gnunet-credential.c:381 src/namestore/gnunet-namestore.c:994
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:280
-#: src/credential/gnunet-credential.c:434
+#: src/credential/gnunet-credential.c:397
+#: src/credential/gnunet-credential.c:859
 #, fuzzy, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/credential/gnunet-credential.c:361
-#: src/credential/gnunet-credential.c:423
+#: src/credential/gnunet-credential.c:532
+#: src/credential/gnunet-service-credential.c:1728
+#: src/namestore/gnunet-namestore.c:1019
+#: src/namestore/gnunet-namestore-fcfsd.c:1138
+#, fuzzy, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/credential/gnunet-credential.c:798
+#: src/credential/gnunet-credential.c:849
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/credential/gnunet-credential.c:372
-#: src/credential/gnunet-credential.c:444
+#: src/credential/gnunet-credential.c:807
+#: src/credential/gnunet-credential.c:868
 #, fuzzy, c-format
 msgid "Failed to connect to CREDENTIAL\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/credential/gnunet-credential.c:379
+#: src/credential/gnunet-credential.c:813
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:387
+#: src/credential/gnunet-credential.c:820
 #, c-format
 msgid "ego required\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:403
+#: src/credential/gnunet-credential.c:830
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:414
+#: src/credential/gnunet-credential.c:839
 #, fuzzy, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/credential/gnunet-credential.c:451
+#: src/credential/gnunet-credential.c:874
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:504
-#, c-format
-msgid "Issuer ego required\n"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:516
+#: src/credential/gnunet-credential.c:930
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:536
-msgid "create credential"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:540
+#: src/credential/gnunet-credential.c:951
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:545
-msgid "The public key of the subject to lookup the credential for"
+#: src/credential/gnunet-credential.c:958
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:550
-msgid "The name of the credential presented by the subject"
+#: src/credential/gnunet-credential.c:965
+msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:555
+#: src/credential/gnunet-credential.c:972
 msgid "The public key of the authority to verify the credential against"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:560
+#: src/credential/gnunet-credential.c:977
 #, fuzzy
-msgid "The ego to use"
+msgid "The ego/zone name to use"
 msgstr "消息尺寸"
 
-#: src/credential/gnunet-credential.c:565
+#: src/credential/gnunet-credential.c:983
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:570
-msgid "The time to live for the credential"
+#: src/credential/gnunet-credential.c:989
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/credential/gnunet-credential.c:574
+#: src/credential/gnunet-credential.c:994
 msgid "collect credentials"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:588
+#: src/credential/gnunet-credential.c:999
+msgid "Create and issue a credential issuer side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1004
+msgid "Issue a credential subject side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1009
+msgid "Create, sign and return a credential subject side."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1016
+msgid "Import signed credentials that should be issued to a zone/ego"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1020
+msgid "Create private record entry."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1026
+#: src/credential/gnunet-credential.c:1032
+msgid "Indicates that the collect/verify process is done via forward search."
+msgstr ""
+
+#: src/credential/gnunet-credential.c:1045
 #, fuzzy
 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:185
+#: src/credential/gnunet-service-credential.c:1723 src/gns/gnunet-gns.c:185
+#: 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:1138
-#: src/namestore/gnunet-namestore.c:1019
-#, fuzzy, c-format
-msgid "Failed to connect to namestore\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/credential/plugin_gnsrecord_credential.c:186
+#: src/credential/plugin_gnsrecord_credential.c:182
 #, fuzzy, c-format
 msgid "Unable to parse ATTR record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
+#: src/credential/plugin_rest_credential.c:1128
+msgid "GNS REST API initialized\n"
+msgstr ""
+
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:311
 #: src/datastore/gnunet-service-datastore.c:757
 msgid "# bytes stored"
@@ -1638,14 +1645,12 @@ msgstr "sqlite 数据仓库"
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_sqlite.c:53
 #: src/peerstore/plugin_peerstore_sqlite.c:52
-#: src/psycstore/plugin_psycstore_mysql.c:62
-#: src/reclaim/plugin_reclaim_sqlite.c:52
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:818 src/include/gnunet_common.h:827
+#: src/include/gnunet_common.h:840 src/include/gnunet_common.h:849
 #: src/scalarproduct/scalarproduct.h:35
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1655,7 +1660,6 @@ msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 #: src/datastore/plugin_datastore_sqlite.c:508
 #: src/namecache/plugin_namecache_sqlite.c:229
 #: src/namestore/plugin_namestore_sqlite.c:265
-#: src/reclaim/plugin_reclaim_sqlite.c:336
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1959,22 +1963,20 @@ msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
 #: src/datastore/plugin_datastore_mysql.c:1180
-#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:276
-#: src/datastore/plugin_datastore_postgres.c:893
+#: src/datastore/plugin_datastore_postgres.c:280
+#: src/datastore/plugin_datastore_postgres.c:897
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:854
+#: src/datastore/plugin_datastore_postgres.c:858
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "发送消息失败。\n"
 
-#: src/datastore/plugin_datastore_postgres.c:952
-#: src/psycstore/plugin_psycstore_postgres.c:1506
+#: src/datastore/plugin_datastore_postgres.c:956
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1990,8 +1992,6 @@ msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 #: src/namecache/plugin_namecache_sqlite.c:173
 #: src/namestore/plugin_namestore_sqlite.c:206
 #: src/peerstore/plugin_peerstore_sqlite.c:535
-#: src/psycstore/plugin_psycstore_sqlite.c:325
-#: src/reclaim/plugin_reclaim_sqlite.c:212
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite:%s。\n"
@@ -2013,8 +2013,7 @@ msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1405
 #: src/namecache/plugin_namecache_sqlite.c:557
-#: src/namestore/plugin_namestore_sqlite.c:750
-#: src/reclaim/plugin_reclaim_sqlite.c:711
+#: src/namestore/plugin_namestore_sqlite.c:751
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -2086,6 +2085,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 src/rps/gnunet-rps-profiler.c:3083
+#, 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:300
+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 ""
@@ -2331,54 +2378,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 src/rps/gnunet-rps-profiler.c:2953
-#, 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"
@@ -2464,11 +2463,6 @@ msgstr "无效的进程优先级“%s”\n"
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:175
-#, fuzzy
-msgid "Print information about DV state"
-msgstr "无法获取有关用户“%s”的信息:%s\n"
-
 #: src/exit/gnunet-daemon-exit.c:960
 msgid "# TCP packets sent via TUN"
 msgstr ""
@@ -2900,58 +2894,63 @@ msgstr ""
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
-#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
+#: src/fs/fs_publish.c:725
+#, fuzzy, c-format
+msgid "Can not index file `%s': %s.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/fs/fs_publish.c:782 src/fs/fs_publish.c:827 src/fs/fs_publish.c:848
+#: src/fs/fs_publish.c:878 src/fs/fs_publish.c:1144
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:780
+#: src/fs/fs_publish.c:784
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_publish.c:825
+#: src/fs/fs_publish.c:829
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:845
+#: src/fs/fs_publish.c:849
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:876
+#: src/fs/fs_publish.c:880
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:902
+#: src/fs/fs_publish.c:906
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
+#: src/fs/fs_publish.c:995 src/fs/fs_publish.c:1031
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1094
+#: src/fs/fs_publish.c:1098
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1102
+#: src/fs/fs_publish.c:1106
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1142
+#: src/fs/fs_publish.c:1146
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1381
+#: src/fs/fs_publish.c:1385
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/fs/fs_publish.c:1472
+#: src/fs/fs_publish.c:1476
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3022,93 +3021,93 @@ msgstr "打开日志文件“%s”失败:%s\n"
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:234
+#: src/fs/fs_uri.c:236
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:293
+#: src/fs/fs_uri.c:295
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:311
+#: src/fs/fs_uri.c:313
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:318
+#: src/fs/fs_uri.c:320
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:388
+#: src/fs/fs_uri.c:390
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:429
+#: src/fs/fs_uri.c:431
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:444
+#: src/fs/fs_uri.c:446
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:523
+#: src/fs/fs_uri.c:525
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:538
+#: src/fs/fs_uri.c:540
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:548
+#: src/fs/fs_uri.c:550
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:556
+#: src/fs/fs_uri.c:558
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:566
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:570
+#: src/fs/fs_uri.c:572
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:576
+#: src/fs/fs_uri.c:578
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:587
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:591
+#: src/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:609
+#: src/fs/fs_uri.c:611
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:645
 #, fuzzy
 msgid "invalid argument"
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_uri.c:655
+#: src/fs/fs_uri.c:657
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1092
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3148,11 +3147,11 @@ msgstr ""
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:907
+#: src/fs/gnunet-auto-share.c:772
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:907
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
@@ -3235,7 +3234,7 @@ msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:215 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3259,12 +3258,12 @@ msgid "Target filename must be specified.\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:872
-#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:273 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:312
+#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:315
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
@@ -3272,7 +3271,7 @@ msgstr ""
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:316
+#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3298,6 +3297,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 ""
@@ -3314,14 +3321,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"
@@ -3408,7 +3407,7 @@ msgstr ""
 
 #: src/fs/gnunet-publish.c:687
 #, fuzzy
-msgid "Internal error scanning directory.\n"
+msgid "Error scanning directory.\n"
 msgstr "未知错误。\n"
 
 #: src/fs/gnunet-publish.c:715
@@ -3453,6 +3452,10 @@ msgstr ""
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
+#: src/fs/gnunet-publish.c:911
+msgid "enable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
 #: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
@@ -3511,32 +3514,32 @@ msgstr ""
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:204
+#: src/fs/gnunet-search.c:207
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-search.c:260
+#: src/fs/gnunet-search.c:263
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:284
+#: src/fs/gnunet-search.c:287
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:321
+#: src/fs/gnunet-search.c:324
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:329
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:332
+#: src/fs/gnunet-search.c:335
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:348
+#: src/fs/gnunet-search.c:351
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -3924,39 +3927,39 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:203
+#: src/gns/gnunet-dns2gns.c:214
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-dns2gns.c:405
+#: src/gns/gnunet-dns2gns.c:416
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:421
+#: src/gns/gnunet-dns2gns.c:432
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:429
+#: src/gns/gnunet-dns2gns.c:440
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:588
+#: src/gns/gnunet-dns2gns.c:600
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:688
+#: src/gns/gnunet-dns2gns.c:748
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:693
+#: src/gns/gnunet-dns2gns.c:753
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:710
+#: src/gns/gnunet-dns2gns.c:770
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3972,6 +3975,28 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:199
+#, 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 ""
@@ -4006,129 +4031,107 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:980
+#: src/gns/gnunet-gns-proxy.c:989
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:1005
+#: src/gns/gnunet-gns-proxy.c:1014
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1026
+#: src/gns/gnunet-gns-proxy.c:1035
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/gns/gnunet-gns-proxy.c:1041
+#: src/gns/gnunet-gns-proxy.c:1050
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1056
+#: src/gns/gnunet-gns-proxy.c:1065
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:1066
+#: src/gns/gnunet-gns-proxy.c:1075
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1090
+#: src/gns/gnunet-gns-proxy.c:1099
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1221
+#: src/gns/gnunet-gns-proxy.c:1230
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2121
+#: src/gns/gnunet-gns-proxy.c:2131
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2642
+#: src/gns/gnunet-gns-proxy.c:2652
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户:"
 
-#: src/gns/gnunet-gns-proxy.c:2674
+#: src/gns/gnunet-gns-proxy.c:2684
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "无法保存配置文件“%s”:"
 
-#: src/gns/gnunet-gns-proxy.c:2875
+#: src/gns/gnunet-gns-proxy.c:2885
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2897 src/rest/gnunet-rest-server.c:658
+#: src/gns/gnunet-gns-proxy.c:2907 src/rest/gnunet-rest-server.c:668
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3233
+#: src/gns/gnunet-gns-proxy.c:3243
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3262
+#: src/gns/gnunet-gns-proxy.c:3272
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3345
+#: src/gns/gnunet-gns-proxy.c:3355
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3635
+#: src/gns/gnunet-gns-proxy.c:3693
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3763
+#: src/gns/gnunet-gns-proxy.c:3821
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3768
+#: src/gns/gnunet-gns-proxy.c:3826
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3772
+#: src/gns/gnunet-gns-proxy.c:3830
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3798
+#: src/gns/gnunet-gns-proxy.c:3856
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199
-#, 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:506
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4140,8 +4143,8 @@ msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/gns/gnunet-service-gns.c:561
-#: 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"
@@ -4234,6 +4237,10 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
+#: src/gns/plugin_rest_gns.c:452
+msgid "Gns REST API initialized\n"
+msgstr ""
+
 #: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4614,7 +4621,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2814
+#: src/transport/gnunet-service-transport.c:2827
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -4745,15 +4752,15 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 
+#: src/identity/plugin_rest_identity.c:1297
+msgid "Identity REST API initialized\n"
+msgstr ""
+
 #: src/json/json.c:123
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
-msgid "This command doesn't do anything yet."
-msgstr ""
-
 #: src/my/my.c:196 src/my/my.c:215
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
@@ -4818,8 +4825,8 @@ msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
 
 #: src/namecache/plugin_namecache_flat.c:121
 #: src/namecache/plugin_namecache_flat.c:255
-#: src/namestore/plugin_namestore_heap.c:148
-#: src/namestore/plugin_namestore_heap.c:395
+#: src/namestore/plugin_namestore_heap.c:179
+#: src/namestore/plugin_namestore_heap.c:412
 #: src/peerstore/plugin_peerstore_flat.c:379
 #: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
@@ -4827,14 +4834,14 @@ msgid "Unable to initialize file: %s.\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
 #: src/namecache/plugin_namecache_flat.c:132
-#: src/namestore/plugin_namestore_heap.c:159
+#: src/namestore/plugin_namestore_heap.c:190
 #: src/peerstore/plugin_peerstore_flat.c:394
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "发送消息失败。\n"
 
 #: src/namecache/plugin_namecache_flat.c:151
-#: src/namestore/plugin_namestore_heap.c:172
+#: src/namestore/plugin_namestore_heap.c:203
 #: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
@@ -4853,70 +4860,6 @@ msgstr "sqlite 数据仓库"
 msgid "Failed to setup database at `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:549
-#, fuzzy, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:576
-#, fuzzy, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:597
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:629
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:689
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:777
-#, fuzzy, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "发送消息失败。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:796
-#, fuzzy, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:832
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:841
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1071
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1099
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1147
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1173
-msgid "name of the zone that is to be managed by FCFSD"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1192
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
-
 #: src/namestore/gnunet-namestore.c:341
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -5124,6 +5067,70 @@ msgstr ""
 msgid "name of the ego controlling the zone"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-fcfsd.c:549
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:576
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:597
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:629
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:689
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:777
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "发送消息失败。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:796
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:832
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:841
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1099
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1147
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1173
+msgid "name of the zone that is to be managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1192
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
 #: src/namestore/gnunet-service-namestore.c:900
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
@@ -5141,11 +5148,15 @@ msgstr ""
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_heap.c:778
+#: src/namestore/plugin_namestore_heap.c:773
 #, fuzzy
 msgid "heap file database running\n"
 msgstr "sqlite 数据仓库"
 
+#: src/namestore/plugin_rest_namestore.c:1079
+msgid "Namestore REST API initialized\n"
+msgstr ""
+
 #: src/nat-auto/gnunet-nat-auto.c:193
 #, fuzzy
 msgid "Suggested configuration changes:\n"
@@ -5425,6 +5436,10 @@ 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 ""
@@ -5450,16 +5465,66 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-nse.c:122
-msgid "Show network size estimates from 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/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/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
@@ -5471,7 +5536,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:299
-#: src/rest-plugins/plugin_rest_peerinfo.c:501
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -5537,73 +5602,23 @@ msgstr "无法获取有关用户“%s”的信息:%s\n"
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
 #: src/transport/gnunet-service-transport_plugins.c:168
 #, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:173
-#, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:208
-#, fuzzy, c-format
-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"
+msgid "Starting transport plugins `%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
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:173
 #, c-format
-msgid "Importing HELLOs from `%s'\n"
+msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1451
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:208
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/peerinfo_api.c:220
-msgid "Failed to receive response from `PEERINFO' service."
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:796
+msgid "Peerinfo REST API initialized\n"
 msgstr ""
 
 #: src/peerstore/gnunet-peerstore.c:91
@@ -5615,22 +5630,21 @@ msgstr ""
 msgid "Could not load database backend `%s'\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/peerstore/peerstore_api.c:532 src/peerstore/peerstore_api.c:581
+#: src/peerstore/peerstore_api.c:605 src/peerstore/peerstore_api.c:657
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "输出格式未知,不应出现这种情况。\n"
 
-#: src/peerstore/peerstore_api.c:595
+#: src/peerstore/peerstore_api.c:671
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/peerstore/peerstore_api.c:731
+#: src/peerstore/peerstore_api.c:807
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
 #: src/peerstore/plugin_peerstore_sqlite.c:453
-#: src/psycstore/plugin_psycstore_sqlite.c:282
 #, fuzzy, c-format
 msgid ""
 "Error executing SQL query: %s\n"
@@ -5638,8 +5652,6 @@ msgid ""
 msgstr "创建用户出错"
 
 #: src/peerstore/plugin_peerstore_sqlite.c:488
-#: src/psycstore/plugin_psycstore_mysql.c:250
-#: src/psycstore/plugin_psycstore_sqlite.c:259
 #, fuzzy, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
@@ -5656,114 +5668,6 @@ msgstr "发送消息失败。\n"
 msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:249
-#, fuzzy
-msgid "Failed to store membership information!\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:271
-#, fuzzy
-msgid "Failed to test membership!\n"
-msgstr "发送消息失败。\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:300
-#, fuzzy
-msgid "Dropping invalid fragment\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:311
-#, fuzzy
-msgid "Failed to store fragment\n"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:368
-#, fuzzy
-msgid "Failed to get fragment!\n"
-msgstr "发送消息失败。\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:434
-#, fuzzy
-msgid "Failed to get message!\n"
-msgstr "发送消息失败。\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:464
-#, fuzzy
-msgid "Failed to get message fragment!\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:494
-#, fuzzy
-msgid "Failed to get master counters!\n"
-msgstr "发送消息失败。\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:675
-#, fuzzy, c-format
-msgid "Failed to begin modifying state: %d\n"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:685
-#, fuzzy, c-format
-msgid "Failed to modify state: %d\n"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:693
-#, fuzzy
-msgid "Failed to end modifying state!\n"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:730
-#, fuzzy
-msgid "Tried to set invalid state variable name!\n"
-msgstr "发送消息失败。\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:744
-#, fuzzy
-msgid "Failed to begin synchronizing state!\n"
-msgstr "发送消息失败。\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:761
-#, fuzzy
-msgid "Failed to end synchronizing state!\n"
-msgstr "发送消息失败。\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:779
-#: src/psycstore/gnunet-service-psycstore.c:795
-#, fuzzy
-msgid "Failed to reset state!\n"
-msgstr "发送消息失败。\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:824
-#: src/psycstore/gnunet-service-psycstore.c:881
-#, fuzzy
-msgid "Tried to get invalid state variable name!\n"
-msgstr "发送消息失败。\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:851
-#: src/psycstore/gnunet-service-psycstore.c:896
-#, fuzzy
-msgid "Failed to get state variable!\n"
-msgstr "发送消息失败。\n"
-
-#: src/psycstore/plugin_psycstore_mysql.c:281
-#, fuzzy
-msgid "Unable to initialize Mysql.\n"
-msgstr "无法初始化 SQLite:%s。\n"
-
-#: src/psycstore/plugin_psycstore_mysql.c:291
-#, fuzzy, c-format
-msgid "Failed to run SQL statement `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:61
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s (%d)\n"
-msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:1924
-#, fuzzy
-msgid "SQLite database running\n"
-msgstr "sqlite 数据仓库"
-
 #: src/pt/gnunet-daemon-pt.c:423
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
@@ -5819,61 +5723,79 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:467
+#: src/reclaim/gnunet-reclaim.c:495
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "%s:选项“%s”有歧义\n"
 
-#: src/reclaim/gnunet-reclaim.c:475
+#: src/reclaim/gnunet-reclaim.c:501
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:483
+#: src/reclaim/gnunet-reclaim.c:507
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "设置要使用的昵称(必须)"
 
-#: src/reclaim/gnunet-reclaim.c:506
-msgid "Add attribute"
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "Add an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:512
-msgid "Attribute value"
+#: src/reclaim/gnunet-reclaim.c:527
+msgid "Add an attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:517
-msgid "Ego"
+#: src/reclaim/gnunet-reclaim.c:530
+msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:522
-msgid "Audience (relying party)"
+#: src/reclaim/gnunet-reclaim.c:533
+#, fuzzy
+msgid "The EGO to use"
+msgstr "消息尺寸"
+
+#: src/reclaim/gnunet-reclaim.c:535
+msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:526
-msgid "List attributes for Ego"
+#: src/reclaim/gnunet-reclaim.c:538
+msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:531
-msgid "Issue a ticket"
+#: src/reclaim/gnunet-reclaim.c:542
+msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:536
+#: src/reclaim/gnunet-reclaim.c:545
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:541
+#: src/reclaim/gnunet-reclaim.c:548
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:546
+#: src/reclaim/gnunet-reclaim.c:551
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:551
+#: src/reclaim/gnunet-reclaim.c:553
+msgid "List tickets of ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:556
 msgid "Expiration interval of the attribute"
 msgstr ""
 
+#: src/reclaim/gnunet-reclaim.c:560
+msgid "re:claimID command line tool"
+msgstr ""
+
+#: src/reclaim/plugin_rest_openid_connect.c:2051
+#: src/reclaim/plugin_rest_reclaim.c:1018
+msgid "Identity Provider REST API initialized\n"
+msgstr ""
+
 #: src/reclaim/reclaim_api.c:436
 #, fuzzy
 msgid "failed to store record\n"
@@ -5967,44 +5889,19 @@ msgstr "服务已删除。\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "服务已删除。\n"
 
-#: src/rest-plugins/plugin_rest_copying.c:209
-msgid "COPYING REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_credential.c:1128
-msgid "GNS REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_gns.c:452
-msgid "Gns REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_identity.c:1297
-msgid "Identity REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_namestore.c:1079
-msgid "Namestore REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_openid_connect.c:2245
-#: src/rest-plugins/plugin_rest_reclaim.c:1079
-msgid "Identity Provider REST API initialized\n"
-msgstr ""
-
-#: src/rest-plugins/plugin_rest_peerinfo.c:796
-msgid "Peerinfo REST API initialized\n"
-msgstr ""
-
-#: src/rest/gnunet-rest-server.c:927
+#: src/rest/gnunet-rest-server.c:986
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:944
+#: src/rest/gnunet-rest-server.c:1003
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet 错误日志"
 
+#: src/rest/plugin_rest_copying.c:209
+msgid "COPYING REST API initialized\n"
+msgstr ""
+
 #: src/revocation/gnunet-revocation.c:129
 #, c-format
 msgid "Key `%s' is valid\n"
@@ -6065,7 +5962,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
+#: src/revocation/gnunet-revocation.c:437
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "“%s”的参数无效。\n"
@@ -6141,36 +6038,36 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/rps/gnunet-rps-profiler.c:2959
+#: src/rps/gnunet-rps.c:260
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:264
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:268
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:3088
 msgid "duration of the profiling"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2965
+#: src/rps/gnunet-rps-profiler.c:3093
 msgid "timeout for the profiling"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2971
+#: src/rps/gnunet-rps-profiler.c:3098
 #, fuzzy
 msgid "number of PeerIDs to request"
 msgstr "迭代次数"
 
-#: src/rps/gnunet-rps-profiler.c:2986
+#: src/rps/gnunet-rps-profiler.c:3114
 #, fuzzy
 msgid "Measure quality and performance of the RPS service."
 msgstr "无法访问该服务"
 
-#: src/rps/gnunet-rps.c:260
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:264
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:268
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/scalarproduct/gnunet-scalarproduct.c:220
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6226,10 +6123,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"
@@ -6254,7 +6151,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2005
+#: src/set/gnunet-service-set.c:2008
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "无法连接到 %s:%u:%s\n"
@@ -6301,132 +6198,6 @@ msgstr ""
 msgid "element size"
 msgstr ""
 
-#: src/social/gnunet-social.c:1166
-#, fuzzy
-msgid "--place missing or invalid.\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/social/gnunet-social.c:1217
-msgid "assign --name in state to --data"
-msgstr ""
-
-#: src/social/gnunet-social.c:1222
-msgid "say good-bye and leave somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1227
-msgid "create a place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1232
-msgid "destroy a place we were hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1237
-msgid "enter somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1243
-msgid "find state matching name prefix"
-msgstr ""
-
-#: src/social/gnunet-social.c:1248
-msgid "replay history of messages up to the given --limit"
-msgstr ""
-
-#: src/social/gnunet-social.c:1253
-msgid "reconnect to a previously created place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1258
-msgid "publish something to a place we are hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1263
-msgid "reconnect to a previously entered place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1268
-msgid "search for state matching exact name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1273
-msgid "submit something to somebody's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1278
-msgid "list of egos and subscribed places"
-msgstr ""
-
-#: src/social/gnunet-social.c:1283
-msgid "extract and replay history between message IDs --start and --until"
-msgstr ""
-
-#: src/social/gnunet-social.c:1292
-msgid "application ID to use when connecting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1298
-msgid "message body or state value"
-msgstr ""
-
-#: src/social/gnunet-social.c:1304
-#, fuzzy
-msgid "name or public key of ego"
-msgstr "“%s”的参数无效。\n"
-
-#: src/social/gnunet-social.c:1309
-#, fuzzy
-msgid "wait for incoming messages"
-msgstr "发送消息失败。\n"
-
-#: src/social/gnunet-social.c:1315
-msgid "GNS name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1321
-msgid "peer ID for --guest-enter"
-msgstr ""
-
-#: src/social/gnunet-social.c:1327
-msgid "name (key) to query from state"
-msgstr ""
-
-#: src/social/gnunet-social.c:1333
-msgid "method name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1339
-#, fuzzy
-msgid "number of messages to replay from history"
-msgstr "每次迭代所使用的消息数量"
-
-#: src/social/gnunet-social.c:1345
-msgid "key address of place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1351
-msgid "start message ID for history replay"
-msgstr ""
-
-#: src/social/gnunet-social.c:1356
-msgid "respond to entry requests by admitting all guests"
-msgstr ""
-
-#: src/social/gnunet-social.c:1362
-msgid "end message ID for history replay"
-msgstr ""
-
-#: src/social/gnunet-social.c:1367
-msgid "respond to entry requests by refusing all guests"
-msgstr ""
-
-#: src/social/gnunet-social.c:1377
-msgid ""
-"gnunet-social - Interact with the social service: enter/leave, send/receive "
-"messages, access history and state.\n"
-msgstr ""
-
 #: src/sq/sq.c:54
 #, c-format
 msgid "Failure to bind %u-th SQL parameter\n"
@@ -6590,7 +6361,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "“%s”的参数无效。\n"
 
 #: src/testbed/generate-underlay-topology.c:342
-#: src/testbed/gnunet-testbed-profiler.c:283
+#: src/testbed/gnunet-testbed-profiler.c:282
 msgid "create COUNT number of peers"
 msgstr ""
 
@@ -6699,17 +6470,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
 msgid "Waiting for child to exit.\n"
 msgstr ""
@@ -6719,6 +6479,17 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
+#: src/testbed/gnunet-testbed-profiler.c:287
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:291
+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"
@@ -6895,48 +6666,48 @@ msgstr ""
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1159
+#: src/testing/testing.c:1161
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1168
+#: src/testing/testing.c:1170
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:1178
+#: src/testing/testing.c:1180
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1191
+#: src/testing/testing.c:1193
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1205
+#: src/testing/testing.c:1207
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing.c:1217
+#: src/testing/testing.c:1219
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:1242
+#: src/testing/testing.c:1244
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1344
+#: src/testing/testing.c:1346
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1649
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -7015,19 +6786,19 @@ msgstr ""
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2329
-#: src/transport/gnunet-communicator-udp.c:2883
-#: src/transport/gnunet-service-tng.c:4679
-#: src/transport/gnunet-service-transport.c:2782
+#: src/transport/gnunet-communicator-tcp.c:2334
+#: src/transport/gnunet-communicator-udp.c:2938
+#: src/transport/gnunet-service-tng.c:7070
+#: src/transport/gnunet-service-transport.c:2795
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/transport/gnunet-communicator-tcp.c:2393
+#: src/transport/gnunet-communicator-tcp.c:2398
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2954
+#: src/transport/gnunet-communicator-udp.c:3016
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7037,60 +6808,60 @@ msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/gnunet-communicator-unix.c:1073
+#: src/transport/gnunet-communicator-unix.c:1074
 #: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/gnunet-communicator-unix.c:1162
+#: src/transport/gnunet-communicator-unix.c:1163
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:448
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:452
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:817
+#: src/transport/gnunet-service-transport.c:826
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1550
+#: src/transport/gnunet-service-transport.c:1563
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1710
+#: src/transport/gnunet-service-transport.c:1723
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1807
+#: src/transport/gnunet-service-transport.c:1820
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2124
-#: src/transport/gnunet-service-transport.c:2596
+#: src/transport/gnunet-service-transport.c:2137
+#: src/transport/gnunet-service-transport.c:2609
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2600
+#: src/transport/gnunet-service-transport.c:2613
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport.c:2708
+#: src/transport/gnunet-service-transport.c:2721
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/gnunet-service-transport.c:2717
+#: src/transport/gnunet-service-transport.c:2730
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\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 ""
@@ -7099,189 +6870,189 @@ msgstr ""
 msgid "# session creation failed"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1052
+#: src/transport/gnunet-service-transport_neighbours.c:1053
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1175
+#: src/transport/gnunet-service-transport_neighbours.c:1176
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1323
-#: src/transport/gnunet-service-transport_neighbours.c:1784
+#: src/transport/gnunet-service-transport_neighbours.c:1324
+#: src/transport/gnunet-service-transport_neighbours.c:1785
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1328
+#: src/transport/gnunet-service-transport_neighbours.c:1329
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1334
+#: src/transport/gnunet-service-transport_neighbours.c:1335
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1394
+#: src/transport/gnunet-service-transport_neighbours.c:1395
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1478
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1514
+#: src/transport/gnunet-service-transport_neighbours.c:1515
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1522
+#: src/transport/gnunet-service-transport_neighbours.c:1523
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1532
+#: src/transport/gnunet-service-transport_neighbours.c:1533
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1577
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1586
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1595
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1603
+#: src/transport/gnunet-service-transport_neighbours.c:1604
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1608
+#: src/transport/gnunet-service-transport_neighbours.c:1609
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1614
+#: src/transport/gnunet-service-transport_neighbours.c:1615
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1681
+#: src/transport/gnunet-service-transport_neighbours.c:1682
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1715
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1730
+#: src/transport/gnunet-service-transport_neighbours.c:1731
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1853
+#: src/transport/gnunet-service-transport_neighbours.c:1854
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1873
+#: src/transport/gnunet-service-transport_neighbours.c:1874
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1912
+#: src/transport/gnunet-service-transport_neighbours.c:1913
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "消息尺寸"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1929
+#: src/transport/gnunet-service-transport_neighbours.c:1930
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1959
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2027
+#: src/transport/gnunet-service-transport_neighbours.c:2028
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2081
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2098
+#: src/transport/gnunet-service-transport_neighbours.c:2099
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2261
+#: src/transport/gnunet-service-transport_neighbours.c:2262
 msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2266
+#: src/transport/gnunet-service-transport_neighbours.c:2267
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2653
+#: src/transport/gnunet-service-transport_neighbours.c:2654
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3139
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3146
+#: src/transport/gnunet-service-transport_neighbours.c:3147
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3165
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3200
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3225
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3238
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3411
+#: src/transport/gnunet-service-transport_neighbours.c:3412
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3447
+#: src/transport/gnunet-service-transport_neighbours.c:3448
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3535
+#: src/transport/gnunet-service-transport_neighbours.c:3536
 msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3543
 msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3582
+#: src/transport/gnunet-service-transport_neighbours.c:3583
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3589
+#: src/transport/gnunet-service-transport_neighbours.c:3590
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3600
+#: src/transport/gnunet-service-transport_neighbours.c:3601
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3735
+#: src/transport/gnunet-service-transport_neighbours.c:3736
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7316,7 +7087,7 @@ msgstr ""
 #: src/transport/gnunet-service-transport_validation.c:491
 #: src/transport/gnunet-service-transport_validation.c:677
 #: src/transport/gnunet-service-transport_validation.c:997
-#: src/transport/gnunet-service-transport_validation.c:1609
+#: src/transport/gnunet-service-transport_validation.c:1610
 #, fuzzy
 msgid "# validations running"
 msgstr "sqlite 数据仓库"
@@ -7341,102 +7112,64 @@ msgstr ""
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1123
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1174
+#: src/transport/gnunet-service-transport_validation.c:1175
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1187
+#: src/transport/gnunet-service-transport_validation.c:1188
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1190
+#: src/transport/gnunet-service-transport_validation.c:1191
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1198
+#: src/transport/gnunet-service-transport_validation.c:1199
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1211
+#: src/transport/gnunet-service-transport_validation.c:1212
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1266
+#: src/transport/gnunet-service-transport_validation.c:1267
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1317
+#: src/transport/gnunet-service-transport_validation.c:1318
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1326
-msgid "# PONGs multicast to all available addresses"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1499
-msgid "# PONGs dropped, no matching pending validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1517
-msgid "# PONGs dropped, signature expired"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1572
-msgid "# validations succeeded"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1627
-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"
+#: src/transport/gnunet-service-transport_validation.c:1327
+msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
+#: src/transport/gnunet-service-transport_validation.c:1500
+msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:621
-msgid "receive data from peer"
+#: src/transport/gnunet-service-transport_validation.c:1518
+msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:626
-msgid "iterations"
+#: src/transport/gnunet-service-transport_validation.c:1573
+msgid "# validations succeeded"
 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"
+#: src/transport/gnunet-service-transport_validation.c:1628
+msgid "# HELLOs given to peerinfo"
 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"
@@ -7573,6 +7306,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 ""
@@ -7581,13 +7319,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
+#, 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:3530
-#: src/transport/plugin_transport_tcp.c:3895
-#: src/transport/plugin_transport_tcp.c:3902
-#: src/transport/plugin_transport_xt.c:3899
-#: src/transport/plugin_transport_xt.c:3906
+#: src/transport/plugin_transport_tcp.c:3901
+#: src/transport/plugin_transport_tcp.c:3908
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7658,7 +7427,6 @@ msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2905
 #: src/transport/plugin_transport_udp.c:3627
-#: src/transport/plugin_transport_xu.c:2049
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7760,132 +7528,120 @@ msgstr ""
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1551
-#: src/transport/plugin_transport_tcp.c:2877
-#: src/transport/plugin_transport_xt.c:1553
-#: src/transport/plugin_transport_xt.c:2879
+#: src/transport/plugin_transport_tcp.c:1557
+#: src/transport/plugin_transport_tcp.c:2883
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1734
-#: src/transport/plugin_transport_tcp.c:1958
-#: src/transport/plugin_transport_tcp.c:3141
-#: src/transport/plugin_transport_tcp.c:4018
-#: src/transport/plugin_transport_xt.c:1736
-#: src/transport/plugin_transport_xt.c:1960
-#: src/transport/plugin_transport_xt.c:3143
+#: src/transport/plugin_transport_tcp.c:1740
+#: src/transport/plugin_transport_tcp.c:1964
+#: src/transport/plugin_transport_tcp.c:3147
+#: src/transport/plugin_transport_tcp.c:4024
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1776
-#: src/transport/plugin_transport_tcp.c:1940
-#: src/transport/plugin_transport_tcp.c:2064
-#: src/transport/plugin_transport_tcp.c:2137
-#: src/transport/plugin_transport_tcp.c:2237
-#: src/transport/plugin_transport_tcp.c:2262
-#: 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
+#: src/transport/plugin_transport_tcp.c:1782
+#: src/transport/plugin_transport_tcp.c:1946
+#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2143
+#: src/transport/plugin_transport_tcp.c:2243
+#: src/transport/plugin_transport_tcp.c:2268
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1779
-#: src/transport/plugin_transport_xt.c:1781
+#: src/transport/plugin_transport_tcp.c:1785
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2067
-#: src/transport/plugin_transport_xt.c:2069
+#: src/transport/plugin_transport_tcp.c:2073
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2141
-#: src/transport/plugin_transport_xt.c:2143
+#: src/transport/plugin_transport_tcp.c:2147
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2539
-#: src/transport/plugin_transport_xt.c:2541
+#: src/transport/plugin_transport_tcp.c:2545
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2715
-#: src/transport/plugin_transport_xt.c:2717
+#: src/transport/plugin_transport_tcp.c:2721
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3207
-#: src/transport/plugin_transport_xt.c:3209
+#: src/transport/plugin_transport_tcp.c:3213
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3413
-#: src/transport/plugin_transport_xt.c:3415
+#: src/transport/plugin_transport_tcp.c:3419
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3464
-#: src/transport/plugin_transport_tcp.c:3522
-#: src/transport/plugin_transport_xt.c:3466
-#: src/transport/plugin_transport_xt.c:3524
+#: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_tcp.c:3528
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/plugin_transport_tcp.c:3468
-#: src/transport/plugin_transport_xt.c:3470
+#: src/transport/plugin_transport_tcp.c:3474
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/plugin_transport_tcp.c:3474
-#: src/transport/plugin_transport_xt.c:3476
+#: src/transport/plugin_transport_tcp.c:3480
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3476
-#: src/transport/plugin_transport_xt.c:3478
+#: src/transport/plugin_transport_tcp.c:3482
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3516
-#: src/transport/plugin_transport_xt.c:3518
+#: src/transport/plugin_transport_tcp.c:3522
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3526
-#: src/transport/plugin_transport_xt.c:3528
+#: src/transport/plugin_transport_tcp.c:3532
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3845
-#: src/transport/plugin_transport_xt.c:3849
+#: src/transport/plugin_transport_tcp.c:3851
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:4006
+#: src/transport/plugin_transport_tcp.c:4012
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4010
+#: src/transport/plugin_transport_tcp.c:4016
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4014
+#: src/transport/plugin_transport_tcp.c:4020
 #, c-format
 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:3371
 #, c-format
 msgid ""
@@ -7906,7 +7662,6 @@ msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
 #: src/transport/plugin_transport_udp.c:3721
-#: src/transport/plugin_transport_xu.c:2143
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7917,19 +7672,15 @@ msgstr "打开日志文件“%s”失败:%s\n"
 
 #: src/transport/plugin_transport_udp.c:3883
 #: src/transport/plugin_transport_udp.c:3897
-#: 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:3929
-#: src/transport/plugin_transport_xu.c:2347
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
 #: src/transport/plugin_transport_udp.c:3956
-#: src/transport/plugin_transport_xu.c:2374
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "“%s”不可用。\n"
@@ -7939,20 +7690,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:1416
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
@@ -8020,56 +7757,6 @@ 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"
@@ -8080,17 +7767,17 @@ msgstr "“%s”已连接到“%s”。\n"
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1624
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1634
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127
+#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1640
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
@@ -8102,7 +7789,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2396
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:864
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -8112,27 +7799,27 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:988
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:1031
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1555
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:953
-#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1195
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1708
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1228
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1741
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8147,44 +7834,44 @@ msgstr "运行 %s失败:%s %d\n"
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1502
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:2015
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1506
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:2019
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1510
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:2023
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1525
-#: src/util/service.c:1380
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1535
+#: src/util/service.c:1893
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1382
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1895
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1401
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1914
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”:%s\n"
 
-#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1762
+#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:2276
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:1826
-#: src/util/service.c:1841
+#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:2340
+#: src/util/service.c:2355
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:1853
+#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:2367
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -8227,11 +7914,11 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:734
+#: src/util/client.c:749
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:925
+#: src/util/client.c:941
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8278,16 +7965,16 @@ msgstr ""
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1500
+#: src/util/common_logging.c:1513
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1518
+#: src/util/common_logging.c:1531
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/util/common_logging.c:1539
+#: src/util/common_logging.c:1552
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8335,26 +8022,26 @@ msgstr ""
 #: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have %"
-"llu)\n"
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:862
+#: src/util/crypto_ecc.c:887
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/crypto_ecc.c:917
+#: src/util/crypto_ecc.c:946
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/crypto_ecc.c:996
+#: src/util/crypto_ecc.c:1025
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/crypto_ecc.c:1057
+#: src/util/crypto_ecc.c:1086
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
@@ -8404,17 +8091,17 @@ msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/disk.c:1255
+#: src/util/disk.c:1265
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
-#: src/util/dnsparser.c:260
+#: src/util/dnsparser.c:264
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/dnsparser.c:950
+#: src/util/dnsparser.c:954
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -8518,7 +8205,7 @@ msgstr "长选项的必选参数对短选项也是必选的。\n"
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:282
+#: src/util/getopt_helpers.c:282 src/util/gnunet-qr.c:300
 msgid "be verbose"
 msgstr ""
 
@@ -8566,52 +8253,52 @@ msgstr "您必须向“%s”选项传递一个数字。\n"
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:160
+#: src/util/gnunet-config.c:161
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/gnunet-config.c:173
+#: src/util/gnunet-config.c:174
 #, fuzzy, c-format
 msgid "%s or %s argument is required\n"
 msgstr "设置要使用的昵称(必须)"
 
-#: src/util/gnunet-config.c:181
+#: src/util/gnunet-config.c:182
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:232
+#: src/util/gnunet-config.c:234
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:286
-msgid "obtain option of value as a filename (with $-expansion)"
+#: src/util/gnunet-config.c:288
+msgid "interpret option value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:291
+#: src/util/gnunet-config.c:293
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:296
+#: src/util/gnunet-config.c:298
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:301
+#: src/util/gnunet-config.c:303
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:305
+#: src/util/gnunet-config.c:307
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "立即保存配置?"
 
-#: src/util/gnunet-config.c:309
+#: src/util/gnunet-config.c:311
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:322
+#: src/util/gnunet-config.c:324
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "更改配置文件中的一个值"
@@ -8704,6 +8391,33 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
 
+#: src/util/gnunet-qr.c:108 src/util/gnunet-uri.c:91
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "无效的网络表示法(没有以“;”结尾:“%s”)\n"
+
+#: src/util/gnunet-qr.c:116 src/util/gnunet-uri.c:98
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:127 src/util/gnunet-uri.c:108
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:297
+msgid "use video-device DEVICE (default: /dev/video0"
+msgstr ""
+
+#: src/util/gnunet-qr.c:303
+msgid "do not show preview windows"
+msgstr ""
+
+#: src/util/gnunet-qr.c:311
+msgid "Scan a QR code using a video device and import the uri read"
+msgstr ""
+
 #: src/util/gnunet-resolver.c:168
 msgid "perform a reverse lookup"
 msgstr ""
@@ -8738,7 +8452,7 @@ msgstr ""
 msgid "Manipulate GNUnet proof of work files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-service-resolver.c:1443
+#: src/util/gnunet-service-resolver.c:1424
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
@@ -8747,21 +8461,6 @@ msgstr ""
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:91
-#, fuzzy, c-format
-msgid "Invalid URI: does not start with `%s'\n"
-msgstr "无效的网络表示法(没有以“;”结尾:“%s”)\n"
-
-#: src/util/gnunet-uri.c:98
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:108
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
-msgstr ""
-
 #: src/util/gnunet-uri.c:170
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
@@ -8781,12 +8480,12 @@ msgstr "打开日志文件“%s”失败:%s\n"
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/network.c:136
+#: src/util/network.c:176
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1795 src/util/network.c:1979
+#: src/util/network.c:1835 src/util/network.c:2019
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8892,18 +8591,18 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/service.c:1307
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
-msgstr ""
-
-#: src/util/service.c:2141
+#: src/util/service.c:668
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
+#: src/util/service.c:1820
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
 #: src/util/signal.c:89
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
@@ -9035,12 +8734,12 @@ msgstr "网络掩码的格式“%s”错误\n"
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
 
-#: src/util/time.c:828 src/util/time.c:860
+#: src/util/time.c:844 src/util/time.c:876
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:866
+#: src/util/time.c:882
 #, c-format
 msgid ""
 "Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
@@ -9216,52 +8915,58 @@ 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"
 
-#: src/include/gnunet_common.h:772 src/include/gnunet_common.h:779
-#: src/include/gnunet_common.h:789
+#: src/include/gnunet_common.h:794 src/include/gnunet_common.h:801
+#: src/include/gnunet_common.h:811
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d. Aborting.\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/include/gnunet_common.h:797
+#: src/include/gnunet_common.h:819
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:809
+#: src/include/gnunet_common.h:831
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:836 src/include/gnunet_common.h:845
+#: src/include/gnunet_common.h:858 src/include/gnunet_common.h:867
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Can not index file `%s': %s.\n"
-#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#~ msgid "Unable to parse CRED record string `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "# XT sessions active"
+#~ msgstr ""
+#~ "\n"
+#~ "按任意键继续\n"
 
 #, fuzzy
-#~ msgid "`%s' is not a valid domain name\n"
-#~ msgstr "“%s”不可用。\n"
+#~ msgid "Failed to bind XU socket to %s: %s\n"
+#~ msgstr "打开日志文件“%s”失败:%s\n"
 
 #, fuzzy
-#~ msgid "Unable to parse CAA record string `%s'\n"
-#~ msgstr "解析配置文件“%s”失败\n"
+#~ msgid "Failed to open XU sockets\n"
+#~ msgstr "打开日志文件“%s”失败:%s\n"
 
 #, fuzzy
-#~ msgid "display private keys as well"
-#~ msgstr "显示一个文件的散列值"
+#~ msgid "Failed to create XU network sockets\n"
+#~ msgstr "发送消息失败。\n"
 
 #, fuzzy
-#~ msgid "The EGO to use"
-#~ msgstr "消息尺寸"
+#~ msgid "Print information about DV state"
+#~ msgstr "无法获取有关用户“%s”的信息:%s\n"
 
 #, fuzzy
 #~ msgid "Invalid tunnel owner `%s'\n"
@@ -9271,6 +8976,98 @@ msgstr ""
 #~ msgid "Provide information about a particular tunnel"
 #~ msgstr "无法获取有关用户“%s”的信息:%s\n"
 
+#, fuzzy
+#~ msgid "Failed to store membership information!\n"
+#~ msgstr "打开日志文件“%s”失败:%s\n"
+
+#, fuzzy
+#~ msgid "Failed to test membership!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Dropping invalid fragment\n"
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "Failed to store fragment\n"
+#~ msgstr "运行 %s失败:%s %d\n"
+
+#, fuzzy
+#~ msgid "Failed to get fragment!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to get message!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to get message fragment!\n"
+#~ msgstr "打开日志文件“%s”失败:%s\n"
+
+#, fuzzy
+#~ msgid "Failed to get master counters!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to begin modifying state: %d\n"
+#~ msgstr "运行 %s失败:%s %d\n"
+
+#, fuzzy
+#~ msgid "Failed to modify state: %d\n"
+#~ msgstr "运行 %s失败:%s %d\n"
+
+#, fuzzy
+#~ msgid "Failed to end modifying state!\n"
+#~ msgstr "运行 %s失败:%s %d\n"
+
+#, fuzzy
+#~ msgid "Failed to begin synchronizing state!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to end synchronizing state!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to reset state!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to get state variable!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Mysql.\n"
+#~ msgstr "无法初始化 SQLite:%s。\n"
+
+#, fuzzy
+#~ msgid "Failed to run SQL statement `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+#~ msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
+
+#, fuzzy
+#~ msgid "SQLite database running\n"
+#~ msgstr "sqlite 数据仓库"
+
+#, fuzzy
+#~ msgid "--place missing or invalid.\n"
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "name or public key of ego"
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "wait for incoming messages"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "number of messages to replay from history"
+#~ msgstr "每次迭代所使用的消息数量"
+
 #~ msgid "Could not resolve `%s' (%s): %s\n"
 #~ msgstr "无法解析“%s”(%s):%s\n"
 
@@ -9822,8 +9619,8 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "%s service is lacking key configuration settings (%s). Using default (%"
-#~ "u).\n"
+#~ "%s service is lacking key configuration settings (%s). Using default "
+#~ "(%u).\n"
 #~ msgstr "立即保存配置?"
 
 #, fuzzy
@@ -10460,6 +10257,9 @@ msgstr ""
 #~ msgid "install GNUnet as Windows service"
 #~ msgstr "以 Windows 服务方式安装 GNUnet"
 
+#~ msgid "display a file's hash value"
+#~ msgstr "显示一个文件的散列值"
+
 #~ msgid "This version of Windows doesn't support services.\n"
 #~ msgstr "此版本的 Windows 不支持服务。\n"
 
diff --git a/src/credential/credential_api.c b/src/credential/credential_api.c
index a3eecd52d..7acce7d9e 100644
--- a/src/credential/credential_api.c
+++ b/src/credential/credential_api.c
@@ -249,7 +249,7 @@ handle_result (void *cls, const struct 
DelegationChainResultMessage *vr_msg)
   if (GNUNET_NO == ntohl (vr_msg->del_found))
   {
     proc (proc_cls, 0, NULL, 0,
-          NULL); // TODO
+          NULL);
   }
   else
   {
@@ -297,7 +297,6 @@ handle_intermediate (void *cls, const struct 
DelegationChainIntermediateMessage
                                                     dd,
                                                     0,
                                                     NULL));
-  sleep(2);
   proc (proc_cls, dd, is_bw);
 }
 
diff --git a/src/credential/gnunet-credential.c 
b/src/credential/gnunet-credential.c
index 0d742d1ef..58f7cf50d 100644
--- a/src/credential/gnunet-credential.c
+++ b/src/credential/gnunet-credential.c
@@ -274,13 +274,12 @@ handle_intermediate_result(void *cls,
   bool is_bw)
 {
   char *prefix = "";
-  // TODO change to printf
   if(is_bw)
     prefix = "Backward -";
   else
     prefix = "Forward -";
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s Intermediate result: %s.%s <- 
%s.%s\n",
+  printf ("%s Intermediate result: %s.%s <- %s.%s\n",
       prefix,
       GNUNET_CRYPTO_ecdsa_public_key_to_string (&dd->issuer_key),
       dd->issuer_attribute,
@@ -416,7 +415,7 @@ identity_cb (void *cls, const struct GNUNET_IDENTITY_Ego 
*ego)
 
     collect_request = GNUNET_CREDENTIAL_collect (credential,
                                                  &issuer_pkey,
-                                                 issuer_attr, //TODO argument
+                                                 issuer_attr,
                                                  privkey,
                                                  direction,
                                                  &handle_collect_result,
@@ -487,7 +486,6 @@ error_cb (void *cls)
 static void
 add_continuation (void *cls, int32_t success, const char *emsg)
 {
-  // TODO what does that do, can I somehow parse an empty callback on success 
or do I have to set the qe* to NULL?
   struct GNUNET_NAMESTORE_QueueEntry **qe = cls;
   *qe = NULL;
 
@@ -510,9 +508,8 @@ get_existing_record (void *cls,
   rde->data = data;
   rde->data_size = data_size;
   rde->record_type = type;
-  // Flags not required , TODO what have we said we do with that now? Look it 
up in my writing
-  /*if (1 == is_shadow)
-    rde->flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;*/
+
+  // Set flags
   if (GNUNET_YES == is_private)
     rde->flags |= GNUNET_GNSRECORD_RF_PRIVATE;
   rde->expiration_time = etime;
@@ -520,6 +517,7 @@ get_existing_record (void *cls,
     rde->flags |= GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
   else if (GNUNET_NO != etime_is_rel)
     rde->expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
+
   GNUNET_assert (NULL != rec_name);
   add_qe = GNUNET_NAMESTORE_records_store (ns,
                                            &zone_pkey,
@@ -551,7 +549,6 @@ store_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego)
   // Key handling
   zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
 
-  // TODO maybe dont have to set subject, if only used in if/else can use 
import here instead!!
   if (GNUNET_GNSRECORD_TYPE_DELEGATE == type)
   {
     // Parse import
@@ -922,7 +919,7 @@ run (void *cls,
 
     verify_request = GNUNET_CREDENTIAL_verify (credential,
                                                &issuer_pkey,
-                                               issuer_attr, //TODO argument
+                                               issuer_attr,
                                                &subject_pkey,
                                                count,
                                                delegates,
@@ -1053,7 +1050,7 @@ main (int argc, char *const *argv)
     return 2;
 
   GNUNET_log_setup ("gnunet-credential", "WARNING", NULL);
-  if (GNUNET_OK == GNUNET_PROGRAM_run (argc,
+  if (GNUNET_OK != GNUNET_PROGRAM_run (argc,
                                           argv,
                                           "gnunet-credential",
                                           _ ("GNUnet credential resolver 
tool"),
diff --git a/src/credential/gnunet-service-credential.c 
b/src/credential/gnunet-service-credential.c
index 5ce0f70d9..daffc0bb9 100644
--- a/src/credential/gnunet-service-credential.c
+++ b/src/credential/gnunet-service-credential.c
@@ -429,26 +429,28 @@ cleanup_handle (struct VerifyRequestHandle *vrh)
   struct DelegateRecordEntry *del_entry;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up...\n");
 
-  if (NULL == vrh->dsq_head)
-    return;
-
-  for (struct DelegationSetQueueEntry *ds_entry = vrh->dsq_head; NULL != 
vrh->dsq_head;
-       ds_entry = vrh->dsq_head)
+  if (NULL != vrh->dsq_head)
   {
-    GNUNET_CONTAINER_DLL_remove (vrh->dsq_head, vrh->dsq_tail, ds_entry);
-    cleanup_dsq_entry(ds_entry);
+    for (struct DelegationSetQueueEntry *ds_entry = vrh->dsq_head; NULL != 
vrh->dsq_head;
+       ds_entry = vrh->dsq_head)
+    {
+      GNUNET_CONTAINER_DLL_remove (vrh->dsq_head, vrh->dsq_tail, ds_entry);
+      cleanup_dsq_entry(ds_entry);
+    }
   }
-
-  GNUNET_free_non_null (vrh->issuer_attribute);
-  for (del_entry = vrh->del_chain_head; NULL != vrh->del_chain_head;
-       del_entry = vrh->del_chain_head)
+  if (NULL != vrh->del_chain_head)
   {
-    GNUNET_CONTAINER_DLL_remove (vrh->del_chain_head,
-                                 vrh->del_chain_tail,
-                                 del_entry);
-    GNUNET_free_non_null (del_entry->delegate);
-    GNUNET_free (del_entry);
+    for (del_entry = vrh->del_chain_head; NULL != vrh->del_chain_head;
+        del_entry = vrh->del_chain_head)
+    {
+      GNUNET_CONTAINER_DLL_remove (vrh->del_chain_head,
+                                  vrh->del_chain_tail,
+                                  del_entry);
+      GNUNET_free_non_null (del_entry->delegate);
+      GNUNET_free (del_entry);
+    }
   }
+  GNUNET_free_non_null (vrh->issuer_attribute);
   GNUNET_free (vrh);
 }
 
@@ -622,7 +624,6 @@ send_lookup_response (struct VerifyRequestHandle *vrh)
   GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (vrh->client), env);
   GNUNET_CONTAINER_DLL_remove (vrh_head, vrh_tail, vrh);
   cleanup_handle (vrh);
-
   GNUNET_STATISTICS_update (statistics,
                             "Completed verifications",
                             1,
@@ -1217,7 +1218,7 @@ backward_resolution (void *cls,
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                     "%s still to go...\n",
                     ds_entry->attr_trailer);
-      // TODO remove
+
       vrh->pending_lookups++;
       ds_entry->handle = vrh;
       ds_entry->lookup_request =
@@ -1247,9 +1248,11 @@ backward_resolution (void *cls,
  *
  * @param cls the closure (our client lookup handle)
  */
-static void
+static int
 delegation_chain_bw_resolution_start (void *cls)
 {
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Start Backward Resolution...\n");
+
   struct VerifyRequestHandle *vrh = cls;
   struct DelegationSetQueueEntry *ds_entry;
   struct DelegateRecordEntry *del_entry;
@@ -1258,7 +1261,7 @@ delegation_chain_bw_resolution_start (void *cls)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No delegates found\n");
     send_lookup_response (vrh);
-    return;
+    return 2;
   }
 
   // Pre-check with vrh->dele_chain_.. if match issuer_key
@@ -1281,7 +1284,7 @@ delegation_chain_bw_resolution_start (void *cls)
     del_entry->refcount++;
     // Found match prematurely
     send_lookup_response (vrh);
-    return;
+    return 1;
   }
 
 
@@ -1321,11 +1324,14 @@ delegation_chain_bw_resolution_start (void *cls)
                                                 GNUNET_GNS_LO_DEFAULT,
                                                 &backward_resolution,
                                                 ds_entry);
+  return 0;
 }
 
-static void
+static int
 delegation_chain_fw_resolution_start (void *cls)
 {
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Start Forward Resolution...\n");
+
   struct VerifyRequestHandle *vrh = cls;
   struct DelegationSetQueueEntry *ds_entry;
   struct DelegateRecordEntry *del_entry;
@@ -1337,7 +1343,7 @@ delegation_chain_fw_resolution_start (void *cls)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No delegations found\n");
     send_lookup_response (vrh);
-    return;
+    return 2;
   }
 
   // Pre-check with vrh->dele_chain_.. if match issuer_key
@@ -1359,7 +1365,7 @@ delegation_chain_fw_resolution_start (void *cls)
     del_entry->refcount++;
     // Found match prematurely
     send_lookup_response (vrh);
-    return;
+    return 1;
   }
 
   // None match, therefore start for every delegation found a lookup chain
@@ -1409,6 +1415,7 @@ delegation_chain_fw_resolution_start (void *cls)
                          &forward_resolution,
                          ds_entry);
   }
+  return 0;
 }
 
 static int
@@ -1528,7 +1535,8 @@ handle_verify (void *cls, const struct VerifyMessage 
*v_msg)
   if (GNUNET_CREDENTIAL_FLAG_BACKWARD & vrh->resolution_algo &&
       GNUNET_CREDENTIAL_FLAG_FORWARD & vrh->resolution_algo)
   {
-    delegation_chain_fw_resolution_start (vrh);
+    if(1 == delegation_chain_fw_resolution_start (vrh))
+      return;
     delegation_chain_bw_resolution_start (vrh);
   }
   else if (GNUNET_CREDENTIAL_FLAG_BACKWARD & vrh->resolution_algo)
@@ -1561,7 +1569,9 @@ delegate_collection_finished (void *cls)
   if (GNUNET_CREDENTIAL_FLAG_BACKWARD & vrh->resolution_algo &&
       GNUNET_CREDENTIAL_FLAG_FORWARD & vrh->resolution_algo)
   {
-    delegation_chain_fw_resolution_start (vrh);
+    // if premature match found don't start bw resultion
+    if(1 == delegation_chain_fw_resolution_start (vrh))
+      return;
     delegation_chain_bw_resolution_start (vrh);
   }
   else if (GNUNET_CREDENTIAL_FLAG_BACKWARD & vrh->resolution_algo)
diff --git a/src/credential/test_credential_bi_and.sh 
b/src/credential/test_credential_bi_and.sh
index 66f0b29f2..a7ed3ce1a 100755
--- a/src/credential/test_credential_bi_and.sh
+++ b/src/credential/test_credential_bi_and.sh
@@ -75,7 +75,7 @@ echo $DELS
 echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY 
--delegate=\'$DELS\' --forward --backward -c test_credential_lookup.conf
 gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY 
--delegate="$DELS" --forward --backward -c test_credential_lookup.conf
 
-RES = $?
+RES=$?
 
 # Cleanup properly
 gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf
@@ -87,7 +87,7 @@ gnunet-namestore -z f -d -n "@" -t DEL -c 
test_credential_lookup.conf
 
 gnunet-arm -e -c test_credential_lookup.conf
 
-if [ $RES == 0 ]
+if [ "$RES" == 0 ]
 then
   exit 0
 else
diff --git a/src/credential/test_credential_bi_and2.sh 
b/src/credential/test_credential_bi_and2.sh
index 8803dfda0..23b55111c 100755
--- a/src/credential/test_credential_bi_and2.sh
+++ b/src/credential/test_credential_bi_and2.sh
@@ -72,7 +72,7 @@ echo $DELS
 echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY 
--delegate=\'$DELS\' -c test_credential_lookup.conf
 gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY 
--delegate="$DELS" -c test_credential_lookup.conf
 
-RES = $?
+RES=$?
 
 # Cleanup properly
 gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf
@@ -83,7 +83,7 @@ gnunet-namestore -z f -d -n "@" -t DEL -c 
test_credential_lookup.conf
 
 gnunet-arm -e -c test_credential_lookup.conf
 
-if [ $RES == 0 ]
+if [ "$RES" == 0 ]
 then
   exit 0
 else
diff --git a/src/credential/test_credential_bi_and3.sh 
b/src/credential/test_credential_bi_and3.sh
index f88c23d46..e2f167622 100755
--- a/src/credential/test_credential_bi_and3.sh
+++ b/src/credential/test_credential_bi_and3.sh
@@ -17,7 +17,6 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS 
-o GNUNET_HOME -f`
 
 
 
-
 which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10"
 gnunet-arm -s -c test_credential_lookup.conf
 
@@ -38,6 +37,7 @@ FKEY=$(gnunet-identity -d -c test_credential_lookup.conf | 
grep f | awk '{print
 GKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep g | awk 
'{print $3}')
 HKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep h | awk 
'{print $3}')
 
+gnunet-identity -d
 #   (1) (A.a) <- B.b
 #   (2) (B.b) <- C.c AND G.g
 #   (3) C.c <- (D.d)
@@ -75,7 +75,7 @@ echo $DELS
 echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY 
--delegate=\'$DELS\' -c test_credential_lookup.conf
 gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY 
--delegate="$DELS" -c test_credential_lookup.conf
 
-RES = $?
+RES=$?
 
 # Cleanup properly
 gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf
@@ -87,7 +87,7 @@ gnunet-namestore -z h -d -n "@" -t DEL -c 
test_credential_lookup.conf
 
 gnunet-arm -e -c test_credential_lookup.conf
 
-if [ $RES == 0 ]
+if [ "$RES" == 0 ]
 then
   exit 0
 else
diff --git a/src/credential/test_credential_own_and2.sh 
b/src/credential/test_credential_bi_and4.sh
similarity index 99%
rename from src/credential/test_credential_own_and2.sh
rename to src/credential/test_credential_bi_and4.sh
index 9abfac899..c4db5c82a 100755
--- a/src/credential/test_credential_own_and2.sh
+++ b/src/credential/test_credential_bi_and4.sh
@@ -63,7 +63,7 @@ echo $DELS
 echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY 
--delegate=\'$DELS\'  --backward -c test_credential_lookup.conf
 gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY 
--delegate="$DELS"  --backward -c test_credential_lookup.conf
 
-RES = $?
+RES=$?
 
 # Cleanup properly
 gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf
@@ -72,7 +72,7 @@ gnunet-namestore -z f -d -n "@" -t DEL -c 
test_credential_lookup.conf
 
 gnunet-arm -e -c test_credential_lookup.conf
 
-if [ $RES == 0 ]
+if [ "$RES" == 0 ]
 then
   exit 0
 else
diff --git a/src/credential/test_credential_bi_bw.sh 
b/src/credential/test_credential_bi_bw.sh
index eedcea7eb..3a2043db6 100755
--- a/src/credential/test_credential_bi_bw.sh
+++ b/src/credential/test_credential_bi_bw.sh
@@ -66,7 +66,7 @@ echo $DELS
 echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY 
--delegate=\'$DELS\' --forward --backward -c test_credential_lookup.conf
 gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY 
--delegate="$DELS" --forward --backward -c test_credential_lookup.conf
 
-RES = $?
+RES=$?
 
 # Cleanup properly
 gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf
@@ -77,7 +77,7 @@ gnunet-namestore -z f -d -n "@" -t DEL -c 
test_credential_lookup.conf
 
 gnunet-arm -e -c test_credential_lookup.conf
 
-if [ $RES == 0 ]
+if [ "$RES" == 0 ]
 then
   exit 0
 else
diff --git a/src/credential/test_credential_bi_bw_link.sh 
b/src/credential/test_credential_bi_bw_link.sh
index a8a420d18..86b0e7418 100755
--- a/src/credential/test_credential_bi_bw_link.sh
+++ b/src/credential/test_credential_bi_bw_link.sh
@@ -69,7 +69,7 @@ echo $DELS
 echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY 
--delegate=\'$DELS\' --forward --backward -c test_credential_lookup.conf
 gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY 
--delegate="$DELS" --forward --backward -c test_credential_lookup.conf
 
-RES = $?
+RES=$?
 
 # Cleanup properly
 gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf
@@ -81,7 +81,7 @@ gnunet-namestore -z f -d -n "@" -t DEL -c 
test_credential_lookup.conf
 
 gnunet-arm -e -c test_credential_lookup.conf
 
-if [ $RES == 0 ]
+if [ "$RES" == 0 ]
 then
   exit 0
 else
diff --git a/src/credential/test_credential_bi_bw_link2.sh 
b/src/credential/test_credential_bi_bw_link2.sh
index 1c0d370db..ccb71b880 100755
--- a/src/credential/test_credential_bi_bw_link2.sh
+++ b/src/credential/test_credential_bi_bw_link2.sh
@@ -70,7 +70,7 @@ echo $DELS
 echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY 
--delegate=\'$DELS\' --forward --backward -c test_credential_lookup.conf
 gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY 
--delegate="$DELS" --forward --backward -c test_credential_lookup.conf
 
-RES = $?
+RES=$?
 
 # Cleanup properly
 gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf
@@ -82,7 +82,7 @@ gnunet-namestore -z f -d -n "@" -t DEL -c 
test_credential_lookup.conf
 
 gnunet-arm -e -c test_credential_lookup.conf
 
-if [ $RES == 0 ]
+if [ "$RES" == 0 ]
 then
   exit 0
 else
diff --git a/src/credential/test_credential_bi_fw.sh 
b/src/credential/test_credential_bi_fw.sh
index 2aba82479..9c8f768c5 100755
--- a/src/credential/test_credential_bi_fw.sh
+++ b/src/credential/test_credential_bi_fw.sh
@@ -70,7 +70,7 @@ echo $DELS
 echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$GKEY 
--delegate=\'$DELS\' --forward --backward -c test_credential_lookup.conf
 gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$GKEY 
--delegate="$DELS" --forward --backward -c test_credential_lookup.conf
 
-RES = $?
+RES=$?
 
 # Cleanup properly
 gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf
@@ -82,7 +82,7 @@ gnunet-namestore -z g -d -n "@" -t DEL -c 
test_credential_lookup.conf
 
 gnunet-arm -e -c test_credential_lookup.conf
 
-if [ $RES == 0 ]
+if [ "$RES" == 0 ]
 then
   exit 0
 else
diff --git a/src/credential/test_credential_issue.sh 
b/src/credential/test_credential_issue.sh
index f06de5d42..833a094e6 100755
--- a/src/credential/test_credential_issue.sh
+++ b/src/credential/test_credential_issue.sh
@@ -28,8 +28,10 @@ gnunet-identity -C testissuer -c test_credential_lookup.conf
 gnunet-identity -C testsubject -c test_credential_lookup.conf
 SUBJECT_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep 
testsubject | awk '{print $3}')
 ISSUER_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep 
testissuer | awk '{print $3}')
-#TODO1 Get credential and store it with subject (3)
-CRED=`$DO_TIMEOUT gnunet-credential --issue --ego=testissuer 
--subject=$SUBJECT_KEY --attribute=$TEST_ATTR --ttl=5m -c 
test_credential_lookup.conf`
+# Get credential and store it with subject (3)
+#CRED=`$DO_TIMEOUT gnunet-credential --issue --ego=testissuer 
--subject=$SUBJECT_KEY --attribute=$TEST_ATTR --ttl=5m -c 
test_credential_lookup.conf`
+SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=testissuer 
--attribute=$TEST_ATTR --subject=$SUBJECT_KEY --ttl="2019-12-12 10:00:00" -c 
test_credential_lookup.conf`
+
 STATUS=$?
 
 if test $? != 0
@@ -38,7 +40,8 @@ then
   exit 1
 fi
 #Try import
-$DO_TIMEOUT gnunet-namestore -a -z testsubject -n c1 -t CRED -V "$CRED" -e 5m 
-c test_credential_lookup.conf
+$DO_TIMEOUT gnunet-credential --createSubjectSide --ego=testsubject --import 
"$SIGNED" --private -c test_credential_lookup.conf
+#$DO_TIMEOUT gnunet-namestore -a -z testsubject -n c1 -t CRED -V "$CRED" -e 5m 
-c test_credential_lookup.conf
 RES=$?
 gnunet-arm -e -c test_credential_lookup.conf
 exit $RES
diff --git a/src/credential/test_credential_own.sh 
b/src/credential/test_credential_own.sh
index fa2580a22..b868cdf67 100755
--- a/src/credential/test_credential_own.sh
+++ b/src/credential/test_credential_own.sh
@@ -15,10 +15,6 @@ fi
 
 rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME 
-f`
 
-#   (1) EPub.discount <- EOrg.preferred
-#   (2) EOrg.preferred <- StateU.student
-#   (3) StateU.student <- RegistrarB.student
-#   (4) RegistrarB.student <- Alice
 
 
 which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10"
@@ -35,6 +31,12 @@ EKEY=$(gnunet-identity -d -c test_credential_lookup.conf | 
grep e | awk '{print
 FKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep f | awk 
'{print $3}')
 GKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep g | awk 
'{print $3}')
 
+############################################################################################
+#   (1) EPub.discount <- EOrg.preferred
+#   (2) EOrg.preferred <- StateU.student
+#   (3) StateU.student <- RegistrarB.student
+#   (4) RegistrarB.student <- Alice
+
 gnunet-identity -C epub -c test_credential_lookup.conf
 gnunet-identity -C eorg -c test_credential_lookup.conf
 gnunet-identity -C stateu -c test_credential_lookup.conf
@@ -54,7 +56,7 @@ STATE_STUD_ATTR="student"
 REG_STUD_ATTR="student"
 END_ATTR="end"
 
-# FORWARD, subject side stored
+# FORWARD, subject side stored (different constallations)
 SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=a 
--attribute="a" --subject="$AKEY b.c" --ttl="2019-12-12 10:00:00"`
 gnunet-credential --createSubjectSide --ego=a --import "$SIGNED"
 gnunet-namestore -D -z a
@@ -99,11 +101,13 @@ gnunet-credential --createSubjectSide --ego=alice --import 
"$SIGNED" --private
 # Starting to resolve
 echo "+++ Starting to Resolve +++"
 
+# FORWARD
 #DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$AKEY --attribute="a" 
--ego=g --forward -c test_credential_lookup.conf | paste -d, -s`
 #echo $DELS
 #echo gnunet-credential --verify --issuer=$AKEY --attribute="a" 
--subject=$GKEY --delegate=\'$DELS\' --forward -c test_credential_lookup.conf
 #RES_DELS=`gnunet-credential --verify --issuer=$AKEY --attribute="a" 
--subject=$GKEY --delegate="$DELS" --forward -c test_credential_lookup.conf`
 
+# BACKWARD
 DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$EPUB_KEY 
--attribute=$DISC_ATTR --ego=alice --backward -c test_credential_lookup.conf | 
paste -d, -s`
 echo $DELS
 echo gnunet-credential --verify --issuer=$EPUB_KEY --attribute=$DISC_ATTR 
--subject=$ALICE_KEY --delegate=\'$DELS\' --backward -c 
test_credential_lookup.conf
@@ -115,15 +119,16 @@ RES=$?
 gnunet-namestore -z epub -d -n $DISC_ATTR -t ATTR -c 
test_credential_lookup.conf
 gnunet-namestore -z eorg -d -n $PREF_ATTR -t ATTR -c 
test_credential_lookup.conf
 gnunet-namestore -z stateu -d -n $STATE_STUD_ATTR -t ATTR -c 
test_credential_lookup.conf
-#gnunet-namestore -z a -d -n $STATE_STUD_ATTR -t ATTR -c 
test_credential_lookup.conf
-#gnunet-namestore -z d -d -n $STATE_STUD_ATTR -t ATTR -c 
test_credential_lookup.conf
-#gnunet-namestore -z e -d -n $STATE_STUD_ATTR -t ATTR -c 
test_credential_lookup.conf
-#gnunet-namestore -z f -d -n $STATE_STUD_ATTR -t ATTR -c 
test_credential_lookup.conf
-#gnunet-namestore -z g -d -n $STATE_STUD_ATTR -t ATTR -c 
test_credential_lookup.conf
+#gnunet-namestore -z a -d -n "@" -t DEL -c test_credential_lookup.conf
+#gnunet-namestore -z d -d -n "@" -t DEL -c test_credential_lookup.conf
+#gnunet-namestore -z e -d -n "@" -t DEL -c test_credential_lookup.conf
+#gnunet-namestore -z f -d -n "@" -t DEL -c test_credential_lookup.conf
+#gnunet-namestore -z g -d -n "@" -t DEL -c test_credential_lookup.conf
+
 
 gnunet-arm -e -c test_credential_lookup.conf
 
-if [ $RES == 0 ]
+if [ "$RES" == 0 ]
 then
   exit 0
 else
diff --git a/src/credential/test_credential_verify.sh 
b/src/credential/test_credential_verify.sh
index 49d4d4afb..08060f60a 100755
--- a/src/credential/test_credential_verify.sh
+++ b/src/credential/test_credential_verify.sh
@@ -42,41 +42,44 @@ DEV_ATTR="developer"
 TEST_CREDENTIAL="mygnunetcreds"
 
 # (1) A service assigns the attribute "user" to all entities that have been 
assigned "member" by entities that werde assigned "project" from GNU
-gnunet-namestore -p -z service -a -n $USER_ATTR -t ATTR -V "$GNU_KEY 
$GNU_PROJECT_ATTR.$MEMBER_ATTR" -e 5m -c test_credential_lookup.conf
+gnunet-credential --createIssuerSide --ego=service --attribute="$USER_ATTR" 
--subject="$GNU_KEY $GNU_PROJECT_ATTR.$MEMBER_ATTR" --ttl="2019-12-12 10:00:00" 
-c test_credential_lookup.conf
+gnunet-namestore -D -z service
 
 # (2) GNU recognized GNUnet as a GNU project and delegates the "project" 
attribute
-gnunet-namestore -p -z gnu -a -n $GNU_PROJECT_ATTR -t ATTR -V "$GNUNET_KEY" -e 
5m -c test_credential_lookup.conf
+gnunet-credential --createIssuerSide --ego=gnu --attribute="$GNU_PROJECT_ATTR" 
--subject="$GNUNET_KEY" --ttl="2019-12-12 10:00:00" -c 
test_credential_lookup.conf
+gnunet-namestore -D -z gnu
 
 # (3+4) GNUnet assigns the attribute "member" to all entities gnunet has also 
assigned "developer" or "user"
-gnunet-namestore -p -z gnunet -a -n $MEMBER_ATTR -t ATTR -V "$GNUNET_KEY 
$DEVELOPER_ATTR" -e 5m -c test_credential_lookup.conf
-gnunet-namestore -p -z gnunet -a -n $MEMBER_ATTR -t ATTR -V "$GNUNET_KEY 
$USER_ATTR" -e 5m -c test_credential_lookup.conf
+gnunet-credential --createIssuerSide --ego=gnunet --attribute="$MEMBER_ATTR" 
--subject="$GNUNET_KEY $DEVELOPER_ATTR" --ttl="2019-12-12 10:00:00" -c 
test_credential_lookup.conf
+gnunet-credential --createIssuerSide --ego=gnunet --attribute="$MEMBER_ATTR" 
--subject="$GNUNET_KEY $USER_ATTR" --ttl="2019-12-12 10:00:00" -c 
test_credential_lookup.conf
+gnunet-namestore -D -z gnunet
 
-# (5) GNUnet issues Alice the credential "developer"
-CRED=`$DO_TIMEOUT gnunet-credential --issue --ego=gnunet --subject=$ALICE_KEY 
--attribute=$DEV_ATTR --ttl=5m -c test_credential_lookup.conf`
+# (5) GNUnet signes the delegate and Alice stores it
+SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=gnunet 
--attribute=$DEV_ATTR --subject=$ALICE_KEY --ttl="2019-12-12 10:00:00"`
+gnunet-credential --createSubjectSide --ego=alice --import "$SIGNED" --private
+gnunet-namestore -D -z alice
 
-# Alice stores the credential under "mygnunetcreds"
-gnunet-namestore -p -z alice -a -n $TEST_CREDENTIAL -t CRED -V "$CRED" -e 5m 
-c test_credential_lookup.conf
+# Starting to resolve
+echo "+++ Starting to Resolve +++"
 
-CREDS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$SERVICE_KEY 
--attribute=$USER_ATTR --ego=alice -c test_credential_lookup.conf | paste -d, 
-s`
+DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$SERVICE_KEY 
--attribute=$USER_ATTR --ego=alice --backward -c test_credential_lookup.conf | 
paste -d, -s`
+echo $DELS
+echo gnunet-credential --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR 
--subject=$ALICE_KEY --delegate=\'$DELS\' --backward -c 
test_credential_lookup.conf
+gnunet-credential --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR 
--subject=$ALICE_KEY --delegate="$DELS" --backward -c 
test_credential_lookup.conf
 
-echo gnunet-credential --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR 
--subject=$ALICE_KEY --credential=\'$CREDS\' -c test_credential_lookup.conf
-#TODO2 Add -z swich like in gnunet-gns
-gnunet-credential --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR 
--subject=$ALICE_KEY --credential="$CREDS" -c test_credential_lookup.conf
+RES=$?
 
-
-#TODO cleanup properly
-gnunet-namestore -z alice -d -n $TEST_CREDENTIAL -t CRED -e never -c 
test_credential_lookup.conf
+# Cleanup properly
+gnunet-namestore -z alice -d -n "@" -t DEL -c test_credential_lookup.conf
 gnunet-namestore -z gnu -d -n $GNU_PROJECT_ATTR -t ATTR -c 
test_credential_lookup.conf
 gnunet-namestore -z gnunet -d -n $MEMBER_ATTR -t ATTR -c 
test_credential_lookup.conf
 gnunet-namestore -z service -d -n $USER_ATTR -t ATTR -c 
test_credential_lookup.conf
 gnunet-arm -e -c test_credential_lookup.conf
 
-if [ "$RES_CRED" != "Failed." ]
+if [ "$RES" == 0 ]
 then
-  # TODO: replace echo -e bashism
-  echo -e "${RES_CRED}"
   exit 0
 else
-  echo "FAIL: Failed to verify credential $RES_CRED."
+  echo "FAIL: Failed to verify credential."
   exit 1
 fi
diff --git a/src/credential/test_credential_verify_and.sh 
b/src/credential/test_credential_verify_and.sh
index aaabcd753..03313c692 100755
--- a/src/credential/test_credential_verify_and.sh
+++ b/src/credential/test_credential_verify_and.sh
@@ -17,8 +17,8 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS 
-o GNUNET_HOME -f`
 
 #  (1) Service.user -> GNU.project.member
 #  (2) GNU.project -> GNUnet
-#  (3) GNUnet.member -> GNUnet.developer and (4)GNUnet.user
-#  (5) GNUnet.developer -> Alice
+#  (3) GNUnet.member -> GNUnet.developer AND GNUnet.user
+#  (4) GNUnet.developer -> Alice
 
 
 which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
@@ -39,43 +39,47 @@ MEMBER_ATTR="member"
 DEVELOPER_ATTR="developer"
 DEV_ATTR="developer"
 TEST_CREDENTIAL="mygnunetcreds"
-set -x
+
 # (1) A service assigns the attribute "user" to all entities that have been 
assigned "member" by entities that werde assigned "project" from GNU
-gnunet-namestore -p -z service -a -n $USER_ATTR -t ATTR -V "$GNU_KEY 
$GNU_PROJECT_ATTR.$MEMBER_ATTR" -e 5m -c test_credential_lookup.conf
+gnunet-credential --createIssuerSide --ego=service --attribute="$USER_ATTR" 
--subject="$GNU_KEY $GNU_PROJECT_ATTR.$MEMBER_ATTR" --ttl="2019-12-12 10:00:00" 
-c test_credential_lookup.conf
+gnunet-namestore -D -z service
 
 # (2) GNU recognized GNUnet as a GNU project and delegates the "project" 
attribute
-gnunet-namestore -p -z gnu -a -n $GNU_PROJECT_ATTR -t ATTR -V "$GNUNET_KEY" -e 
5m -c test_credential_lookup.conf
+gnunet-credential --createIssuerSide --ego=gnu --attribute="$GNU_PROJECT_ATTR" 
--subject="$GNUNET_KEY" --ttl="2019-12-12 10:00:00" -c 
test_credential_lookup.conf
+gnunet-namestore -D -z gnu
 
-# (3+4) GNUnet assigns the attribute "member" to all entities gnunet has also
-# assigned "developer" and "user"
-gnunet-namestore -p -z gnunet -a -n $MEMBER_ATTR -t ATTR -V "$GNUNET_KEY 
$DEVELOPER_ATTR,$GNUNET_KEY $USER_ATTR" -e 5m -c test_credential_lookup.conf
+# (3+4) GNUnet assigns the attribute "member" to all entities gnunet has also 
assigned "developer" or "user"
+gnunet-credential --createIssuerSide --ego=gnunet --attribute="$MEMBER_ATTR" 
--subject="$GNUNET_KEY $DEVELOPER_ATTR, $GNUNET_KEY $USER_ATTR" 
--ttl="2019-12-12 10:00:00" -c test_credential_lookup.conf
+gnunet-namestore -D -z gnunet
 
-# (5) GNUnet issues Alice the credential "developer"
-CRED1=`$DO_TIMEOUT gnunet-credential --issue --ego=gnunet --subject=$ALICE_KEY 
--attribute=$DEV_ATTR --ttl=5m -c test_credential_lookup.conf`
-# (5) GNUnet issues Alice the credential "user"
-CRED2=`$DO_TIMEOUT gnunet-credential --issue --ego=gnunet --subject=$ALICE_KEY 
--attribute=$USER_ATTR --ttl=5m -c test_credential_lookup.conf`
-# Alice stores the credential under "mygnunetcreds"
-gnunet-namestore -p -z alice -a -n $TEST_CREDENTIAL -t CRED -V "$CRED1" -e 5m 
-c test_credential_lookup.conf
-gnunet-namestore -p -z alice -a -n $TEST_CREDENTIAL -t CRED -V "$CRED2" -e 5m 
-c test_credential_lookup.conf
+# (5) GNUnet signes the delegates and Alice stores it
+SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=gnunet 
--attribute=$DEV_ATTR --subject=$ALICE_KEY --ttl="2019-12-12 10:00:00"`
+gnunet-credential --createSubjectSide --ego=alice --import "$SIGNED" --private
+SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=gnunet 
--attribute=$USER_ATTR --subject=$ALICE_KEY --ttl="2019-12-12 10:00:00"`
+gnunet-credential --createSubjectSide --ego=alice --import "$SIGNED" --private
+gnunet-namestore -D -z alice
 
-CREDS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$SERVICE_KEY 
--attribute=$USER_ATTR --ego=alice -c test_credential_lookup.conf | paste -d, 
-s`
+# Starting to resolve
+echo "+++ Starting to Resolve +++"
 
-#TODO2 Add -z swich like in gnunet-gns
-RES_CRED=`gnunet-credential --verify --issuer=$SERVICE_KEY 
--attribute=$USER_ATTR --subject=$ALICE_KEY --credential="$CREDS" -c 
test_credential_lookup.conf`
+DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$SERVICE_KEY 
--attribute=$USER_ATTR --ego=alice --backward -c test_credential_lookup.conf | 
paste -d, -s`
+echo $DELS
+echo gnunet-credential --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR 
--subject=$ALICE_KEY --delegate=\'$DELS\' --backward -c 
test_credential_lookup.conf
+gnunet-credential --verify --issuer=$SERVICE_KEY --attribute=$USER_ATTR 
--subject=$ALICE_KEY --delegate="$DELS" --backward -c 
test_credential_lookup.conf
 
+RES=$?
 
-#TODO cleanup properly
-gnunet-namestore -z alice -d -n $TEST_CREDENTIAL -t CRED -e never -c 
test_credential_lookup.conf
+# Cleanup properly
+gnunet-namestore -z alice -d -n "@" -t DEL -c test_credential_lookup.conf
 gnunet-namestore -z gnu -d -n $GNU_PROJECT_ATTR -t ATTR -c 
test_credential_lookup.conf
 gnunet-namestore -z gnunet -d -n $MEMBER_ATTR -t ATTR -c 
test_credential_lookup.conf
 gnunet-namestore -z service -d -n $USER_ATTR -t ATTR -c 
test_credential_lookup.conf
 gnunet-arm -e -c test_credential_lookup.conf
 
-if [ "$RES_CRED" != "Failed." ]
+if [ "$RES" == 0 ]
 then
-  echo -e "${RES_CRED}"
   exit 0
 else
   echo "FAIL: Failed to verify credential $RES_CRED."
   exit 1
-fi
\ No newline at end of file
+fi
diff --git a/src/credential/test_credential_verify_simple.sh 
b/src/credential/test_credential_verify_simple.sh
index 41afb47b0..d7657c55f 100755
--- a/src/credential/test_credential_verify_simple.sh
+++ b/src/credential/test_credential_verify_simple.sh
@@ -15,7 +15,7 @@ fi
 
 rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME 
-f`
 
-#  (3) Isser.user -> Subject
+#  (1) Issuer.user -> Subject
 
 
 which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
@@ -26,27 +26,29 @@ gnunet-identity -C testsubject -c 
test_credential_lookup.conf
 TEST_ATTR="user"
 SUBJECT_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep 
testsubject | awk '{print $3}')
 ISSUER_KEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep 
testissuer | awk '{print $3}')
-CRED=`$DO_TIMEOUT gnunet-credential --issue --ego=testissuer 
--subject=$SUBJECT_KEY --attribute=$TEST_ATTR --ttl=5m -c 
test_credential_lookup.conf`
 
-TEST_CREDENTIAL="t1"
-gnunet-namestore -p -z testsubject -a -n $TEST_CREDENTIAL -t CRED -V "$CRED" 
-e 5m -c test_credential_lookup.conf
+# Create delegate (1)
+SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=testissuer 
--attribute=$TEST_ATTR --subject=$SUBJECT_KEY --ttl="2019-12-12 10:00:00" -c 
test_credential_lookup.conf`
+gnunet-credential --createSubjectSide --ego=testsubject --import "$SIGNED" 
--private
+gnunet-namestore -D -z testsubject
 
-CREDS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$ISSUER_KEY 
--attribute=$TEST_ATTR --ego=testsubject -c test_credential_lookup.conf | paste 
-d, -s`
+# Starting to resolve
+echo "+++ Starting to Resolve +++"
 
+DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$ISSUER_KEY 
--attribute=$TEST_ATTR --ego=testsubject -c test_credential_lookup.conf | paste 
-d, -s`
+echo $DELS
+gnunet-credential --verify --issuer=$ISSUER_KEY --attribute=$TEST_ATTR 
--subject=$SUBJECT_KEY --delegate="$DELS" -c test_credential_lookup.conf
 
-#TODO2 Add -z swich like in gnunet-gns
-#RES_CRED=`$DO_TIMEOUT gnunet-credential --verify --issuer=$ISSUER_KEY 
--attribute="$TEST_ATTR" --subject=$SUBJECT_KEY --credential=$TEST_CREDENTIAL 
-c test_credential_lookup.conf`
-RES_CRED=`gnunet-credential --verify --issuer=$ISSUER_KEY 
--attribute=$TEST_ATTR --subject=$SUBJECT_KEY --credential="$CREDS" -c 
test_credential_lookup.conf`
+RES=$?
 
-#TODO cleanup properly
-gnunet-namestore -z testsubject -d -n $TEST_CREDENTIAL -t CRED -e never -c 
test_credential_lookup.conf
-gnunet-identity -D testsubject -c test_credential_lookup.conf
+# Cleanup properly
+gnunet-namestore -z testsubject -d -n "@" -t DEL -c test_credential_lookup.conf
 gnunet-arm -e -c test_credential_lookup.conf
-#TODO3 proper test
-if [ "$RES_CRED" != "Failed." ]
+
+if [ "$RES" == 0 ]
 then
   exit 0
 else
   echo "FAIL: Failed to verify credential."
   exit 1
-fi
+fi
\ No newline at end of file

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



reply via email to

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