gnunet-svn
[Top][All Lists]
Advanced

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

[gnunet] 02/02: - housekeeping, forgotten for 0.19.1


From: gnunet
Subject: [gnunet] 02/02: - housekeeping, forgotten for 0.19.1
Date: Thu, 29 Dec 2022 12:10:51 +0100

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

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

commit bcf99cf2e295b92b23b40926ad37abfa0d4ceddb
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Dec 29 20:10:26 2022 +0900

    - housekeeping, forgotten for 0.19.1
---
 ChangeLog      |   70 +++
 po/POTFILES.in |  100 ++--
 po/de.po       | 1420 +++++++++++++++++++++++++++----------------------------
 po/es.po       | 1422 +++++++++++++++++++++++++++----------------------------
 po/fr.po       | 1356 ++++++++++++++++++++++++++---------------------------
 po/it.po       | 1346 ++++++++++++++++++++++++++--------------------------
 po/sr.po       | 1424 ++++++++++++++++++++++++++++----------------------------
 po/sv.po       | 1418 +++++++++++++++++++++++++++----------------------------
 po/vi.po       | 1416 +++++++++++++++++++++++++++----------------------------
 po/zh_CN.po    | 1308 +++++++++++++++++++++++++--------------------------
 10 files changed, 5675 insertions(+), 5605 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 51982a07d..b4a1ff2d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,73 @@
+Mon, 26 Dec 2022 14:41:09 +0100 (05fef7b53)
+DHT: call try_connect also on already connected peers, just in case address 
changed
+
+by: Christian Grothoff
+
+Mon, 26 Dec 2022 14:03:27 +0100 (cc41a24c5)
+DHT: adjust BF size to actual neighbour set size
+
+by: Christian Grothoff
+
+Sat, 10 Dec 2022 16:00:56 +0900 (52d0d0914)
+GNS: Do not autogenerate flags
+
+by: Martin Schanzenbach
+
+Fri, 9 Dec 2022 23:54:05 +0900 (7e725a7a8)
+TESTING: Fix NP deref
+
+by: Martin Schanzenbach
+
+Fri, 9 Dec 2022 14:06:20 +0900 (5357758fd)
+TESTING: Various notes on API
+
+by: Martin Schanzenbach
+
+Fri, 9 Dec 2022 12:07:26 +0900 (4f46e2f2e)
+TESTING: Fix TESTING-NG API to follow naming conventions
+Rename structs and functions to follow GNUnet naming conventions.
+Some structs may actually also be private, a review is necessary.
+The barrier API was modified in order to untangle Barriers and
+lists of Barriers.
+This is a rough draft, it needs fixes wrt memory leaks.
+
+by: Martin Schanzenbach
+
+Fri, 9 Dec 2022 10:40:56 +0900 (1b3f6f366)
+UTIL: Fix regression regarding C++ compatibility
+
+by: Martin Schanzenbach
+
+Thu, 8 Dec 2022 20:51:35 +0900 (7768a7a75)
+TESTING: Sanitize API. Add new GNUNET_TESTING_command_new API
+This commit changes the label member of GNUNET_TRANSPORT_Command to a
+static, fixed length buffer allocated with the struct itself.
+The check for the end of a command array should be done by checking the
+run command instead of the label.
+
+by: Martin Schanzenbach
+
+Thu, 8 Dec 2022 17:52:42 +0900 (1029772b3)
+TESTING: Properly handle label allocations
+
+by: Martin Schanzenbach
+
+Thu, 8 Dec 2022 17:30:22 +0900 (5c4b06071)
+TESTING: The testing API should properly take strings as const
+Strings passed to the API should either be const and copied, or handled
+by the caller and free'd. Looking at the transport tests currently
+neither is happening. The strings are probably safer but definitely
+leaked.
+Changed the API to use "const" strings. Users of the testing API must
+define functions that copy (and free!) strings accordingly.
+
+by: Martin Schanzenbach
+
+Thu, 8 Dec 2022 15:37:43 +0900 (2d257589d)
+BUILD: Add functionality to generate changes in plain text and HTML
+
+by: Martin Schanzenbach
+
 Thu, 8 Dec 2022 15:11:49 +0900 (3889a387e)
 BUILD: Add some helper scripts for release maintenance
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 58401a433..78babb7a6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,13 +9,14 @@ src/arm/arm_monitor_api.c
 src/arm/gnunet-arm.c
 src/arm/gnunet-service-arm.c
 src/arm/mockup-service.c
+src/ats-tool/gnunet-ats.c
 src/ats/ats_api_connectivity.c
 src/ats/ats_api_performance.c
 src/ats/ats_api_scanner.c
 src/ats/ats_api_scheduling.c
 src/ats/gnunet-ats-solver-eval.c
-src/ats/gnunet-service-ats_addresses.c
 src/ats/gnunet-service-ats.c
+src/ats/gnunet-service-ats_addresses.c
 src/ats/gnunet-service-ats_connectivity.c
 src/ats/gnunet-service-ats_normalization.c
 src/ats/gnunet-service-ats_performance.c
@@ -24,7 +25,6 @@ src/ats/gnunet-service-ats_preferences.c
 src/ats/gnunet-service-ats_reservations.c
 src/ats/gnunet-service-ats_scheduling.c
 src/ats/plugin_ats_proportional.c
-src/ats-tool/gnunet-ats.c
 src/auction/gnunet-auction-create.c
 src/auction/gnunet-auction-info.c
 src/auction/gnunet-auction-join.c
@@ -42,8 +42,8 @@ src/cadet/cadet_api_list_peers.c
 src/cadet/cadet_api_list_tunnels.c
 src/cadet/cadet_test_lib.c
 src/cadet/desirability_table.c
-src/cadet/gnunet-cadet.c
 src/cadet/gnunet-cadet-profiler.c
+src/cadet/gnunet-cadet.c
 src/cadet/gnunet-service-cadet.c
 src/cadet/gnunet-service-cadet_channel.c
 src/cadet/gnunet-service-cadet_connection.c
@@ -59,15 +59,15 @@ src/consensus/gnunet-service-consensus.c
 src/consensus/plugin_block_consensus.c
 src/conversation/conversation_api.c
 src/conversation/conversation_api_call.c
-src/conversation/gnunet-conversation.c
 src/conversation/gnunet-conversation-test.c
-src/conversation/gnunet_gst.c
-src/conversation/gnunet_gst_test.c
-src/conversation/gnunet-helper-audio-playback.c
+src/conversation/gnunet-conversation.c
 src/conversation/gnunet-helper-audio-playback-gst.c
-src/conversation/gnunet-helper-audio-record.c
+src/conversation/gnunet-helper-audio-playback.c
 src/conversation/gnunet-helper-audio-record-gst.c
+src/conversation/gnunet-helper-audio-record.c
 src/conversation/gnunet-service-conversation.c
+src/conversation/gnunet_gst.c
+src/conversation/gnunet_gst_test.c
 src/conversation/microphone.c
 src/conversation/plugin_gnsrecord_conversation.c
 src/conversation/speaker.c
@@ -98,13 +98,13 @@ src/dht/dht_test_lib.c
 src/dht/gnunet-dht-get.c
 src/dht/gnunet-dht-hello.c
 src/dht/gnunet-dht-monitor.c
-src/dht/gnunet_dht_profiler.c
 src/dht/gnunet-dht-put.c
 src/dht/gnunet-service-dht.c
 src/dht/gnunet-service-dht_clients.c
 src/dht/gnunet-service-dht_datacache.c
 src/dht/gnunet-service-dht_neighbours.c
 src/dht/gnunet-service-dht_routing.c
+src/dht/gnunet_dht_profiler.c
 src/dht/plugin_block_dht.c
 src/dhtu/plugin_dhtu_gnunet.c
 src/dhtu/plugin_dhtu_ip.c
@@ -142,8 +142,8 @@ src/fs/gnunet-auto-share.c
 src/fs/gnunet-daemon-fsprofiler.c
 src/fs/gnunet-directory.c
 src/fs/gnunet-download.c
-src/fs/gnunet-fs.c
 src/fs/gnunet-fs-profiler.c
+src/fs/gnunet-fs.c
 src/fs/gnunet-helper-fs-publish.c
 src/fs/gnunet-publish.c
 src/fs/gnunet-search.c
@@ -164,9 +164,9 @@ src/gns/gns_tld_api.c
 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-import.c
 src/gns/gnunet-gns-proxy.c
+src/gns/gnunet-gns.c
 src/gns/gnunet-service-gns.c
 src/gns/gnunet-service-gns_interceptor.c
 src/gns/gnunet-service-gns_resolver.c
@@ -184,9 +184,9 @@ src/gnsrecord/json_gnsrecord.c
 src/gnsrecord/plugin_gnsrecord_dns.c
 src/hello/address.c
 src/hello/gnunet-hello.c
-src/hello/hello.c
 src/hello/hello-ng.c
 src/hello/hello-uri.c
+src/hello/hello.c
 src/hostlist/gnunet-daemon-hostlist.c
 src/hostlist/gnunet-daemon-hostlist_client.c
 src/hostlist/gnunet-daemon-hostlist_server.c
@@ -202,8 +202,8 @@ src/json/json_helper.c
 src/json/json_mhd.c
 src/json/json_pack.c
 src/messenger/gnunet-messenger.c
-src/messenger/gnunet-service-messenger_basement.c
 src/messenger/gnunet-service-messenger.c
+src/messenger/gnunet-service-messenger_basement.c
 src/messenger/gnunet-service-messenger_ego_store.c
 src/messenger/gnunet-service-messenger_handle.c
 src/messenger/gnunet-service-messenger_list_handles.c
@@ -243,10 +243,10 @@ src/namecache/namecache_api.c
 src/namecache/plugin_namecache_flat.c
 src/namecache/plugin_namecache_postgres.c
 src/namecache/plugin_namecache_sqlite.c
-src/namestore/gnunet-namestore.c
 src/namestore/gnunet-namestore-dbtool.c
 src/namestore/gnunet-namestore-fcfsd.c
 src/namestore/gnunet-namestore-zonefile.c
+src/namestore/gnunet-namestore.c
 src/namestore/gnunet-service-namestore.c
 src/namestore/gnunet-zoneimport.c
 src/namestore/namestore_api.c
@@ -272,17 +272,17 @@ src/nat/gnunet-service-nat_mini.c
 src/nat/gnunet-service-nat_stun.c
 src/nat/nat_api.c
 src/nat/nat_api_stun.c
-src/nse/gnunet-nse.c
 src/nse/gnunet-nse-profiler.c
+src/nse/gnunet-nse.c
 src/nse/gnunet-service-nse.c
 src/nse/nse_api.c
 src/nt/nt.c
-src/peerinfo/gnunet-service-peerinfo.c
-src/peerinfo/peerinfo_api.c
-src/peerinfo/peerinfo_api_notify.c
 src/peerinfo-tool/gnunet-peerinfo.c
 src/peerinfo-tool/gnunet-peerinfo_plugins.c
 src/peerinfo-tool/plugin_rest_peerinfo.c
+src/peerinfo/gnunet-service-peerinfo.c
+src/peerinfo/peerinfo_api.c
+src/peerinfo/peerinfo_api_notify.c
 src/peerstore/gnunet-peerstore.c
 src/peerstore/gnunet-service-peerstore.c
 src/peerstore/peerstore_api.c
@@ -336,27 +336,27 @@ 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
 src/revocation/gnunet-revocation-tvg.c
+src/revocation/gnunet-revocation.c
 src/revocation/gnunet-service-revocation.c
 src/revocation/plugin_block_revocation.c
 src/revocation/revocation_api.c
-src/rps/gnunet-rps.c
 src/rps/gnunet-rps-profiler.c
+src/rps/gnunet-rps.c
 src/rps/gnunet-service-rps.c
 src/rps/gnunet-service-rps_custommap.c
 src/rps/gnunet-service-rps_sampler.c
 src/rps/gnunet-service-rps_sampler_elem.c
 src/rps/gnunet-service-rps_view.c
-src/rps/rps_api.c
 src/rps/rps-sampler_client.c
 src/rps/rps-sampler_common.c
 src/rps/rps-test_util.c
+src/rps/rps_api.c
 src/scalarproduct/gnunet-scalarproduct.c
-src/scalarproduct/gnunet-service-scalarproduct_alice.c
-src/scalarproduct/gnunet-service-scalarproduct_bob.c
 src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
 src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
+src/scalarproduct/gnunet-service-scalarproduct_alice.c
+src/scalarproduct/gnunet-service-scalarproduct_bob.c
 src/scalarproduct/scalarproduct_api.c
 src/secretsharing/gnunet-secretsharing-profiler.c
 src/secretsharing/gnunet-service-secretsharing.c
@@ -370,12 +370,12 @@ src/set/gnunet-set-ibf-profiler.c
 src/set/gnunet-set-profiler.c
 src/set/ibf.c
 src/set/ibf_sim.c
+src/set/plugin_block_set_test.c
+src/set/set_api.c
 src/seti/gnunet-service-seti.c
 src/seti/gnunet-seti-profiler.c
 src/seti/plugin_block_seti_test.c
 src/seti/seti_api.c
-src/set/plugin_block_set_test.c
-src/set/set_api.c
 src/setu/gnunet-service-setu.c
 src/setu/gnunet-service-setu_strata_estimator.c
 src/setu/gnunet-setu-ibf-profiler.c
@@ -394,15 +394,16 @@ src/statistics/gnunet-statistics.c
 src/statistics/statistics_api.c
 src/template/gnunet-service-template.c
 src/template/gnunet-template.c
+src/testbed-logger/gnunet-service-testbed-logger.c
+src/testbed-logger/testbed_logger_api.c
 src/testbed/generate-underlay-topology.c
 src/testbed/gnunet-daemon-latency-logger.c
 src/testbed/gnunet-daemon-testbed-blacklist.c
 src/testbed/gnunet-daemon-testbed-underlay.c
 src/testbed/gnunet-helper-testbed.c
-src/testbed/gnunet_mpi_test.c
 src/testbed/gnunet-service-test-barriers.c
-src/testbed/gnunet-service-testbed_barriers.c
 src/testbed/gnunet-service-testbed.c
+src/testbed/gnunet-service-testbed_barriers.c
 src/testbed/gnunet-service-testbed_cache.c
 src/testbed/gnunet-service-testbed_connectionpool.c
 src/testbed/gnunet-service-testbed_cpustatus.c
@@ -411,23 +412,23 @@ src/testbed/gnunet-service-testbed_meminfo.c
 src/testbed/gnunet-service-testbed_oc.c
 src/testbed/gnunet-service-testbed_peers.c
 src/testbed/gnunet-testbed-profiler.c
-src/testbed-logger/gnunet-service-testbed-logger.c
-src/testbed-logger/testbed_logger_api.c
-src/testbed/testbed_api_barriers.c
+src/testbed/gnunet_mpi_test.c
 src/testbed/testbed_api.c
+src/testbed/testbed_api_barriers.c
 src/testbed/testbed_api_hosts.c
 src/testbed/testbed_api_operations.c
 src/testbed/testbed_api_peers.c
 src/testbed/testbed_api_sd.c
 src/testbed/testbed_api_services.c
 src/testbed/testbed_api_statistics.c
-src/testbed/testbed_api_testbed.c
 src/testbed/testbed_api_test.c
+src/testbed/testbed_api_testbed.c
 src/testbed/testbed_api_topology.c
 src/testbed/testbed_api_underlay.c
 src/testing/gnunet-cmds-helper.c
 src/testing/gnunet-testing.c
 src/testing/list-keys.c
+src/testing/testing.c
 src/testing/testing_api_cmd_barrier.c
 src/testing/testing_api_cmd_barrier_reached.c
 src/testing/testing_api_cmd_batch.c
@@ -445,41 +446,51 @@ src/testing/testing_api_cmd_system_create.c
 src/testing/testing_api_cmd_system_destroy.c
 src/testing/testing_api_loop.c
 src/testing/testing_api_traits.c
-src/testing/testing.c
 src/topology/friends.c
 src/topology/gnunet-daemon-topology.c
 src/transport/gnunet-communicator-tcp.c
 src/transport/gnunet-communicator-udp.c
 src/transport/gnunet-communicator-unix.c
 src/transport/gnunet-helper-transport-bluetooth.c
-src/transport/gnunet-helper-transport-wlan.c
 src/transport/gnunet-helper-transport-wlan-dummy.c
+src/transport/gnunet-helper-transport-wlan.c
 src/transport/gnunet-service-tng.c
-src/transport/gnunet-service-transport_ats.c
 src/transport/gnunet-service-transport.c
+src/transport/gnunet-service-transport_ats.c
 src/transport/gnunet-service-transport_hello.c
 src/transport/gnunet-service-transport_manipulation.c
 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-profiler.c
 src/transport/gnunet-transport-wlan-receiver.c
 src/transport/gnunet-transport-wlan-sender.c
+src/transport/gnunet-transport.c
 src/transport/plugin_transport_http_client.c
 src/transport/plugin_transport_http_common.c
 src/transport/plugin_transport_http_server.c
 src/transport/plugin_transport_smtp.c
 src/transport/plugin_transport_tcp.c
 src/transport/plugin_transport_template.c
-src/transport/plugin_transport_udp_broadcasting.c
 src/transport/plugin_transport_udp.c
+src/transport/plugin_transport_udp_broadcasting.c
 src/transport/plugin_transport_unix.c
 src/transport/plugin_transport_wlan.c
 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-testing-communicator.c
+src/transport/transport-testing-filenames.c
+src/transport/transport-testing-filenames2.c
+src/transport/transport-testing-loggers.c
+src/transport/transport-testing-loggers2.c
+src/transport/transport-testing-main.c
+src/transport/transport-testing-main2.c
+src/transport/transport-testing-send.c
+src/transport/transport-testing-send2.c
+src/transport/transport-testing.c
+src/transport/transport-testing2.c
 src/transport/transport_api2_application.c
 src/transport/transport_api2_communication.c
 src/transport/transport_api2_core.c
@@ -498,17 +509,6 @@ src/transport/transport_api_monitor_peers.c
 src/transport/transport_api_monitor_plugins.c
 src/transport/transport_api_offer_hello.c
 src/transport/transport_api_traits.c
-src/transport/transport-testing2.c
-src/transport/transport-testing.c
-src/transport/transport-testing-communicator.c
-src/transport/transport-testing-filenames2.c
-src/transport/transport-testing-filenames.c
-src/transport/transport-testing-loggers2.c
-src/transport/transport-testing-loggers.c
-src/transport/transport-testing-main2.c
-src/transport/transport-testing-main.c
-src/transport/transport-testing-send2.c
-src/transport/transport-testing-send.c
 src/util/bandwidth.c
 src/util/benchmark.c
 src/util/bio.c
@@ -524,8 +524,8 @@ src/util/configuration_helper.c
 src/util/consttime_memcmp.c
 src/util/container_bloomfilter.c
 src/util/container_heap.c
-src/util/container_multihashmap32.c
 src/util/container_multihashmap.c
+src/util/container_multihashmap32.c
 src/util/container_multipeermap.c
 src/util/container_multishortmap.c
 src/util/container_multiuuidmap.c
@@ -552,17 +552,17 @@ src/util/dnsstub.c
 src/util/getopt.c
 src/util/getopt_helpers.c
 src/util/gnunet-base32.c
-src/util/gnunet-config.c
 src/util/gnunet-config-diff.c
+src/util/gnunet-config.c
 src/util/gnunet-crypto-tvg.c
 src/util/gnunet-ecc.c
-src/util/gnunet_error_codes.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-uri.c
+src/util/gnunet_error_codes.c
 src/util/helper.c
 src/util/load.c
 src/util/mq.c
diff --git a/po/de.po b/po/de.po
index 7ea04e395..2084f6e58 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-12-26 09:51+0100\n"
+"POT-Creation-Date: 2022-12-28 19:48+0900\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -34,8 +34,8 @@ msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
 #: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore.c:1957
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
+#: src/namestore/gnunet-namestore.c:1957
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -506,80 +506,6 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2993 src/ats/gnunet-ats-solver-eval.c:3045
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3012
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3064
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3553
-msgid "solver to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3558
-msgid "experiment to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3565
-msgid "print logging"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3570
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3575
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:321
-#, 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:331
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:377
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:462
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
-
-#: src/ats/plugin_ats_proportional.c:1142
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
-
-#: src/ats/plugin_ats_proportional.c:1165
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr " gconfig\tGTK Konfiguration\n"
-
 #: src/ats-tool/gnunet-ats.c:299
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -697,6 +623,80 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
+#: src/ats/gnunet-ats-solver-eval.c:2993 src/ats/gnunet-ats-solver-eval.c:3045
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3012
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3064
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3553
+msgid "solver to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3558
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3565
+msgid "print logging"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3570
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3575
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:321
+#, 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:331
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:377
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:462
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#: src/ats/plugin_ats_proportional.c:1142
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
+
+#: src/ats/plugin_ats_proportional.c:1165
+#, 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 ""
@@ -833,6 +833,28 @@ 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:146
+#, c-format
+msgid ""
+"\n"
+"ew are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:218
+#, 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:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1092,30 +1114,8 @@ msgstr ""
 msgid "Enables having a conversation with other GNUnet users."
 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:146
-#, c-format
-msgid ""
-"\n"
-"ew are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:218
-#, 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:665
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr "Fehler beim Lesen aus STDIN: %d %s\n"
@@ -2019,6 +2019,40 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:140
+#, fuzzy, c-format
+msgid "Could not connect to DHT service!\n"
+msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
+
+#: src/dht/gnunet-dht-put.c:151
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:188
+msgid "the data to insert under the key"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:194
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:212
+msgid "how many replicas to create"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:223
+msgid "the type to insert data as"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:241
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr ""
+
 #: src/dht/gnunet_dht_profiler.c:925 src/testbed/gnunet-testbed-profiler.c:253
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
@@ -2066,58 +2100,24 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
+#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:140
-#, fuzzy, c-format
-msgid "Could not connect to DHT service!\n"
-msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
-
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+#: src/dns/gnunet-dns-monitor.c:387
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:188
-msgid "the data to insert under the key"
+#: src/dns/gnunet-dns-redirector.c:240
+msgid "set A records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:194
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/dns/gnunet-dns-redirector.c:246
+msgid "set AAAA records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:212
-msgid "how many replicas to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:223
-msgid "the type to insert data as"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:241
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
-msgid "only monitor DNS queries"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:387
-msgid "Monitor DNS queries."
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:240
-msgid "set A records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:246
-msgid "set AAAA records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:259
-msgid "Change DNS replies to point elsewhere."
+#: src/dns/gnunet-dns-redirector.c:259
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
 #: src/dns/gnunet-service-dns.c:463
@@ -3025,15 +3025,6 @@ msgid ""
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:180
-#, 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 ""
@@ -3050,6 +3041,15 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:180
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Alle Optionen anzeigen"
+
 #: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3815,52 +3815,6 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:256
-#, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "»%s« ist keine gültige IP-Adresse.\n"
-
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:304
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:345
-#, fuzzy
-msgid "Specify the type of the record to lookup"
-msgstr "Die Priorität des Inhalts angeben"
-
-#: src/gns/gnunet-gns.c:351
-#, fuzzy
-msgid "Specify a timeout for the lookup"
-msgstr "Die Priorität des Inhalts angeben"
-
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "GNUnet Netzwerk Topologie tracen."
-
 #: src/gns/gnunet-gns-import.c:490
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -3981,6 +3935,52 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:256
+#, fuzzy, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "»%s« ist keine gültige IP-Adresse.\n"
+
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:345
+#, fuzzy
+msgid "Specify the type of the record to lookup"
+msgstr "Die Priorität des Inhalts angeben"
+
+#: src/gns/gnunet-gns.c:351
+#, fuzzy
+msgid "Specify a timeout for the lookup"
+msgstr "Die Priorität des Inhalts angeben"
+
+#: src/gns/gnunet-gns.c:355
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:374
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "GNUnet Netzwerk Topologie tracen."
+
 #: src/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4785,413 +4785,413 @@ 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.c:411
-#, fuzzy, c-format
-msgid "Missing entries in record line `%s'.\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+#: src/namestore/gnunet-namestore-dbtool.c:87
+#: src/namestore/gnunet-namestore.c:1950
+#, c-format
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Unbekannter Befehl »%s«\n"
+#: src/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
+#: src/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:434
-#, fuzzy, c-format
-msgid "Error parsing expiration time %s.\n"
-msgstr "Fehler beim Lesen von »%s«: %s\n"
+#: src/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "Ungültiges Format für IP: »%s«\n"
+#: src/namestore/gnunet-namestore-dbtool.c:189
+#: src/namestore/gnunet-namestore-zonefile.c:753
+#, fuzzy
+msgid "GNUnet namestore database manipulation tool"
+msgstr "GNUnet Konfiguration"
 
-#: src/namestore/gnunet-namestore.c:666
-#, c-format
-msgid "Adding record failed: %s\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:373
+#, fuzzy
+msgid "can not search the namestore"
+msgstr "GNUnet testbed Controller starten."
 
-#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
+#: src/namestore/gnunet-namestore-fcfsd.c:427
+#: src/namestore/gnunet-namestore-fcfsd.c:561
+#, fuzzy
+msgid "unable to scan namestore"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:447
 #, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+msgid "Failed to create record for `%s': %s\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1136
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:460
+#, fuzzy
+msgid "no errors"
+msgstr "Unbekannter Fehler"
 
-#: src/namestore/gnunet-namestore.c:1257
+#: src/namestore/gnunet-namestore-fcfsd.c:496
 #, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
+msgid "The requested key `%s' exists as `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1300
-#, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:503
+msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1325
-#, c-format
-msgid "%s\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy
+msgid "Error creating record data\n"
+msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/namestore/gnunet-namestore.c:1354
+#: src/namestore/gnunet-namestore-fcfsd.c:524
+#, fuzzy
+msgid "unable to store record"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:595
 #, c-format
-msgid "No options given\n"
+msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1368
-#, c-format
-msgid "Recordlines only work with option `%s'\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:601
+msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
-#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
-#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
-#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
-#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
-#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
-#: src/namestore/gnunet-namestore.c:1685
-#, fuzzy, c-format
-msgid "Missing option `%s' for operation `%s'\n"
-msgstr "Unbekannte Operation `%s'\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:787
+msgid "unable to process submitted data"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1379
-msgid "name"
+#: src/namestore/gnunet-namestore-fcfsd.c:798
+msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1408
-#, fuzzy, c-format
-msgid "Invalid nick `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/namestore/gnunet-namestore.c:1431 src/namestore/gnunet-namestore.c:1441
-#: src/namestore/gnunet-namestore.c:1451 src/namestore/gnunet-namestore.c:1480
-#: src/namestore/gnunet-namestore.c:1501 src/namestore/gnunet-namestore.c:1687
-msgid "add"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1459
-#, fuzzy, c-format
-msgid "Unsupported type `%s'\n"
-msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:817
+#, fuzzy
+msgid "invalid parameters"
+msgstr "Ungültiges Argument »%s«\n"
 
-#: src/namestore/gnunet-namestore.c:1469
-#, c-format
-msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:834
+#, fuzzy
+msgid "invalid name"
+msgstr "Ungültiges Argument »%s«\n"
 
-#: src/namestore/gnunet-namestore.c:1489
+#: src/namestore/gnunet-namestore-fcfsd.c:845
 #, fuzzy, c-format
-msgid "Value `%s' invalid for record type `%s'\n"
-msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
+msgid "Unable to parse key %s\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/namestore/gnunet-namestore.c:1508 src/namestore/gnunet-namestore.c:1694
-#, fuzzy, c-format
-msgid "Invalid time format `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:849
+#, fuzzy
+msgid "unable to parse key"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
-msgid "del"
+#: src/namestore/gnunet-namestore-fcfsd.c:960
+msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1571
-msgid "purge-zone"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
+#, fuzzy
+msgid "No expiration specified for records.\n"
+msgstr "Keine Kommandos angegeben.\n"
 
-#: src/namestore/gnunet-namestore.c:1596
-msgid "list"
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
+msgid "No port specified, using default value\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1630
-msgid "reverse-pkey"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:1098
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore.c:1640
-#, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
+msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1664
-msgid "uri"
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
+msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1677
-#: src/peerinfo-tool/gnunet-peerinfo.c:737
+#: src/namestore/gnunet-namestore-zonefile.c:329
 #, fuzzy, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/namestore/gnunet-namestore.c:1950
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
-msgstr ""
+msgid "Failed to store records...\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/namestore/gnunet-namestore.c:1965
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
 #, fuzzy, c-format
-msgid "Cannot connect to identity service\n"
-msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
-
-#: src/namestore/gnunet-namestore.c:1984
-msgid "add record"
-msgstr ""
+msgid "Name `%s' is too long\n"
+msgstr "Dienst »%s« läuft nicht\n"
 
-#: src/namestore/gnunet-namestore.c:1987
-msgid "delete record"
-msgstr ""
+#: src/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1991
-msgid "display records"
-msgstr ""
+#: src/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1995
-msgid "read commands from stdin"
+#: src/namestore/gnunet-namestore-zonefile.c:520
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2002
-msgid ""
-"expiration time for record to use (for adding only), \"never\" is possible"
+#: src/namestore/gnunet-namestore-zonefile.c:529
+#, c-format
+msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2008
-msgid "set the desired nick name for the zone"
-msgstr ""
+#: src/namestore/gnunet-namestore-zonefile.c:591
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Schlüssel »%s« ist gültig\n"
 
-#: src/namestore/gnunet-namestore.c:2013
-msgid "monitor changes in the namestore"
-msgstr ""
+#: src/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore.c:2023
-msgid "Output in recordline format"
-msgstr ""
+#: src/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore.c:2029
-msgid "determine our name for the given KEY"
+#: src/namestore/gnunet-namestore-zonefile.c:738
+#: src/namestore/gnunet-namestore.c:2086
+msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2035
-msgid "type of the record to add/delete/display"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:411
+#, fuzzy, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/namestore/gnunet-namestore.c:2040
-msgid "URI to import into our zone"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Unbekannter Befehl »%s«\n"
 
-#: src/namestore/gnunet-namestore.c:2046
-msgid "value of the record to add/delete"
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2050
-msgid "create or list public record"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:434
+#, fuzzy, c-format
+msgid "Error parsing expiration time %s.\n"
+msgstr "Fehler beim Lesen von »%s«: %s\n"
 
-#: src/namestore/gnunet-namestore.c:2054
-msgid "omit private records"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "Ungültiges Format für IP: »%s«\n"
 
-#: src/namestore/gnunet-namestore.c:2059
-msgid "do not filter maintenance records"
+#: src/namestore/gnunet-namestore.c:666
+#, c-format
+msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2064
-msgid "purge namestore of all orphans"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/namestore/gnunet-namestore.c:2069
+#: src/namestore/gnunet-namestore.c:1136
+#, c-format
 msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2074
-msgid "delete all records in specified zone"
+#: src/namestore/gnunet-namestore.c:1257
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2080
+#: src/namestore/gnunet-namestore.c:1300
+#, c-format
 msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
+"There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2086
-#: src/namestore/gnunet-namestore-zonefile.c:738
-msgid "name of the ego controlling the zone"
+#: src/namestore/gnunet-namestore.c:1325
+#, c-format
+msgid "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
+#: src/namestore/gnunet-namestore.c:1354
+#, c-format
+msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
+#: src/namestore/gnunet-namestore.c:1368
+#, c-format
+msgid "Recordlines only work with option `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
+#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
+#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
+#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
+#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
+#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
+#: src/namestore/gnunet-namestore.c:1685
+#, fuzzy, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "Unbekannte Operation `%s'\n"
 
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-#, fuzzy
-msgid "GNUnet namestore database manipulation tool"
-msgstr "GNUnet Konfiguration"
+#: src/namestore/gnunet-namestore.c:1379
+msgid "name"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:373
-#, fuzzy
-msgid "can not search the namestore"
-msgstr "GNUnet testbed Controller starten."
+#: src/namestore/gnunet-namestore.c:1408
+#, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
-#, fuzzy
-msgid "unable to scan namestore"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+#: src/namestore/gnunet-namestore.c:1431 src/namestore/gnunet-namestore.c:1441
+#: src/namestore/gnunet-namestore.c:1451 src/namestore/gnunet-namestore.c:1480
+#: src/namestore/gnunet-namestore.c:1501 src/namestore/gnunet-namestore.c:1687
+msgid "add"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:447
+#: src/namestore/gnunet-namestore.c:1459
 #, fuzzy, c-format
-msgid "Failed to create record for `%s': %s\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:460
-#, fuzzy
-msgid "no errors"
-msgstr "Unbekannter Fehler"
+msgid "Unsupported type `%s'\n"
+msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/namestore/gnunet-namestore.c:1469
 #, c-format
-msgid "The requested key `%s' exists as `%s'\n"
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
-msgid "key exists"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:1489
+#, fuzzy, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
+msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, fuzzy
-msgid "Error creating record data\n"
-msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
+#: src/namestore/gnunet-namestore.c:1508 src/namestore/gnunet-namestore.c:1694
+#, fuzzy, c-format
+msgid "Invalid time format `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:524
-#, fuzzy
-msgid "unable to store record"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
+msgid "del"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:595
-#, c-format
-msgid "Requested name `%s' exists with `%u' records\n"
+#: src/namestore/gnunet-namestore.c:1571
+msgid "purge-zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:601
-msgid "name exists\n"
+#: src/namestore/gnunet-namestore.c:1596
+msgid "list"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
-msgid "unable to process submitted data"
+#: src/namestore/gnunet-namestore.c:1630
+msgid "reverse-pkey"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:798
-msgid "the submitted data is invalid"
+#: src/namestore/gnunet-namestore.c:1640
+#, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
-#, fuzzy
-msgid "invalid parameters"
-msgstr "Ungültiges Argument »%s«\n"
+#: src/namestore/gnunet-namestore.c:1664
+msgid "uri"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
-#, fuzzy
-msgid "invalid name"
-msgstr "Ungültiges Argument »%s«\n"
+#: src/namestore/gnunet-namestore.c:1677
+#: src/peerinfo-tool/gnunet-peerinfo.c:737
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:845
+#: src/namestore/gnunet-namestore.c:1965
 #, fuzzy, c-format
-msgid "Unable to parse key %s\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+msgid "Cannot connect to identity service\n"
+msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:849
-#, fuzzy
-msgid "unable to parse key"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+#: src/namestore/gnunet-namestore.c:1984
+msgid "add record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1987
+msgid "delete record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1991
+msgid "display records"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:960
-msgid "No ego configured for `fcfsd` subsystem\n"
+#: src/namestore/gnunet-namestore.c:1995
+msgid "read commands from stdin"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
-#, fuzzy
-msgid "No expiration specified for records.\n"
-msgstr "Keine Kommandos angegeben.\n"
+#: src/namestore/gnunet-namestore.c:2002
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
-msgid "No port specified, using default value\n"
+#: src/namestore/gnunet-namestore.c:2008
+msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+#: src/namestore/gnunet-namestore.c:2013
+msgid "monitor changes in the namestore"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
-msgid "name of the zone managed by FCFSD"
+#: src/namestore/gnunet-namestore.c:2023
+msgid "Output in recordline format"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
-msgid "GNU Name System First-Come-First-Served name registration service"
+#: src/namestore/gnunet-namestore.c:2029
+msgid "determine our name for the given KEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+#: src/namestore/gnunet-namestore.c:2035
+msgid "type of the record to add/delete/display"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, fuzzy, c-format
-msgid "Name `%s' is too long\n"
-msgstr "Dienst »%s« läuft nicht\n"
+#: src/namestore/gnunet-namestore.c:2040
+msgid "URI to import into our zone"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "Datei `%s' hat URI: %s\n"
+#: src/namestore/gnunet-namestore.c:2046
+msgid "value of the record to add/delete"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "Datei `%s' hat URI: %s\n"
+#: src/namestore/gnunet-namestore.c:2050
+msgid "create or list public record"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+#: src/namestore/gnunet-namestore.c:2054
+msgid "omit private records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
+#: src/namestore/gnunet-namestore.c:2059
+msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, fuzzy, c-format
-msgid "Data `%s' invalid\n"
-msgstr "Schlüssel »%s« ist gültig\n"
+#: src/namestore/gnunet-namestore.c:2064
+msgid "purge namestore of all orphans"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+#: src/namestore/gnunet-namestore.c:2069
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+#: src/namestore/gnunet-namestore.c:2074
+msgid "delete all records in specified zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:2080
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
+msgstr ""
 
 #: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
@@ -5517,10 +5517,6 @@ 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:124
-msgid "Show network size estimates from NSE service."
-msgstr ""
-
 #: src/nse/gnunet-nse-profiler.c:857
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
@@ -5545,68 +5541,15 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
+#: src/nse/gnunet-nse.c:124
+msgid "Show network size estimates from NSE service."
+msgstr ""
+
 #: src/nse/gnunet-service-nse.c:1441
 #: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:175
-#, 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:306
-#, 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:323
-#: src/peerinfo/gnunet-service-peerinfo.c:348
-#, 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:426
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:468
-#, 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:624
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "==> Verzeichnis `%s':\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:631
-#, 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:1027
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "==> Verzeichnis `%s':\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1322
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1335
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:210
-#, 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:237
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
@@ -5703,6 +5646,63 @@ msgstr "Anwendung `%s' konnte nicht initialisiert 
werden.\n"
 msgid "Peerinfo REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
+#: src/peerinfo/gnunet-service-peerinfo.c:175
+#, 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:306
+#, 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:323
+#: src/peerinfo/gnunet-service-peerinfo.c:348
+#, 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:426
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:468
+#, 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:624
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "==> Verzeichnis `%s':\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:631
+#, 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:1027
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "==> Verzeichnis `%s':\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1322
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1335
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:210
+#, fuzzy
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
+
 #: src/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
@@ -6206,18 +6206,6 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/rps/gnunet-rps-profiler.c:3142
 msgid "duration of the profiling"
 msgstr ""
@@ -6235,6 +6223,18 @@ msgstr "Anzahl an Durchläufen"
 msgid "Measure quality and performance of the RPS service."
 msgstr ""
 
+#: src/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6290,10 +6290,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -6978,10 +6978,6 @@ msgstr "Pfad zu »%s« kann nicht erstellt werden\n"
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:137
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport.c:445
 msgid "# messages dropped due to slow client"
 msgstr ""
@@ -7022,6 +7018,10 @@ msgstr ""
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:137
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
@@ -7347,6 +7347,43 @@ msgstr ""
 msgid "# HELLOs given to peerinfo"
 msgstr ""
 
+#: src/transport/gnunet-transport-profiler.c:220
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:577
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:581
+#, fuzzy
+msgid "receive data from peer"
+msgstr "# Bytes des Typs %d empfangen"
+
+#: src/transport/gnunet-transport-profiler.c:586
+msgid "iterations"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:591
+#, fuzzy
+msgid "number of messages to send"
+msgstr "Anzahl an Durchläufen"
+
+#: src/transport/gnunet-transport-profiler.c:596
+msgid "message size to use"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:601
+#: src/transport/gnunet-transport.c:1404
+msgid "peer identity"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:614
+#: src/transport/gnunet-transport.c:1426
+msgid "Direct access to transport service."
+msgstr "Direkter Zugriff auf den Transportdienst"
+
 #: src/transport/gnunet-transport.c:406
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7479,11 +7516,6 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr "Keine Rechnernamen auflösen"
 
-#: src/transport/gnunet-transport.c:1404
-#: src/transport/gnunet-transport-profiler.c:601
-msgid "peer identity"
-msgstr ""
-
 #: src/transport/gnunet-transport.c:1408
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7492,38 +7524,6 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1426
-#: src/transport/gnunet-transport-profiler.c:614
-msgid "Direct access to transport service."
-msgstr "Direkter Zugriff auf den Transportdienst"
-
-#: src/transport/gnunet-transport-profiler.c:220
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:577
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:581
-#, fuzzy
-msgid "receive data from peer"
-msgstr "# Bytes des Typs %d empfangen"
-
-#: src/transport/gnunet-transport-profiler.c:586
-msgid "iterations"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:591
-#, fuzzy
-msgid "number of messages to send"
-msgstr "Anzahl an Durchläufen"
-
-#: src/transport/gnunet-transport-profiler.c:596
-msgid "message size to use"
-msgstr ""
-
 #: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
@@ -7796,21 +7796,6 @@ msgstr ""
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:553
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:571
-#, 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:3170
 #, c-format
 msgid ""
@@ -7858,6 +7843,21 @@ 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:169
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:553
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:571
+#, 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:1396
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
@@ -8636,102 +8636,6 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:59
-msgid "No error (success)."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:65
-#, fuzzy
-msgid "Unknown and unspecified error."
-msgstr "Unbekannter Anfragestatus"
-
-#: src/util/gnunet_error_codes.c:71
-#, fuzzy
-msgid "Communication with service failed."
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/util/gnunet_error_codes.c:77
-#, fuzzy
-msgid "Ego not found."
-msgstr "Kein Inhalt gefunden"
-
-#: src/util/gnunet_error_codes.c:83
-msgid "Identifier already in use for another ego."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:89
-msgid "The given ego is invalid or malformed."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:95
-#, fuzzy
-msgid "Unknown namestore error."
-msgstr "Unbekannter Anfragestatus"
-
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
-#, fuzzy
-msgid "Zone iteration failed."
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/util/gnunet_error_codes.c:107
-#, fuzzy
-msgid "Zone not found."
-msgstr "Kein Inhalt gefunden"
-
-#: src/util/gnunet_error_codes.c:113
-#, fuzzy
-msgid "Record not found."
-msgstr "Kommando `%s' wurde nicht gefunden!\n"
-
-#: src/util/gnunet_error_codes.c:125
-msgid "Zone does not contain any records."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:131
-#, fuzzy
-msgid "Failed to lookup record."
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/util/gnunet_error_codes.c:137
-#, fuzzy
-msgid "No records given."
-msgstr "Kein Knoten angegeben!\n"
-
-#: src/util/gnunet_error_codes.c:143
-msgid "Record data invalid."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:149
-#, fuzzy
-msgid "No label given."
-msgstr "Kein Knoten angegeben!\n"
-
-#: src/util/gnunet_error_codes.c:155
-#, fuzzy
-msgid "No results given."
-msgstr "# empfangene Ergebnisse"
-
-#: src/util/gnunet_error_codes.c:161
-msgid "Record already exists."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:167
-msgid "Record size exceeds maximum limit."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:173
-msgid "There was an error in the database backend."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:179
-#, fuzzy
-msgid "Failed to store the given records."
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/util/gnunet_error_codes.c:185
-msgid "Label invalid or malformed."
-msgstr ""
-
 #: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
@@ -8873,6 +8777,102 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
+#: src/util/gnunet_error_codes.c:60
+msgid "No error (success)."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:66
+#, fuzzy
+msgid "Unknown and unspecified error."
+msgstr "Unbekannter Anfragestatus"
+
+#: src/util/gnunet_error_codes.c:72
+#, fuzzy
+msgid "Communication with service failed."
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/util/gnunet_error_codes.c:78
+#, fuzzy
+msgid "Ego not found."
+msgstr "Kein Inhalt gefunden"
+
+#: src/util/gnunet_error_codes.c:84
+msgid "Identifier already in use for another ego."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:90
+msgid "The given ego is invalid or malformed."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:96
+#, fuzzy
+msgid "Unknown namestore error."
+msgstr "Unbekannter Anfragestatus"
+
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
+#, fuzzy
+msgid "Zone iteration failed."
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/util/gnunet_error_codes.c:108
+#, fuzzy
+msgid "Zone not found."
+msgstr "Kein Inhalt gefunden"
+
+#: src/util/gnunet_error_codes.c:114
+#, fuzzy
+msgid "Record not found."
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/util/gnunet_error_codes.c:126
+msgid "Zone does not contain any records."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:132
+#, fuzzy
+msgid "Failed to lookup record."
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/util/gnunet_error_codes.c:138
+#, fuzzy
+msgid "No records given."
+msgstr "Kein Knoten angegeben!\n"
+
+#: src/util/gnunet_error_codes.c:144
+msgid "Record data invalid."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:150
+#, fuzzy
+msgid "No label given."
+msgstr "Kein Knoten angegeben!\n"
+
+#: src/util/gnunet_error_codes.c:156
+#, fuzzy
+msgid "No results given."
+msgstr "# empfangene Ergebnisse"
+
+#: src/util/gnunet_error_codes.c:162
+msgid "Record already exists."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:168
+msgid "Record size exceeds maximum limit."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:174
+msgid "There was an error in the database backend."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:180
+#, fuzzy
+msgid "Failed to store the given records."
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/util/gnunet_error_codes.c:186
+msgid "Label invalid or malformed."
+msgstr ""
+
 #: src/util/helper.c:305
 #, c-format
 msgid "Error reading from `%s': %s\n"
diff --git a/po/es.po b/po/es.po
index a449d0595..a7597758a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-12-26 09:51+0100\n"
+"POT-Creation-Date: 2022-12-28 19:48+0900\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -31,8 +31,8 @@ msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
 #: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore.c:1957
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
+#: src/namestore/gnunet-namestore.c:1957
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
@@ -532,93 +532,6 @@ 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/gnunet-ats-solver-eval.c:2993 src/ats/gnunet-ats-solver-eval.c:3045
-#, 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:3012
-#, 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:3064
-#, 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:3553
-#, fuzzy
-msgid "solver to use"
-msgstr "valor a establecer"
-
-#: src/ats/gnunet-ats-solver-eval.c:3558
-msgid "experiment to use"
-msgstr "experimento para usar"
-
-#: src/ats/gnunet-ats-solver-eval.c:3565
-#, fuzzy
-msgid "print logging"
-msgstr "Iniciando descarga «%s».\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3570
-msgid "save logging to disk"
-msgstr "guarda protocolo al fichero en disco"
-
-#: src/ats/gnunet-ats-solver-eval.c:3575
-msgid "disable normalization"
-msgstr "deshabilita normalización"
-
-#: src/ats/gnunet-service-ats_plugins.c:321
-#, 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:331
-#, 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:377
-#, fuzzy, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-#: src/ats/gnunet-service-ats_plugins.c:462
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "¡No se puede inicializar el resolvedor!\n"
-
-#: src/ats/plugin_ats_proportional.c:1142
-#, 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_proportional.c:1165
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "Se produjo un fallo al cargar la configuración de %s\n"
-
 # 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
@@ -753,6 +666,93 @@ 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:2993 src/ats/gnunet-ats-solver-eval.c:3045
+#, 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:3012
+#, 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:3064
+#, 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:3553
+#, fuzzy
+msgid "solver to use"
+msgstr "valor a establecer"
+
+#: src/ats/gnunet-ats-solver-eval.c:3558
+msgid "experiment to use"
+msgstr "experimento para usar"
+
+#: src/ats/gnunet-ats-solver-eval.c:3565
+#, fuzzy
+msgid "print logging"
+msgstr "Iniciando descarga «%s».\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3570
+msgid "save logging to disk"
+msgstr "guarda protocolo al fichero en disco"
+
+#: src/ats/gnunet-ats-solver-eval.c:3575
+msgid "disable normalization"
+msgstr "deshabilita normalización"
+
+#: src/ats/gnunet-service-ats_plugins.c:321
+#, 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:331
+#, 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:377
+#, fuzzy, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
+
+#: src/ats/gnunet-service-ats_plugins.c:462
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "¡No se puede inicializar el resolvedor!\n"
+
+#: src/ats/plugin_ats_proportional.c:1142
+#, 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_proportional.c:1165
+#, 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"
@@ -895,6 +895,28 @@ 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:146
+#, c-format
+msgid ""
+"\n"
+"ew are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:218
+#, 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:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1155,30 +1177,8 @@ msgstr ""
 msgid "Enables having a conversation with other GNUnet users."
 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:146
-#, c-format
-msgid ""
-"\n"
-"ew are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:218
-#, 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:665
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -2106,28 +2106,64 @@ msgstr "ser prolijo (imprime información de progreso)"
 msgid "Prints all packets that go through the DHT."
 msgstr "Imprime todos los paquetes que pasan por la DHT."
 
-#: src/dht/gnunet_dht_profiler.c:925 src/testbed/gnunet-testbed-profiler.c:253
+#: src/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr "¡Se deben proveer «KEY» y «DATA» para una subida a la DHT!\n"
+
+#: src/dht/gnunet-dht-put.c:140
 #, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "El número máximo de conexiones es %u\n"
+msgid "Could not connect to DHT service!\n"
+msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/dht/gnunet_dht_profiler.c:958 src/rps/gnunet-rps-profiler.c:3136
-msgid "number of peers to start"
-msgstr "número de pares para empezar"
+#: src/dht/gnunet-dht-put.c:151
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr "¡Iniciando petición de subida para «%s» con datos «%s»!\n"
 
-#: src/dht/gnunet_dht_profiler.c:964
-msgid "number of PUTs to perform per peer"
-msgstr ""
+#: src/dht/gnunet-dht-put.c:188
+msgid "the data to insert under the key"
+msgstr "los datos a insertar bajo la clave"
 
-#: src/dht/gnunet_dht_profiler.c:970 src/nse/gnunet-nse-profiler.c:872
-#: src/testbed/gnunet-testbed-profiler.c:302
-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-put.c:194
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr "cuanto tiempo almacenar esta entrada en la DHT (en segundos)"
 
-#: src/dht/gnunet_dht_profiler.c:976
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
+#: src/dht/gnunet-dht-put.c:212
+msgid "how many replicas to create"
+msgstr "cuantas réplicas crear"
+
+#: src/dht/gnunet-dht-put.c:223
+msgid "the type to insert data as"
+msgstr "el tipo de datos a insertar"
+
+#: src/dht/gnunet-dht-put.c:241
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr ""
+"Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo "
+"«KEY»."
+
+#: src/dht/gnunet_dht_profiler.c:925 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:958 src/rps/gnunet-rps-profiler.c:3136
+msgid "number of peers to start"
+msgstr "número de pares para empezar"
+
+#: src/dht/gnunet_dht_profiler.c:964
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:970 src/nse/gnunet-nse-profiler.c:872
+#: src/testbed/gnunet-testbed-profiler.c:302
+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:976
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
 #: src/dht/gnunet_dht_profiler.c:982
@@ -2155,42 +2191,6 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
-msgstr "¡Se deben proveer «KEY» y «DATA» para una subida a la DHT!\n"
-
-#: src/dht/gnunet-dht-put.c:140
-#, fuzzy, c-format
-msgid "Could not connect to DHT service!\n"
-msgstr "¡No se pudo conectar al servicio %s!\n"
-
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
-msgstr "¡Iniciando petición de subida para «%s» con datos «%s»!\n"
-
-#: src/dht/gnunet-dht-put.c:188
-msgid "the data to insert under the key"
-msgstr "los datos a insertar bajo la clave"
-
-#: src/dht/gnunet-dht-put.c:194
-msgid "how long to store this entry in the dht (in seconds)"
-msgstr "cuanto tiempo almacenar esta entrada en la DHT (en segundos)"
-
-#: src/dht/gnunet-dht-put.c:212
-msgid "how many replicas to create"
-msgstr "cuantas réplicas crear"
-
-#: src/dht/gnunet-dht-put.c:223
-msgid "the type to insert data as"
-msgstr "el tipo de datos a insertar"
-
-#: src/dht/gnunet-dht-put.c:241
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr ""
-"Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo "
-"«KEY»."
-
 #: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr "sólo monitorizar consultas DNS"
@@ -3145,14 +3145,6 @@ msgstr ""
 "Descargar ficheros de GNUnet usando una URI GNUnet CHK o LOC (gnunet://fs/"
 "chk/...)"
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
-msgstr "imprimir una lista de todos los ficheros indexados"
-
-#: src/fs/gnunet-fs.c:180
-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"
@@ -3173,6 +3165,14 @@ msgstr ""
 "ejecuta una batería de pruebas para medir el rendimiento de la compartición "
 "de ficheros"
 
+#: src/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr "imprimir una lista de todos los ficheros indexados"
+
+#: src/fs/gnunet-fs.c:180
+msgid "Special file-sharing operations"
+msgstr "Operaciones especiales de compartición de ficheros"
+
 #: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3936,53 +3936,6 @@ msgstr "¿cuánto tiempo se debe ejecutar? 0 = para 
siempre"
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:256
-#, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "«%s» no es una dirección IP válida.\n"
-
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, 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/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:304
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
-msgstr "Buscar el registro para el nombre dado"
-
-#: src/gns/gnunet-gns.c:345
-msgid "Specify the type of the record to lookup"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/gns/gnunet-gns.c:351
-#, fuzzy
-msgid "Specify a timeout for the lookup"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
-msgstr "Sin salida innecesaria"
-
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "Herramienta de acceso GNUnet GNS"
-
 #: src/gns/gnunet-gns-import.c:490
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -4103,6 +4056,53 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
+#: src/gns/gnunet-gns.c:256
+#, fuzzy, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "«%s» no es una dirección IP válida.\n"
+
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
+#, 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/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
+msgstr "Buscar el registro para el nombre dado"
+
+#: src/gns/gnunet-gns.c:345
+msgid "Specify the type of the record to lookup"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/gns/gnunet-gns.c:351
+#, fuzzy
+msgid "Specify a timeout for the lookup"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/gns/gnunet-gns.c:355
+msgid "No unneeded output"
+msgstr "Sin salida innecesaria"
+
+#: src/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:374
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Herramienta de acceso GNUnet GNS"
+
 #: src/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4947,50 +4947,232 @@ msgstr "Base de datos sqlite ejecutándose\n"
 msgid "Failed to setup database at `%s'\n"
 msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:411
+#: src/namestore/gnunet-namestore-dbtool.c:87
+#: src/namestore/gnunet-namestore.c:1950
 #, fuzzy, c-format
-msgid "Missing entries in record line `%s'.\n"
-msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgstr "Argumentos superfluos (ignorados).\n"
 
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Comando desconocido «%s»\n"
+#: src/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
+#: src/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:434
-#, fuzzy, c-format
-msgid "Error parsing expiration time %s.\n"
-msgstr "Imposible guardar la configuración"
+#: src/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "Formato no válido para la IP: «%s»\n"
+#: src/namestore/gnunet-namestore-dbtool.c:189
+#: src/namestore/gnunet-namestore-zonefile.c:753
+#, fuzzy
+msgid "GNUnet namestore database manipulation tool"
+msgstr "Herramienta de manipulación de zona de GNUnet"
 
-#: src/namestore/gnunet-namestore.c:666
-#, c-format
-msgid "Adding record failed: %s\n"
-msgstr "No se pudo añadir el registro: %s\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:373
+#, fuzzy
+msgid "can not search the namestore"
+msgstr "No se puede iniciar el controlador maestro"
 
-#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
+#: src/namestore/gnunet-namestore-fcfsd.c:427
+#: src/namestore/gnunet-namestore-fcfsd.c:561
+#, fuzzy
+msgid "unable to scan namestore"
+msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:447
 #, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr "No se pudo borrar el registro: %s\n"
+msgid "Failed to create record for `%s': %s\n"
+msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1136
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:460
+#, fuzzy
+msgid "no errors"
+msgstr "error desconocido"
 
-#: src/namestore/gnunet-namestore.c:1257
-#, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:496
+#, fuzzy, c-format
+msgid "The requested key `%s' exists as `%s'\n"
+msgstr "Creada la entrada '%s' en el espacio '%s'\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:503
+msgid "key exists"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy
+msgid "Error creating record data\n"
+msgstr "Error interno escaneando directorio.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:524
+#, fuzzy
+msgid "unable to store record"
+msgstr "El almacén de nombres no pudo añadir el registro\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:595
+#, c-format
+msgid "Requested name `%s' exists with `%u' records\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:601
+msgid "name exists\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:787
+msgid "unable to process submitted data"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:798
+msgid "the submitted data is invalid"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:817
+#, fuzzy
+msgid "invalid parameters"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:834
+#, fuzzy
+msgid "invalid name"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:845
+#, fuzzy, c-format
+msgid "Unable to parse key %s\n"
+msgstr "No se pudo procesar el registro MX «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:849
+#, fuzzy
+msgid "unable to parse key"
+msgstr "No se pudo procesar el registro MX «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:960
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
+#, fuzzy
+msgid "No expiration specified for records.\n"
+msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
+#, fuzzy
+msgid "No port specified, using default value\n"
+msgstr ""
+"La configuración no especifica «%s», asumiendo el valor predeterminado."
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1098
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
+msgid "name of the zone managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
+#, fuzzy
+msgid "GNU Name System First-Come-First-Served name registration service"
+msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
+
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "El almacén de nombres no pudo añadir el registro\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "El servicio «%s» no está ejecutandose\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "Se produjo un fallo al procesar la URI: %s\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "Se produjo un fallo al procesar la URI: %s\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:520
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:529
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:591
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Formato del pseudónimo '%s' no es válido.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:738
+#: src/namestore/gnunet-namestore.c:2086
+#, fuzzy
+msgid "name of the ego controlling the zone"
+msgstr "nombre de la sección a la que acceder"
+
+#: src/namestore/gnunet-namestore.c:411
+#, fuzzy, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
+
+#: src/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Comando desconocido «%s»\n"
+
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:434
+#, fuzzy, c-format
+msgid "Error parsing expiration time %s.\n"
+msgstr "Imposible guardar la configuración"
+
+#: src/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "Formato no válido para la IP: «%s»\n"
+
+#: src/namestore/gnunet-namestore.c:666
+#, c-format
+msgid "Adding record failed: %s\n"
+msgstr "No se pudo añadir el registro: %s\n"
+
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "No se pudo borrar el registro: %s\n"
+
+#: src/namestore/gnunet-namestore.c:1136
+#, c-format
+msgid ""
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1257
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:1300
@@ -5092,12 +5274,6 @@ msgstr ""
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1950
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#, fuzzy, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
-msgstr "Argumentos superfluos (ignorados).\n"
-
 #: src/namestore/gnunet-namestore.c:1965
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
@@ -5146,226 +5322,50 @@ msgstr "salida en formato de gnuplot"
 msgid "determine our name for the given KEY"
 msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:2035
-msgid "type of the record to add/delete/display"
-msgstr "tipo del registro a añadir/borrar/mostrar"
-
-#: src/namestore/gnunet-namestore.c:2040
-msgid "URI to import into our zone"
-msgstr "URI a importar a nuestra zona"
-
-#: src/namestore/gnunet-namestore.c:2046
-msgid "value of the record to add/delete"
-msgstr "valor del registro a añadir/borrar"
-
-#: src/namestore/gnunet-namestore.c:2050
-msgid "create or list public record"
-msgstr "crear o listar registros públicos"
-
-#: src/namestore/gnunet-namestore.c:2054
-#, fuzzy
-msgid "omit private records"
-msgstr "mostrar registros"
-
-#: src/namestore/gnunet-namestore.c:2059
-msgid "do not filter maintenance records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2064
-msgid "purge namestore of all orphans"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2069
-msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2074
-msgid "delete all records in specified zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2080
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2086
-#: src/namestore/gnunet-namestore-zonefile.c:738
-#, fuzzy
-msgid "name of the ego controlling the zone"
-msgstr "nombre de la sección a la que acceder"
-
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-#, fuzzy
-msgid "GNUnet namestore database manipulation tool"
-msgstr "Herramienta de manipulación de zona de GNUnet"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:373
-#, fuzzy
-msgid "can not search the namestore"
-msgstr "No se puede iniciar el controlador maestro"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
-#, fuzzy
-msgid "unable to scan namestore"
-msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:447
-#, fuzzy, c-format
-msgid "Failed to create record for `%s': %s\n"
-msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:460
-#, fuzzy
-msgid "no errors"
-msgstr "error desconocido"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:496
-#, fuzzy, c-format
-msgid "The requested key `%s' exists as `%s'\n"
-msgstr "Creada la entrada '%s' en el espacio '%s'\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:503
-msgid "key exists"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, fuzzy
-msgid "Error creating record data\n"
-msgstr "Error interno escaneando directorio.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:524
-#, fuzzy
-msgid "unable to store record"
-msgstr "El almacén de nombres no pudo añadir el registro\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:595
-#, c-format
-msgid "Requested name `%s' exists with `%u' records\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:601
-msgid "name exists\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:787
-msgid "unable to process submitted data"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:798
-msgid "the submitted data is invalid"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:817
-#, fuzzy
-msgid "invalid parameters"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:834
-#, fuzzy
-msgid "invalid name"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:845
-#, fuzzy, c-format
-msgid "Unable to parse key %s\n"
-msgstr "No se pudo procesar el registro MX «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:849
-#, fuzzy
-msgid "unable to parse key"
-msgstr "No se pudo procesar el registro MX «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:960
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
-#, fuzzy
-msgid "No expiration specified for records.\n"
-msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
-#, fuzzy
-msgid "No port specified, using default value\n"
-msgstr ""
-"La configuración no especifica «%s», asumiendo el valor predeterminado."
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Se produjo un fallo al conectar con GNS\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
-msgid "name of the zone managed by FCFSD"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
-#, fuzzy
-msgid "GNU Name System First-Come-First-Served name registration service"
-msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
+#: src/namestore/gnunet-namestore.c:2035
+msgid "type of the record to add/delete/display"
+msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "El almacén de nombres no pudo añadir el registro\n"
+#: src/namestore/gnunet-namestore.c:2040
+msgid "URI to import into our zone"
+msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, fuzzy, c-format
-msgid "Name `%s' is too long\n"
-msgstr "El servicio «%s» no está ejecutandose\n"
+#: src/namestore/gnunet-namestore.c:2046
+msgid "value of the record to add/delete"
+msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "Se produjo un fallo al procesar la URI: %s\n"
+#: src/namestore/gnunet-namestore.c:2050
+msgid "create or list public record"
+msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "Se produjo un fallo al procesar la URI: %s\n"
+#: src/namestore/gnunet-namestore.c:2054
+#, fuzzy
+msgid "omit private records"
+msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+#: src/namestore/gnunet-namestore.c:2059
+msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
+#: src/namestore/gnunet-namestore.c:2064
+msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, fuzzy, c-format
-msgid "Data `%s' invalid\n"
-msgstr "Formato del pseudónimo '%s' no es válido.\n"
+#: src/namestore/gnunet-namestore.c:2069
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "Se produjo un fallo al conectar con GNS\n"
+#: src/namestore/gnunet-namestore.c:2074
+msgid "delete all records in specified zone"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "Se produjo un fallo al conectar con GNS\n"
+#: src/namestore/gnunet-namestore.c:2080
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
+msgstr ""
 
 #: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
@@ -5701,11 +5701,6 @@ msgstr "comando «external-ip» no encontrado\n"
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nse/gnunet-nse.c:124
-#, fuzzy
-msgid "Show network size estimates from NSE service."
-msgstr "# Estimaciones del tamaño de red recibidas"
-
 #: src/nse/gnunet-nse-profiler.c:857
 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"
@@ -5731,70 +5726,16 @@ 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:124
+#, fuzzy
+msgid "Show network size estimates from NSE service."
+msgstr "# Estimaciones del tamaño de red recibidas"
+
 #: src/nse/gnunet-service-nse.c:1441
 #: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:175
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Eliminando dirección de transporte «%s»\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:306
-#, 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:323
-#: src/peerinfo/gnunet-service-peerinfo.c:348
-#, 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:426
-msgid "# peers known"
-msgstr "# pares conocidos"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:468
-#, 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:624
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "Escaneando directorio «%s».\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:631
-#, 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:1027
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "Escaneando directorio «%s».\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1322
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr "Importando HELLO de «%s»\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1335
-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:210
-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:237
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
@@ -5890,6 +5831,65 @@ msgstr "Se produjo un fallo al cargar el módulo del 
transporte para «%s»\n"
 msgid "Peerinfo REST API initialized\n"
 msgstr "Conexión fallida\n"
 
+#: src/peerinfo/gnunet-service-peerinfo.c:175
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Eliminando dirección de transporte «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:306
+#, 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:323
+#: src/peerinfo/gnunet-service-peerinfo.c:348
+#, 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:426
+msgid "# peers known"
+msgstr "# pares conocidos"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:468
+#, 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:624
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "Escaneando directorio «%s».\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:631
+#, 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:1027
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "Escaneando directorio «%s».\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1322
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr "Importando HELLO de «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1335
+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:210
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr ""
+"No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
+
 #: src/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
@@ -6406,18 +6406,6 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/rps/gnunet-rps-profiler.c:3142
 #, fuzzy
 msgid "duration of the profiling"
@@ -6439,6 +6427,18 @@ msgstr "número de pares para empezar"
 msgid "Measure quality and performance of the RPS service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
+#: src/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6494,10 +6494,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "Conexión fallida (¿bug?)\n"
@@ -7221,10 +7221,6 @@ msgstr "Se produjo un fallo al crear la página para 
«%s»\n"
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:137
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport.c:445
 msgid "# messages dropped due to slow client"
 msgstr "# mensajes omitidos debido a un cliente lento"
@@ -7266,6 +7262,10 @@ msgstr "Añadiendo «%s» sin direcciones para el par 
«%s»\n"
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:137
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr "# refrescos de mi «HELLO»"
@@ -7597,15 +7597,54 @@ msgstr "# PONG omitidos, no hay una validación 
pendiente coincidente"
 msgid "# PONGs dropped, signature expired"
 msgstr "# Mensajes PONG omitidos, firma expirada"
 
-#: src/transport/gnunet-service-transport_validation.c:1590
+#: src/transport/gnunet-service-transport_validation.c:1590
+#, fuzzy
+msgid "# validations succeeded"
+msgstr "# revalidaciones de direcciones iniciadas"
+
+#: src/transport/gnunet-service-transport_validation.c:1645
+#, fuzzy
+msgid "# HELLOs given to peerinfo"
+msgstr "# «HELLO» obtenidos de «peerinfo»"
+
+#: src/transport/gnunet-transport-profiler.c:220
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:577
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:581
+#, fuzzy
+msgid "receive data from peer"
+msgstr "# respuestas recibidas de otros pares"
+
+#: src/transport/gnunet-transport-profiler.c:586
 #, fuzzy
-msgid "# validations succeeded"
-msgstr "# revalidaciones de direcciones iniciadas"
+msgid "iterations"
+msgstr "Otras configuraciones"
 
-#: src/transport/gnunet-service-transport_validation.c:1645
+#: src/transport/gnunet-transport-profiler.c:591
 #, fuzzy
-msgid "# HELLOs given to peerinfo"
-msgstr "# «HELLO» obtenidos de «peerinfo»"
+msgid "number of messages to send"
+msgstr "número de mensajes a usar por iteración"
+
+#: src/transport/gnunet-transport-profiler.c:596
+#, fuzzy
+msgid "message size to use"
+msgstr "tamaño del mensaje"
+
+#: src/transport/gnunet-transport-profiler.c:601
+#: src/transport/gnunet-transport.c:1404
+msgid "peer identity"
+msgstr "identidad del par"
+
+#: src/transport/gnunet-transport-profiler.c:614
+#: src/transport/gnunet-transport.c:1426
+msgid "Direct access to transport service."
+msgstr "Acceso directo al servicio de transporte."
 
 #: src/transport/gnunet-transport.c:406
 #, c-format
@@ -7751,11 +7790,6 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:1404
-#: src/transport/gnunet-transport-profiler.c:601
-msgid "peer identity"
-msgstr "identidad del par"
-
 #: src/transport/gnunet-transport.c:1408
 #, fuzzy
 msgid "monitor plugin sessions"
@@ -7765,40 +7799,6 @@ 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:1426
-#: src/transport/gnunet-transport-profiler.c:614
-msgid "Direct access to transport service."
-msgstr "Acceso directo al servicio de transporte."
-
-#: src/transport/gnunet-transport-profiler.c:220
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:577
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:581
-#, fuzzy
-msgid "receive data from peer"
-msgstr "# respuestas recibidas de otros pares"
-
-#: src/transport/gnunet-transport-profiler.c:586
-#, fuzzy
-msgid "iterations"
-msgstr "Otras configuraciones"
-
-#: src/transport/gnunet-transport-profiler.c:591
-#, fuzzy
-msgid "number of messages to send"
-msgstr "número de mensajes a usar por iteración"
-
-#: src/transport/gnunet-transport-profiler.c:596
-#, fuzzy
-msgid "message size to use"
-msgstr "tamaño del mensaje"
-
 #: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
@@ -8083,23 +8083,6 @@ msgstr "Transporte TCP no escuchando en ningún puerto 
(únicamente cliente)\n"
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:553
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:571
-#, 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:3170
 #, c-format
 msgid ""
@@ -8154,6 +8137,23 @@ 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:169
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:553
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:571
+#, 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:1396
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
@@ -8944,105 +8944,6 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
-#: src/util/gnunet_error_codes.c:59
-msgid "No error (success)."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:65
-#, fuzzy
-msgid "Unknown and unspecified error."
-msgstr "Error desconocido"
-
-# Miguel: ¿Conectar y conexión?
-#: src/util/gnunet_error_codes.c:71
-#, fuzzy
-msgid "Communication with service failed."
-msgstr "Error al comunicar con el servicio ARM.\n"
-
-#: src/util/gnunet_error_codes.c:77
-#, fuzzy
-msgid "Ego not found."
-msgstr "Contenido no encontrado"
-
-#: src/util/gnunet_error_codes.c:83
-msgid "Identifier already in use for another ego."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:89
-msgid "The given ego is invalid or malformed."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:95
-#, fuzzy
-msgid "Unknown namestore error."
-msgstr "Error desconocido"
-
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
-#, fuzzy
-msgid "Zone iteration failed."
-msgstr "# sesiones wlan creadas"
-
-#: src/util/gnunet_error_codes.c:107
-#, fuzzy
-msgid "Zone not found."
-msgstr "Contenido no encontrado"
-
-#: src/util/gnunet_error_codes.c:113
-#, fuzzy
-msgid "Record not found."
-msgstr "«upnpc» no encontrado\n"
-
-#: src/util/gnunet_error_codes.c:125
-#, fuzzy
-msgid "Zone does not contain any records."
-msgstr "El fichero '%s' no contiene un pseudónimo.\n"
-
-#: src/util/gnunet_error_codes.c:131
-#, fuzzy
-msgid "Failed to lookup record."
-msgstr "El almacén de nombres no pudo añadir el registro\n"
-
-#: src/util/gnunet_error_codes.c:137
-#, fuzzy
-msgid "No records given."
-msgstr "No se han proporcionado opciones\n"
-
-#: src/util/gnunet_error_codes.c:143
-msgid "Record data invalid."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:149
-#, fuzzy
-msgid "No label given."
-msgstr "No se han proporcionado opciones\n"
-
-#: src/util/gnunet_error_codes.c:155
-#, fuzzy
-msgid "No results given."
-msgstr "No se han proporcionado opciones\n"
-
-#: src/util/gnunet_error_codes.c:161
-#, fuzzy
-msgid "Record already exists."
-msgstr "El registro ya existía en el almacén de nombres"
-
-#: src/util/gnunet_error_codes.c:167
-msgid "Record size exceeds maximum limit."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:173
-msgid "There was an error in the database backend."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:179
-#, fuzzy
-msgid "Failed to store the given records."
-msgstr "El almacén de nombres no pudo añadir el registro\n"
-
-#: src/util/gnunet_error_codes.c:185
-msgid "Label invalid or malformed."
-msgstr ""
-
 #: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
@@ -9186,6 +9087,105 @@ msgstr "No hay un manejador conocido para el subsistema 
«%s»\n"
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
 
+#: src/util/gnunet_error_codes.c:60
+msgid "No error (success)."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:66
+#, fuzzy
+msgid "Unknown and unspecified error."
+msgstr "Error desconocido"
+
+# Miguel: ¿Conectar y conexión?
+#: src/util/gnunet_error_codes.c:72
+#, fuzzy
+msgid "Communication with service failed."
+msgstr "Error al comunicar con el servicio ARM.\n"
+
+#: src/util/gnunet_error_codes.c:78
+#, fuzzy
+msgid "Ego not found."
+msgstr "Contenido no encontrado"
+
+#: src/util/gnunet_error_codes.c:84
+msgid "Identifier already in use for another ego."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:90
+msgid "The given ego is invalid or malformed."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:96
+#, fuzzy
+msgid "Unknown namestore error."
+msgstr "Error desconocido"
+
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
+#, fuzzy
+msgid "Zone iteration failed."
+msgstr "# sesiones wlan creadas"
+
+#: src/util/gnunet_error_codes.c:108
+#, fuzzy
+msgid "Zone not found."
+msgstr "Contenido no encontrado"
+
+#: src/util/gnunet_error_codes.c:114
+#, fuzzy
+msgid "Record not found."
+msgstr "«upnpc» no encontrado\n"
+
+#: src/util/gnunet_error_codes.c:126
+#, fuzzy
+msgid "Zone does not contain any records."
+msgstr "El fichero '%s' no contiene un pseudónimo.\n"
+
+#: src/util/gnunet_error_codes.c:132
+#, fuzzy
+msgid "Failed to lookup record."
+msgstr "El almacén de nombres no pudo añadir el registro\n"
+
+#: src/util/gnunet_error_codes.c:138
+#, fuzzy
+msgid "No records given."
+msgstr "No se han proporcionado opciones\n"
+
+#: src/util/gnunet_error_codes.c:144
+msgid "Record data invalid."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:150
+#, fuzzy
+msgid "No label given."
+msgstr "No se han proporcionado opciones\n"
+
+#: src/util/gnunet_error_codes.c:156
+#, fuzzy
+msgid "No results given."
+msgstr "No se han proporcionado opciones\n"
+
+#: src/util/gnunet_error_codes.c:162
+#, fuzzy
+msgid "Record already exists."
+msgstr "El registro ya existía en el almacén de nombres"
+
+#: src/util/gnunet_error_codes.c:168
+msgid "Record size exceeds maximum limit."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:174
+msgid "There was an error in the database backend."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:180
+#, fuzzy
+msgid "Failed to store the given records."
+msgstr "El almacén de nombres no pudo añadir el registro\n"
+
+#: src/util/gnunet_error_codes.c:186
+msgid "Label invalid or malformed."
+msgstr ""
+
 #: src/util/helper.c:305
 #, c-format
 msgid "Error reading from `%s': %s\n"
diff --git a/po/fr.po b/po/fr.po
index d487c61a0..ea4bedf36 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-12-26 09:51+0100\n"
+"POT-Creation-Date: 2022-12-28 19:48+0900\n"
 "PO-Revision-Date: 2021-11-21 00:53+0100\n"
 "Last-Translator: Stéphane  Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -30,8 +30,8 @@ msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
 #: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore.c:1957
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
+#: src/namestore/gnunet-namestore.c:1957
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr ""
@@ -498,80 +498,6 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2993 src/ats/gnunet-ats-solver-eval.c:3045
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3012
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3064
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3553
-msgid "solver to use"
-msgstr "solveur utilisé"
-
-#: src/ats/gnunet-ats-solver-eval.c:3558
-msgid "experiment to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3565
-msgid "print logging"
-msgstr "afficher le journal"
-
-#: src/ats/gnunet-ats-solver-eval.c:3570
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3575
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:321
-#, 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:331
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:377
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:462
-#, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1142
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "fornat invalide : « %s »\n"
-
-#: src/ats/plugin_ats_proportional.c:1165
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "fornat invalide : « %s »\n"
-
 #: src/ats-tool/gnunet-ats.c:299
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -687,6 +613,80 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr ""
 
+#: src/ats/gnunet-ats-solver-eval.c:2993 src/ats/gnunet-ats-solver-eval.c:3045
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3012
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3064
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3553
+msgid "solver to use"
+msgstr "solveur utilisé"
+
+#: src/ats/gnunet-ats-solver-eval.c:3558
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3565
+msgid "print logging"
+msgstr "afficher le journal"
+
+#: src/ats/gnunet-ats-solver-eval.c:3570
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3575
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:321
+#, 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:331
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:377
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:462
+#, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1142
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/ats/plugin_ats_proportional.c:1165
+#, 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 ""
@@ -817,6 +817,28 @@ 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:146
+#, c-format
+msgid ""
+"\n"
+"ew are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:218
+#, 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:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1073,30 +1095,8 @@ msgstr ""
 msgid "Enables having a conversation with other GNUnet users."
 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:146
-#, c-format
-msgid ""
-"\n"
-"ew are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:218
-#, 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:665
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1961,6 +1961,40 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:140
+#, c-format
+msgid "Could not connect to DHT service!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:151
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:188
+msgid "the data to insert under the key"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:194
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:212
+msgid "how many replicas to create"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:223
+msgid "the type to insert data as"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:241
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr ""
+
 #: src/dht/gnunet_dht_profiler.c:925 src/testbed/gnunet-testbed-profiler.c:253
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
@@ -2008,62 +2042,28 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
+#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:140
-#, c-format
-msgid "Could not connect to DHT service!\n"
+#: src/dns/gnunet-dns-monitor.c:387
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+#: src/dns/gnunet-dns-redirector.c:240
+msgid "set A records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:188
-msgid "the data to insert under the key"
+#: src/dns/gnunet-dns-redirector.c:246
+msgid "set AAAA records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:194
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/dns/gnunet-dns-redirector.c:259
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:212
-msgid "how many replicas to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:223
-msgid "the type to insert data as"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:241
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
-msgid "only monitor DNS queries"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:387
-msgid "Monitor DNS queries."
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:240
-msgid "set A records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:246
-msgid "set AAAA records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:259
-msgid "Change DNS replies to point elsewhere."
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:463
-msgid "# DNS requests answered via TUN interface"
+#: src/dns/gnunet-service-dns.c:463
+msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
 #: src/dns/gnunet-service-dns.c:617
@@ -2917,14 +2917,6 @@ msgid ""
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:180
-msgid "Special file-sharing operations"
-msgstr ""
-
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
@@ -2941,6 +2933,14 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:180
+msgid "Special file-sharing operations"
+msgstr ""
+
 #: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3652,49 +3652,6 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:256
-#, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:304
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:345
-msgid "Specify the type of the record to lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:351
-msgid "Specify a timeout for the lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-msgid "GNUnet GNS resolver tool"
-msgstr ""
-
 #: src/gns/gnunet-gns-import.c:490
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -3814,6 +3771,49 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:256
+#, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:345
+msgid "Specify the type of the record to lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:351
+msgid "Specify a timeout for the lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:355
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:374
+msgid "GNUnet GNS resolver tool"
+msgstr ""
+
 #: src/gns/gnunet-service-gns.c:518
 msgid "Properly base32-encoded public key required"
 msgstr ""
@@ -4595,408 +4595,408 @@ msgstr ""
 msgid "Failed to setup database at `%s'\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/namestore/gnunet-namestore.c:411
+#: src/namestore/gnunet-namestore-dbtool.c:87
+#: src/namestore/gnunet-namestore.c:1950
 #, c-format
-msgid "Missing entries in record line `%s'.\n"
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Commande « %s » inconnue\n"
-
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
+#: src/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:434
-#, c-format
-msgid "Error parsing expiration time %s.\n"
+#: src/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "fornat invalide : « %s »\n"
-
-#: src/namestore/gnunet-namestore.c:666
-#, c-format
-msgid "Adding record failed: %s\n"
+#: src/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
-#, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr "Résolution de « %s » échouée\n"
-
-#: src/namestore/gnunet-namestore.c:1136
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
+#: src/namestore/gnunet-namestore-dbtool.c:189
+#: src/namestore/gnunet-namestore-zonefile.c:753
+msgid "GNUnet namestore database manipulation tool"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1257
-#, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:373
+msgid "can not search the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1300
-#, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:427
+#: src/namestore/gnunet-namestore-fcfsd.c:561
+msgid "unable to scan namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1325
-#, c-format
-msgid "%s\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:447
+#, fuzzy, c-format
+msgid "Failed to create record for `%s': %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/namestore/gnunet-namestore.c:1354
-#, c-format
-msgid "No options given\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:460
+#, fuzzy
+msgid "no errors"
+msgstr "erreur unconnue."
 
-#: src/namestore/gnunet-namestore.c:1368
+#: src/namestore/gnunet-namestore-fcfsd.c:496
 #, c-format
-msgid "Recordlines only work with option `%s'\n"
+msgid "The requested key `%s' exists as `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
-#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
-#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
-#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
-#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
-#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
-#: src/namestore/gnunet-namestore.c:1685
-#, c-format
-msgid "Missing option `%s' for operation `%s'\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:503
+msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1379
-msgid "name"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy
+msgid "Error creating record data\n"
+msgstr "Erreur de création du tunnel\n"
 
-#: src/namestore/gnunet-namestore.c:1408
+#: src/namestore/gnunet-namestore-fcfsd.c:524
+#, fuzzy
+msgid "unable to store record"
+msgstr "suprimer un enregistrement"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:595
 #, c-format
-msgid "Invalid nick `%s'\n"
+msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1431 src/namestore/gnunet-namestore.c:1441
-#: src/namestore/gnunet-namestore.c:1451 src/namestore/gnunet-namestore.c:1480
-#: src/namestore/gnunet-namestore.c:1501 src/namestore/gnunet-namestore.c:1687
-msgid "add"
-msgstr "ajouter"
-
-#: src/namestore/gnunet-namestore.c:1459
-#, c-format
-msgid "Unsupported type `%s'\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:601
+msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1469
-#, c-format
-msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+#: src/namestore/gnunet-namestore-fcfsd.c:787
+msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1489
-#, c-format
-msgid "Value `%s' invalid for record type `%s'\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:798
+msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1508 src/namestore/gnunet-namestore.c:1694
-#, c-format
-msgid "Invalid time format `%s'\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:817
+#, fuzzy
+msgid "invalid parameters"
+msgstr "adresse invalide"
 
-#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
-msgid "del"
-msgstr "supprimer"
+#: src/namestore/gnunet-namestore-fcfsd.c:834
+#, fuzzy
+msgid "invalid name"
+msgstr "adresse invalide"
 
-#: src/namestore/gnunet-namestore.c:1571
-msgid "purge-zone"
+#: src/namestore/gnunet-namestore-fcfsd.c:845
+#, fuzzy, c-format
+msgid "Unable to parse key %s\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:849
+msgid "unable to parse key"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1596
-msgid "list"
+#: src/namestore/gnunet-namestore-fcfsd.c:960
+msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1630
-msgid "reverse-pkey"
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
+msgid "No expiration specified for records.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1640
-#, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
+msgid "No port specified, using default value\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1664
-msgid "uri"
+#: src/namestore/gnunet-namestore-fcfsd.c:1098
+msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1677
-#: src/peerinfo-tool/gnunet-peerinfo.c:737
-#, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "URI invalide « %s »\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
+msgid "name of the zone managed by FCFSD"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1950
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
+msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1965
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
 #, c-format
-msgid "Cannot connect to identity service\n"
+msgid "Name `%s' is too long\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1984
-msgid "add record"
-msgstr "ajouter un enregistrement"
-
-#: src/namestore/gnunet-namestore.c:1987
-msgid "delete record"
-msgstr "suprimer un enregistrement"
+#: src/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/namestore/gnunet-namestore.c:1991
-msgid "display records"
-msgstr "afficher les enregistrements"
+#: src/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/namestore/gnunet-namestore.c:1995
-msgid "read commands from stdin"
+#: src/namestore/gnunet-namestore-zonefile.c:520
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2002
-msgid ""
-"expiration time for record to use (for adding only), \"never\" is possible"
+#: src/namestore/gnunet-namestore-zonefile.c:529
+#, c-format
+msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2008
-msgid "set the desired nick name for the zone"
-msgstr ""
+#: src/namestore/gnunet-namestore-zonefile.c:591
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Appel terminé\n"
 
-#: src/namestore/gnunet-namestore.c:2013
-msgid "monitor changes in the namestore"
-msgstr ""
+#: src/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/namestore/gnunet-namestore.c:2023
-msgid "Output in recordline format"
-msgstr ""
+#: src/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/namestore/gnunet-namestore.c:2029
-msgid "determine our name for the given KEY"
+#: src/namestore/gnunet-namestore-zonefile.c:738
+#: src/namestore/gnunet-namestore.c:2086
+msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2035
-msgid "type of the record to add/delete/display"
+#: src/namestore/gnunet-namestore.c:411
+#, c-format
+msgid "Missing entries in record line `%s'.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2040
-msgid "URI to import into our zone"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Commande « %s » inconnue\n"
 
-#: src/namestore/gnunet-namestore.c:2046
-msgid "value of the record to add/delete"
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2050
-msgid "create or list public record"
+#: src/namestore/gnunet-namestore.c:434
+#, c-format
+msgid "Error parsing expiration time %s.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2054
-#, fuzzy
-msgid "omit private records"
-msgstr "afficher les enregistrements"
+#: src/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "fornat invalide : « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:2059
-msgid "do not filter maintenance records"
+#: src/namestore/gnunet-namestore.c:666
+#, c-format
+msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2064
-msgid "purge namestore of all orphans"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "Résolution de « %s » échouée\n"
 
-#: src/namestore/gnunet-namestore.c:2069
+#: src/namestore/gnunet-namestore.c:1136
+#, c-format
 msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2074
-msgid "delete all records in specified zone"
+#: src/namestore/gnunet-namestore.c:1257
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2080
+#: src/namestore/gnunet-namestore.c:1300
+#, c-format
 msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
+"There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2086
-#: src/namestore/gnunet-namestore-zonefile.c:738
-msgid "name of the ego controlling the zone"
+#: src/namestore/gnunet-namestore.c:1325
+#, c-format
+msgid "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
+#: src/namestore/gnunet-namestore.c:1354
+#, c-format
+msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
+#: src/namestore/gnunet-namestore.c:1368
+#, c-format
+msgid "Recordlines only work with option `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
+#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
+#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
+#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
+#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
+#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
+#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
+#: src/namestore/gnunet-namestore.c:1685
+#, c-format
+msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-msgid "GNUnet namestore database manipulation tool"
+#: src/namestore/gnunet-namestore.c:1379
+msgid "name"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:373
-msgid "can not search the namestore"
+#: src/namestore/gnunet-namestore.c:1408
+#, c-format
+msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
-msgid "unable to scan namestore"
+#: src/namestore/gnunet-namestore.c:1431 src/namestore/gnunet-namestore.c:1441
+#: src/namestore/gnunet-namestore.c:1451 src/namestore/gnunet-namestore.c:1480
+#: src/namestore/gnunet-namestore.c:1501 src/namestore/gnunet-namestore.c:1687
+msgid "add"
+msgstr "ajouter"
+
+#: src/namestore/gnunet-namestore.c:1459
+#, c-format
+msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:447
-#, fuzzy, c-format
-msgid "Failed to create record for `%s': %s\n"
-msgstr "Résolution de « %s » échouée : %s\n"
+#: src/namestore/gnunet-namestore.c:1469
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:460
-#, fuzzy
-msgid "no errors"
-msgstr "erreur unconnue."
+#: src/namestore/gnunet-namestore.c:1489
+#, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/namestore/gnunet-namestore.c:1508 src/namestore/gnunet-namestore.c:1694
 #, c-format
-msgid "The requested key `%s' exists as `%s'\n"
+msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
-msgid "key exists"
+#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
+msgid "del"
+msgstr "supprimer"
+
+#: src/namestore/gnunet-namestore.c:1571
+msgid "purge-zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, fuzzy
-msgid "Error creating record data\n"
-msgstr "Erreur de création du tunnel\n"
+#: src/namestore/gnunet-namestore.c:1596
+msgid "list"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:524
-#, fuzzy
-msgid "unable to store record"
-msgstr "suprimer un enregistrement"
+#: src/namestore/gnunet-namestore.c:1630
+msgid "reverse-pkey"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:595
+#: src/namestore/gnunet-namestore.c:1640
 #, c-format
-msgid "Requested name `%s' exists with `%u' records\n"
+msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:601
-msgid "name exists\n"
+#: src/namestore/gnunet-namestore.c:1664
+msgid "uri"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
-msgid "unable to process submitted data"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:1677
+#: src/peerinfo-tool/gnunet-peerinfo.c:737
+#, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "URI invalide « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:798
-msgid "the submitted data is invalid"
+#: src/namestore/gnunet-namestore.c:1965
+#, c-format
+msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
-#, fuzzy
-msgid "invalid parameters"
-msgstr "adresse invalide"
+#: src/namestore/gnunet-namestore.c:1984
+msgid "add record"
+msgstr "ajouter un enregistrement"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
-#, fuzzy
-msgid "invalid name"
-msgstr "adresse invalide"
+#: src/namestore/gnunet-namestore.c:1987
+msgid "delete record"
+msgstr "suprimer un enregistrement"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:845
-#, fuzzy, c-format
-msgid "Unable to parse key %s\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/namestore/gnunet-namestore.c:1991
+msgid "display records"
+msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:849
-msgid "unable to parse key"
+#: src/namestore/gnunet-namestore.c:1995
+msgid "read commands from stdin"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:960
-msgid "No ego configured for `fcfsd` subsystem\n"
+#: src/namestore/gnunet-namestore.c:2002
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
-msgid "No expiration specified for records.\n"
+#: src/namestore/gnunet-namestore.c:2008
+msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
-msgid "No port specified, using default value\n"
+#: src/namestore/gnunet-namestore.c:2013
+msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
-msgid "Failed to connect to identity\n"
+#: src/namestore/gnunet-namestore.c:2023
+msgid "Output in recordline format"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
-msgid "name of the zone managed by FCFSD"
+#: src/namestore/gnunet-namestore.c:2029
+msgid "determine our name for the given KEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
-msgid "GNU Name System First-Come-First-Served name registration service"
+#: src/namestore/gnunet-namestore.c:2035
+msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/namestore/gnunet-namestore.c:2040
+msgid "URI to import into our zone"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, c-format
-msgid "Name `%s' is too long\n"
+#: src/namestore/gnunet-namestore.c:2046
+msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/namestore/gnunet-namestore.c:2050
+msgid "create or list public record"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/namestore/gnunet-namestore.c:2054
+#, fuzzy
+msgid "omit private records"
+msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+#: src/namestore/gnunet-namestore.c:2059
+msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
+#: src/namestore/gnunet-namestore.c:2064
+msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, fuzzy, c-format
-msgid "Data `%s' invalid\n"
-msgstr "Appel terminé\n"
+#: src/namestore/gnunet-namestore.c:2069
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/namestore/gnunet-namestore.c:2074
+msgid "delete all records in specified zone"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/namestore/gnunet-namestore.c:2080
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
+msgstr ""
 
 #: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
@@ -5304,10 +5304,6 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:124
-msgid "Show network size estimates from NSE service."
-msgstr ""
-
 #: src/nse/gnunet-nse-profiler.c:857
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
@@ -5332,65 +5328,15 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
+#: src/nse/gnunet-nse.c:124
+msgid "Show network size estimates from NSE service."
+msgstr ""
+
 #: src/nse/gnunet-service-nse.c:1441
 #: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:175
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:306
-#, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:323
-#: src/peerinfo/gnunet-service-peerinfo.c:348
-#, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:426
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:468
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:624
-#, c-format
-msgid "Scanning directory `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:631
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1027
-#, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1322
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1335
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:210
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr ""
-
 #: src/peerinfo-tool/gnunet-peerinfo.c:237
 #, c-format
 msgid "%sPeer `%s'\n"
@@ -5485,6 +5431,60 @@ msgstr ""
 msgid "Peerinfo REST API initialized\n"
 msgstr ""
 
+#: src/peerinfo/gnunet-service-peerinfo.c:175
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:306
+#, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:323
+#: src/peerinfo/gnunet-service-peerinfo.c:348
+#, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:426
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:468
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:624
+#, c-format
+msgid "Scanning directory `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:631
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1027
+#, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1322
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1335
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:210
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr ""
+
 #: src/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
@@ -5968,18 +5968,6 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/rps/gnunet-rps-profiler.c:3142
 msgid "duration of the profiling"
 msgstr ""
@@ -5996,6 +5984,18 @@ msgstr ""
 msgid "Measure quality and performance of the RPS service."
 msgstr ""
 
+#: src/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:228
 msgid "You must specify at least one message ID to check!\n"
 msgstr ""
@@ -6050,10 +6050,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 msgid "Connect to CADET failed\n"
 msgstr ""
 
@@ -6724,10 +6724,6 @@ msgstr ""
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:137
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport.c:445
 msgid "# messages dropped due to slow client"
 msgstr ""
@@ -6768,6 +6764,10 @@ msgstr ""
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:137
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
@@ -7073,6 +7073,42 @@ msgstr ""
 msgid "# HELLOs given to peerinfo"
 msgstr ""
 
+#: src/transport/gnunet-transport-profiler.c:220
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:577
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:581
+msgid "receive data from peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:586
+msgid "iterations"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:591
+#, fuzzy
+msgid "number of messages to send"
+msgstr "nombre de valeurs"
+
+#: src/transport/gnunet-transport-profiler.c:596
+msgid "message size to use"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:601
+#: src/transport/gnunet-transport.c:1404
+msgid "peer identity"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:614
+#: src/transport/gnunet-transport.c:1426
+msgid "Direct access to transport service."
+msgstr ""
+
 #: src/transport/gnunet-transport.c:406
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7202,11 +7238,6 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1404
-#: src/transport/gnunet-transport-profiler.c:601
-msgid "peer identity"
-msgstr ""
-
 #: src/transport/gnunet-transport.c:1408
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7215,37 +7246,6 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1426
-#: src/transport/gnunet-transport-profiler.c:614
-msgid "Direct access to transport service."
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:220
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:577
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:581
-msgid "receive data from peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:586
-msgid "iterations"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:591
-#, fuzzy
-msgid "number of messages to send"
-msgstr "nombre de valeurs"
-
-#: src/transport/gnunet-transport-profiler.c:596
-msgid "message size to use"
-msgstr ""
-
 #: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
@@ -7511,20 +7511,6 @@ msgstr ""
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:553
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:571
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-
 #: src/transport/plugin_transport_udp.c:3170
 #, c-format
 msgid ""
@@ -7571,6 +7557,20 @@ msgstr "adresse invalide"
 msgid "Failed to create UDP network sockets\n"
 msgstr ""
 
+#: src/transport/plugin_transport_udp_broadcasting.c:169
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:553
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:571
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
 #: src/transport/plugin_transport_unix.c:1396
 #, c-format
 msgid "Cannot bind to `%s'\n"
@@ -8327,99 +8327,6 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:59
-msgid "No error (success)."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:65
-#, fuzzy
-msgid "Unknown and unspecified error."
-msgstr "%.s Code d'erreur inconnu"
-
-#: src/util/gnunet_error_codes.c:71
-msgid "Communication with service failed."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:77
-#, fuzzy
-msgid "Ego not found."
-msgstr "upnpc introuvable\n"
-
-#: src/util/gnunet_error_codes.c:83
-msgid "Identifier already in use for another ego."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:89
-msgid "The given ego is invalid or malformed."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:95
-#, fuzzy
-msgid "Unknown namestore error."
-msgstr "%.s Code d'erreur inconnu"
-
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
-#, fuzzy
-msgid "Zone iteration failed."
-msgstr "# Session TCP active"
-
-#: src/util/gnunet_error_codes.c:107
-#, fuzzy
-msgid "Zone not found."
-msgstr "upnpc introuvable\n"
-
-#: src/util/gnunet_error_codes.c:113
-#, fuzzy
-msgid "Record not found."
-msgstr "upnpc introuvable\n"
-
-#: src/util/gnunet_error_codes.c:125
-msgid "Zone does not contain any records."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:131
-#, fuzzy
-msgid "Failed to lookup record."
-msgstr "Échec du démarrage de %s\n"
-
-#: src/util/gnunet_error_codes.c:137
-msgid "No records given."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:143
-msgid "Record data invalid."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:149
-msgid "No label given."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:155
-#, fuzzy
-msgid "No results given."
-msgstr "# résultats introuvables"
-
-#: src/util/gnunet_error_codes.c:161
-msgid "Record already exists."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:167
-msgid "Record size exceeds maximum limit."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:173
-msgid "There was an error in the database backend."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:179
-#, fuzzy
-msgid "Failed to store the given records."
-msgstr "Échec du démarrage de %s\n"
-
-#: src/util/gnunet_error_codes.c:185
-msgid "Label invalid or malformed."
-msgstr ""
-
 #: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
@@ -8561,6 +8468,99 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
+#: src/util/gnunet_error_codes.c:60
+msgid "No error (success)."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:66
+#, fuzzy
+msgid "Unknown and unspecified error."
+msgstr "%.s Code d'erreur inconnu"
+
+#: src/util/gnunet_error_codes.c:72
+msgid "Communication with service failed."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:78
+#, fuzzy
+msgid "Ego not found."
+msgstr "upnpc introuvable\n"
+
+#: src/util/gnunet_error_codes.c:84
+msgid "Identifier already in use for another ego."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:90
+msgid "The given ego is invalid or malformed."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:96
+#, fuzzy
+msgid "Unknown namestore error."
+msgstr "%.s Code d'erreur inconnu"
+
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
+#, fuzzy
+msgid "Zone iteration failed."
+msgstr "# Session TCP active"
+
+#: src/util/gnunet_error_codes.c:108
+#, fuzzy
+msgid "Zone not found."
+msgstr "upnpc introuvable\n"
+
+#: src/util/gnunet_error_codes.c:114
+#, fuzzy
+msgid "Record not found."
+msgstr "upnpc introuvable\n"
+
+#: src/util/gnunet_error_codes.c:126
+msgid "Zone does not contain any records."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:132
+#, fuzzy
+msgid "Failed to lookup record."
+msgstr "Échec du démarrage de %s\n"
+
+#: src/util/gnunet_error_codes.c:138
+msgid "No records given."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:144
+msgid "Record data invalid."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:150
+msgid "No label given."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:156
+#, fuzzy
+msgid "No results given."
+msgstr "# résultats introuvables"
+
+#: src/util/gnunet_error_codes.c:162
+msgid "Record already exists."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:168
+msgid "Record size exceeds maximum limit."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:174
+msgid "There was an error in the database backend."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:180
+#, fuzzy
+msgid "Failed to store the given records."
+msgstr "Échec du démarrage de %s\n"
+
+#: src/util/gnunet_error_codes.c:186
+msgid "Label invalid or malformed."
+msgstr ""
+
 #: src/util/helper.c:305
 #, c-format
 msgid "Error reading from `%s': %s\n"
diff --git a/po/it.po b/po/it.po
index 11e6e5718..5e3a69ca9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-12-26 09:51+0100\n"
+"POT-Creation-Date: 2022-12-28 19:48+0900\n"
 "PO-Revision-Date: 2019-10-16 11:00+0200\n"
 "Last-Translator: Sebastiano Pistore <sebastianopistore.info@protonmail.ch>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -33,8 +33,8 @@ msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
 #: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore.c:1957
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
+#: src/namestore/gnunet-namestore.c:1957
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr ""
@@ -498,80 +498,6 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2993 src/ats/gnunet-ats-solver-eval.c:3045
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3012
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3064
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3553
-msgid "solver to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3558
-msgid "experiment to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3565
-msgid "print logging"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3570
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3575
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:321
-#, 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:331
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:377
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:462
-#, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1142
-#, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1165
-#, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr ""
-
 #: src/ats-tool/gnunet-ats.c:299
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -688,6 +614,80 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr ""
 
+#: src/ats/gnunet-ats-solver-eval.c:2993 src/ats/gnunet-ats-solver-eval.c:3045
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3012
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3064
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3553
+msgid "solver to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3558
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3565
+msgid "print logging"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3570
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3575
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:321
+#, 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:331
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:377
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:462
+#, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1142
+#, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1165
+#, 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 ""
@@ -818,6 +818,28 @@ 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:146
+#, c-format
+msgid ""
+"\n"
+"ew are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:218
+#, 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:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1074,30 +1096,8 @@ msgstr ""
 msgid "Enables having a conversation with other GNUnet users."
 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:146
-#, c-format
-msgid ""
-"\n"
-"ew are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:218
-#, 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:665
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1965,6 +1965,40 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:140
+#, fuzzy, c-format
+msgid "Could not connect to DHT service!\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/dht/gnunet-dht-put.c:151
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:188
+msgid "the data to insert under the key"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:194
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:212
+msgid "how many replicas to create"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:223
+msgid "the type to insert data as"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:241
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr ""
+
 #: src/dht/gnunet_dht_profiler.c:925 src/testbed/gnunet-testbed-profiler.c:253
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
@@ -2011,58 +2045,24 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
+#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:140
-#, fuzzy, c-format
-msgid "Could not connect to DHT service!\n"
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+#: src/dns/gnunet-dns-monitor.c:387
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:188
-msgid "the data to insert under the key"
+#: src/dns/gnunet-dns-redirector.c:240
+msgid "set A records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:194
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/dns/gnunet-dns-redirector.c:246
+msgid "set AAAA records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:212
-msgid "how many replicas to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:223
-msgid "the type to insert data as"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:241
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
-msgid "only monitor DNS queries"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:387
-msgid "Monitor DNS queries."
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:240
-msgid "set A records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:246
-msgid "set AAAA records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:259
-msgid "Change DNS replies to point elsewhere."
+#: src/dns/gnunet-dns-redirector.c:259
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
 #: src/dns/gnunet-service-dns.c:463
@@ -2930,14 +2930,6 @@ msgid ""
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:180
-msgid "Special file-sharing operations"
-msgstr ""
-
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
@@ -2954,6 +2946,14 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:180
+msgid "Special file-sharing operations"
+msgstr ""
+
 #: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3675,49 +3675,6 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:256
-#, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "`%s' non è un indirizzo IP valido.\n"
-
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:304
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:345
-msgid "Specify the type of the record to lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:351
-msgid "Specify a timeout for the lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-msgid "GNUnet GNS resolver tool"
-msgstr ""
-
 #: src/gns/gnunet-gns-import.c:490
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -3837,6 +3794,49 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:256
+#, fuzzy, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "`%s' non è un indirizzo IP valido.\n"
+
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:345
+msgid "Specify the type of the record to lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:351
+msgid "Specify a timeout for the lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:355
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:374
+msgid "GNUnet GNS resolver tool"
+msgstr ""
+
 #: src/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4620,408 +4620,408 @@ msgstr ""
 msgid "Failed to setup database at `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/namestore/gnunet-namestore.c:411
+#: src/namestore/gnunet-namestore-dbtool.c:87
+#: src/namestore/gnunet-namestore.c:1950
 #, c-format
-msgid "Missing entries in record line `%s'.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Comando `%s' sconosciuto.\n"
-
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:434
-#, c-format
-msgid "Error parsing expiration time %s.\n"
+#: src/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "Indirizzo IPv6 non valido: `%s'\n"
-
-#: src/namestore/gnunet-namestore.c:666
-#, c-format
-msgid "Adding record failed: %s\n"
+#: src/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
-#, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr "Impossibile leggere il file"
-
-#: src/namestore/gnunet-namestore.c:1136
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
+#: src/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1257
-#, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
+#: src/namestore/gnunet-namestore-dbtool.c:189
+#: src/namestore/gnunet-namestore-zonefile.c:753
+msgid "GNUnet namestore database manipulation tool"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1300
-#, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:373
+msgid "can not search the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1325
-#, c-format
-msgid "%s\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:427
+#: src/namestore/gnunet-namestore-fcfsd.c:561
+msgid "unable to scan namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1354
-#, c-format
-msgid "No options given\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:447
+#, fuzzy, c-format
+msgid "Failed to create record for `%s': %s\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/namestore/gnunet-namestore.c:1368
-#, c-format
-msgid "Recordlines only work with option `%s'\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:460
+#, fuzzy
+msgid "no errors"
+msgstr "errore sconosciuto"
 
-#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
-#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
-#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
-#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
-#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
-#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
-#: src/namestore/gnunet-namestore.c:1685
+#: src/namestore/gnunet-namestore-fcfsd.c:496
 #, c-format
-msgid "Missing option `%s' for operation `%s'\n"
+msgid "The requested key `%s' exists as `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1379
-msgid "name"
+#: src/namestore/gnunet-namestore-fcfsd.c:503
+msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1408
-#, c-format
-msgid "Invalid nick `%s'\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy
+msgid "Error creating record data\n"
+msgstr "Errore interno."
 
-#: src/namestore/gnunet-namestore.c:1431 src/namestore/gnunet-namestore.c:1441
-#: src/namestore/gnunet-namestore.c:1451 src/namestore/gnunet-namestore.c:1480
-#: src/namestore/gnunet-namestore.c:1501 src/namestore/gnunet-namestore.c:1687
-msgid "add"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:524
+#, fuzzy
+msgid "unable to store record"
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/namestore/gnunet-namestore.c:1459
+#: src/namestore/gnunet-namestore-fcfsd.c:595
 #, c-format
-msgid "Unsupported type `%s'\n"
+msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1469
-#, c-format
-msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+#: src/namestore/gnunet-namestore-fcfsd.c:601
+msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1489
-#, c-format
-msgid "Value `%s' invalid for record type `%s'\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:787
+msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1508 src/namestore/gnunet-namestore.c:1694
-#, c-format
-msgid "Invalid time format `%s'\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:798
+msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
-msgid "del"
+#: src/namestore/gnunet-namestore-fcfsd.c:817
+#, fuzzy
+msgid "invalid parameters"
+msgstr "argomento non valido"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:834
+#, fuzzy
+msgid "invalid name"
+msgstr "argomento non valido"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:845
+#, fuzzy, c-format
+msgid "Unable to parse key %s\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:849
+#, fuzzy
+msgid "unable to parse key"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:960
+msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1571
-msgid "purge-zone"
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
+msgid "No expiration specified for records.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1596
-msgid "list"
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
+msgid "No port specified, using default value\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1630
-msgid "reverse-pkey"
+#: src/namestore/gnunet-namestore-fcfsd.c:1098
+msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1640
-#, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
+msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1664
-msgid "uri"
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
+msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1677
-#: src/peerinfo-tool/gnunet-peerinfo.c:737
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "nome file troppo lungo"
+
+#: src/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "Impossibile leggere il file"
+
+#: src/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "Generazione statistiche fallita\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:520
 #, c-format
-msgid "Invalid URI `%s'\n"
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1950
-#: src/namestore/gnunet-namestore-dbtool.c:87
+#: src/namestore/gnunet-namestore-zonefile.c:529
 #, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1965
+#: src/namestore/gnunet-namestore-zonefile.c:591
 #, c-format
-msgid "Cannot connect to identity service\n"
+msgid "Data `%s' invalid\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1984
-msgid "add record"
-msgstr ""
+#: src/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/namestore/gnunet-namestore.c:1987
-msgid "delete record"
-msgstr ""
+#: src/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/namestore/gnunet-namestore.c:1991
-msgid "display records"
+#: src/namestore/gnunet-namestore-zonefile.c:738
+#: src/namestore/gnunet-namestore.c:2086
+msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1995
-msgid "read commands from stdin"
+#: src/namestore/gnunet-namestore.c:411
+#, c-format
+msgid "Missing entries in record line `%s'.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2002
-msgid ""
-"expiration time for record to use (for adding only), \"never\" is possible"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/namestore/gnunet-namestore.c:2008
-msgid "set the desired nick name for the zone"
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2013
-msgid "monitor changes in the namestore"
+#: src/namestore/gnunet-namestore.c:434
+#, c-format
+msgid "Error parsing expiration time %s.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2023
-msgid "Output in recordline format"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "Indirizzo IPv6 non valido: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:2029
-msgid "determine our name for the given KEY"
+#: src/namestore/gnunet-namestore.c:666
+#, c-format
+msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2035
-msgid "type of the record to add/delete/display"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "Impossibile leggere il file"
 
-#: src/namestore/gnunet-namestore.c:2040
-msgid "URI to import into our zone"
+#: src/namestore/gnunet-namestore.c:1136
+#, c-format
+msgid ""
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2046
-msgid "value of the record to add/delete"
+#: src/namestore/gnunet-namestore.c:1257
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2050
-msgid "create or list public record"
+#: src/namestore/gnunet-namestore.c:1300
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2054
-msgid "omit private records"
+#: src/namestore/gnunet-namestore.c:1325
+#, c-format
+msgid "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2059
-msgid "do not filter maintenance records"
+#: src/namestore/gnunet-namestore.c:1354
+#, c-format
+msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2064
-msgid "purge namestore of all orphans"
+#: src/namestore/gnunet-namestore.c:1368
+#, c-format
+msgid "Recordlines only work with option `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2069
-msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
+#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
+#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
+#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
+#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
+#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
+#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
+#: src/namestore/gnunet-namestore.c:1685
+#, c-format
+msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2074
-msgid "delete all records in specified zone"
+#: src/namestore/gnunet-namestore.c:1379
+msgid "name"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2080
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
+#: src/namestore/gnunet-namestore.c:1408
+#, c-format
+msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2086
-#: src/namestore/gnunet-namestore-zonefile.c:738
-msgid "name of the ego controlling the zone"
+#: src/namestore/gnunet-namestore.c:1431 src/namestore/gnunet-namestore.c:1441
+#: src/namestore/gnunet-namestore.c:1451 src/namestore/gnunet-namestore.c:1480
+#: src/namestore/gnunet-namestore.c:1501 src/namestore/gnunet-namestore.c:1687
+msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
+#: src/namestore/gnunet-namestore.c:1459
+#, c-format
+msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
+#: src/namestore/gnunet-namestore.c:1469
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
+#: src/namestore/gnunet-namestore.c:1489
+#, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-msgid "GNUnet namestore database manipulation tool"
+#: src/namestore/gnunet-namestore.c:1508 src/namestore/gnunet-namestore.c:1694
+#, c-format
+msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:373
-msgid "can not search the namestore"
+#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
+msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
-msgid "unable to scan namestore"
+#: src/namestore/gnunet-namestore.c:1571
+msgid "purge-zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:447
-#, fuzzy, c-format
-msgid "Failed to create record for `%s': %s\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/namestore/gnunet-namestore.c:1596
+msgid "list"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:460
-#, fuzzy
-msgid "no errors"
-msgstr "errore sconosciuto"
+#: src/namestore/gnunet-namestore.c:1630
+msgid "reverse-pkey"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/namestore/gnunet-namestore.c:1640
 #, c-format
-msgid "The requested key `%s' exists as `%s'\n"
+msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
-msgid "key exists"
+#: src/namestore/gnunet-namestore.c:1664
+msgid "uri"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, fuzzy
-msgid "Error creating record data\n"
-msgstr "Errore interno."
-
-#: src/namestore/gnunet-namestore-fcfsd.c:524
-#, fuzzy
-msgid "unable to store record"
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:595
+#: src/namestore/gnunet-namestore.c:1677
+#: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, c-format
-msgid "Requested name `%s' exists with `%u' records\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:601
-msgid "name exists\n"
+msgid "Invalid URI `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
-msgid "unable to process submitted data"
+#: src/namestore/gnunet-namestore.c:1965
+#, c-format
+msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:798
-msgid "the submitted data is invalid"
+#: src/namestore/gnunet-namestore.c:1984
+msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
-#, fuzzy
-msgid "invalid parameters"
-msgstr "argomento non valido"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:834
-#, fuzzy
-msgid "invalid name"
-msgstr "argomento non valido"
+#: src/namestore/gnunet-namestore.c:1987
+msgid "delete record"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:845
-#, fuzzy, c-format
-msgid "Unable to parse key %s\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/namestore/gnunet-namestore.c:1991
+msgid "display records"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:849
-#, fuzzy
-msgid "unable to parse key"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/namestore/gnunet-namestore.c:1995
+msgid "read commands from stdin"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:960
-msgid "No ego configured for `fcfsd` subsystem\n"
+#: src/namestore/gnunet-namestore.c:2002
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
-msgid "No expiration specified for records.\n"
+#: src/namestore/gnunet-namestore.c:2008
+msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
-msgid "No port specified, using default value\n"
+#: src/namestore/gnunet-namestore.c:2013
+msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
-msgid "Failed to connect to identity\n"
+#: src/namestore/gnunet-namestore.c:2023
+msgid "Output in recordline format"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
-msgid "name of the zone managed by FCFSD"
+#: src/namestore/gnunet-namestore.c:2029
+msgid "determine our name for the given KEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
-msgid "GNU Name System First-Come-First-Served name registration service"
+#: src/namestore/gnunet-namestore.c:2035
+msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "Impossibile avviare il servizio.\n"
+#: src/namestore/gnunet-namestore.c:2040
+msgid "URI to import into our zone"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, fuzzy, c-format
-msgid "Name `%s' is too long\n"
-msgstr "nome file troppo lungo"
+#: src/namestore/gnunet-namestore.c:2046
+msgid "value of the record to add/delete"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "Impossibile leggere il file"
+#: src/namestore/gnunet-namestore.c:2050
+msgid "create or list public record"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "Generazione statistiche fallita\n"
+#: src/namestore/gnunet-namestore.c:2054
+msgid "omit private records"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+#: src/namestore/gnunet-namestore.c:2059
+msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
+#: src/namestore/gnunet-namestore.c:2064
+msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, c-format
-msgid "Data `%s' invalid\n"
+#: src/namestore/gnunet-namestore.c:2069
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "Impossibile avviare il servizio.\n"
+#: src/namestore/gnunet-namestore.c:2074
+msgid "delete all records in specified zone"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "Impossibile avviare il servizio.\n"
+#: src/namestore/gnunet-namestore.c:2080
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
+msgstr ""
 
 #: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
@@ -5330,10 +5330,6 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:124
-msgid "Show network size estimates from NSE service."
-msgstr ""
-
 #: src/nse/gnunet-nse-profiler.c:857
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
@@ -5358,65 +5354,15 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
+#: src/nse/gnunet-nse.c:124
+msgid "Show network size estimates from NSE service."
+msgstr ""
+
 #: src/nse/gnunet-service-nse.c:1441
 #: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:175
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:306
-#, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:323
-#: src/peerinfo/gnunet-service-peerinfo.c:348
-#, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:426
-msgid "# peers known"
-msgstr "# peer conosciuti"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:468
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:624
-#, c-format
-msgid "Scanning directory `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:631
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1027
-#, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1322
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1335
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:210
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr ""
-
 #: src/peerinfo-tool/gnunet-peerinfo.c:237
 #, c-format
 msgid "%sPeer `%s'\n"
@@ -5511,6 +5457,60 @@ msgstr ""
 msgid "Peerinfo REST API initialized\n"
 msgstr ""
 
+#: src/peerinfo/gnunet-service-peerinfo.c:175
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:306
+#, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:323
+#: src/peerinfo/gnunet-service-peerinfo.c:348
+#, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:426
+msgid "# peers known"
+msgstr "# peer conosciuti"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:468
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:624
+#, c-format
+msgid "Scanning directory `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:631
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1027
+#, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1322
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1335
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:210
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr ""
+
 #: src/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
@@ -5995,18 +5995,6 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/rps/gnunet-rps-profiler.c:3142
 msgid "duration of the profiling"
 msgstr ""
@@ -6023,6 +6011,18 @@ msgstr ""
 msgid "Measure quality and performance of the RPS service."
 msgstr ""
 
+#: src/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:228
 msgid "You must specify at least one message ID to check!\n"
 msgstr ""
@@ -6077,10 +6077,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 msgid "Connect to CADET failed\n"
 msgstr ""
 
@@ -6753,10 +6753,6 @@ msgstr ""
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:137
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport.c:445
 msgid "# messages dropped due to slow client"
 msgstr ""
@@ -6797,6 +6793,10 @@ msgstr ""
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:137
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
@@ -7114,6 +7114,41 @@ msgstr ""
 msgid "# HELLOs given to peerinfo"
 msgstr ""
 
+#: src/transport/gnunet-transport-profiler.c:220
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:577
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:581
+msgid "receive data from peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:586
+msgid "iterations"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:591
+msgid "number of messages to send"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:596
+msgid "message size to use"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:601
+#: src/transport/gnunet-transport.c:1404
+msgid "peer identity"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:614
+#: src/transport/gnunet-transport.c:1426
+msgid "Direct access to transport service."
+msgstr ""
+
 #: src/transport/gnunet-transport.c:406
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7246,11 +7281,6 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1404
-#: src/transport/gnunet-transport-profiler.c:601
-msgid "peer identity"
-msgstr ""
-
 #: src/transport/gnunet-transport.c:1408
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7259,36 +7289,6 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1426
-#: src/transport/gnunet-transport-profiler.c:614
-msgid "Direct access to transport service."
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:220
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:577
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:581
-msgid "receive data from peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:586
-msgid "iterations"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:591
-msgid "number of messages to send"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:596
-msgid "message size to use"
-msgstr ""
-
 #: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
@@ -7555,21 +7555,6 @@ msgstr ""
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# messaggi PONG ricevuti"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:553
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:571
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-
 #: src/transport/plugin_transport_udp.c:3170
 #, c-format
 msgid ""
@@ -7616,6 +7601,21 @@ msgstr "deve essere un indirizzo IPv4 valido"
 msgid "Failed to create UDP network sockets\n"
 msgstr "Generazione statistiche fallita\n"
 
+#: src/transport/plugin_transport_udp_broadcasting.c:169
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:553
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:571
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
 #: src/transport/plugin_transport_unix.c:1396
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
@@ -8378,98 +8378,6 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:59
-msgid "No error (success)."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:65
-#, fuzzy
-msgid "Unknown and unspecified error."
-msgstr "Comando `%s' sconosciuto.\n"
-
-#: src/util/gnunet_error_codes.c:71
-msgid "Communication with service failed."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:77
-#, fuzzy
-msgid "Ego not found."
-msgstr "Contenuto non trovato"
-
-#: src/util/gnunet_error_codes.c:83
-msgid "Identifier already in use for another ego."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:89
-msgid "The given ego is invalid or malformed."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:95
-#, fuzzy
-msgid "Unknown namestore error."
-msgstr "Comando `%s' sconosciuto.\n"
-
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
-#, fuzzy
-msgid "Zone iteration failed."
-msgstr "# connessioni attive"
-
-#: src/util/gnunet_error_codes.c:107
-#, fuzzy
-msgid "Zone not found."
-msgstr "Contenuto non trovato"
-
-#: src/util/gnunet_error_codes.c:113
-#, fuzzy
-msgid "Record not found."
-msgstr "upnpc non trovato\n"
-
-#: src/util/gnunet_error_codes.c:125
-msgid "Zone does not contain any records."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:131
-#, fuzzy
-msgid "Failed to lookup record."
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/util/gnunet_error_codes.c:137
-msgid "No records given."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:143
-msgid "Record data invalid."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:149
-msgid "No label given."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:155
-msgid "No results given."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:161
-msgid "Record already exists."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:167
-msgid "Record size exceeds maximum limit."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:173
-msgid "There was an error in the database backend."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:179
-#, fuzzy
-msgid "Failed to store the given records."
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/util/gnunet_error_codes.c:185
-msgid "Label invalid or malformed."
-msgstr ""
-
 #: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
@@ -8611,6 +8519,98 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
+#: src/util/gnunet_error_codes.c:60
+msgid "No error (success)."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:66
+#, fuzzy
+msgid "Unknown and unspecified error."
+msgstr "Comando `%s' sconosciuto.\n"
+
+#: src/util/gnunet_error_codes.c:72
+msgid "Communication with service failed."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:78
+#, fuzzy
+msgid "Ego not found."
+msgstr "Contenuto non trovato"
+
+#: src/util/gnunet_error_codes.c:84
+msgid "Identifier already in use for another ego."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:90
+msgid "The given ego is invalid or malformed."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:96
+#, fuzzy
+msgid "Unknown namestore error."
+msgstr "Comando `%s' sconosciuto.\n"
+
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
+#, fuzzy
+msgid "Zone iteration failed."
+msgstr "# connessioni attive"
+
+#: src/util/gnunet_error_codes.c:108
+#, fuzzy
+msgid "Zone not found."
+msgstr "Contenuto non trovato"
+
+#: src/util/gnunet_error_codes.c:114
+#, fuzzy
+msgid "Record not found."
+msgstr "upnpc non trovato\n"
+
+#: src/util/gnunet_error_codes.c:126
+msgid "Zone does not contain any records."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:132
+#, fuzzy
+msgid "Failed to lookup record."
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/util/gnunet_error_codes.c:138
+msgid "No records given."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:144
+msgid "Record data invalid."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:150
+msgid "No label given."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:156
+msgid "No results given."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:162
+msgid "Record already exists."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:168
+msgid "Record size exceeds maximum limit."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:174
+msgid "There was an error in the database backend."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:180
+#, fuzzy
+msgid "Failed to store the given records."
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/util/gnunet_error_codes.c:186
+msgid "Label invalid or malformed."
+msgstr ""
+
 #: src/util/helper.c:305
 #, c-format
 msgid "Error reading from `%s': %s\n"
diff --git a/po/sr.po b/po/sr.po
index 2d2bee716..431e2bce1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-12-26 09:51+0100\n"
+"POT-Creation-Date: 2022-12-28 19:48+0900\n"
 "PO-Revision-Date: 2020-10-23 18:39+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -31,8 +31,8 @@ msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "Јавни кључ „%s“ није добро оформљен\n"
 
 #: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore.c:1957
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
+#: src/namestore/gnunet-namestore.c:1957
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Нисам успео да се повежем са смештајем назива\n"
@@ -513,90 +513,6 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr "Започињем гашење као што је затражио клијент.\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2993 src/ats/gnunet-ats-solver-eval.c:3045
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-"Не могу да учитам квоту за мрежу „%s“:  „%s“, додељујем основни пропусни "
-"опсег %llu\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3012
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-"Нема подешене одлазне квоте за мрежу „%s“, додељујем основни пропусни опсег "
-"%llu\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3064
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-"Није подешена одлазна квота за мрежу „%s“, додељујем основни пропусни опсег "
-"%llu\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3553
-msgid "solver to use"
-msgstr "решавач за коришћење"
-
-#: src/ats/gnunet-ats-solver-eval.c:3558
-msgid "experiment to use"
-msgstr "експеримент за коришћење"
-
-#: src/ats/gnunet-ats-solver-eval.c:3565
-msgid "print logging"
-msgstr "исписује дневничење"
-
-#: src/ats/gnunet-ats-solver-eval.c:3570
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3575
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:321
-#, fuzzy, c-format
-msgid ""
-"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-"Не могу да учитам квоту за мрежу „%s“:  „%s“, додељујем основни пропусни "
-"опсег %llu\n"
-
-#: src/ats/gnunet-service-ats_plugins.c:331
-#, fuzzy, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr "Квота долазности подешена за мрежу „%s“ је %llu\n"
-
-#: src/ats/gnunet-service-ats_plugins.c:377
-#, fuzzy, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-"Нема подешене одлазне квоте за мрежу „%s“, додељујем основни пропусни опсег "
-"%llu\n"
-
-#: src/ats/gnunet-service-ats_plugins.c:462
-#, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "Нисам успео да покренем решавача „%s“!\n"
-
-#: src/ats/plugin_ats_proportional.c:1142
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "Нисам успео да учитам подешавање за „%s“\n"
-
-#: src/ats/plugin_ats_proportional.c:1165
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "Нађох пријатеља „%s“ у подешавањима\n"
-
 #: src/ats-tool/gnunet-ats.c:299
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -714,6 +630,90 @@ msgstr "опширан излаз (укључује својства АТС ад
 msgid "Print information about ATS state"
 msgstr "Исписује податке о АТС стању"
 
+#: src/ats/gnunet-ats-solver-eval.c:2993 src/ats/gnunet-ats-solver-eval.c:3045
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"Не могу да учитам квоту за мрежу „%s“:  „%s“, додељујем основни пропусни "
+"опсег %llu\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3012
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"Нема подешене одлазне квоте за мрежу „%s“, додељујем основни пропусни опсег "
+"%llu\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3064
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"Није подешена одлазна квота за мрежу „%s“, додељујем основни пропусни опсег "
+"%llu\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3553
+msgid "solver to use"
+msgstr "решавач за коришћење"
+
+#: src/ats/gnunet-ats-solver-eval.c:3558
+msgid "experiment to use"
+msgstr "експеримент за коришћење"
+
+#: src/ats/gnunet-ats-solver-eval.c:3565
+msgid "print logging"
+msgstr "исписује дневничење"
+
+#: src/ats/gnunet-ats-solver-eval.c:3570
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3575
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:321
+#, fuzzy, c-format
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"Не могу да учитам квоту за мрежу „%s“:  „%s“, додељујем основни пропусни "
+"опсег %llu\n"
+
+#: src/ats/gnunet-service-ats_plugins.c:331
+#, fuzzy, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr "Квота долазности подешена за мрежу „%s“ је %llu\n"
+
+#: src/ats/gnunet-service-ats_plugins.c:377
+#, fuzzy, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+"Нема подешене одлазне квоте за мрежу „%s“, додељујем основни пропусни опсег "
+"%llu\n"
+
+#: src/ats/gnunet-service-ats_plugins.c:462
+#, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "Нисам успео да покренем решавача „%s“!\n"
+
+#: src/ats/plugin_ats_proportional.c:1142
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Нисам успео да учитам подешавање за „%s“\n"
+
+#: src/ats/plugin_ats_proportional.c:1165
+#, 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 ""
@@ -853,6 +853,34 @@ msgid "Connection to conversation service lost, trying to 
reconnect\n"
 msgstr ""
 "Веза са услугом конверзације је изгубљена, покушавам поново да се повежем\n"
 
+#: src/conversation/gnunet-conversation-test.c:120
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+"\n"
+"Крај преноса.  Нека вам је ГНУ дан.\n"
+
+#: src/conversation/gnunet-conversation-test.c:146
+#, fuzzy, c-format
+msgid ""
+"\n"
+"ew are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+"\n"
+"Сада пуштамо ваш снимак.  Ако можете да га чујете, ваша подешавања звука су "
+"добра..."
+
+#: src/conversation/gnunet-conversation-test.c:218
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+"Сада ћемо вас снимати за %s. Након тог времена, снимак ће вам бити пуштен..."
+
 #: src/conversation/gnunet-conversation.c:264
 #, fuzzy, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1119,36 +1147,8 @@ msgstr "поставља РЕД за коришћење за телефон"
 msgid "Enables having a conversation with other GNUnet users."
 msgstr "Укључује могућност конверзације са другим ГНУнет корисницима."
 
-#: src/conversation/gnunet-conversation-test.c:120
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-"\n"
-"Крај преноса.  Нека вам је ГНУ дан.\n"
-
-#: src/conversation/gnunet-conversation-test.c:146
-#, fuzzy, c-format
-msgid ""
-"\n"
-"ew are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-"\n"
-"Сада пуштамо ваш снимак.  Ако можете да га чујете, ваша подешавања звука су "
-"добра..."
-
-#: src/conversation/gnunet-conversation-test.c:218
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
-msgstr ""
-"Сада ћемо вас снимати за %s. Након тог времена, снимак ће вам бити пуштен..."
-
-#: src/conversation/gnunet_gst.c:665
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr "Грешка читања са СТНДУЛАЗА: %d %s\n"
@@ -2045,25 +2045,59 @@ msgstr "бива опширан (исписује податке напредо
 msgid "Prints all packets that go through the DHT."
 msgstr "Исписује све пакете који иду кроз „DHT“."
 
-#: src/dht/gnunet_dht_profiler.c:925 src/testbed/gnunet-testbed-profiler.c:253
-#, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "Излазим јер је број парњака %u\n"
-
-#: src/dht/gnunet_dht_profiler.c:958 src/rps/gnunet-rps-profiler.c:3136
-#, fuzzy
-msgid "number of peers to start"
-msgstr "број парњака у концензусу"
+#: src/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr "Морате доставити КЉУЧ и ПОДАЦИ за ДХТ стављање!\n"
 
-#: src/dht/gnunet_dht_profiler.c:964
-#, fuzzy
-msgid "number of PUTs to perform per peer"
-msgstr "број битова за тражење доказивања о раду"
+#: src/dht/gnunet-dht-put.c:140
+#, fuzzy, c-format
+msgid "Could not connect to DHT service!\n"
+msgstr "Не могу да се повежем са „%s“ услугом!\n"
 
-#: src/dht/gnunet_dht_profiler.c:970 src/nse/gnunet-nse-profiler.c:872
-#: src/testbed/gnunet-testbed-profiler.c:302
-msgid "name of the file with the login information for the testbed"
-msgstr "назив датотеке са подацима пријављивања за пробно место"
+#: src/dht/gnunet-dht-put.c:151
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr "Издајем захтев стављања за „%s“ са подацима „%s“!\n"
+
+#: src/dht/gnunet-dht-put.c:188
+msgid "the data to insert under the key"
+msgstr "подаци за уметање под кључем"
+
+#: src/dht/gnunet-dht-put.c:194
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr "колико ће дуго да држи овај унос у дхт-у (у секундама)"
+
+#: src/dht/gnunet-dht-put.c:212
+msgid "how many replicas to create"
+msgstr "број реплика за стварање"
+
+#: src/dht/gnunet-dht-put.c:223
+msgid "the type to insert data as"
+msgstr "врста за уметање података"
+
+#: src/dht/gnunet-dht-put.c:241
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr "Издаје захтев СТАВИ у ГНУнет ДХТ уметак ПОДАТАКА под КЉУЧЕМ."
+
+#: src/dht/gnunet_dht_profiler.c:925 src/testbed/gnunet-testbed-profiler.c:253
+#, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "Излазим јер је број парњака %u\n"
+
+#: src/dht/gnunet_dht_profiler.c:958 src/rps/gnunet-rps-profiler.c:3136
+#, fuzzy
+msgid "number of peers to start"
+msgstr "број парњака у концензусу"
+
+#: src/dht/gnunet_dht_profiler.c:964
+#, fuzzy
+msgid "number of PUTs to perform per peer"
+msgstr "број битова за тражење доказивања о раду"
+
+#: src/dht/gnunet_dht_profiler.c:970 src/nse/gnunet-nse-profiler.c:872
+#: src/testbed/gnunet-testbed-profiler.c:302
+msgid "name of the file with the login information for the testbed"
+msgstr "назив датотеке са подацима пријављивања за пробно место"
 
 #: src/dht/gnunet_dht_profiler.c:976
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
@@ -2094,40 +2128,6 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "Мери квалитет и учинковитост НСЕ услуге."
 
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
-msgstr "Морате доставити КЉУЧ и ПОДАЦИ за ДХТ стављање!\n"
-
-#: src/dht/gnunet-dht-put.c:140
-#, fuzzy, c-format
-msgid "Could not connect to DHT service!\n"
-msgstr "Не могу да се повежем са „%s“ услугом!\n"
-
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
-msgstr "Издајем захтев стављања за „%s“ са подацима „%s“!\n"
-
-#: src/dht/gnunet-dht-put.c:188
-msgid "the data to insert under the key"
-msgstr "подаци за уметање под кључем"
-
-#: src/dht/gnunet-dht-put.c:194
-msgid "how long to store this entry in the dht (in seconds)"
-msgstr "колико ће дуго да држи овај унос у дхт-у (у секундама)"
-
-#: src/dht/gnunet-dht-put.c:212
-msgid "how many replicas to create"
-msgstr "број реплика за стварање"
-
-#: src/dht/gnunet-dht-put.c:223
-msgid "the type to insert data as"
-msgstr "врста за уметање података"
-
-#: src/dht/gnunet-dht-put.c:241
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr "Издаје захтев СТАВИ у ГНУнет ДХТ уметак ПОДАТАКА под КЉУЧЕМ."
-
 #: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr "само надгледа ДНС упите"
@@ -3057,14 +3057,6 @@ msgstr ""
 "Преузима датотеке са ГНУнет-а користећи ГНУнет CHK или LOC УРИ (gnunet://fs/"
 "chk/...)"
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
-msgstr "исписује списак свих индексираних датотека"
-
-#: src/fs/gnunet-fs.c:180
-msgid "Special file-sharing operations"
-msgstr "Посебне радње дељења датотека"
-
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr "одрађује експеримент са БРОЈ парњака"
@@ -3081,6 +3073,14 @@ msgstr "самостално окончава експеримент након
 msgid "run a testbed to measure file-sharing performance"
 msgstr "покреће пробно место за мерење учинковитости дељења датотека"
 
+#: src/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr "исписује списак свих индексираних датотека"
+
+#: src/fs/gnunet-fs.c:180
+msgid "Special file-sharing operations"
+msgstr "Посебне радње дељења датотека"
+
 #: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3837,50 +3837,6 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:256
-#, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "„%s“ није исправна ИП адреса.\n"
-
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr "Нисам успео да претворим ДНС ИДНА „%s“ у УТФ-8: %s\n"
-
-#: src/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:304
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
-msgstr "Претражује запис за датим називом"
-
-#: src/gns/gnunet-gns.c:345
-msgid "Specify the type of the record to lookup"
-msgstr "Наводи врсту записа за претраживање"
-
-#: src/gns/gnunet-gns.c:351
-#, fuzzy
-msgid "Specify a timeout for the lookup"
-msgstr "Наводи време истека за претраживање"
-
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
-msgstr "Нема непотребног излаза"
-
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-msgid "GNUnet GNS resolver tool"
-msgstr "Алат ГНУнет ГНС решавача"
-
 #: src/gns/gnunet-gns-import.c:490
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr "Овај програм ће увести неке ГНС ауторитете у ваш ГНС смештај назива."
@@ -4000,6 +3956,50 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr "ГНУнет ГНС посредник"
 
+#: src/gns/gnunet-gns.c:256
+#, fuzzy, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "„%s“ није исправна ИП адреса.\n"
+
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "Нисам успео да претворим ДНС ИДНА „%s“ у УТФ-8: %s\n"
+
+#: src/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
+msgstr "Претражује запис за датим називом"
+
+#: src/gns/gnunet-gns.c:345
+msgid "Specify the type of the record to lookup"
+msgstr "Наводи врсту записа за претраживање"
+
+#: src/gns/gnunet-gns.c:351
+#, fuzzy
+msgid "Specify a timeout for the lookup"
+msgstr "Наводи време истека за претраживање"
+
+#: src/gns/gnunet-gns.c:355
+msgid "No unneeded output"
+msgstr "Нема непотребног излаза"
+
+#: src/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:374
+msgid "GNUnet GNS resolver tool"
+msgstr "Алат ГНУнет ГНС решавача"
+
 #: src/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4806,56 +4806,234 @@ msgstr ""
 msgid "Failed to setup database at `%s'\n"
 msgstr "Нисам успео да покренем „%s“ на „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:411
-#, fuzzy, c-format
-msgid "Missing entries in record line `%s'.\n"
-msgstr "Недостаје функција „%s“ у прикључку преноса за „%s“\n"
+#: src/namestore/gnunet-namestore-dbtool.c:87
+#: src/namestore/gnunet-namestore.c:1950
+#, c-format
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Непозната наредба „%s“\n"
+#: src/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
+#: src/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:434
-#, fuzzy, c-format
-msgid "Error parsing expiration time %s.\n"
-msgstr "Грешка прорачуна уније скупа опозивања са %s\n"
+#: src/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "Неисправан формат за ИП: „%s“\n"
+#: src/namestore/gnunet-namestore-dbtool.c:189
+#: src/namestore/gnunet-namestore-zonefile.c:753
+#, fuzzy
+msgid "GNUnet namestore database manipulation tool"
+msgstr "Алат манипуслисања ГНУнет зоном"
 
-#: src/namestore/gnunet-namestore.c:666
-#, c-format
-msgid "Adding record failed: %s\n"
-msgstr "Додавање записа није успело: %s\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:373
+#, fuzzy
+msgid "can not search the namestore"
+msgstr "Не могу да покренем главног контролора"
 
-#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
+#: src/namestore/gnunet-namestore-fcfsd.c:427
+#: src/namestore/gnunet-namestore-fcfsd.c:561
+#, fuzzy
+msgid "unable to scan namestore"
+msgstr "Нисам успео да се повежем са смештајем назива\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:447
 #, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr "Брисање записа није успело%s%s\n"
+msgid "Failed to create record for `%s': %s\n"
+msgstr "Нисам успео да направим запис за домен „%s“: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1136
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:460
+#, fuzzy
+msgid "no errors"
+msgstr "непозната грешка"
 
-#: src/namestore/gnunet-namestore.c:1257
+#: src/namestore/gnunet-namestore-fcfsd.c:496
 #, fuzzy, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
-msgstr "Нема позива који би могао бити отказан управо сада.\n"
+msgid "The requested key `%s' exists as `%s'\n"
+msgstr "Скупови знакова се захтевају где је „%s“–>„%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1300
-#, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:503
+msgid "key exists"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy
+msgid "Error creating record data\n"
+msgstr "Грешка стварања тунела\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:524
+#, fuzzy
+msgid "unable to store record"
+msgstr "Смештај назива није успео да смести запис\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:595
+#, c-format
+msgid "Requested name `%s' exists with `%u' records\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:601
+msgid "name exists\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:787
+msgid "unable to process submitted data"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:798
+msgid "the submitted data is invalid"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:817
+#, fuzzy
+msgid "invalid parameters"
+msgstr "Неисправан аргумент „%s“\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:834
+#, fuzzy
+msgid "invalid name"
+msgstr "Неисправан аргумент „%s“\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:845
+#, fuzzy, c-format
+msgid "Unable to parse key %s\n"
+msgstr "Не могу да обрадим „MX“ запис „%s“\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:849
+#, fuzzy
+msgid "unable to parse key"
+msgstr "Не могу да обрадим „MX“ запис „%s“\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:960
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr "Није подешен его за „fcfsd“ подсистем\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
+#, fuzzy
+msgid "No expiration specified for records.\n"
+msgstr "Није наведена ниједна радња. Немам шта да радим.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
+msgid "No port specified, using default value\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1098
+msgid "Failed to connect to identity\n"
+msgstr "Нисам успео да се повежем са идентитетом\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
+msgid "name of the zone managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
+#, fuzzy
+msgid "GNU Name System First-Come-First-Served name registration service"
+msgstr "Услуга регистрације назива Први Стиже Први Служи ГНУ Система Назива"
+
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Смештај назива није успео да смести запис\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "Регуларни израз „%s“ је превелик!\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "Нисам успео да обрадим УРИ: %s\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "Нисам успео да обрадим УРИ: %s\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:520
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:529
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:591
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Кључ „%s“ је исправан\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Нисам успео да се повежем са ГНС-ом\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Нисам успео да се повежем са ГНС-ом\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:738
+#: src/namestore/gnunet-namestore.c:2086
+msgid "name of the ego controlling the zone"
+msgstr "назив егоа који контролише зону"
+
+#: src/namestore/gnunet-namestore.c:411
+#, fuzzy, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr "Недостаје функција „%s“ у прикључку преноса за „%s“\n"
+
+#: src/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Непозната наредба „%s“\n"
+
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:434
+#, fuzzy, c-format
+msgid "Error parsing expiration time %s.\n"
+msgstr "Грешка прорачуна уније скупа опозивања са %s\n"
+
+#: src/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "Неисправан формат за ИП: „%s“\n"
+
+#: src/namestore/gnunet-namestore.c:666
+#, c-format
+msgid "Adding record failed: %s\n"
+msgstr "Додавање записа није успело: %s\n"
+
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "Брисање записа није успело%s%s\n"
+
+#: src/namestore/gnunet-namestore.c:1136
+#, c-format
+msgid ""
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1257
+#, fuzzy, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr "Нема позива који би могао бити отказан управо сада.\n"
+
+#: src/namestore/gnunet-namestore.c:1300
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:1325
@@ -4950,12 +5128,6 @@ msgstr ""
 msgid "Invalid URI `%s'\n"
 msgstr "Неисправан УРИ „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1950
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
-msgstr ""
-
 #: src/namestore/gnunet-namestore.c:1965
 #, c-format
 msgid "Cannot connect to identity service\n"
@@ -4996,226 +5168,54 @@ msgstr ""
 
 #: src/namestore/gnunet-namestore.c:2029
 #, fuzzy
-msgid "determine our name for the given KEY"
-msgstr "одређује наш назив за дати „PKEY“"
-
-#: src/namestore/gnunet-namestore.c:2035
-msgid "type of the record to add/delete/display"
-msgstr "врста записа за додавање/брисање/приказ"
-
-#: src/namestore/gnunet-namestore.c:2040
-msgid "URI to import into our zone"
-msgstr "УРИ за увоз у нашу зону"
-
-#: src/namestore/gnunet-namestore.c:2046
-msgid "value of the record to add/delete"
-msgstr "вредност записа за додавање/брисање"
-
-#: src/namestore/gnunet-namestore.c:2050
-msgid "create or list public record"
-msgstr "ствара или исписује јавни запис"
-
-#: src/namestore/gnunet-namestore.c:2054
-#, fuzzy
-msgid "omit private records"
-msgstr "приказује записе"
-
-#: src/namestore/gnunet-namestore.c:2059
-msgid "do not filter maintenance records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2064
-msgid "purge namestore of all orphans"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2069
-msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2074
-msgid "delete all records in specified zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2080
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
-msgstr ""
-"прави сеновити запис (важи само ако су сви остали записи исте врсте истекли"
-
-#: src/namestore/gnunet-namestore.c:2086
-#: src/namestore/gnunet-namestore-zonefile.c:738
-msgid "name of the ego controlling the zone"
-msgstr "назив егоа који контролише зону"
-
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-#, fuzzy
-msgid "GNUnet namestore database manipulation tool"
-msgstr "Алат манипуслисања ГНУнет зоном"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:373
-#, fuzzy
-msgid "can not search the namestore"
-msgstr "Не могу да покренем главног контролора"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
-#, fuzzy
-msgid "unable to scan namestore"
-msgstr "Нисам успео да се повежем са смештајем назива\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:447
-#, fuzzy, c-format
-msgid "Failed to create record for `%s': %s\n"
-msgstr "Нисам успео да направим запис за домен „%s“: %s\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:460
-#, fuzzy
-msgid "no errors"
-msgstr "непозната грешка"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:496
-#, fuzzy, c-format
-msgid "The requested key `%s' exists as `%s'\n"
-msgstr "Скупови знакова се захтевају где је „%s“–>„%s“\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:503
-msgid "key exists"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, fuzzy
-msgid "Error creating record data\n"
-msgstr "Грешка стварања тунела\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:524
-#, fuzzy
-msgid "unable to store record"
-msgstr "Смештај назива није успео да смести запис\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:595
-#, c-format
-msgid "Requested name `%s' exists with `%u' records\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:601
-msgid "name exists\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:787
-msgid "unable to process submitted data"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:798
-msgid "the submitted data is invalid"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:817
-#, fuzzy
-msgid "invalid parameters"
-msgstr "Неисправан аргумент „%s“\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:834
-#, fuzzy
-msgid "invalid name"
-msgstr "Неисправан аргумент „%s“\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:845
-#, fuzzy, c-format
-msgid "Unable to parse key %s\n"
-msgstr "Не могу да обрадим „MX“ запис „%s“\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:849
-#, fuzzy
-msgid "unable to parse key"
-msgstr "Не могу да обрадим „MX“ запис „%s“\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:960
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr "Није подешен его за „fcfsd“ подсистем\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
-#, fuzzy
-msgid "No expiration specified for records.\n"
-msgstr "Није наведена ниједна радња. Немам шта да радим.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
-msgid "No port specified, using default value\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
-msgid "Failed to connect to identity\n"
-msgstr "Нисам успео да се повежем са идентитетом\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
-msgid "name of the zone managed by FCFSD"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
-#, fuzzy
-msgid "GNU Name System First-Come-First-Served name registration service"
-msgstr "Услуга регистрације назива Први Стиже Први Служи ГНУ Система Назива"
+msgid "determine our name for the given KEY"
+msgstr "одређује наш назив за дати „PKEY“"
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "Смештај назива није успео да смести запис\n"
+#: src/namestore/gnunet-namestore.c:2035
+msgid "type of the record to add/delete/display"
+msgstr "врста записа за додавање/брисање/приказ"
 
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, fuzzy, c-format
-msgid "Name `%s' is too long\n"
-msgstr "Регуларни израз „%s“ је превелик!\n"
+#: src/namestore/gnunet-namestore.c:2040
+msgid "URI to import into our zone"
+msgstr "УРИ за увоз у нашу зону"
 
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "Нисам успео да обрадим УРИ: %s\n"
+#: src/namestore/gnunet-namestore.c:2046
+msgid "value of the record to add/delete"
+msgstr "вредност записа за додавање/брисање"
 
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "Нисам успео да обрадим УРИ: %s\n"
+#: src/namestore/gnunet-namestore.c:2050
+msgid "create or list public record"
+msgstr "ствара или исписује јавни запис"
 
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+#: src/namestore/gnunet-namestore.c:2054
+#, fuzzy
+msgid "omit private records"
+msgstr "приказује записе"
+
+#: src/namestore/gnunet-namestore.c:2059
+msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
+#: src/namestore/gnunet-namestore.c:2064
+msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, fuzzy, c-format
-msgid "Data `%s' invalid\n"
-msgstr "Кључ „%s“ је исправан\n"
+#: src/namestore/gnunet-namestore.c:2069
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "Нисам успео да се повежем са ГНС-ом\n"
+#: src/namestore/gnunet-namestore.c:2074
+msgid "delete all records in specified zone"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "Нисам успео да се повежем са ГНС-ом\n"
+#: src/namestore/gnunet-namestore.c:2080
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
+msgstr ""
+"прави сеновити запис (важи само ако су сви остали записи исте врсте истекли"
 
 #: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
@@ -5543,10 +5543,6 @@ msgstr "нисам нашао наредбу „external-ip“\n"
 msgid "`upnpc' command not found\n"
 msgstr "нисам нашао „upnpc“ наредбу\n"
 
-#: src/nse/gnunet-nse.c:124
-msgid "Show network size estimates from NSE service."
-msgstr "Показује процене величине мреже из НСЕ услуге."
-
 #: src/nse/gnunet-nse-profiler.c:857
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "ограничење броја веза на НСЕ услуге, 0 за ништа"
@@ -5571,67 +5567,15 @@ msgstr "застој између рунди"
 msgid "Measure quality and performance of the NSE service."
 msgstr "Мери квалитет и учинковитост НСЕ услуге."
 
+#: src/nse/gnunet-nse.c:124
+msgid "Show network size estimates from NSE service."
+msgstr "Показује процене величине мреже из НСЕ услуге."
+
 #: src/nse/gnunet-service-nse.c:1441
 #: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr "Вредност је превелика.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:175
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Уклањам истеклу адресу преноса „%s“\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:306
-#, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr "Нисам успео да обрадим „HELLO“ у датотеци „%s“: %s\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:323
-#: src/peerinfo/gnunet-service-peerinfo.c:348
-#, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr "Нисам успео да обрадим „HELLO“ у датотеци „%s“\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:426
-msgid "# peers known"
-msgstr "# парњака је познато"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:468
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-"Датотека „%s“ у директоријуму „%s“ не одговара договору именовања. Уклоњена "
-"је.\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:624
-#, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "Скенирам директоријум „%s“\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:631
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr "Још увек нисам нашао парњаке у „%s“!\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1027
-#, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "Чистим директоријум „%s“\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1322
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr "Увозим „HELLO“-е из „%s“\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1335
-msgid "Skipping import of included HELLOs\n"
-msgstr "Прескачем увоз укључених „HELLO“-а\n"
-
-#: src/peerinfo/peerinfo_api.c:210
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr "Нисам успео да примим одговор са услуге „PEERINFO“."
-
 #: src/peerinfo-tool/gnunet-peerinfo.c:237
 #, c-format
 msgid "%sPeer `%s'\n"
@@ -5726,6 +5670,62 @@ msgstr "Нисам успео да учитам прикључак пренос
 msgid "Peerinfo REST API initialized\n"
 msgstr ""
 
+#: src/peerinfo/gnunet-service-peerinfo.c:175
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Уклањам истеклу адресу преноса „%s“\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:306
+#, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr "Нисам успео да обрадим „HELLO“ у датотеци „%s“: %s\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:323
+#: src/peerinfo/gnunet-service-peerinfo.c:348
+#, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "Нисам успео да обрадим „HELLO“ у датотеци „%s“\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:426
+msgid "# peers known"
+msgstr "# парњака је познато"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:468
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"Датотека „%s“ у директоријуму „%s“ не одговара договору именовања. Уклоњена "
+"је.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:624
+#, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "Скенирам директоријум „%s“\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:631
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr "Још увек нисам нашао парњаке у „%s“!\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1027
+#, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "Чистим директоријум „%s“\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1322
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr "Увозим „HELLO“-е из „%s“\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1335
+msgid "Skipping import of included HELLOs\n"
+msgstr "Прескачем увоз укључених „HELLO“-а\n"
+
+#: src/peerinfo/peerinfo_api.c:210
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr "Нисам успео да примим одговор са услуге „PEERINFO“."
+
 #: src/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
@@ -6223,18 +6223,6 @@ msgstr "Услуга ПОСТАВИ се урушила, окончавам ус
 msgid "Could not open revocation database file!"
 msgstr "Не могу да отворим датотеку базе података опозивања!"
 
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/rps/gnunet-rps-profiler.c:3142
 msgid "duration of the profiling"
 msgstr ""
@@ -6254,6 +6242,18 @@ msgstr "број парњака у концензусу"
 msgid "Measure quality and performance of the RPS service."
 msgstr "Мери квалитет и учинковитост НСЕ услуге."
 
+#: src/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:228
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Морате навести бар један ИБ поруке за проверу!\n"
@@ -6317,10 +6317,10 @@ msgstr "ИБ преноса дељеног са парњаком."
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr "Израчунава Производ вектора са ГНУнет парњаком."
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "Повезивање са МЕШОМ није успело\n"
@@ -7049,10 +7049,6 @@ msgstr "Не могу да направим путању до „%s“\n"
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:137
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport.c:445
 msgid "# messages dropped due to slow client"
 msgstr "# поруке су одбачене услед спорог клијента"
@@ -7093,6 +7089,10 @@ msgstr "Додајем унос списка забрана за парњака
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr "Додајем унос списка забрана за парњака „%s“:„%s“\n"
 
+#: src/transport/gnunet-service-transport_ats.c:137
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr "# освежих мој „HELLO“"
@@ -7419,19 +7419,57 @@ msgstr "# вишеодредишни пренос ПОНГ-ова ка свим
 msgid "# PONGs dropped, no matching pending validation"
 msgstr "# ПОНГ-ови су одбачени, нема одговарајућих потврђивања на чекању"
 
-#: src/transport/gnunet-service-transport_validation.c:1533
-msgid "# PONGs dropped, signature expired"
-msgstr "# ПОНГ-ови су одбачени, потпис је истекао"
+#: src/transport/gnunet-service-transport_validation.c:1533
+msgid "# PONGs dropped, signature expired"
+msgstr "# ПОНГ-ови су одбачени, потпис је истекао"
+
+#: src/transport/gnunet-service-transport_validation.c:1590
+#, fuzzy
+msgid "# validations succeeded"
+msgstr "# поновно потврђивање адресе је започето"
+
+#: src/transport/gnunet-service-transport_validation.c:1645
+#, fuzzy
+msgid "# HELLOs given to peerinfo"
+msgstr "# „HELLO“-и су добијени из података парњака"
+
+#: src/transport/gnunet-transport-profiler.c:220
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:577
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:581
+#, fuzzy
+msgid "receive data from peer"
+msgstr "# одговори су примљени за друге парњаке"
+
+#: src/transport/gnunet-transport-profiler.c:586
+msgid "iterations"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1590
+#: src/transport/gnunet-transport-profiler.c:591
 #, fuzzy
-msgid "# validations succeeded"
-msgstr "# поновно потврђивање адресе је започето"
+msgid "number of messages to send"
+msgstr "број парњака у концензусу"
 
-#: src/transport/gnunet-service-transport_validation.c:1645
+#: src/transport/gnunet-transport-profiler.c:596
 #, fuzzy
-msgid "# HELLOs given to peerinfo"
-msgstr "# „HELLO“-и су добијени из података парњака"
+msgid "message size to use"
+msgstr "експеримент за коришћење"
+
+#: src/transport/gnunet-transport-profiler.c:601
+#: src/transport/gnunet-transport.c:1404
+msgid "peer identity"
+msgstr "идентитет парњака"
+
+#: src/transport/gnunet-transport-profiler.c:614
+#: src/transport/gnunet-transport.c:1426
+msgid "Direct access to transport service."
+msgstr "Непосредан приступ услузи преноса."
 
 #: src/transport/gnunet-transport.c:406
 #, c-format
@@ -7570,11 +7608,6 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr "не разрешава називе домаћина"
 
-#: src/transport/gnunet-transport.c:1404
-#: src/transport/gnunet-transport-profiler.c:601
-msgid "peer identity"
-msgstr "идентитет парњака"
-
 #: src/transport/gnunet-transport.c:1408
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7583,39 +7616,6 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr "шаље податке за оцењивање другим парњацима (све до КТРЛ-Ц)"
 
-#: src/transport/gnunet-transport.c:1426
-#: src/transport/gnunet-transport-profiler.c:614
-msgid "Direct access to transport service."
-msgstr "Непосредан приступ услузи преноса."
-
-#: src/transport/gnunet-transport-profiler.c:220
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:577
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:581
-#, fuzzy
-msgid "receive data from peer"
-msgstr "# одговори су примљени за друге парњаке"
-
-#: src/transport/gnunet-transport-profiler.c:586
-msgid "iterations"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:591
-#, fuzzy
-msgid "number of messages to send"
-msgstr "број парњака у концензусу"
-
-#: src/transport/gnunet-transport-profiler.c:596
-#, fuzzy
-msgid "message size to use"
-msgstr "експеримент за коришћење"
-
 #: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
@@ -7890,24 +7890,6 @@ msgstr "ТЦП пренос не ослушкује ни на једном пр
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr "ТЦП пренос упозорава себе да је на прикључнику %llu\n"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# ИПв6 вишеодредишне „HELLO“ ознаке су примљене путем удп-а"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:553
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-"Искључујем „HELLO“ емитовање због подешавања само пријатељ пријатељу!\n"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:571
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-"Нисам успео да поставим опцију ИПв4 емитовања за прикључницу емитовања на "
-"прикључнику %d\n"
-
 #: src/transport/plugin_transport_udp.c:3170
 #, c-format
 msgid ""
@@ -7960,6 +7942,24 @@ msgstr "Морате навести исправну ИПв6 адресу"
 msgid "Failed to create UDP network sockets\n"
 msgstr "Нисам успео да направим прикључнице мреже, прикључак није успео\n"
 
+#: src/transport/plugin_transport_udp_broadcasting.c:169
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr "# ИПв6 вишеодредишне „HELLO“ ознаке су примљене путем удп-а"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:553
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+"Искључујем „HELLO“ емитовање због подешавања само пријатељ пријатељу!\n"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:571
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+"Нисам успео да поставим опцију ИПв4 емитовања за прикључницу емитовања на "
+"прикључнику %d\n"
+
 #: src/transport/plugin_transport_unix.c:1396
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
@@ -8745,104 +8745,6 @@ msgstr "исписује примере ЕЦЦ операција (корист
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Управља ГНУнет датотекама личног ЕЦЦ кључа"
 
-#: src/util/gnunet_error_codes.c:59
-msgid "No error (success)."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:65
-#, fuzzy
-msgid "Unknown and unspecified error."
-msgstr "%.s Непознат код резултата."
-
-#: src/util/gnunet_error_codes.c:71
-#, fuzzy
-msgid "Communication with service failed."
-msgstr "Грешка у комуникацији са услугом ПОДАЦИ_ПАРЊАКА: %s\n"
-
-#: src/util/gnunet_error_codes.c:77
-#, fuzzy
-msgid "Ego not found."
-msgstr "Нисам нашао садржај"
-
-#: src/util/gnunet_error_codes.c:83
-#, fuzzy
-msgid "Identifier already in use for another ego."
-msgstr "одредник се већ користи за други его"
-
-#: src/util/gnunet_error_codes.c:89
-msgid "The given ego is invalid or malformed."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:95
-#, fuzzy
-msgid "Unknown namestore error."
-msgstr "%.s Непознат код резултата."
-
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
-#, fuzzy
-msgid "Zone iteration failed."
-msgstr "# Бирање парњака није успело"
-
-#: src/util/gnunet_error_codes.c:107
-#, fuzzy
-msgid "Zone not found."
-msgstr "Нисам нашао садржај"
-
-#: src/util/gnunet_error_codes.c:113
-#, fuzzy
-msgid "Record not found."
-msgstr "нисам нашао „upnpc“\n"
-
-#: src/util/gnunet_error_codes.c:125
-msgid "Zone does not contain any records."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:131
-#, fuzzy
-msgid "Failed to lookup record."
-msgstr "Смештај назива није успео да смести запис\n"
-
-#: src/util/gnunet_error_codes.c:137
-#, fuzzy
-msgid "No records given."
-msgstr "Није дат парњак!\n"
-
-#: src/util/gnunet_error_codes.c:143
-msgid "Record data invalid."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:149
-#, fuzzy
-msgid "No label given."
-msgstr "Није дат парњак!\n"
-
-#: src/util/gnunet_error_codes.c:155
-#, fuzzy
-msgid "No results given."
-msgstr "Нису дате опције\n"
-
-#: src/util/gnunet_error_codes.c:161
-#, fuzzy
-msgid "Record already exists."
-msgstr "назив мете већ постоји"
-
-#: src/util/gnunet_error_codes.c:167
-msgid "Record size exceeds maximum limit."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:173
-msgid "There was an error in the database backend."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:179
-#, fuzzy
-msgid "Failed to store the given records."
-msgstr "Смештај назива није успео да смести запис\n"
-
-#: src/util/gnunet_error_codes.c:185
-msgid "Label invalid or malformed."
-msgstr ""
-
 #: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
@@ -8985,6 +8887,104 @@ msgstr "Није познат руковалац за подсистем „%s
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Обавља основне радње за путање ГНУнет-а"
 
+#: src/util/gnunet_error_codes.c:60
+msgid "No error (success)."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:66
+#, fuzzy
+msgid "Unknown and unspecified error."
+msgstr "%.s Непознат код резултата."
+
+#: src/util/gnunet_error_codes.c:72
+#, fuzzy
+msgid "Communication with service failed."
+msgstr "Грешка у комуникацији са услугом ПОДАЦИ_ПАРЊАКА: %s\n"
+
+#: src/util/gnunet_error_codes.c:78
+#, fuzzy
+msgid "Ego not found."
+msgstr "Нисам нашао садржај"
+
+#: src/util/gnunet_error_codes.c:84
+#, fuzzy
+msgid "Identifier already in use for another ego."
+msgstr "одредник се већ користи за други его"
+
+#: src/util/gnunet_error_codes.c:90
+msgid "The given ego is invalid or malformed."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:96
+#, fuzzy
+msgid "Unknown namestore error."
+msgstr "%.s Непознат код резултата."
+
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
+#, fuzzy
+msgid "Zone iteration failed."
+msgstr "# Бирање парњака није успело"
+
+#: src/util/gnunet_error_codes.c:108
+#, fuzzy
+msgid "Zone not found."
+msgstr "Нисам нашао садржај"
+
+#: src/util/gnunet_error_codes.c:114
+#, fuzzy
+msgid "Record not found."
+msgstr "нисам нашао „upnpc“\n"
+
+#: src/util/gnunet_error_codes.c:126
+msgid "Zone does not contain any records."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:132
+#, fuzzy
+msgid "Failed to lookup record."
+msgstr "Смештај назива није успео да смести запис\n"
+
+#: src/util/gnunet_error_codes.c:138
+#, fuzzy
+msgid "No records given."
+msgstr "Није дат парњак!\n"
+
+#: src/util/gnunet_error_codes.c:144
+msgid "Record data invalid."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:150
+#, fuzzy
+msgid "No label given."
+msgstr "Није дат парњак!\n"
+
+#: src/util/gnunet_error_codes.c:156
+#, fuzzy
+msgid "No results given."
+msgstr "Нису дате опције\n"
+
+#: src/util/gnunet_error_codes.c:162
+#, fuzzy
+msgid "Record already exists."
+msgstr "назив мете већ постоји"
+
+#: src/util/gnunet_error_codes.c:168
+msgid "Record size exceeds maximum limit."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:174
+msgid "There was an error in the database backend."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:180
+#, fuzzy
+msgid "Failed to store the given records."
+msgstr "Смештај назива није успео да смести запис\n"
+
+#: src/util/gnunet_error_codes.c:186
+msgid "Label invalid or malformed."
+msgstr ""
+
 #: src/util/helper.c:305
 #, c-format
 msgid "Error reading from `%s': %s\n"
diff --git a/po/sv.po b/po/sv.po
index 1b43df35e..9e41bdb30 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-12-26 09:51+0100\n"
+"POT-Creation-Date: 2022-12-28 19:48+0900\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -29,8 +29,8 @@ msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
 #: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore.c:1957
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
+#: src/namestore/gnunet-namestore.c:1957
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -509,81 +509,6 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2993 src/ats/gnunet-ats-solver-eval.c:3045
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3012
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3064
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3553
-msgid "solver to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3558
-msgid "experiment to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3565
-#, fuzzy
-msgid "print logging"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3570
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3575
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:321
-#, 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:331
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:377
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:462
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "Kunde inte initiera SQLite.\n"
-
-#: src/ats/plugin_ats_proportional.c:1142
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/ats/plugin_ats_proportional.c:1165
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
 #: src/ats-tool/gnunet-ats.c:299
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -705,6 +630,81 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
 
+#: src/ats/gnunet-ats-solver-eval.c:2993 src/ats/gnunet-ats-solver-eval.c:3045
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3012
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3064
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3553
+msgid "solver to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3558
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3565
+#, fuzzy
+msgid "print logging"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3570
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3575
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:321
+#, 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:331
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:377
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:462
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/ats/plugin_ats_proportional.c:1142
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/ats/plugin_ats_proportional.c:1165
+#, 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 ""
@@ -844,6 +844,28 @@ 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:146
+#, c-format
+msgid ""
+"\n"
+"ew are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:218
+#, 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:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1103,30 +1125,8 @@ msgstr ""
 msgid "Enables having a conversation with other GNUnet users."
 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:146
-#, c-format
-msgid ""
-"\n"
-"ew are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:218
-#, 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:665
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -2050,6 +2050,40 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:140
+#, fuzzy, c-format
+msgid "Could not connect to DHT service!\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/dht/gnunet-dht-put.c:151
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:188
+msgid "the data to insert under the key"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:194
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:212
+msgid "how many replicas to create"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:223
+msgid "the type to insert data as"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:241
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr ""
+
 #: src/dht/gnunet_dht_profiler.c:925 src/testbed/gnunet-testbed-profiler.c:253
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
@@ -2098,58 +2132,24 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
+#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:140
-#, fuzzy, c-format
-msgid "Could not connect to DHT service!\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
+#: src/dns/gnunet-dns-monitor.c:387
+msgid "Monitor DNS queries."
+msgstr ""
 
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+#: src/dns/gnunet-dns-redirector.c:240
+msgid "set A records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:188
-msgid "the data to insert under the key"
+#: src/dns/gnunet-dns-redirector.c:246
+msgid "set AAAA records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:194
-msgid "how long to store this entry in the dht (in seconds)"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:212
-msgid "how many replicas to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:223
-msgid "the type to insert data as"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:241
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
-msgid "only monitor DNS queries"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:387
-msgid "Monitor DNS queries."
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:240
-msgid "set A records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:246
-msgid "set AAAA records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:259
-msgid "Change DNS replies to point elsewhere."
+#: src/dns/gnunet-dns-redirector.c:259
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
 #: src/dns/gnunet-service-dns.c:463
@@ -3059,15 +3059,6 @@ msgid ""
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:180
-#, 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 ""
@@ -3084,6 +3075,15 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:180
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Visa alla alternativ"
+
 #: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3836,52 +3836,6 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:256
-#, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "\"%s\" är inte tillgänglig."
-
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, fuzzy, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:304
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:345
-#, fuzzy
-msgid "Specify the type of the record to lookup"
-msgstr "ange prioritet för innehållet"
-
-#: src/gns/gnunet-gns.c:351
-#, fuzzy
-msgid "Specify a timeout for the lookup"
-msgstr "ange prioritet för innehållet"
-
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "Spåra GNUnets nätverkstopologi."
-
 #: src/gns/gnunet-gns-import.c:490
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -4002,6 +3956,52 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:256
+#, fuzzy, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
+#, fuzzy, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:345
+#, fuzzy
+msgid "Specify the type of the record to lookup"
+msgstr "ange prioritet för innehållet"
+
+#: src/gns/gnunet-gns.c:351
+#, fuzzy
+msgid "Specify a timeout for the lookup"
+msgstr "ange prioritet för innehållet"
+
+#: src/gns/gnunet-gns.c:355
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:374
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Spåra GNUnets nätverkstopologi."
+
 #: src/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4803,85 +4803,265 @@ msgstr ""
 msgid "Failed to setup database at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/namestore/gnunet-namestore.c:411
+#: src/namestore/gnunet-namestore-dbtool.c:87
+#: src/namestore/gnunet-namestore.c:1950
 #, fuzzy, c-format
-msgid "Missing entries in record line `%s'.\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgstr "Onödiga argument (ignorerade).\n"
 
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Okänd operation \"%s\"\n"
+#: src/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
+#: src/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:434
-#, fuzzy, c-format
-msgid "Error parsing expiration time %s.\n"
-msgstr "Kunde inte spara konfiguration!"
+#: src/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "Ogiltigt format för IP: \"%s\"\n"
+#: src/namestore/gnunet-namestore-dbtool.c:189
+#: src/namestore/gnunet-namestore-zonefile.c:753
+#, fuzzy
+msgid "GNUnet namestore database manipulation tool"
+msgstr "GNUnet-konfiguration"
 
-#: src/namestore/gnunet-namestore.c:666
+#: src/namestore/gnunet-namestore-fcfsd.c:373
+#, fuzzy
+msgid "can not search the namestore"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:427
+#: src/namestore/gnunet-namestore-fcfsd.c:561
+#, fuzzy
+msgid "unable to scan namestore"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:447
 #, fuzzy, c-format
-msgid "Adding record failed: %s\n"
-msgstr ""
-"\n"
-"Fel vid uppladdning av fil: %s\n"
+msgid "Failed to create record for `%s': %s\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
+#: src/namestore/gnunet-namestore-fcfsd.c:460
+#, fuzzy
+msgid "no errors"
+msgstr "Okänt fel"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:496
 #, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr ""
-"\n"
-"Fel vid uppladdning av fil: %s\n"
+msgid "The requested key `%s' exists as `%s'\n"
+msgstr "Skapade post \"%s\" i namnrymd \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1136
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:503
+msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1257
-#, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy
+msgid "Error creating record data\n"
+msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/namestore/gnunet-namestore.c:1300
+#: src/namestore/gnunet-namestore-fcfsd.c:524
+#, fuzzy
+msgid "unable to store record"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:595
 #, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
+msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1325
-#, c-format
-msgid "%s\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:601
+msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1354
-#, c-format
-msgid "No options given\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:787
+msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1368
-#, c-format
-msgid "Recordlines only work with option `%s'\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:798
+msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
-#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
-#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
-#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
-#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
-#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
-#: src/namestore/gnunet-namestore.c:1685
-#, fuzzy, c-format
+#: src/namestore/gnunet-namestore-fcfsd.c:817
+#, fuzzy
+msgid "invalid parameters"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:834
+#, fuzzy
+msgid "invalid name"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:845
+#, fuzzy, c-format
+msgid "Unable to parse key %s\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:849
+#, fuzzy
+msgid "unable to parse key"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:960
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
+#, fuzzy
+msgid "No expiration specified for records.\n"
+msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
+#, fuzzy
+msgid "No port specified, using default value\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1098
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
+msgid "name of the zone managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
+msgid "GNU Name System First-Come-First-Served name registration service"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "\"%s\" är inte en fil.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "Fil \"%s\" har URI: %s\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "Fil \"%s\" har URI: %s\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:520
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:529
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:591
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:738
+#: src/namestore/gnunet-namestore.c:2086
+#, fuzzy
+msgid "name of the ego controlling the zone"
+msgstr "Visa värde av alternativet"
+
+#: src/namestore/gnunet-namestore.c:411
+#, fuzzy, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Okänd operation \"%s\"\n"
+
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:434
+#, fuzzy, c-format
+msgid "Error parsing expiration time %s.\n"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#: src/namestore/gnunet-namestore.c:666
+#, fuzzy, c-format
+msgid "Adding record failed: %s\n"
+msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
+
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
+
+#: src/namestore/gnunet-namestore.c:1136
+#, c-format
+msgid ""
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1257
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1300
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1325
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1354
+#, c-format
+msgid "No options given\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1368
+#, c-format
+msgid "Recordlines only work with option `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
+#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
+#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
+#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
+#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
+#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
+#: src/namestore/gnunet-namestore.c:1685
+#, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
@@ -4952,12 +5132,6 @@ msgstr ""
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:1950
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#, fuzzy, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
-msgstr "Onödiga argument (ignorerade).\n"
-
 #: src/namestore/gnunet-namestore.c:1965
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
@@ -4996,231 +5170,57 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/namestore/gnunet-namestore.c:2023
 #, fuzzy
-msgid "Output in recordline format"
-msgstr "utdata i gnuplot-format"
-
-#: src/namestore/gnunet-namestore.c:2029
-#, fuzzy
-msgid "determine our name for the given KEY"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/namestore/gnunet-namestore.c:2035
-msgid "type of the record to add/delete/display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2040
-msgid "URI to import into our zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2046
-msgid "value of the record to add/delete"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2050
-msgid "create or list public record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2054
-msgid "omit private records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2059
-msgid "do not filter maintenance records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2064
-msgid "purge namestore of all orphans"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2069
-msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2074
-msgid "delete all records in specified zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2080
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2086
-#: src/namestore/gnunet-namestore-zonefile.c:738
-#, fuzzy
-msgid "name of the ego controlling the zone"
-msgstr "Visa värde av alternativet"
-
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-#, fuzzy
-msgid "GNUnet namestore database manipulation tool"
-msgstr "GNUnet-konfiguration"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:373
-#, fuzzy
-msgid "can not search the namestore"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
-#, fuzzy
-msgid "unable to scan namestore"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:447
-#, fuzzy, c-format
-msgid "Failed to create record for `%s': %s\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:460
-#, fuzzy
-msgid "no errors"
-msgstr "Okänt fel"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:496
-#, fuzzy, c-format
-msgid "The requested key `%s' exists as `%s'\n"
-msgstr "Skapade post \"%s\" i namnrymd \"%s\"\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:503
-msgid "key exists"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, fuzzy
-msgid "Error creating record data\n"
-msgstr "=\tFel vid läsning av katalog.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:524
-#, fuzzy
-msgid "unable to store record"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:595
-#, c-format
-msgid "Requested name `%s' exists with `%u' records\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:601
-msgid "name exists\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:787
-msgid "unable to process submitted data"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:798
-msgid "the submitted data is invalid"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:817
-#, fuzzy
-msgid "invalid parameters"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:834
-#, fuzzy
-msgid "invalid name"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:845
-#, fuzzy, c-format
-msgid "Unable to parse key %s\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:849
-#, fuzzy
-msgid "unable to parse key"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:960
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
-#, fuzzy
-msgid "No expiration specified for records.\n"
-msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
-#, fuzzy
-msgid "No port specified, using default value\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
+msgid "Output in recordline format"
+msgstr "utdata i gnuplot-format"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
+#: src/namestore/gnunet-namestore.c:2029
 #, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "determine our name for the given KEY"
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
-msgid "name of the zone managed by FCFSD"
+#: src/namestore/gnunet-namestore.c:2035
+msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
-msgid "GNU Name System First-Come-First-Served name registration service"
+#: src/namestore/gnunet-namestore.c:2040
+msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, fuzzy, c-format
-msgid "Name `%s' is too long\n"
-msgstr "\"%s\" är inte en fil.\n"
+#: src/namestore/gnunet-namestore.c:2046
+msgid "value of the record to add/delete"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "Fil \"%s\" har URI: %s\n"
+#: src/namestore/gnunet-namestore.c:2050
+msgid "create or list public record"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "Fil \"%s\" har URI: %s\n"
+#: src/namestore/gnunet-namestore.c:2054
+msgid "omit private records"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+#: src/namestore/gnunet-namestore.c:2059
+msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
+#: src/namestore/gnunet-namestore.c:2064
+msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, fuzzy, c-format
-msgid "Data `%s' invalid\n"
-msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
+#: src/namestore/gnunet-namestore.c:2069
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/namestore/gnunet-namestore.c:2074
+msgid "delete all records in specified zone"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/namestore/gnunet-namestore.c:2080
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
+msgstr ""
 
 #: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
@@ -5545,11 +5545,6 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:124
-#, fuzzy
-msgid "Show network size estimates from NSE service."
-msgstr "# byte mottogs via TCP"
-
 #: src/nse/gnunet-nse-profiler.c:857
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
@@ -5576,66 +5571,16 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
+#: src/nse/gnunet-nse.c:124
+#, fuzzy
+msgid "Show network size estimates from NSE service."
+msgstr "# byte mottogs via TCP"
+
 #: src/nse/gnunet-service-nse.c:1441
 #: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:175
-#, fuzzy, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Tillgängliga transport(er): %s\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:306
-#, 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:323
-#: src/peerinfo/gnunet-service-peerinfo.c:348
-#, 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:426
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:468
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:624
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:631
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1027
-#, 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:1322
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1335
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:210
-#, 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:237
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
@@ -5732,6 +5677,61 @@ msgstr "Kunde inte slå upp \"%s\": %s\n"
 msgid "Peerinfo REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
 
+#: src/peerinfo/gnunet-service-peerinfo.c:175
+#, fuzzy, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Tillgängliga transport(er): %s\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:306
+#, 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:323
+#: src/peerinfo/gnunet-service-peerinfo.c:348
+#, 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:426
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:468
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:624
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:631
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1027
+#, 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:1322
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1335
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:210
+#, 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:92
 msgid "peerstore"
 msgstr ""
@@ -6248,18 +6248,6 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/rps/gnunet-rps-profiler.c:3142
 msgid "duration of the profiling"
 msgstr ""
@@ -6279,6 +6267,18 @@ msgstr "antal iterationer"
 msgid "Measure quality and performance of the RPS service."
 msgstr "Kan inte tillgå tjänsten"
 
+#: src/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6334,10 +6334,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Anslutning misslyckades (fel?)\n"
@@ -7027,10 +7027,6 @@ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:137
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport.c:445
 msgid "# messages dropped due to slow client"
 msgstr ""
@@ -7074,6 +7070,10 @@ msgstr "Motpart \"%s\" med pålitlighet %8u och adress 
\"%s\"\n"
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:137
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
@@ -7393,22 +7393,62 @@ msgstr ""
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1515
-msgid "# PONGs dropped, no matching pending validation"
+#: src/transport/gnunet-service-transport_validation.c:1515
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1533
+msgid "# PONGs dropped, signature expired"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1590
+msgid "# validations succeeded"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1645
+#, fuzzy
+msgid "# HELLOs given to peerinfo"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#: src/transport/gnunet-transport-profiler.c:220
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:577
+msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1533
-msgid "# PONGs dropped, signature expired"
-msgstr ""
+#: src/transport/gnunet-transport-profiler.c:581
+#, fuzzy
+msgid "receive data from peer"
+msgstr "# byte mottagna av typen %d"
 
-#: src/transport/gnunet-service-transport_validation.c:1590
-msgid "# validations succeeded"
+#: src/transport/gnunet-transport-profiler.c:586
+#, fuzzy
+msgid "iterations"
+msgstr "Visa alla alternativ"
+
+#: src/transport/gnunet-transport-profiler.c:591
+#, fuzzy
+msgid "number of messages to send"
+msgstr "antal meddelanden att använda per iteration"
+
+#: src/transport/gnunet-transport-profiler.c:596
+#, fuzzy
+msgid "message size to use"
+msgstr "meddelandestorlek"
+
+#: src/transport/gnunet-transport-profiler.c:601
+#: src/transport/gnunet-transport.c:1404
+msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1645
+#: src/transport/gnunet-transport-profiler.c:614
+#: src/transport/gnunet-transport.c:1426
 #, fuzzy
-msgid "# HELLOs given to peerinfo"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
+msgid "Direct access to transport service."
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/transport/gnunet-transport.c:406
 #, fuzzy, c-format
@@ -7549,11 +7589,6 @@ 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:1404
-#: src/transport/gnunet-transport-profiler.c:601
-msgid "peer identity"
-msgstr ""
-
 #: src/transport/gnunet-transport.c:1408
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7562,41 +7597,6 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1426
-#: src/transport/gnunet-transport-profiler.c:614
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/transport/gnunet-transport-profiler.c:220
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:577
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:581
-#, fuzzy
-msgid "receive data from peer"
-msgstr "# byte mottagna av typen %d"
-
-#: src/transport/gnunet-transport-profiler.c:586
-#, fuzzy
-msgid "iterations"
-msgstr "Visa alla alternativ"
-
-#: src/transport/gnunet-transport-profiler.c:591
-#, fuzzy
-msgid "number of messages to send"
-msgstr "antal meddelanden att använda per iteration"
-
-#: src/transport/gnunet-transport-profiler.c:596
-#, fuzzy
-msgid "message size to use"
-msgstr "meddelandestorlek"
-
 #: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
@@ -7884,21 +7884,6 @@ msgstr ""
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:553
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:571
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-
 #: src/transport/plugin_transport_udp.c:3170
 #, c-format
 msgid ""
@@ -7947,6 +7932,21 @@ 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:169
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:553
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:571
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
 #: src/transport/plugin_transport_unix.c:1396
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
@@ -8721,101 +8721,6 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet_error_codes.c:59
-msgid "No error (success)."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:65
-#, fuzzy
-msgid "Unknown and unspecified error."
-msgstr "Okänt fel"
-
-#: src/util/gnunet_error_codes.c:71
-#, fuzzy
-msgid "Communication with service failed."
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/util/gnunet_error_codes.c:77
-#, fuzzy
-msgid "Ego not found."
-msgstr "Kommando \"%s\" hittades inte!\n"
-
-#: src/util/gnunet_error_codes.c:83
-msgid "Identifier already in use for another ego."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:89
-msgid "The given ego is invalid or malformed."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:95
-#, fuzzy
-msgid "Unknown namestore error."
-msgstr "Okänt fel"
-
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
-#, fuzzy
-msgid "Zone iteration failed."
-msgstr "# sessionsnycklar accepterade"
-
-#: src/util/gnunet_error_codes.c:107
-#, fuzzy
-msgid "Zone not found."
-msgstr "Kommando \"%s\" hittades inte!\n"
-
-#: src/util/gnunet_error_codes.c:113
-#, fuzzy
-msgid "Record not found."
-msgstr "Kommando \"%s\" hittades inte!\n"
-
-#: src/util/gnunet_error_codes.c:125
-msgid "Zone does not contain any records."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:131
-#, fuzzy
-msgid "Failed to lookup record."
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/util/gnunet_error_codes.c:137
-#, fuzzy
-msgid "No records given."
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/util/gnunet_error_codes.c:143
-msgid "Record data invalid."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:149
-msgid "No label given."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:155
-#, fuzzy
-msgid "No results given."
-msgstr "# byte mottogs via TCP"
-
-#: src/util/gnunet_error_codes.c:161
-msgid "Record already exists."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:167
-msgid "Record size exceeds maximum limit."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:173
-msgid "There was an error in the database backend."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:179
-#, fuzzy
-msgid "Failed to store the given records."
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/util/gnunet_error_codes.c:185
-msgid "Label invalid or malformed."
-msgstr ""
-
 #: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
@@ -8958,6 +8863,101 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
+#: src/util/gnunet_error_codes.c:60
+msgid "No error (success)."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:66
+#, fuzzy
+msgid "Unknown and unspecified error."
+msgstr "Okänt fel"
+
+#: src/util/gnunet_error_codes.c:72
+#, fuzzy
+msgid "Communication with service failed."
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/util/gnunet_error_codes.c:78
+#, fuzzy
+msgid "Ego not found."
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/util/gnunet_error_codes.c:84
+msgid "Identifier already in use for another ego."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:90
+msgid "The given ego is invalid or malformed."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:96
+#, fuzzy
+msgid "Unknown namestore error."
+msgstr "Okänt fel"
+
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
+#, fuzzy
+msgid "Zone iteration failed."
+msgstr "# sessionsnycklar accepterade"
+
+#: src/util/gnunet_error_codes.c:108
+#, fuzzy
+msgid "Zone not found."
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/util/gnunet_error_codes.c:114
+#, fuzzy
+msgid "Record not found."
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/util/gnunet_error_codes.c:126
+msgid "Zone does not contain any records."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:132
+#, fuzzy
+msgid "Failed to lookup record."
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/util/gnunet_error_codes.c:138
+#, fuzzy
+msgid "No records given."
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/util/gnunet_error_codes.c:144
+msgid "Record data invalid."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:150
+msgid "No label given."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:156
+#, fuzzy
+msgid "No results given."
+msgstr "# byte mottogs via TCP"
+
+#: src/util/gnunet_error_codes.c:162
+msgid "Record already exists."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:168
+msgid "Record size exceeds maximum limit."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:174
+msgid "There was an error in the database backend."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:180
+#, fuzzy
+msgid "Failed to store the given records."
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/util/gnunet_error_codes.c:186
+msgid "Label invalid or malformed."
+msgstr ""
+
 #: src/util/helper.c:305
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
diff --git a/po/vi.po b/po/vi.po
index 840f2e6e7..da2d2d44a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-12-26 09:51+0100\n"
+"POT-Creation-Date: 2022-12-28 19:48+0900\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -32,8 +32,8 @@ msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
 #: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore.c:1957
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
+#: src/namestore/gnunet-namestore.c:1957
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -516,81 +516,6 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2993 src/ats/gnunet-ats-solver-eval.c:3045
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3012
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3064
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3553
-msgid "solver to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3558
-msgid "experiment to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3565
-#, fuzzy
-msgid "print logging"
-msgstr "Theo dõi"
-
-#: src/ats/gnunet-ats-solver-eval.c:3570
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3575
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:321
-#, 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:331
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:377
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:462
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "Không thể sơ khởi SQLite: %s.\n"
-
-#: src/ats/plugin_ats_proportional.c:1142
-#, 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_proportional.c:1165
-#, 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-tool/gnunet-ats.c:299
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -713,6 +638,81 @@ 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:2993 src/ats/gnunet-ats-solver-eval.c:3045
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3012
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3064
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3553
+msgid "solver to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3558
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3565
+#, fuzzy
+msgid "print logging"
+msgstr "Theo dõi"
+
+#: src/ats/gnunet-ats-solver-eval.c:3570
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3575
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:321
+#, 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:331
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:377
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:462
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "Không thể sơ khởi SQLite: %s.\n"
+
+#: src/ats/plugin_ats_proportional.c:1142
+#, 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_proportional.c:1165
+#, 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 ""
@@ -852,6 +852,28 @@ 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:146
+#, c-format
+msgid ""
+"\n"
+"ew are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:218
+#, 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:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1111,30 +1133,8 @@ msgstr ""
 msgid "Enables having a conversation with other GNUnet users."
 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:146
-#, c-format
-msgid ""
-"\n"
-"ew are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:218
-#, 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:665
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -2071,6 +2071,40 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:140
+#, fuzzy, c-format
+msgid "Could not connect to DHT service!\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/dht/gnunet-dht-put.c:151
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:188
+msgid "the data to insert under the key"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:194
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:212
+msgid "how many replicas to create"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:223
+msgid "the type to insert data as"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:241
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr ""
+
 #: src/dht/gnunet_dht_profiler.c:925 src/testbed/gnunet-testbed-profiler.c:253
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
@@ -2119,58 +2153,24 @@ msgstr ""
 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:133
-msgid "Must provide KEY and DATA for DHT put!\n"
+#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:140
-#, fuzzy, c-format
-msgid "Could not connect to DHT service!\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
+#: src/dns/gnunet-dns-monitor.c:387
+msgid "Monitor DNS queries."
+msgstr ""
 
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+#: src/dns/gnunet-dns-redirector.c:240
+msgid "set A records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:188
-msgid "the data to insert under the key"
+#: src/dns/gnunet-dns-redirector.c:246
+msgid "set AAAA records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:194
-msgid "how long to store this entry in the dht (in seconds)"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:212
-msgid "how many replicas to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:223
-msgid "the type to insert data as"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:241
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
-msgid "only monitor DNS queries"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:387
-msgid "Monitor DNS queries."
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:240
-msgid "set A records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:246
-msgid "set AAAA records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:259
-msgid "Change DNS replies to point elsewhere."
+#: src/dns/gnunet-dns-redirector.c:259
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
 #: src/dns/gnunet-service-dns.c:463
@@ -3078,15 +3078,6 @@ msgid ""
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:180
-#, 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 ""
@@ -3103,6 +3094,15 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:180
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Tùy chọn chia sẻ tập tin"
+
 #: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3880,52 +3880,6 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:256
-#, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "« %s » không sẵn sàng.\n"
-
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, 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/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:304
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:345
-#, 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:351
-#, fuzzy
-msgid "Specify a timeout for the lookup"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "Bản ghi lỗi GNUnet"
-
 #: src/gns/gnunet-gns-import.c:490
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -4046,6 +4000,52 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:256
+#, fuzzy, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
+#, 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/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:345
+#, 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:351
+#, fuzzy
+msgid "Specify a timeout for the lookup"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/gns/gnunet-gns.c:355
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:374
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Bản ghi lỗi GNUnet"
+
 #: src/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4862,81 +4862,260 @@ 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.c:411
-#, fuzzy, c-format
-msgid "Missing entries in record line `%s'.\n"
-msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+#: src/namestore/gnunet-namestore-dbtool.c:87
+#: src/namestore/gnunet-namestore.c:1950
+#, c-format
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Không rõ câu lệnh « %s ».\n"
+#: src/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
+#: src/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:434
-#, fuzzy, c-format
-msgid "Error parsing expiration time %s.\n"
-msgstr "Gặp lỗi khi lưu cấu hình."
+#: src/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "Địa chỉ IP định dạng sai: %s\n"
+#: src/namestore/gnunet-namestore-dbtool.c:189
+#: src/namestore/gnunet-namestore-zonefile.c:753
+#, fuzzy
+msgid "GNUnet namestore database manipulation tool"
+msgstr "Cấu hình GNUnet"
 
-#: src/namestore/gnunet-namestore.c:666
+#: src/namestore/gnunet-namestore-fcfsd.c:373
+#, fuzzy
+msgid "can not search the namestore"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/namestore/gnunet-namestore-fcfsd.c:427
+#: src/namestore/gnunet-namestore-fcfsd.c:561
+#, fuzzy
+msgid "unable to scan namestore"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/namestore/gnunet-namestore-fcfsd.c:447
 #, fuzzy, c-format
-msgid "Adding record failed: %s\n"
-msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+msgid "Failed to create record for `%s': %s\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
+#: src/namestore/gnunet-namestore-fcfsd.c:460
+#, fuzzy
+msgid "no errors"
+msgstr "Lỗi không rõ"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:496
 #, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+msgid "The requested key `%s' exists as `%s'\n"
+msgstr "Đã tạo mục nhập « %s » trong không gian tên « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:1136
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:503
+msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1257
-#, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy
+msgid "Error creating record data\n"
+msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/namestore/gnunet-namestore.c:1300
+#: src/namestore/gnunet-namestore-fcfsd.c:524
+#, fuzzy
+msgid "unable to store record"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:595
 #, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
+msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1325
-#, c-format
-msgid "%s\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:601
+msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1354
-#, fuzzy, c-format
-msgid "No options given\n"
-msgstr "chưa đưa ra tên"
+#: src/namestore/gnunet-namestore-fcfsd.c:787
+msgid "unable to process submitted data"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1368
-#, c-format
-msgid "Recordlines only work with option `%s'\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:798
+msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
-#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
-#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
-#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
-#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
-#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
-#: src/namestore/gnunet-namestore.c:1685
-#, fuzzy, c-format
+#: src/namestore/gnunet-namestore-fcfsd.c:817
+#, fuzzy
+msgid "invalid parameters"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:834
+#, fuzzy
+msgid "invalid name"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:845
+#, fuzzy, c-format
+msgid "Unable to parse key %s\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:849
+#, fuzzy
+msgid "unable to parse key"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:960
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
+#, fuzzy
+msgid "No expiration specified for records.\n"
+msgstr "Chưa xác định giao diện nên dùng mặc định.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
+#, fuzzy
+msgid "No port specified, using default value\n"
+msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1098
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
+msgid "name of the zone managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
+msgid "GNU Name System First-Come-First-Served name registration service"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "« %s » không phải là một tập tin.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "Tập tin « %s » có URI: %s\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "Tập tin « %s » có URI: %s\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:520
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:529
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:591
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:738
+#: src/namestore/gnunet-namestore.c:2086
+msgid "name of the ego controlling the zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:411
+#, fuzzy, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+
+#: src/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Không rõ câu lệnh « %s ».\n"
+
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:434
+#, fuzzy, c-format
+msgid "Error parsing expiration time %s.\n"
+msgstr "Gặp lỗi khi lưu cấu hình."
+
+#: src/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "Địa chỉ IP định dạng sai: %s\n"
+
+#: src/namestore/gnunet-namestore.c:666
+#, fuzzy, c-format
+msgid "Adding record failed: %s\n"
+msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+
+#: src/namestore/gnunet-namestore.c:1136
+#, c-format
+msgid ""
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1257
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1300
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1325
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1354
+#, fuzzy, c-format
+msgid "No options given\n"
+msgstr "chưa đưa ra tên"
+
+#: src/namestore/gnunet-namestore.c:1368
+#, c-format
+msgid "Recordlines only work with option `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
+#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
+#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
+#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
+#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
+#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
+#: src/namestore/gnunet-namestore.c:1685
+#, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
@@ -5007,12 +5186,6 @@ msgstr ""
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore.c:1950
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
-msgstr ""
-
 #: src/namestore/gnunet-namestore.c:1965
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
@@ -5065,216 +5238,43 @@ msgstr ""
 
 #: src/namestore/gnunet-namestore.c:2040
 msgid "URI to import into our zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2046
-msgid "value of the record to add/delete"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2050
-msgid "create or list public record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2054
-msgid "omit private records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2059
-msgid "do not filter maintenance records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2064
-msgid "purge namestore of all orphans"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2069
-msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2074
-msgid "delete all records in specified zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2080
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2086
-#: src/namestore/gnunet-namestore-zonefile.c:738
-msgid "name of the ego controlling the zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-#, fuzzy
-msgid "GNUnet namestore database manipulation tool"
-msgstr "Cấu hình GNUnet"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:373
-#, fuzzy
-msgid "can not search the namestore"
-msgstr "Không kết nối được đến trình nền gnunetd."
-
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
-#, fuzzy
-msgid "unable to scan namestore"
-msgstr "Không kết nối được đến trình nền gnunetd."
-
-#: src/namestore/gnunet-namestore-fcfsd.c:447
-#, fuzzy, c-format
-msgid "Failed to create record for `%s': %s\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:460
-#, fuzzy
-msgid "no errors"
-msgstr "Lỗi không rõ"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:496
-#, fuzzy, c-format
-msgid "The requested key `%s' exists as `%s'\n"
-msgstr "Đã tạo mục nhập « %s » trong không gian tên « %s »\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:503
-msgid "key exists"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, fuzzy
-msgid "Error creating record data\n"
-msgstr "=\tLỗi đọc thư mục.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:524
-#, fuzzy
-msgid "unable to store record"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:595
-#, c-format
-msgid "Requested name `%s' exists with `%u' records\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:601
-msgid "name exists\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:787
-msgid "unable to process submitted data"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:798
-msgid "the submitted data is invalid"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:817
-#, fuzzy
-msgid "invalid parameters"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:834
-#, fuzzy
-msgid "invalid name"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:845
-#, fuzzy, c-format
-msgid "Unable to parse key %s\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:849
-#, fuzzy
-msgid "unable to parse key"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:960
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
-#, fuzzy
-msgid "No expiration specified for records.\n"
-msgstr "Chưa xác định giao diện nên dùng mặc định.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
-#, fuzzy
-msgid "No port specified, using default value\n"
-msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
-msgid "name of the zone managed by FCFSD"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
-msgid "GNU Name System First-Come-First-Served name registration service"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, fuzzy, c-format
-msgid "Name `%s' is too long\n"
-msgstr "« %s » không phải là một tập tin.\n"
+#: src/namestore/gnunet-namestore.c:2046
+msgid "value of the record to add/delete"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "Tập tin « %s » có URI: %s\n"
+#: src/namestore/gnunet-namestore.c:2050
+msgid "create or list public record"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "Tập tin « %s » có URI: %s\n"
+#: src/namestore/gnunet-namestore.c:2054
+msgid "omit private records"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+#: src/namestore/gnunet-namestore.c:2059
+msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
+#: src/namestore/gnunet-namestore.c:2064
+msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, fuzzy, c-format
-msgid "Data `%s' invalid\n"
-msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
+#: src/namestore/gnunet-namestore.c:2069
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+#: src/namestore/gnunet-namestore.c:2074
+msgid "delete all records in specified zone"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+#: src/namestore/gnunet-namestore.c:2080
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
+msgstr ""
 
 #: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
@@ -5597,11 +5597,6 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:124
-#, 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:857
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
@@ -5628,71 +5623,17 @@ 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:124
+#, 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:1441
 #: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 #, 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:175
-#, 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:306
-#, 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:323
-#: src/peerinfo/gnunet-service-peerinfo.c:348
-#, 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:426
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:468
-#, 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:624
-#, 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:631
-#, 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:1027
-#, 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:1322
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1335
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:210
-#, 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:237
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
@@ -5790,6 +5731,65 @@ msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 msgid "Peerinfo REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
+#: src/peerinfo/gnunet-service-peerinfo.c:175
+#, 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:306
+#, 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:323
+#: src/peerinfo/gnunet-service-peerinfo.c:348
+#, 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:426
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:468
+#, 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:624
+#, 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:631
+#, 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:1027
+#, 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:1322
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1335
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:210
+#, fuzzy
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
+
 #: src/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
@@ -6304,18 +6304,6 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/rps/gnunet-rps-profiler.c:3142
 msgid "duration of the profiling"
 msgstr ""
@@ -6335,6 +6323,18 @@ msgstr "số lần lặp lại"
 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:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6390,10 +6390,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Không kết nối được (lỗi ?)\n"
@@ -7089,10 +7089,6 @@ msgstr "Không thể tạo miền tên.\n"
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:137
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport.c:445
 #, fuzzy
 msgid "# messages dropped due to slow client"
@@ -7137,6 +7133,10 @@ msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:137
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
@@ -7455,26 +7455,66 @@ msgstr "Không thể tạo miền tên.\n"
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1340
-msgid "# PONGs multicast to all available addresses"
-msgstr ""
+#: src/transport/gnunet-service-transport_validation.c:1340
+msgid "# PONGs multicast to all available addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1515
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1533
+msgid "# PONGs dropped, signature expired"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1590
+msgid "# validations succeeded"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1645
+#, 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:220
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:577
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:581
+#, 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:586
+#, fuzzy
+msgid "iterations"
+msgstr "Tùy chọn chung"
 
-#: src/transport/gnunet-service-transport_validation.c:1515
-msgid "# PONGs dropped, no matching pending validation"
-msgstr ""
+#: src/transport/gnunet-transport-profiler.c:591
+#, 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:1533
-msgid "# PONGs dropped, signature expired"
-msgstr ""
+#: src/transport/gnunet-transport-profiler.c:596
+#, fuzzy
+msgid "message size to use"
+msgstr "kích cỡ tin nhắn"
 
-#: src/transport/gnunet-service-transport_validation.c:1590
-msgid "# validations succeeded"
+#: src/transport/gnunet-transport-profiler.c:601
+#: src/transport/gnunet-transport.c:1404
+msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1645
+#: src/transport/gnunet-transport-profiler.c:614
+#: src/transport/gnunet-transport.c:1426
 #, fuzzy
-msgid "# HELLOs given to peerinfo"
-msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
+msgid "Direct access to transport service."
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/transport/gnunet-transport.c:406
 #, fuzzy, c-format
@@ -7615,11 +7655,6 @@ 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:1404
-#: src/transport/gnunet-transport-profiler.c:601
-msgid "peer identity"
-msgstr ""
-
 #: src/transport/gnunet-transport.c:1408
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7628,41 +7663,6 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1426
-#: src/transport/gnunet-transport-profiler.c:614
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/transport/gnunet-transport-profiler.c:220
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:577
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:581
-#, 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:586
-#, fuzzy
-msgid "iterations"
-msgstr "Tùy chọn chung"
-
-#: src/transport/gnunet-transport-profiler.c:591
-#, 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:596
-#, fuzzy
-msgid "message size to use"
-msgstr "kích cỡ tin nhắn"
-
 #: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
@@ -7941,21 +7941,6 @@ msgstr ""
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# các thông báo PONG đã mật mã được nhận"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:553
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:571
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-
 #: src/transport/plugin_transport_udp.c:3170
 #, c-format
 msgid ""
@@ -8004,6 +7989,21 @@ 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:169
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:553
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:571
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
 #: src/transport/plugin_transport_unix.c:1396
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
@@ -8782,103 +8782,6 @@ 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_error_codes.c:59
-msgid "No error (success)."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:65
-#, fuzzy
-msgid "Unknown and unspecified error."
-msgstr "Lỗi không rõ.\n"
-
-#: src/util/gnunet_error_codes.c:71
-#, fuzzy
-msgid "Communication with service failed."
-msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
-
-#: src/util/gnunet_error_codes.c:77
-#, fuzzy
-msgid "Ego not found."
-msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-
-#: src/util/gnunet_error_codes.c:83
-msgid "Identifier already in use for another ego."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:89
-msgid "The given ego is invalid or malformed."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:95
-#, fuzzy
-msgid "Unknown namestore error."
-msgstr "Lỗi không rõ.\n"
-
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
-#, fuzzy
-msgid "Zone iteration failed."
-msgstr "# các khoá phiên chạy được chấp nhận"
-
-#: src/util/gnunet_error_codes.c:107
-#, fuzzy
-msgid "Zone not found."
-msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-
-#: src/util/gnunet_error_codes.c:113
-#, fuzzy
-msgid "Record not found."
-msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-
-#: src/util/gnunet_error_codes.c:125
-#, fuzzy
-msgid "Zone does not contain any records."
-msgstr "Tập tin « %s » không chứa biệt hiệu.\n"
-
-#: src/util/gnunet_error_codes.c:131
-#, fuzzy
-msgid "Failed to lookup record."
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/util/gnunet_error_codes.c:137
-#, fuzzy
-msgid "No records given."
-msgstr "chưa đưa ra tên"
-
-#: src/util/gnunet_error_codes.c:143
-msgid "Record data invalid."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:149
-#, fuzzy
-msgid "No label given."
-msgstr "chưa đưa ra tên"
-
-#: src/util/gnunet_error_codes.c:155
-#, fuzzy
-msgid "No results given."
-msgstr "chưa đưa ra tên"
-
-#: src/util/gnunet_error_codes.c:161
-msgid "Record already exists."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:167
-msgid "Record size exceeds maximum limit."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:173
-msgid "There was an error in the database backend."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:179
-#, fuzzy
-msgid "Failed to store the given records."
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/util/gnunet_error_codes.c:185
-msgid "Label invalid or malformed."
-msgstr ""
-
 #: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
@@ -9020,6 +8923,103 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
+#: src/util/gnunet_error_codes.c:60
+msgid "No error (success)."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:66
+#, fuzzy
+msgid "Unknown and unspecified error."
+msgstr "Lỗi không rõ.\n"
+
+#: src/util/gnunet_error_codes.c:72
+#, fuzzy
+msgid "Communication with service failed."
+msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
+#: src/util/gnunet_error_codes.c:78
+#, fuzzy
+msgid "Ego not found."
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#: src/util/gnunet_error_codes.c:84
+msgid "Identifier already in use for another ego."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:90
+msgid "The given ego is invalid or malformed."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:96
+#, fuzzy
+msgid "Unknown namestore error."
+msgstr "Lỗi không rõ.\n"
+
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
+#, fuzzy
+msgid "Zone iteration failed."
+msgstr "# các khoá phiên chạy được chấp nhận"
+
+#: src/util/gnunet_error_codes.c:108
+#, fuzzy
+msgid "Zone not found."
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#: src/util/gnunet_error_codes.c:114
+#, fuzzy
+msgid "Record not found."
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#: src/util/gnunet_error_codes.c:126
+#, fuzzy
+msgid "Zone does not contain any records."
+msgstr "Tập tin « %s » không chứa biệt hiệu.\n"
+
+#: src/util/gnunet_error_codes.c:132
+#, fuzzy
+msgid "Failed to lookup record."
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/util/gnunet_error_codes.c:138
+#, fuzzy
+msgid "No records given."
+msgstr "chưa đưa ra tên"
+
+#: src/util/gnunet_error_codes.c:144
+msgid "Record data invalid."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:150
+#, fuzzy
+msgid "No label given."
+msgstr "chưa đưa ra tên"
+
+#: src/util/gnunet_error_codes.c:156
+#, fuzzy
+msgid "No results given."
+msgstr "chưa đưa ra tên"
+
+#: src/util/gnunet_error_codes.c:162
+msgid "Record already exists."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:168
+msgid "Record size exceeds maximum limit."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:174
+msgid "There was an error in the database backend."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:180
+#, fuzzy
+msgid "Failed to store the given records."
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/util/gnunet_error_codes.c:186
+msgid "Label invalid or malformed."
+msgstr ""
+
 #: src/util/helper.c:305
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 154126fc0..3c32bbbee 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-12-26 09:51+0100\n"
+"POT-Creation-Date: 2022-12-28 19:48+0900\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -29,8 +29,8 @@ msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "“%s”的参数无效。\n"
 
 #: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore.c:1957
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
+#: src/namestore/gnunet-namestore.c:1957
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -500,81 +500,6 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2993 src/ats/gnunet-ats-solver-eval.c:3045
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3012
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3064
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3553
-msgid "solver to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3558
-msgid "experiment to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3565
-#, fuzzy
-msgid "print logging"
-msgstr "未知的命令“%s”。\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3570
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3575
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:321
-#, 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:331
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:377
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:462
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "无法初始化 SQLite:%s。\n"
-
-#: src/ats/plugin_ats_proportional.c:1142
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/ats/plugin_ats_proportional.c:1165
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "解析配置文件“%s”失败\n"
-
 #: src/ats-tool/gnunet-ats.c:299
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -696,6 +621,81 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
+#: src/ats/gnunet-ats-solver-eval.c:2993 src/ats/gnunet-ats-solver-eval.c:3045
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3012
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3064
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3553
+msgid "solver to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3558
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3565
+#, fuzzy
+msgid "print logging"
+msgstr "未知的命令“%s”。\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3570
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3575
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:321
+#, 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:331
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:377
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:462
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "无法初始化 SQLite:%s。\n"
+
+#: src/ats/plugin_ats_proportional.c:1142
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/ats/plugin_ats_proportional.c:1165
+#, 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 ""
@@ -832,6 +832,28 @@ 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:146
+#, c-format
+msgid ""
+"\n"
+"ew are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:218
+#, 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:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1090,30 +1112,8 @@ msgstr ""
 msgid "Enables having a conversation with other GNUnet users."
 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:146
-#, c-format
-msgid ""
-"\n"
-"ew are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:218
-#, 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:665
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1996,6 +1996,40 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:140
+#, fuzzy, c-format
+msgid "Could not connect to DHT service!\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/dht/gnunet-dht-put.c:151
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:188
+msgid "the data to insert under the key"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:194
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:212
+msgid "how many replicas to create"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:223
+msgid "the type to insert data as"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:241
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr ""
+
 #: src/dht/gnunet_dht_profiler.c:925 src/testbed/gnunet-testbed-profiler.c:253
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
@@ -2044,58 +2078,24 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "无法访问该服务"
 
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
+#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:140
-#, fuzzy, c-format
-msgid "Could not connect to DHT service!\n"
-msgstr "无法连接到 %s:%u:%s\n"
+#: src/dns/gnunet-dns-monitor.c:387
+msgid "Monitor DNS queries."
+msgstr ""
 
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+#: src/dns/gnunet-dns-redirector.c:240
+msgid "set A records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:188
-msgid "the data to insert under the key"
+#: src/dns/gnunet-dns-redirector.c:246
+msgid "set AAAA records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:194
-msgid "how long to store this entry in the dht (in seconds)"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:212
-msgid "how many replicas to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:223
-msgid "the type to insert data as"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:241
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
-msgid "only monitor DNS queries"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:387
-msgid "Monitor DNS queries."
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:240
-msgid "set A records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:246
-msgid "set AAAA records"
-msgstr ""
-
-#: src/dns/gnunet-dns-redirector.c:259
-msgid "Change DNS replies to point elsewhere."
+#: src/dns/gnunet-dns-redirector.c:259
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
 #: src/dns/gnunet-service-dns.c:463
@@ -2973,14 +2973,6 @@ msgid ""
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:180
-msgid "Special file-sharing operations"
-msgstr ""
-
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
@@ -2997,6 +2989,14 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:180
+msgid "Special file-sharing operations"
+msgstr ""
+
 #: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3719,50 +3719,6 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:256
-#, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "“%s”不可用。\n"
-
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, fuzzy, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:304
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:345
-msgid "Specify the type of the record to lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:351
-msgid "Specify a timeout for the lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "GNUnet 错误日志"
-
 #: src/gns/gnunet-gns-import.c:490
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -3883,6 +3839,50 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:256
+#, fuzzy, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "“%s”不可用。\n"
+
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
+#, fuzzy, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:345
+msgid "Specify the type of the record to lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:351
+msgid "Specify a timeout for the lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:355
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:374
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "GNUnet 错误日志"
+
 #: src/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4677,90 +4677,269 @@ msgstr "sqlite 数据仓库"
 msgid "Failed to setup database at `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/namestore/gnunet-namestore.c:411
-#, fuzzy, c-format
-msgid "Missing entries in record line `%s'.\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/namestore/gnunet-namestore-dbtool.c:87
+#: src/namestore/gnunet-namestore.c:1950
+#, c-format
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "未知的命令“%s”。\n"
+#: src/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
+#: src/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:434
-#, fuzzy, c-format
-msgid "Error parsing expiration time %s.\n"
-msgstr "保存配置出错。"
+#: src/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "IP 格式无效:“%s”\n"
+#: src/namestore/gnunet-namestore-dbtool.c:189
+#: src/namestore/gnunet-namestore-zonefile.c:753
+#, fuzzy
+msgid "GNUnet namestore database manipulation tool"
+msgstr "GNUnet 配置"
 
-#: src/namestore/gnunet-namestore.c:666
-#, c-format
-msgid "Adding record failed: %s\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:373
+#, fuzzy
+msgid "can not search the namestore"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
+#: src/namestore/gnunet-namestore-fcfsd.c:427
+#: src/namestore/gnunet-namestore-fcfsd.c:561
+#, fuzzy
+msgid "unable to scan namestore"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:447
 #, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr "“%s”以错误码 %d 失败:%s\n"
+msgid "Failed to create record for `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore.c:1136
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:460
+#, fuzzy
+msgid "no errors"
+msgstr "未知错误"
 
-#: src/namestore/gnunet-namestore.c:1257
+#: src/namestore/gnunet-namestore-fcfsd.c:496
 #, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
+msgid "The requested key `%s' exists as `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1300
-#, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:503
+msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1325
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy
+msgid "Error creating record data\n"
+msgstr "未知错误。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:524
+#, fuzzy
+msgid "unable to store record"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:595
 #, c-format
-msgid "%s\n"
+msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1354
-#, c-format
-msgid "No options given\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:601
+msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1368
-#, c-format
-msgid "Recordlines only work with option `%s'\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:787
+msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
-#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
-#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
-#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
-#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
-#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
-#: src/namestore/gnunet-namestore.c:1685
-#, fuzzy, c-format
-msgid "Missing option `%s' for operation `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:798
+msgid "the submitted data is invalid"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1379
+#: src/namestore/gnunet-namestore-fcfsd.c:817
 #, fuzzy
-msgid "name"
-msgstr "无名称"
+msgid "invalid parameters"
+msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-namestore.c:1408
+#: src/namestore/gnunet-namestore-fcfsd.c:834
+#, fuzzy
+msgid "invalid name"
+msgstr "“%s”的参数无效。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:845
+#, fuzzy, c-format
+msgid "Unable to parse key %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:849
+#, fuzzy
+msgid "unable to parse key"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:960
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
+#, fuzzy
+msgid "No expiration specified for records.\n"
+msgstr "没有指定接口,将使用默认。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
+#, fuzzy
+msgid "No port specified, using default value\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1098
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
+msgid "name of the zone managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
+msgid "GNU Name System First-Come-First-Served name registration service"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "服务已删除。\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:520
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:529
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:591
+#, c-format
+msgid "Data `%s' invalid\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore-zonefile.c:738
+#: src/namestore/gnunet-namestore.c:2086
+msgid "name of the ego controlling the zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:411
+#, fuzzy, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:434
+#, fuzzy, c-format
+msgid "Error parsing expiration time %s.\n"
+msgstr "保存配置出错。"
+
+#: src/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "IP 格式无效:“%s”\n"
+
+#: src/namestore/gnunet-namestore.c:666
+#, c-format
+msgid "Adding record failed: %s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "“%s”以错误码 %d 失败:%s\n"
+
+#: src/namestore/gnunet-namestore.c:1136
+#, c-format
+msgid ""
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1257
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1300
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1325
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1354
+#, c-format
+msgid "No options given\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1368
+#, c-format
+msgid "Recordlines only work with option `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
+#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
+#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
+#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
+#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
+#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
+#: src/namestore/gnunet-namestore.c:1685
+#, fuzzy, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/namestore/gnunet-namestore.c:1379
+#, fuzzy
+msgid "name"
+msgstr "无名称"
+
+#: src/namestore/gnunet-namestore.c:1408
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
@@ -4822,12 +5001,6 @@ msgstr ""
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:1950
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
-msgstr ""
-
 #: src/namestore/gnunet-namestore.c:1965
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
@@ -4918,179 +5091,6 @@ msgid ""
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2086
-#: src/namestore/gnunet-namestore-zonefile.c:738
-msgid "name of the ego controlling the zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-#, fuzzy
-msgid "GNUnet namestore database manipulation tool"
-msgstr "GNUnet 配置"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:373
-#, fuzzy
-msgid "can not search the namestore"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
-#, fuzzy
-msgid "unable to scan namestore"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:447
-#, fuzzy, c-format
-msgid "Failed to create record for `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:460
-#, fuzzy
-msgid "no errors"
-msgstr "未知错误"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:496
-#, c-format
-msgid "The requested key `%s' exists as `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:503
-msgid "key exists"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, fuzzy
-msgid "Error creating record data\n"
-msgstr "未知错误。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:524
-#, fuzzy
-msgid "unable to store record"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:595
-#, c-format
-msgid "Requested name `%s' exists with `%u' records\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:601
-msgid "name exists\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:787
-msgid "unable to process submitted data"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:798
-msgid "the submitted data is invalid"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:817
-#, fuzzy
-msgid "invalid parameters"
-msgstr "“%s”的参数无效。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:834
-#, fuzzy
-msgid "invalid name"
-msgstr "“%s”的参数无效。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:845
-#, fuzzy, c-format
-msgid "Unable to parse key %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:849
-#, fuzzy
-msgid "unable to parse key"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:960
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
-#, fuzzy
-msgid "No expiration specified for records.\n"
-msgstr "没有指定接口,将使用默认。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
-#, fuzzy
-msgid "No port specified, using default value\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
-msgid "name of the zone managed by FCFSD"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
-msgid "GNU Name System First-Come-First-Served name registration service"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, fuzzy, c-format
-msgid "Name `%s' is too long\n"
-msgstr "服务已删除。\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, c-format
-msgid "Data `%s' invalid\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "初始化“%s”服务失败。\n"
-
 #: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
 msgstr ""
@@ -5408,10 +5408,6 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:124
-msgid "Show network size estimates from NSE service."
-msgstr ""
-
 #: src/nse/gnunet-nse-profiler.c:857
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
@@ -5437,66 +5433,16 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
+#: src/nse/gnunet-nse.c:124
+msgid "Show network size estimates from NSE service."
+msgstr ""
+
 #: src/nse/gnunet-service-nse.c:1441
 #: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值不在合法范围内。"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:175
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:306
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:323
-#: src/peerinfo/gnunet-service-peerinfo.c:348
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:426
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:468
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:624
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:631
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1027
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1322
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1335
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:210
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr ""
-
 #: src/peerinfo-tool/gnunet-peerinfo.c:237
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
@@ -5593,6 +5539,60 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Peerinfo REST API initialized\n"
 msgstr ""
 
+#: src/peerinfo/gnunet-service-peerinfo.c:175
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:306
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:323
+#: src/peerinfo/gnunet-service-peerinfo.c:348
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:426
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:468
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:624
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:631
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1027
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1322
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1335
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:210
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr ""
+
 #: src/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
@@ -6092,18 +6092,6 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/rps/gnunet-rps-profiler.c:3142
 msgid "duration of the profiling"
 msgstr ""
@@ -6122,6 +6110,18 @@ msgstr "迭代次数"
 msgid "Measure quality and performance of the RPS service."
 msgstr "无法访问该服务"
 
+#: src/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6177,10 +6177,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "“%s”已连接到“%s”。\n"
@@ -6870,10 +6870,6 @@ msgstr "发送消息失败。\n"
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:137
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport.c:445
 msgid "# messages dropped due to slow client"
 msgstr ""
@@ -6914,6 +6910,10 @@ msgstr "卸载 GNUnet 服务"
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:137
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
@@ -7222,6 +7222,44 @@ msgstr ""
 msgid "# HELLOs given to peerinfo"
 msgstr ""
 
+#: src/transport/gnunet-transport-profiler.c:220
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:577
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:581
+msgid "receive data from peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:586
+msgid "iterations"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:591
+#, fuzzy
+msgid "number of messages to send"
+msgstr "每次迭代所使用的消息数量"
+
+#: src/transport/gnunet-transport-profiler.c:596
+#, fuzzy
+msgid "message size to use"
+msgstr "消息尺寸"
+
+#: src/transport/gnunet-transport-profiler.c:601
+#: src/transport/gnunet-transport.c:1404
+msgid "peer identity"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:614
+#: src/transport/gnunet-transport.c:1426
+#, fuzzy
+msgid "Direct access to transport service."
+msgstr "初始化“%s”服务失败。\n"
+
 #: src/transport/gnunet-transport.c:406
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7358,11 +7396,6 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1404
-#: src/transport/gnunet-transport-profiler.c:601
-msgid "peer identity"
-msgstr ""
-
 #: src/transport/gnunet-transport.c:1408
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7371,39 +7404,6 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1426
-#: src/transport/gnunet-transport-profiler.c:614
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/transport/gnunet-transport-profiler.c:220
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:577
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:581
-msgid "receive data from peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:586
-msgid "iterations"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:591
-#, fuzzy
-msgid "number of messages to send"
-msgstr "每次迭代所使用的消息数量"
-
-#: src/transport/gnunet-transport-profiler.c:596
-#, fuzzy
-msgid "message size to use"
-msgstr "消息尺寸"
-
 #: src/transport/plugin_transport_http_client.c:1482
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
@@ -7680,20 +7680,6 @@ msgstr ""
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:553
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:571
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-
 #: src/transport/plugin_transport_udp.c:3170
 #, c-format
 msgid ""
@@ -7742,6 +7728,20 @@ msgstr "“%s”不可用。\n"
 msgid "Failed to create UDP network sockets\n"
 msgstr "发送消息失败。\n"
 
+#: src/transport/plugin_transport_udp_broadcasting.c:169
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:553
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:571
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
 #: src/transport/plugin_transport_unix.c:1396
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
@@ -8502,97 +8502,6 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet_error_codes.c:59
-msgid "No error (success)."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:65
-#, fuzzy
-msgid "Unknown and unspecified error."
-msgstr "未知的用户“%s”\n"
-
-#: src/util/gnunet_error_codes.c:71
-#, fuzzy
-msgid "Communication with service failed."
-msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
-
-#: src/util/gnunet_error_codes.c:77
-msgid "Ego not found."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:83
-msgid "Identifier already in use for another ego."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:89
-msgid "The given ego is invalid or malformed."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:95
-#, fuzzy
-msgid "Unknown namestore error."
-msgstr "未知的用户“%s”\n"
-
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
-msgid "Zone iteration failed."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:107
-msgid "Zone not found."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:113
-msgid "Record not found."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:125
-msgid "Zone does not contain any records."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:131
-#, fuzzy
-msgid "Failed to lookup record."
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/util/gnunet_error_codes.c:137
-#, fuzzy
-msgid "No records given."
-msgstr "无法获取有关用户“%s”的信息:%s\n"
-
-#: src/util/gnunet_error_codes.c:143
-msgid "Record data invalid."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:149
-msgid "No label given."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:155
-#, fuzzy
-msgid "No results given."
-msgstr "无法获取有关用户“%s”的信息:%s\n"
-
-#: src/util/gnunet_error_codes.c:161
-msgid "Record already exists."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:167
-msgid "Record size exceeds maximum limit."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:173
-msgid "There was an error in the database backend."
-msgstr ""
-
-#: src/util/gnunet_error_codes.c:179
-#, fuzzy
-msgid "Failed to store the given records."
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/util/gnunet_error_codes.c:185
-msgid "Label invalid or malformed."
-msgstr ""
-
 #: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
@@ -8734,6 +8643,97 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
+#: src/util/gnunet_error_codes.c:60
+msgid "No error (success)."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:66
+#, fuzzy
+msgid "Unknown and unspecified error."
+msgstr "未知的用户“%s”\n"
+
+#: src/util/gnunet_error_codes.c:72
+#, fuzzy
+msgid "Communication with service failed."
+msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
+
+#: src/util/gnunet_error_codes.c:78
+msgid "Ego not found."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:84
+msgid "Identifier already in use for another ego."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:90
+msgid "The given ego is invalid or malformed."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:96
+#, fuzzy
+msgid "Unknown namestore error."
+msgstr "未知的用户“%s”\n"
+
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
+msgid "Zone iteration failed."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:108
+msgid "Zone not found."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:114
+msgid "Record not found."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:126
+msgid "Zone does not contain any records."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:132
+#, fuzzy
+msgid "Failed to lookup record."
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/util/gnunet_error_codes.c:138
+#, fuzzy
+msgid "No records given."
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#: src/util/gnunet_error_codes.c:144
+msgid "Record data invalid."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:150
+msgid "No label given."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:156
+#, fuzzy
+msgid "No results given."
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#: src/util/gnunet_error_codes.c:162
+msgid "Record already exists."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:168
+msgid "Record size exceeds maximum limit."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:174
+msgid "There was an error in the database backend."
+msgstr ""
+
+#: src/util/gnunet_error_codes.c:180
+#, fuzzy
+msgid "Failed to store the given records."
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/util/gnunet_error_codes.c:186
+msgid "Label invalid or malformed."
+msgstr ""
+
 #: src/util/helper.c:305
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

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