gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r20011 - in gnunet: contrib po src/ats


From: gnunet
Subject: [GNUnet-SVN] r20011 - in gnunet: contrib po src/ats
Date: Fri, 24 Feb 2012 16:14:18 +0100

Author: grothoff
Date: 2012-02-24 16:14:18 +0100 (Fri, 24 Feb 2012)
New Revision: 20011

Added:
   gnunet/contrib/pogen.sh
Modified:
   gnunet/po/POTFILES.in
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/ats/Makefile.am
Log:
-updating PO files

Added: gnunet/contrib/pogen.sh
===================================================================
--- gnunet/contrib/pogen.sh                             (rev 0)
+++ gnunet/contrib/pogen.sh     2012-02-24 15:14:18 UTC (rev 20011)
@@ -0,0 +1,3 @@
+#!/bin/sh
+find src -name "*.c" | grep -v \# | grep -v /test_ | grep -v /perf_  | sort  > 
po/POTFILES.in
+grep -l _\( `find src -name "*.h"` | grep -v "platform.h" | sort >> 
po/POTFILES.in


Property changes on: gnunet/contrib/pogen.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2012-02-24 15:12:56 UTC (rev 20010)
+++ gnunet/po/POTFILES.in       2012-02-24 15:14:18 UTC (rev 20011)
@@ -1,296 +1,226 @@
-src/datastore/plugin_datastore_sqlite.c
-src/datastore/plugin_datastore_mysql.c
-src/datastore/plugin_datastore_postgres.c
-src/datastore/datastore_api.c
-src/datastore/plugin_datastore_template.c
-src/datastore/gnunet-service-datastore.c
-src/core/gnunet-service-core_sessions.c
+src/arm/arm_api.c
+src/arm/do_start_process.c
+src/arm/gnunet-arm.c
+src/arm/gnunet-service-arm.c
+src/arm/mockup-service.c
+src/ats/ats_api.c
+src/ats/ats_api_peer_change_preference.c
+src/ats/ats_api_performance.c
+src/ats/ats_api_scheduling.c
+src/ats/gnunet-service-ats_addresses.c
+src/ats/gnunet-service-ats_addresses_mlp.c
+src/ats/gnunet-service-ats.c
+src/ats/gnunet-service-ats_performance.c
+src/ats/gnunet-service-ats_reservations.c
+src/ats/gnunet-service-ats_scheduling.c
+src/block/block.c
+src/block/plugin_block_template.c
+src/block/plugin_block_test.c
+src/chat/chat.c
+src/chat/gnunet-chat.c
+src/chat/gnunet-service-chat.c
+src/core/core_api.c
+src/core/core_api_iterate_peers.c
 src/core/gnunet-core-list-connections.c
-src/core/gnunet-service-core_clients.c
 src/core/gnunet-service-core.c
-src/core/gnunet-service-core_typemap.c
-src/core/core_api_iterate_peers.c
-src/core/gnunet-service-core_neighbours.c
+src/core/gnunet-service-core_clients.c
 src/core/gnunet-service-core_kx.c
-src/core/core_api.c
-src/vpn/gnunet-helper-vpn.c
-src/vpn/gnunet-service-vpn.c
-src/util/getopt_helpers.c
-src/util/common_logging.c
-src/util/gnunet-config-diff.c
-src/util/plugin.c
-src/util/common_allocation.c
-src/util/container_multihashmap.c
-src/util/crypto_crc.c
-src/util/crypto_aes.c
-src/util/bandwidth.c
-src/util/crypto_hkdf.c
-src/util/configuration.c
-src/util/container_slist.c
-src/util/getopt.c
-src/util/crypto_ksk.c
-src/util/scheduler.c
-src/util/common_endian.c
-src/util/connection.c
-src/util/signal.c
-src/util/time.c
-src/util/network.c
-src/util/container_heap.c
-src/util/os_installation.c
-src/util/strings.c
-src/util/program.c
-src/util/server.c
-src/util/crypto_random.c
-src/util/crypto_hash.c
-src/util/winproc.c
-src/util/disk.c
-src/util/server_tc.c
-src/util/service.c
-src/util/gnunet-resolver.c
-src/util/load.c
-src/util/container_bloomfilter.c
-src/util/os_priority.c
-src/util/resolver_api.c
-src/util/pseudonym.c
-src/util/gnunet-service-resolver.c
-src/util/os_network.c
-src/util/bio.c
-src/util/server_nc.c
-src/util/server_mst.c
-src/util/client.c
-src/util/crypto_kdf.c
-src/util/crypto_rsa.c
-src/util/container_meta_data.c
-src/util/peer.c
-src/nse/gnunet-nse-profiler.c
-src/nse/nse_api.c
-src/nse/gnunet-service-nse.c
-src/peerinfo/gnunet-service-peerinfo.c
-src/peerinfo/peerinfo_api_notify.c
-src/peerinfo/peerinfo_api.c
-src/datacache/plugin_datacache_sqlite.c
+src/core/gnunet-service-core_neighbours.c
+src/core/gnunet-service-core_sessions.c
+src/core/gnunet-service-core_typemap.c
 src/datacache/datacache.c
+src/datacache/plugin_datacache_mysql.c
 src/datacache/plugin_datacache_postgres.c
+src/datacache/plugin_datacache_sqlite.c
 src/datacache/plugin_datacache_template.c
-src/datacache/plugin_datacache_mysql.c
-src/dht/gnunet-service-dht_neighbours.c
+src/datastore/datastore_api.c
+src/datastore/gnunet-service-datastore.c
+src/datastore/plugin_datastore_mysql.c
+src/datastore/plugin_datastore_postgres.c
+src/datastore/plugin_datastore_sqlite.c
+src/datastore/plugin_datastore_template.c
 src/dht/dht_api.c
-src/dht/gnunet-service-dht.c
 src/dht/gnunet-dht-get.c
-src/dht/gnunet-service-dht_clients.c
-src/dht/gnunet-service-dht_nse.c
 src/dht/gnunet-dht-put.c
-src/dht/gnunet-service-dht_routing.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_hello.c
-src/arm/gnunet-arm.c
-src/arm/mockup-service.c
-src/arm/gnunet-service-arm.c
-src/arm/arm_api.c
-src/arm/do_start_process.c
-src/ats/gnunet-service-ats_reservations.c
-src/ats/ats_api.c
-src/ats/ats_api_peer_change_preference.c
-src/ats/ats_api_scheduling.c
-src/ats/gnunet-service-ats.c
-src/ats/gnunet-service-ats_addresses.c
-src/ats/gnunet-service-ats_performance.c
-src/ats/ats_api_performance.c
-src/ats/gnunet-service-ats_scheduling.c
+src/dht/gnunet-service-dht_neighbours.c
+src/dht/gnunet-service-dht_nse.c
+src/dht/gnunet-service-dht_routing.c
+src/dht/plugin_block_dht.c
+src/dns/dns_api.c
+src/dns/dnsparser.c
+src/dns/gnunet-dns-monitor.c
+src/dns/gnunet-dns-redirector.c
+src/dns/gnunet-helper-dns.c
+src/dns/gnunet-service-dns.c
+src/dns/plugin_block_dns.c
+src/dv/dv_api.c
+src/dv/gnunet-service-dv.c
+src/dv/plugin_transport_dv.c
+src/exit/gnunet-daemon-exit.c
+src/exit/gnunet-helper-exit.c
 src/fragmentation/defragmentation.c
 src/fragmentation/fragmentation.c
-src/statistics/gnunet-service-statistics.c
-src/statistics/statistics_api.c
-src/statistics/gnunet-statistics.c
-src/fs/gnunet-unindex.c
-src/fs/gnunet-pseudonym.c
-src/fs/gnunet-service-fs_put.c
-src/fs/fs_namespace.c
-src/fs/gnunet-search.c
-src/fs/fs_uri.c
-src/fs/gnunet-publish.c
-src/fs/fs_search.c
-src/fs/gnunet-service-fs_lc.c
+src/fs/fs_api.c
 src/fs/fs_directory.c
+src/fs/fs_dirmetascan.c
+src/fs/fs_download.c
+src/fs/fs_file_information.c
+src/fs/fs_getopt.c
+src/fs/fs_list_indexed.c
 src/fs/fs_misc.c
-src/fs/gnunet-directory.c
-src/fs/gnunet-service-fs_pr.c
-src/fs/gnunet-service-fs_pe.c
-src/fs/gnunet-service-fs_cp.c
+src/fs/fs_namespace_advertise.c
+src/fs/fs_namespace.c
+src/fs/fs_publish.c
+src/fs/fs_publish_ksk.c
+src/fs/fs_search.c
+src/fs/fs_sharetree.c
+src/fs/fs_test_lib.c
 src/fs/fs_tree.c
-src/fs/gnunet-service-fs_push.c
-src/fs/gnunet-service-fs_indexing.c
-src/fs/fs_list_indexed.c
 src/fs/fs_unindex.c
+src/fs/fs_uri.c
+src/fs/gnunet-directory.c
 src/fs/gnunet-download.c
-src/fs/fs_getopt.c
-src/fs/fs_publish.c
-src/fs/fs_api.c
-src/fs/fs_download.c
+src/fs/gnunet-fs.c
+src/fs/gnunet-helper-fs-publish.c
+src/fs/gnunet-pseudonym.c
+src/fs/gnunet-publish.c
+src/fs/gnunet-search.c
 src/fs/gnunet-service-fs.c
-src/fs/fs_file_information.c
-src/transport/gnunet-service-transport_neighbours.c
+src/fs/gnunet-service-fs_cp.c
+src/fs/gnunet-service-fs_indexing.c
+src/fs/gnunet-service-fs_lc.c
+src/fs/gnunet-service-fs_pe.c
+src/fs/gnunet-service-fs_pr.c
+src/fs/gnunet-service-fs_push.c
+src/fs/gnunet-service-fs_put.c
+src/fs/gnunet-unindex.c
+src/fs/plugin_block_fs.c
+src/gns/gns_api.c
+src/gns/gnunet-gns-lookup.c
+src/gns/gnunet-service-gns.c
+src/gns/namestore_stub_api.c
+src/hello/address.c
+src/hello/hello.c
+src/hostlist/gnunet-daemon-hostlist.c
+src/hostlist/hostlist-client.c
+src/hostlist/hostlist-server.c
+src/mesh/gnunet-service-mesh.c
+src/mesh/mesh_api.c
+src/mesh/mesh_tunnel_tree.c
+src/namestore/gnunet-service-namestore.c
+src/namestore/namestore_api.c
+src/namestore/plugin_namestore_sqlite.c
+src/nat/gnunet-helper-nat-client.c
+src/nat/gnunet-helper-nat-client-windows.c
+src/nat/gnunet-helper-nat-server.c
+src/nat/gnunet-helper-nat-server-windows.c
+src/nat/gnunet-nat-server.c
+src/nat/nat.c
+src/nat/nat_mini.c
+src/nat/nat_test.c
+src/nse/gnunet-nse-profiler.c
+src/nse/gnunet-service-nse.c
+src/nse/nse_api.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/pt/gnunet-daemon-pt.c
+src/statistics/gnunet-service-statistics.c
+src/statistics/gnunet-statistics.c
+src/statistics/statistics_api.c
+src/stream/stream_api.c
+src/template/gnunet-service-template.c
+src/template/gnunet-template.c
+src/testing/gnunet-testing.c
+src/testing/helper.c
+src/testing/testing.c
+src/testing/testing_group.c
+src/testing/testing_peergroup.c
+src/topology/gnunet-daemon-topology.c
+src/transport/gnunet-helper-transport-wlan.c
+src/transport/gnunet-helper-transport-wlan-dummy.c
 src/transport/gnunet-service-transport_blacklist.c
-src/transport/plugin_transport_http_server.c
+src/transport/gnunet-service-transport.c
+src/transport/gnunet-service-transport_clients.c
 src/transport/gnunet-service-transport_hello.c
-src/transport/plugin_transport_udp.c
-src/transport/plugin_transport_http_client.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-certificate-creation.c
 src/transport/gnunet-transport-connect-running-peers.c
-src/transport/plugin_transport_template.c
-src/transport/plugin_transport_tcp.c
+src/transport/gnunet-transport-wlan-sender.c
 src/transport/plugin_transport_http.c
-src/transport/plugin_transport_unix.c
+src/transport/plugin_transport_http_client.c
+src/transport/plugin_transport_http_server.c
 src/transport/plugin_transport_smtp.c
-src/transport/gnunet-service-transport_plugins.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_unix.c
 src/transport/plugin_transport_wlan.c
-src/transport/gnunet-transport.c
-src/transport/gnunet-service-transport_validation.c
-src/transport/gnunet-transport-certificate-creation.c
-src/transport/gnunet-service-transport_clients.c
+src/transport/transport_api_address_lookup.c
+src/transport/transport_api_address_to_string.c
+src/transport/transport_api_blacklist.c
 src/transport/transport_api.c
-src/transport/gnunet-service-transport.c
-src/dv/plugin_transport_dv.c
-src/dv/gnunet-service-dv.c
-src/dv/dv_api.c
-src/topology/gnunet-daemon-topology.c
-src/chat/chat.c
-src/chat/gnunet-service-chat.c
-src/chat/gnunet-chat.c
-src/nat/gnunet-nat-server.c
-src/nat/gnunet-helper-nat-server-windows.c
-src/nat/gnunet-helper-nat-server.c
-src/nat/nat.c
-src/nat/gnunet-helper-nat-client-windows.c
-src/nat/nat_test.c
-src/nat/gnunet-helper-nat-client.c
-src/nat/nat_mini.c
-src/dht/plugin_block_dht.c
-src/fs/plugin_block_fs.c
-src/block/block.c
-src/block/plugin_block_test.c
-src/dns/plugin_block_dns.c
-src/block/plugin_block_template.c
-src/mesh/mesh_api.c
-src/mesh/mesh_tunnel_tree.c
-src/mesh/gnunet-service-mesh.c
-src/hello/hello.c
-src/hostlist/hostlist-client.c
-src/hostlist/gnunet-daemon-hostlist.c
-src/hostlist/hostlist-server.c
-src/peerinfo-tool/gnunet-peerinfo.c
-src/datastore/datastore.h
-src/core/gnunet-service-core_clients.h
-src/core/gnunet-service-core_typemap.h
-src/core/gnunet-service-core_kx.h
-src/core/gnunet-service-core.h
-src/core/core.h
-src/core/gnunet-service-core_sessions.h
-src/core/gnunet-service-core_neighbours.h
-src/util/resolver.h
-src/util/disk.h
-src/nse/nse.h
-src/peerinfo/peerinfo.h
-src/dht/gnunet-service-dht_clients.h
-src/dht/gnunet-service-dht_datacache.h
-src/dht/gnunet-service-dht_routing.h
-src/dht/dht.h
-src/dht/gnunet-service-dht_neighbours.h
-src/dht/gnunet-service-dht.h
-src/dht/gnunet-service-dht_hello.h
-src/dht/gnunet-service-dht_nse.h
-src/arm/arm.h
-src/ats/gnunet-service-ats_performance.h
-src/ats/gnunet-service-ats.h
-src/ats/ats.h
-src/ats/gnunet-service-ats_addresses.h
-src/ats/gnunet-service-ats_scheduling.h
-src/ats/ats_api.h
-src/ats/gnunet-service-ats_reservations.h
-src/fragmentation/fragmentation.h
-src/statistics/statistics.h
-src/fs/gnunet-service-fs_cp.h
-src/fs/gnunet-service-fs_indexing.h
-src/fs/fs.h
-src/fs/gnunet-service-fs_lc.h
-src/fs/gnunet-service-fs_pr.h
-src/fs/gnunet-service-fs.h
-src/fs/gnunet-service-fs_push.h
-src/fs/fs_tree.h
-src/fs/gnunet-service-fs_pe.h
-src/fs/gnunet-service-fs_put.h
-src/transport/gnunet-service-transport_neighbours.h
-src/transport/plugin_transport_http.h
-src/transport/gnunet-service-transport_validation.h
-src/transport/transport.h
-src/transport/gnunet-service-transport_clients.h
-src/transport/plugin_transport_sat_constants.h
-src/transport/ieee80211_radiotap.h
-src/transport/gnunet-service-transport_hello.h
-src/transport/gnunet-service-transport.h
-src/transport/gnunet-service-transport_blacklist.h
-src/transport/gnunet-service-transport_plugins.h
-src/dv/dv.h
-src/chat/chat.h
-src/nat/nat.h
-src/mesh/mesh_tunnel_tree.h
-src/mesh/mesh.h
-src/mesh/mesh_protocol.h
-src/hostlist/gnunet-daemon-hostlist.h
-src/hostlist/hostlist-server.h
-src/hostlist/hostlist-client.h
-src/include/gnunet_service_lib.h
-src/include/gnunet_arm_service.h
-src/include/gnunet_peerinfo_service.h
-src/include/gnunet_block_lib.h
-src/include/gnunet_resolver_service.h
-src/include/gnunet_server_lib.h
-src/include/winproc.h
-src/include/gnunet_connection_lib.h
-src/include/gnunet_core_service.h
-src/include/gnunet_statistics_service.h
-src/include/gnunet_strings_lib.h
-src/include/platform.h
-src/include/gnunet_load_lib.h
-src/include/gnunet_ats_service.h
-src/include/gnunet_getopt_lib.h
-src/include/gnunet_configuration_lib.h
-src/include/gnunet_util_lib.h
-src/include/gnunet_disk_lib.h
-src/include/gnunet_datastore_plugin.h
-src/include/gnunet_datacache_plugin.h
-src/include/gnunet_crypto_lib.h
-src/include/gnunet_bandwidth_lib.h
-src/include/gnunet_fragmentation_lib.h
-src/include/gnunet_nse_service.h
-src/include/gnunet_protocols.h
-src/include/gnunet_dht_service.h
-src/include/gnunet_datacache_lib.h
-src/include/gnunet_scheduler_lib.h
-src/include/gnunet_fs_service.h
-src/include/gnunet_dv_service.h
-src/include/gnunet_transport_service.h
-src/include/block_dns.h
-src/include/gnunet_hello_lib.h
-src/include/gnunet_directories.h
-src/include/gnunet_mesh_service.h
-src/include/gnunet_chat_service.h
-src/include/gnunet_client_lib.h
-src/include/gnunet_container_lib.h
-src/include/gnunet_signatures.h
-src/include/gnunet_peer_lib.h
-src/include/gnunet_nat_lib.h
-src/include/gnunet_transport_plugin.h
-src/include/gnunet_program_lib.h
-src/include/gnunet_time_lib.h
-src/include/gnunet_signal_lib.h
-src/include/gnunet_pseudonym_lib.h
-src/include/gnunet_plugin_lib.h
-src/include/gnunet_constants.h
-src/include/gnunet_bio_lib.h
-src/include/gnunet_datastore_service.h
-src/include/gnunet_block_plugin.h
-src/include/gnunet_network_lib.h
-src/include/gnunet_os_lib.h
-src/include/block_fs.h
+src/transport/transport-testing.c
+src/tun/tun.c
+src/util/bandwidth.c
+src/util/bio.c
+src/util/client.c
+src/util/common_allocation.c
+src/util/common_endian.c
+src/util/common_logging.c
+src/util/configuration.c
+src/util/connection.c
+src/util/container_bloomfilter.c
+src/util/container_heap.c
+src/util/container_meta_data.c
+src/util/container_multihashmap.c
+src/util/container_slist.c
+src/util/crypto_aes.c
+src/util/crypto_crc.c
+src/util/crypto_hash.c
+src/util/crypto_hkdf.c
+src/util/crypto_kdf.c
+src/util/crypto_ksk.c
+src/util/crypto_random.c
+src/util/crypto_rsa.c
+src/util/disk.c
+src/util/getopt.c
+src/util/getopt_helpers.c
+src/util/gnunet-config-diff.c
+src/util/gnunet-resolver.c
+src/util/gnunet-service-resolver.c
+src/util/helper.c
+src/util/load.c
+src/util/network.c
+src/util/os_installation.c
+src/util/os_network.c
+src/util/os_priority.c
+src/util/peer.c
+src/util/plugin.c
+src/util/program.c
+src/util/pseudonym.c
+src/util/resolver_api.c
+src/util/scheduler.c
+src/util/server.c
+src/util/server_mst.c
+src/util/server_nc.c
+src/util/server_tc.c
+src/util/service.c
+src/util/signal.c
+src/util/strings.c
+src/util/time.c
+src/util/winproc.c
+src/vpn/gnunet-helper-vpn.c
+src/vpn/gnunet-service-vpn.c
+src/vpn/gnunet-vpn.c
+src/vpn/vpn_api.c
 src/include/gnunet_common.h
-src/include/gnunet_applications.h

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2012-02-24 15:12:56 UTC (rev 20010)
+++ gnunet/po/de.po     2012-02-24 15:14:18 UTC (rev 20011)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-01-07 20:53+0100\n"
+"POT-Creation-Date: 2012-02-24 16:13+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -17,404 +17,539 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:61
-#: src/datastore/plugin_datastore_mysql.c:139
-#: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:613
-#: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685
-#: src/datastore/plugin_datastore_mysql.c:1362
-#: src/datastore/plugin_datastore_mysql.c:1376 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/datacache/plugin_datacache_sqlite.c:71
-#: src/datacache/plugin_datacache_sqlite.c:74
-#: src/datacache/plugin_datacache_mysql.c:103
-#: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:517
-#: src/datacache/plugin_datacache_mysql.c:526
-#: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:458
-#: src/include/gnunet_common.h:465
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+#: src/arm/arm_api.c:187
+#, fuzzy
+msgid "Failed to transmit shutdown request to client.\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/arm/arm_api.c:378
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%u with error: %s"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+msgid "Configuration failes to specify option `%s' in section `%s'!\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:239
+#: src/arm/arm_api.c:392
 #, fuzzy, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
-msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:266
+#: src/arm/arm_api.c:465
+#, fuzzy, c-format
+msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
+msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
+
+#: src/arm/arm_api.c:521
 #, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+msgid "Requesting start of service `%s'.\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:414
-#: src/datacache/plugin_datacache_sqlite.c:457
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+#: src/arm/arm_api.c:522
+#, c-format
+msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:671
-#, fuzzy
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:1161
-msgid "sqlite version to old to determine size, assuming zero\n"
+#: src/arm/arm_api.c:544
+#, c-format
+msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1180
+#: src/arm/arm_api.c:546
 #, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1220
-#, fuzzy
-msgid "Sqlite database running\n"
-msgstr "sqlite Datenspeicher"
+#: src/arm/arm_api.c:579
+#, fuzzy, c-format
+msgid "Asked to start service `%s' within %llu ms\n"
+msgstr "`%s': Nachricht wurde nicht innerhalb %llu ms empfangen.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:316
-#: src/datacache/plugin_datacache_mysql.c:224
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
+#: src/arm/arm_api.c:652
+#, fuzzy, c-format
+msgid "Stopping service `%s' within %llu ms\n"
+msgstr "Keine Antwort innerhalb %llums erhalten.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:322
-#: src/datacache/plugin_datacache_mysql.c:230
+#: src/arm/gnunet-arm.c:149
 #, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
+msgid "Service `%s' is unknown to ARM.\n"
+msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#: src/datastore/plugin_datastore_mysql.c:1336
+#: src/arm/gnunet-arm.c:154
 #, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "Service `%s' has been stopped.\n"
+msgstr "Dienst gelöscht.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#: src/datastore/plugin_datastore_mysql.c:1346
+#: src/arm/gnunet-arm.c:157
 #, fuzzy, c-format
-msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
-msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
+msgid "Service `%s' was already running.\n"
+msgstr "Diese Suche läuft bereits!\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1581
-msgid "Mysql database running\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:162
+#, fuzzy, c-format
+msgid "Service `%s' has been started.\n"
+msgstr "Dienst gelöscht.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:93
-#: src/datacache/plugin_datacache_postgres.c:79
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+msgid "Service `%s' was already being stopped.\n"
+msgstr "Dienst gelöscht.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:173
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+msgid "Service `%s' was already not running.\n"
+msgstr "Diese Suche läuft bereits!\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1017
-msgid "Postgres database running\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:173
+#, fuzzy
+msgid "Request ignored as ARM is shutting down.\n"
+msgstr "`%s' fährt herunter.\n"
 
-#: src/datastore/datastore_api.c:289
+#: src/arm/gnunet-arm.c:177
 #, fuzzy
-msgid "Failed to transmit request to drop database.\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+msgid "Error communicating with ARM service.\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/datastore/datastore_api.c:372
-msgid "# queue entry timeouts"
+#: src/arm/gnunet-arm.c:181
+#, fuzzy
+msgid "Timeout communicating with ARM service.\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/arm/gnunet-arm.c:185
+#, fuzzy
+msgid "Operation failed.\n"
+msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+
+#: src/arm/gnunet-arm.c:189
+msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:418
-msgid "# queue overflows"
+#: src/arm/gnunet-arm.c:216
+#, fuzzy, c-format
+msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
+"Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in der "
+"Sektion `%s' angegeben werden.\n"
 
-#: src/datastore/datastore_api.c:445
-#, fuzzy
-msgid "# queue entries created"
-msgstr "# dht Anfragen weitergeleitet"
+#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+msgid "Fatal error initializing ARM API.\n"
+msgstr ""
 
-#: src/datastore/datastore_api.c:465
-#, fuzzy
-msgid "# Requests dropped from datastore queue"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+#: src/arm/gnunet-arm.c:247
+#, fuzzy, c-format
+msgid "Failed to remove configuration file %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/datastore/datastore_api.c:513
-msgid "# datastore connections (re)created"
+#: src/arm/gnunet-arm.c:253
+#, fuzzy, c-format
+msgid "Failed to remove servicehome directory %s\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/arm/gnunet-arm.c:355
+msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/datastore/datastore_api.c:540
-msgid "# reconnected to DATASTORE"
+#: src/arm/gnunet-arm.c:357
+msgid "start a particular service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
-#, fuzzy
-msgid "# transmission request failures"
-msgstr "# Klartext PONG Nachrichten empfangen"
+#: src/arm/gnunet-arm.c:359
+msgid "stop a particular service"
+msgstr ""
 
-#: src/datastore/datastore_api.c:631
-#, fuzzy
-msgid "# bytes sent to datastore"
-msgstr "# bytes in der Datenbank"
+#: src/arm/gnunet-arm.c:361
+msgid "start all GNUnet default services"
+msgstr ""
 
-#: src/datastore/datastore_api.c:772
-#, fuzzy
-msgid "Failed to receive status response from database."
+#: src/arm/gnunet-arm.c:364
+msgid "stop and start all GNUnet default services"
 msgstr ""
-"\n"
-"Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:786
-msgid "Error reading response from datastore service"
+#: src/arm/gnunet-arm.c:367
+msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
-#, fuzzy
-msgid "Invalid error message received from datastore service"
-msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
+#: src/arm/gnunet-arm.c:369
+msgid "don't print status messages"
+msgstr ""
 
-#: src/datastore/datastore_api.c:810
+#: src/arm/gnunet-arm.c:372
 #, fuzzy
-msgid "# status messages received"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
+msgid "timeout for completing current operation"
+msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
 
-#: src/datastore/datastore_api.c:883
-#, fuzzy
-msgid "# PUT requests executed"
-msgstr "# dht Anfragen weitergeleitet"
+#: src/arm/gnunet-arm.c:383
+msgid "Control services and the Automated Restart Manager (ARM)"
+msgstr ""
 
-#: src/datastore/datastore_api.c:954
-#, fuzzy
-msgid "# RESERVE requests executed"
-msgstr "# dht Anfragen weitergeleitet"
+#: src/arm/gnunet-service-arm.c:321
+#, fuzzy, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/datastore/datastore_api.c:1019
-msgid "# RELEASE RESERVE requests executed"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:324
+#, fuzzy, c-format
+msgid "Starting service `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
 
-#: src/datastore/datastore_api.c:1080
+#: src/arm/gnunet-service-arm.c:350
 #, fuzzy
-msgid "# UPDATE requests executed"
-msgstr "# dht Anfragen weitergeleitet"
+msgid "Could not send status result to client\n"
+msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/datastore/datastore_api.c:1148
-#, fuzzy
-msgid "# REMOVE requests executed"
-msgstr "# dht Anfragen weitergeleitet"
+#: src/arm/gnunet-service-arm.c:477
+#, fuzzy, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/datastore/datastore_api.c:1193
-#, fuzzy
-msgid "Failed to receive response from database.\n"
+#: src/arm/gnunet-service-arm.c:499
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
-"\n"
-"Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1253
-#, fuzzy
-msgid "# Results received"
-msgstr "# Bytes empfangen über TCP"
+#: src/arm/gnunet-service-arm.c:513
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgstr ""
 
-#: src/datastore/datastore_api.c:1324
-msgid "# GET REPLICATION requests executed"
+#: src/arm/gnunet-service-arm.c:621
+#, fuzzy, c-format
+msgid "Preparing to stop `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/arm/gnunet-service-arm.c:775
+#, fuzzy, c-format
+msgid "Restarting service `%s'.\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/arm/gnunet-service-arm.c:870
+msgid "exit"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1391
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/arm/gnunet-service-arm.c:875
+msgid "signal"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1455
+#: src/arm/gnunet-service-arm.c:880
 #, fuzzy
-msgid "# GET requests executed"
-msgstr "# dht Anfragen weitergeleitet"
+msgid "unknown"
+msgstr "Unbekannter Fehler"
 
-#: src/datastore/plugin_datastore_template.c:241
-msgid "Template database running\n"
+#: src/arm/gnunet-service-arm.c:914
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/arm/gnunet-service-arm.c:960 src/arm/mockup-service.c:41
 #, fuzzy
-msgid "# bytes expired"
-msgstr "# Bytes empfangen über TCP"
+msgid "Failed to transmit shutdown ACK.\n"
+msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/datastore/gnunet-service-datastore.c:426
-msgid "# bytes purged (low-priority)"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:1060
+#, fuzzy, c-format
+msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/datastore/gnunet-service-datastore.c:486
-msgid "Transmission to client failed!\n"
+#: src/arm/gnunet-service-arm.c:1062
+msgid "option missing"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:640
-msgid "# results found"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:1139
+#, fuzzy, c-format
+msgid "Starting default services `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
 
-#: src/datastore/gnunet-service-datastore.c:685
+#: src/arm/gnunet-service-arm.c:1150
 #, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
-"%llu bytes\n"
+msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
-#, c-format
+#: src/arm/gnunet-service-arm.c:1164
 msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+"No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:700
-msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+#: src/arm/mockup-service.c:46
+msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:706
-msgid "Insufficient space to satisfy request"
+#: src/arm/mockup-service.c:69
+msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
-#: src/datastore/gnunet-service-datastore.c:765
-#: src/datastore/gnunet-service-datastore.c:986
-#: src/datastore/gnunet-service-datastore.c:1465
-msgid "# reserved"
-msgstr ""
+#: src/block/block.c:105
+#, fuzzy, c-format
+msgid "Loading block plugin `%s'\n"
+msgstr "Teste Transport(e) %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:780
-msgid "Could not find matching reservation"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:854 src/datacache/datacache.c:118
-#: src/datacache/datacache.c:255
+#: src/chat/chat.c:175
 #, fuzzy
-msgid "# bytes stored"
-msgstr "# bytes in der Datenbank"
+msgid "Could not transmit confirmation receipt\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:868
-#, c-format
-msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
+#: src/chat/chat.c:283
+msgid "The current user must be the the first one joined\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1034
-#, fuzzy
-msgid "# GET requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/chat/chat.c:412
+#, fuzzy, c-format
+msgid "Unknown message type: '%u'\n"
+msgstr "Unbekannte Operation `%s'\n"
 
-#: src/datastore/gnunet-service-datastore.c:1048
-msgid "# requests filtered by bloomfilter"
-msgstr ""
+#: src/chat/chat.c:472
+#, fuzzy, c-format
+msgid "Configuration option `%s' in section `%s' missing\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1076
-#, fuzzy
-msgid "# UPDATE requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/chat/chat.c:480
+#, fuzzy, c-format
+msgid "Failed to access chat home directory `%s'\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/datastore/gnunet-service-datastore.c:1110
-#, fuzzy
-msgid "# GET REPLICATION requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/chat/chat.c:498
+#, fuzzy, c-format
+msgid "Failed to create/open key in file `%s'\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1145
+#: src/chat/chat.c:559
 #, fuzzy
-msgid "# GET ZERO ANONYMITY requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+msgid "Could not serialize metadata\n"
+msgstr "Konnte libgnunetutil nicht initialisieren!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1172
+#: src/chat/chat.c:674
 #, fuzzy
-msgid "Content not found"
-msgstr "Kommando `%s' wurde nicht gefunden!\n"
+msgid "Failed to connect to the chat service\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1182
-msgid "# bytes removed (explicit request)"
+#: src/chat/chat.c:680
+msgid "Undefined mandatory parameter: joinCallback\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1216
-#, fuzzy
-msgid "# REMOVE requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/chat/chat.c:686
+msgid "Undefined mandatory parameter: messageCallback\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1260
+#: src/chat/chat.c:692
+msgid "Undefined mandatory parameter: memberCallback\n"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:92
+msgid "Joined\n"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:124
+msgid "anonymous"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:130
+#, fuzzy, c-format
+msgid "(%s) `%s' said: %s\n"
+msgstr "`%s' %s schlug fehl: %s\n"
+
+#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#, fuzzy, c-format
+msgid "(%s) `%s' said to you: %s\n"
+msgstr "`%s' %s schlug fehl: %s\n"
+
+#: src/chat/gnunet-chat.c:139
+#, fuzzy, c-format
+msgid "(%s) `%s' said for sure: %s\n"
+msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
+
+#: src/chat/gnunet-chat.c:142
+#, fuzzy, c-format
+msgid "(%s) `%s' said to you for sure: %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#: src/chat/gnunet-chat.c:145
+#, fuzzy, c-format
+msgid "(%s) `%s' was confirmed that you received: %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#: src/chat/gnunet-chat.c:148
+#, fuzzy, c-format
+msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#: src/chat/gnunet-chat.c:151
+#, fuzzy, c-format
+msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#: src/chat/gnunet-chat.c:156
+#, fuzzy, c-format
+msgid ""
+"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#: src/chat/gnunet-chat.c:159
+#, fuzzy, c-format
+msgid "(%s) `%s' said off the record: %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#: src/chat/gnunet-chat.c:162
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1323
+#: src/chat/gnunet-chat.c:193
 #, c-format
-msgid "Loading `%s' datastore plugin\n"
+msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1332
+#: src/chat/gnunet-chat.c:224
+#, c-format
+msgid "`%s' entered the room\n"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:224
 #, fuzzy, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+msgid "`%s' left the room\n"
+msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1531
-#: src/datastore/gnunet-service-datastore.c:1542 src/datacache/datacache.c:144
-#: src/datacache/datacache.c:151
+#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#, fuzzy
+msgid "Could not change username\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
 #, fuzzy, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+msgid "Joining room `%s' as user `%s'...\n"
+msgstr "Ungültige Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1536
+#: src/chat/gnunet-chat.c:320
 #, fuzzy, c-format
-msgid "# bytes used in file-sharing datastore `%s'"
-msgstr "# bytes erlaubt in der Datenbank"
+msgid "Changed username to `%s'\n"
+msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1547
-msgid "# quota"
+#: src/chat/gnunet-chat.c:333
+#, c-format
+msgid "Users in room `%s': "
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1549
-msgid "# cache size"
+#: src/chat/gnunet-chat.c:371
+msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1562
+#: src/chat/gnunet-chat.c:379
+#, fuzzy, c-format
+msgid "Unknown user `%s'\n"
+msgstr "Unbekannte Operation `%s'\n"
+
+#: src/chat/gnunet-chat.c:395
 #, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+msgid "User `%s' is currently not in the room!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1580
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/chat/gnunet-chat.c:448
 #, fuzzy, c-format
-msgid "Failed to remove bogus bloomfilter file `%s'\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+msgid "Unknown command `%s'\n"
+msgstr "Unbekannte Operation `%s'\n"
 
-#: src/datastore/gnunet-service-datastore.c:1626
-#, fuzzy
-msgid "Failed to initialize bloomfilter.\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+#: src/chat/gnunet-chat.c:459
+msgid ""
+"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
+"leave the current room"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1655
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
+#: src/chat/gnunet-chat.c:463
+msgid ""
+"Use `/nick nickname' to change your nickname.  This will cause you to leave "
+"the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1660
-msgid "Plugin does not support get_keys function. Please fix!\n"
+#: src/chat/gnunet-chat.c:467
+msgid ""
+"Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1663
-msgid "Bloomfilter construction complete.\n"
+#: src/chat/gnunet-chat.c:470
+msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
+#: src/chat/gnunet-chat.c:472
+msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:238
+#: src/chat/gnunet-chat.c:474
+msgid "Use `/sig message' to send a signed public message"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:477
+msgid "Use `/ack message' to require signed acknowledgment of the message"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:480
+msgid "Use `/anonymous message' to send a public anonymous message"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:482
+msgid "The `/anon' command is an alias for `/anonymous'"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:484
+msgid "Use `/quit' to terminate gnunet-chat"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:486
+msgid "The `/leave' command is an alias for `/quit'"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:489
+msgid "Use `/names' to list all of the current members in the chat room"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:491
+msgid "Use `/help command' to get help for a specific command"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:606
 #, fuzzy
-msgid "# type map refreshes sent"
-msgstr "# p2p Trace-Antworten gesendet"
+msgid "You must specify a nickname\n"
+msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/core/gnunet-service-core_sessions.c:414
-msgid "# messages discarded (expired prior to transmission)"
+#: src/chat/gnunet-chat.c:622
+#, fuzzy, c-format
+msgid "Failed to join room `%s'\n"
+msgstr "Fehler beim Binden an UDP Port %d.\n"
+
+#: src/chat/gnunet-chat.c:655
+msgid "set the nickname to use (required)"
 msgstr ""
 
+#: src/chat/gnunet-chat.c:658
+msgid "set the chat room to join"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:670
+msgid "Join a chat on GNUnet."
+msgstr ""
+
+#: src/chat/gnunet-service-chat.c:267
+#, fuzzy
+msgid "Failed to queue a message notification\n"
+msgstr "Fehler beim Speichern der Konfiguration!"
+
+#: src/chat/gnunet-service-chat.c:546
+#, fuzzy
+msgid "Failed to queue a join notification\n"
+msgstr "Fehler beim Abfragen der Netzwerkverkehrsbedingungen von gnunetd.\n"
+
+#: src/chat/gnunet-service-chat.c:729
+#, fuzzy
+msgid "Failed to queue a confirmation receipt\n"
+msgstr "Fehler beim Speichern der Konfiguration!"
+
+#: src/chat/gnunet-service-chat.c:907
+#, fuzzy
+msgid "Failed to queue a leave notification\n"
+msgstr "Fehler beim Speichern der Konfiguration!"
+
+#: src/core/core_api.c:798
+msgid "Client was disconnected from core service, trying to reconnect.\n"
+msgstr ""
+
 #: src/core/gnunet-core-list-connections.c:77
 #: src/peerinfo-tool/gnunet-peerinfo.c:60
 #, fuzzy, c-format
@@ -437,6 +572,11 @@
 msgid "Print information about connected peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
+#: src/core/gnunet-service-core.c:99
+#, c-format
+msgid "Core service of `%4s' ready.\n"
+msgstr ""
+
 #: src/core/gnunet-service-core_clients.c:360
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
@@ -452,40 +592,6 @@
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core.c:99
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
-#, fuzzy
-msgid "# type maps received"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
-
-#: src/core/gnunet-service-core_typemap.c:151
-msgid "# updates to my type map"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:163
-#, fuzzy
-msgid "# sessions terminated by transport disconnect"
-msgstr "# Knotenankündigungen empfangen"
-
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:343
-msgid "# neighbour entries allocated"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:252
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:431
-#, fuzzy, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
-msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
-
 #: src/core/gnunet-service-core_kx.c:493
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
@@ -528,7 +634,7 @@
 msgstr "# defragmentierter Nachrichten"
 
 #: src/core/gnunet-service-core_kx.c:880
-#: src/transport/gnunet-service-transport_validation.c:780
+#: src/transport/gnunet-service-transport_validation.c:803
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
@@ -556,7 +662,7 @@
 msgstr "# Klartext PING Nachrichten gesendet"
 
 #: src/core/gnunet-service-core_kx.c:1092
-#: src/transport/gnunet-service-transport_validation.c:985
+#: src/transport/gnunet-service-transport_validation.c:1026
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -615,807 +721,658 @@
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1541
-#: src/transport/gnunet-service-transport.c:578
-#: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/core/gnunet-service-core_kx.c:1541 src/hostlist/hostlist-server.c:555
+#: src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/transport/gnunet-service-transport.c:595
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/core/core_api.c:798
-msgid "Client was disconnected from core service, trying to reconnect.\n"
-msgstr ""
-
-#: src/vpn/gnunet-daemon-exit.c:1496
-msgid "Daemon to run to provide an IP exit node for the VPN"
-msgstr ""
-
-#: src/vpn/gnunet-daemon-vpn.c:1804
+#: src/core/gnunet-service-core_neighbours.c:163
 #, fuzzy
-msgid "help text"
-msgstr "Hilfetext für -t"
+msgid "# sessions terminated by transport disconnect"
+msgstr "# Knotenankündigungen empfangen"
 
-#: src/util/getopt_helpers.c:84
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
+#: src/core/gnunet-service-core_neighbours.c:180
+#: src/core/gnunet-service-core_neighbours.c:342
+msgid "# neighbour entries allocated"
 msgstr ""
-"Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
-"Optionen zwingend.\n"
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "Sie müssen für die Option `%s' zusätzlich eine Zahl angeben.\n"
-
-#: src/util/common_logging.c:239 src/util/common_logging.c:890
-msgid "DEBUG"
-msgstr "DEBUG"
-
-#: src/util/common_logging.c:241 src/util/common_logging.c:888
-msgid "INFO"
-msgstr "INFO"
-
-#: src/util/common_logging.c:243 src/util/common_logging.c:886
-msgid "WARNING"
-msgstr "WARNUNG"
-
-#: src/util/common_logging.c:245 src/util/common_logging.c:884
-msgid "ERROR"
-msgstr "FEHLER"
-
-#: src/util/common_logging.c:247 src/util/common_logging.c:892
-msgid "NONE"
+#: src/core/gnunet-service-core_neighbours.c:251
+msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/util/common_logging.c:610
+#: src/core/gnunet-service-core_neighbours.c:430
 #, fuzzy, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
+msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/util/common_logging.c:725
-#, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
+#: src/core/gnunet-service-core_sessions.c:208
+#: src/core/gnunet-service-core_sessions.c:273
+msgid "# entries in session map"
 msgstr ""
 
-#: src/util/common_logging.c:893
-msgid "INVALID"
+#: src/core/gnunet-service-core_sessions.c:238
+#, fuzzy
+msgid "# type map refreshes sent"
+msgstr "# p2p Trace-Antworten gesendet"
+
+#: src/core/gnunet-service-core_sessions.c:414
+msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/util/common_logging.c:975
+#: src/core/gnunet-service-core_typemap.c:110
+#: src/core/gnunet-service-core_typemap.c:121
 #, fuzzy
-msgid "unknown address"
-msgstr "Unbekannter Fehler"
+msgid "# type maps received"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/util/common_logging.c:1013
-#, fuzzy
-msgid "invalid address"
-msgstr "Ungültige Parameter: "
-
-#: src/util/plugin.c:89
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
-
-#: src/util/plugin.c:146
-#, fuzzy, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
+#: src/core/gnunet-service-core_typemap.c:151
+msgid "# updates to my type map"
 msgstr ""
-"`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/plugin.c:219
-#, fuzzy, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
-msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
-
-#: src/util/plugin.c:349
+#: src/datacache/datacache.c:118 src/datacache/datacache.c:255
+#: src/datastore/gnunet-service-datastore.c:854
 #, fuzzy
-msgid "Could not determine plugin installation path.\n"
-msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+msgid "# bytes stored"
+msgstr "# bytes in der Datenbank"
 
-#: src/util/configuration.c:245
+#: src/datacache/datacache.c:144 src/datacache/datacache.c:151
+#: src/datastore/gnunet-service-datastore.c:1531
+#: src/datastore/gnunet-service-datastore.c:1542
 #, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
-msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/util/configuration.c:817
+#: src/datacache/datacache.c:183
 #, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
+msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/util/getopt.c:672
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: Option `%s' ist mehrdeutig\n"
+#: src/datacache/datacache.c:191
+#, fuzzy, c-format
+msgid "Failed to load datacache plugin for `%s'\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/util/getopt.c:696
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: Option '--%s' erlaubt keinen Parameter\n"
+#: src/datacache/datacache.c:281
+#, fuzzy
+msgid "# requests received"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/util/getopt.c:701
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s: Option '%c%s' erlaubt keinen Parameter\n"
+#: src/datacache/datacache.c:291
+msgid "# requests filtered by bloom filter"
+msgstr ""
 
-#: src/util/getopt.c:718 src/util/getopt.c:886
+#: src/datacache/plugin_datacache_mysql.c:103
+#: src/datacache/plugin_datacache_mysql.c:110
+#: src/datacache/plugin_datacache_mysql.c:517
+#: src/datacache/plugin_datacache_mysql.c:526
+#: src/datacache/plugin_datacache_mysql.c:598
+#: src/datacache/plugin_datacache_mysql.c:614
+#: src/datacache/plugin_datacache_sqlite.c:71
+#: src/datacache/plugin_datacache_sqlite.c:74
+#: src/datastore/plugin_datastore_mysql.c:139
+#: src/datastore/plugin_datastore_mysql.c:146
+#: src/datastore/plugin_datastore_mysql.c:613
+#: src/datastore/plugin_datastore_mysql.c:673
+#: src/datastore/plugin_datastore_mysql.c:685
+#: src/datastore/plugin_datastore_mysql.c:1362
+#: src/datastore/plugin_datastore_mysql.c:1376
+#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
+#: src/include/gnunet_common.h:514
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: Option `%s' benötigt einen Parameter\n"
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/util/getopt.c:747
+#: src/datacache/plugin_datacache_mysql.c:224
+#: src/datastore/plugin_datastore_mysql.c:316
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: unbekannte Option '--%s'\n"
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
 
-#: src/util/getopt.c:751
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: unbekannte Option '%c%s'\n"
+#: src/datacache/plugin_datacache_mysql.c:230
+#: src/datastore/plugin_datastore_mysql.c:322
+#, fuzzy, c-format
+msgid "Could not access file `%s': %s\n"
+msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/getopt.c:776
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: unerlaubte Option -- %c\n"
+#: src/datacache/plugin_datacache_mysql.c:979
+msgid "MySQL datacache running\n"
+msgstr ""
 
-#: src/util/getopt.c:778
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ungültige Option -- %c\n"
+#: src/datacache/plugin_datacache_postgres.c:79
+#: src/datastore/plugin_datastore_postgres.c:93
+#, fuzzy, c-format
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/util/getopt.c:806 src/util/getopt.c:934
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: Option benötigt einen Parameter -- %c\n"
-
-#: src/util/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: Option '-W %s' ist mehrdeutig\n"
-
-#: src/util/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s: Option '-W %s' erlaubt keinen Parameter\n"
-
-#: src/util/getopt.c:1038
+#: src/datacache/plugin_datacache_postgres.c:149
 #, fuzzy, c-format
-msgid "Use %s to get a list of options.\n"
-msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
+msgid "Unable to initialize Postgres: %s"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/util/scheduler.c:870
-msgid "Looks like we're busy waiting...\n"
+#: src/datacache/plugin_datacache_postgres.c:499
+msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/util/scheduler.c:1000
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
+#: src/datacache/plugin_datacache_sqlite.c:424
+msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/util/connection.c:461
-#, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
+#: src/datacache/plugin_datacache_sqlite.c:457
+#: src/datastore/plugin_datastore_sqlite.c:414
+#: src/namestore/plugin_namestore_sqlite.c:381
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+msgstr ""
 
-#: src/util/connection.c:476
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
+#: src/datacache/plugin_datacache_template.c:121
+msgid "Template datacache running\n"
 msgstr ""
 
-#: src/util/connection.c:642
-#, fuzzy, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
-msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
+#: src/datastore/datastore_api.c:289
+#, fuzzy
+msgid "Failed to transmit request to drop database.\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/util/connection.c:852 src/util/connection.c:1025
-#, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+#: src/datastore/datastore_api.c:372
+msgid "# queue entry timeouts"
+msgstr ""
 
-#: src/util/connection.c:862
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/util/connection.c:1015
-#, fuzzy, c-format
-msgid "Attempt to connect to `%s' failed\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/util/connection.c:1528
-#, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
+#: src/datastore/datastore_api.c:418
+msgid "# queue overflows"
 msgstr ""
 
-#: src/util/connection.c:1564
-#, fuzzy, c-format
-msgid "Failed to send to `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+#: src/datastore/datastore_api.c:445
+#, fuzzy
+msgid "# queue entries created"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/util/signal.c:80
-#, fuzzy, c-format
-msgid "signal (%d, %p) returned %d.\n"
-msgstr "Aufruf von `%s' gibt %d zurück.\n"
+#: src/datastore/datastore_api.c:465
+#, fuzzy
+msgid "# Requests dropped from datastore queue"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/util/network.c:1204
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+#: src/datastore/datastore_api.c:513
+msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/util/os_installation.c:299
-#, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+#: src/datastore/datastore_api.c:540
+msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/util/os_installation.c:486
-#, fuzzy, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
+#: src/datastore/datastore_api.c:608
+#, fuzzy
+msgid "# transmission request failures"
+msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/util/os_installation.c:492
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "`%s' schlug fehl: %s\n"
+#: src/datastore/datastore_api.c:631
+#, fuzzy
+msgid "# bytes sent to datastore"
+msgstr "# bytes in der Datenbank"
 
-#: src/util/strings.c:143
-msgid "b"
-msgstr "b"
-
-#: src/util/strings.c:354
-#, c-format
-msgid "Character sets requested were `%s'->`%s'\n"
+#: src/datastore/datastore_api.c:772
+#, fuzzy
+msgid "Failed to receive status response from database."
 msgstr ""
+"\n"
+"Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/util/strings.c:462
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+#: src/datastore/datastore_api.c:786
+msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/util/strings.c:554
-msgid "ms"
-msgstr "ms"
+#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+#, fuzzy
+msgid "Invalid error message received from datastore service"
+msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/util/strings.c:559
-msgid "eternity"
-msgstr ""
+#: src/datastore/datastore_api.c:810
+#, fuzzy
+msgid "# status messages received"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/util/strings.c:563
-msgid "s"
-msgstr "s"
+#: src/datastore/datastore_api.c:883
+#, fuzzy
+msgid "# PUT requests executed"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/util/strings.c:567
-msgid "m"
-msgstr "m"
+#: src/datastore/datastore_api.c:954
+#, fuzzy
+msgid "# RESERVE requests executed"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/util/strings.c:571
-msgid "h"
-msgstr "h"
-
-#: src/util/strings.c:575
-msgid " days"
-msgstr " Tage"
-
-#: src/util/strings.c:599
-msgid "end of time"
+#: src/datastore/datastore_api.c:1019
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/util/server.c:388
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
+#: src/datastore/datastore_api.c:1080
+#, fuzzy
+msgid "# UPDATE requests executed"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/util/server.c:397
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
+#: src/datastore/datastore_api.c:1148
+#, fuzzy
+msgid "# REMOVE requests executed"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/util/server.c:402
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
-
-#: src/util/server.c:617
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+#: src/datastore/datastore_api.c:1193
+#, fuzzy
+msgid "Failed to receive response from database.\n"
 msgstr ""
+"\n"
+"Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/util/crypto_random.c:280
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
+#: src/datastore/datastore_api.c:1253
+#, fuzzy
+msgid "# Results received"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/datastore/datastore_api.c:1324
+msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/util/crypto_random.c:308
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
+#: src/datastore/datastore_api.c:1391
+msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
-"libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/disk.c:479
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%S': %u\n"
-msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
+#: src/datastore/datastore_api.c:1455
+#, fuzzy
+msgid "# GET requests executed"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/util/disk.c:883
-#, fuzzy, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
+#: src/datastore/gnunet-service-datastore.c:351
+#, fuzzy
+msgid "# bytes expired"
+msgstr "# Bytes empfangen über TCP"
 
-#: src/util/disk.c:1235 src/util/service.c:1541
-#, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
+#: src/datastore/gnunet-service-datastore.c:426
+msgid "# bytes purged (low-priority)"
+msgstr ""
 
-#: src/util/disk.c:1553
-#, fuzzy, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
-msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
-
-#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
-#: src/util/service.c:207 src/util/service.c:214
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Ungültiges Format für IP: `%s'\n"
-
-#: src/util/service.c:170
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
-
-#: src/util/service.c:263
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
-
-#: src/util/service.c:296
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Falsches Format `%s' für Netzmaske: %s\n"
-
-#: src/util/service.c:326
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Falsches Format `%s' für Netzwerk: %s\n"
-
-#: src/util/service.c:629
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
+#: src/datastore/gnunet-service-datastore.c:486
+msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/util/service.c:634
-#, fuzzy, c-format
-msgid "Unknown address family %d\n"
-msgstr "Unbekannte Operation `%s'\n"
-
-#: src/util/service.c:641
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
+#: src/datastore/gnunet-service-datastore.c:640
+msgid "# results found"
 msgstr ""
 
-#: src/util/service.c:685
+#: src/datastore/gnunet-service-datastore.c:685
 #, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgid ""
+"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/util/service.c:713
+#: src/datastore/gnunet-service-datastore.c:696
 #, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/util/service.c:830
-#, c-format
+#: src/datastore/gnunet-service-datastore.c:700
 msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:2228
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+#: src/datastore/gnunet-service-datastore.c:706
+msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/util/service.c:880 src/util/client.c:707
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:765
+#: src/datastore/gnunet-service-datastore.c:986
+#: src/datastore/gnunet-service-datastore.c:1465
+msgid "# reserved"
 msgstr ""
 
-#: src/util/service.c:900
-#, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+#: src/datastore/gnunet-service-datastore.c:780
+msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/util/service.c:917
+#: src/datastore/gnunet-service-datastore.c:868
 #, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/util/service.c:947 src/transport/plugin_transport_http.c:1057
-#, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+#: src/datastore/gnunet-service-datastore.c:1034
+#, fuzzy
+msgid "# GET requests received"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/util/service.c:964 src/transport/plugin_transport_http.c:1074
-#, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "Fehler beim Binden an UDP Port %d.\n"
+#: src/datastore/gnunet-service-datastore.c:1048
+msgid "# requests filtered by bloomfilter"
+msgstr ""
 
-#: src/util/service.c:1152
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
+#: src/datastore/gnunet-service-datastore.c:1076
+#, fuzzy
+msgid "# UPDATE requests received"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/datastore/gnunet-service-datastore.c:1110
+#, fuzzy
+msgid "# GET REPLICATION requests received"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/datastore/gnunet-service-datastore.c:1145
+#, fuzzy
+msgid "# GET ZERO ANONYMITY requests received"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/datastore/gnunet-service-datastore.c:1172
+#, fuzzy
+msgid "Content not found"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/datastore/gnunet-service-datastore.c:1182
+msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/util/service.c:1203 src/util/service.c:1221
+#: src/datastore/gnunet-service-datastore.c:1216
+#, fuzzy
+msgid "# REMOVE requests received"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/datastore/gnunet-service-datastore.c:1260
 #, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/util/service.c:1248
+#: src/datastore/gnunet-service-datastore.c:1323
 #, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/util/service.c:1403
+#: src/datastore/gnunet-service-datastore.c:1332
 #, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+msgid "Failed to load datastore plugin for `%s'\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/util/service.c:1436
+#: src/datastore/gnunet-service-datastore.c:1536
 #, fuzzy, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
+msgid "# bytes used in file-sharing datastore `%s'"
+msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/util/service.c:1482
-msgid "Service process failed to initialize\n"
+#: src/datastore/gnunet-service-datastore.c:1547
+msgid "# quota"
 msgstr ""
 
-#: src/util/service.c:1486
-msgid "Service process could not initialize server function\n"
+#: src/datastore/gnunet-service-datastore.c:1549
+msgid "# cache size"
 msgstr ""
 
-#: src/util/service.c:1490
-msgid "Service process failed to report status\n"
+#: src/datastore/gnunet-service-datastore.c:1562
+#, c-format
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/util/service.c:1542
-msgid "No such user"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1580
+#: src/datastore/gnunet-service-datastore.c:1596
+#, fuzzy, c-format
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/util/service.c:1555
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
+#: src/datastore/gnunet-service-datastore.c:1626
+#, fuzzy
+msgid "Failed to initialize bloomfilter.\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/util/service.c:1618
-msgid "do daemonize (detach from terminal)"
+#: src/datastore/gnunet-service-datastore.c:1655
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:76
-msgid "Test GNUnet DNS resolver code."
+#: src/datastore/gnunet-service-datastore.c:1660
+msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:507
-#, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
+#: src/datastore/gnunet-service-datastore.c:1663
+msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/util/os_priority.c:117
-#, c-format
-msgid "Not installing a handler because $%s=%s\n"
+#: src/datastore/plugin_datastore_mysql.c:529
+#: src/datastore/plugin_datastore_mysql.c:1336
+#, fuzzy, c-format
+msgid "Failed to prepare statement `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/datastore/plugin_datastore_mysql.c:622
+#: src/datastore/plugin_datastore_mysql.c:1346
+#, fuzzy, c-format
+msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
+msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
+
+#: src/datastore/plugin_datastore_mysql.c:1581
+msgid "Mysql database running\n"
 msgstr ""
 
-#: src/util/resolver_api.c:202
+#: src/datastore/plugin_datastore_postgres.c:173
 #, fuzzy, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
-msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
+msgid "Unable to initialize Postgres with configuration `%s': %s"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/util/resolver_api.c:221
-#, fuzzy, c-format
-msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+#: src/datastore/plugin_datastore_postgres.c:1017
+msgid "Postgres database running\n"
 msgstr ""
-"Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
-"positive Zahl angeben.\n"
 
-#: src/util/resolver_api.c:358
+#: src/datastore/plugin_datastore_sqlite.c:61
 #, fuzzy, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
+msgid "`%s' failed at %s:%u with error: %s"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/util/resolver_api.c:362
+#: src/datastore/plugin_datastore_sqlite.c:239
+#: src/namestore/plugin_namestore_sqlite.c:223
 #, fuzzy, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "Option `%s' in section `%s' missing in configuration!\n"
+msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/util/resolver_api.c:430
+#: src/datastore/plugin_datastore_sqlite.c:266
+#: src/namestore/plugin_namestore_sqlite.c:248
 #, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
-msgstr ""
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/util/resolver_api.c:791
-#, c-format
-msgid "Resolver returns `%s'.\n"
-msgstr ""
+#: src/datastore/plugin_datastore_sqlite.c:669
+#, fuzzy
+msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
 
-#: src/util/resolver_api.c:875
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
+#: src/datastore/plugin_datastore_sqlite.c:1159
+msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/util/resolver_api.c:880
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s\n"
-msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
-
-#: src/util/resolver_api.c:912
+#: src/datastore/plugin_datastore_sqlite.c:1178
 #, c-format
-msgid "Resolving our hostname `%s'\n"
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/util/pseudonym.c:273
-#, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
-
-#: src/util/pseudonym.c:337
+#: src/datastore/plugin_datastore_sqlite.c:1218
+#: src/namestore/plugin_namestore_sqlite.c:779
 #, fuzzy
-msgid "no-name"
-msgstr "Name anzeigen"
+msgid "Sqlite database running\n"
+msgstr "sqlite Datenspeicher"
 
-#: src/util/gnunet-service-resolver.c:261
-#, fuzzy, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
-
-#: src/util/gnunet-service-resolver.c:317
-#: src/util/gnunet-service-resolver.c:362
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
-
-#: src/util/gnunet-service-resolver.c:460
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
+#: src/datastore/plugin_datastore_template.c:241
+msgid "Template database running\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:508
-#, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
-msgstr ""
-
-#: src/util/bio.c:136 src/util/bio.c:142
-#, fuzzy, c-format
-msgid "Error reading `%s': %s"
-msgstr "Fehler beim Anlegen des Benutzers"
-
-#: src/util/bio.c:143
+#: src/dht/dht_api.c:280
 #, fuzzy
-msgid "End of file"
-msgstr "Eine Konfigurationsdatei laden"
+msgid "Failed to connect to the DHT service!\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/bio.c:195
-#, c-format
-msgid "Error reading length of string `%s'"
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
+#: src/gns/gnunet-gns-lookup.c:185
+msgid "the query key"
 msgstr ""
 
-#: src/util/bio.c:205
-#, c-format
-msgid "String `%s' longer than allowed (%u > %u)"
+#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:188
+msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/util/bio.c:250
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+#: src/dht/gnunet-dht-get.c:207 src/gns/gnunet-gns-lookup.c:191
+msgid "the type of data to look for"
 msgstr ""
 
-#: src/util/bio.c:264
-#, c-format
-msgid "Metadata `%s' failed to deserialize"
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
+#: src/gns/gnunet-gns-lookup.c:194
+msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/util/client.c:301
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
+#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
+#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
+#: src/gns/gnunet-gns-lookup.c:197 src/nse/gnunet-nse-profiler.c:908
+msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/util/client.c:309
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+#: src/dht/gnunet-dht-get.c:232
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/util/client.c:647
-msgid "Failure to transmit TEST request.\n"
+#: src/dht/gnunet-dht-put.c:100
+#, fuzzy
+msgid "PUT request sent!\n"
+msgstr "# gap Anfragen insgesamt empfangen"
+
+#: src/dht/gnunet-dht-put.c:124
+msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/util/client.c:849
+#: src/dht/gnunet-dht-put.c:132
 #, fuzzy, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
+msgid "Could not connect to %s service!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/util/client.c:865
+#: src/dht/gnunet-dht-put.c:137
 #, fuzzy, c-format
-msgid "Failure to transmit request to service `%s'\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+msgid "Connected to %s service!\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/util/client.c:1133
-msgid "Could not submit request, not expecting to receive a response.\n"
+#: src/dht/gnunet-dht-put.c:152
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
-#, fuzzy, c-format
-msgid "Could not aquire lock on file `%s': %s...\n"
-msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
+#: src/dht/gnunet-dht-put.c:166
+msgid "the data to insert under the key"
+msgstr ""
 
-#: src/util/crypto_rsa.c:623
-#, fuzzy
-msgid "Creating a new private key.  This may take a while.\n"
-msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
-
-#: src/util/crypto_rsa.c:641
-#, c-format
-msgid "I am host `%s'.  Stored new private key in `%s'.\n"
+#: src/dht/gnunet-dht-put.c:169
+msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
-msgid "This may be ok if someone is currently generating a hostkey.\n"
+#: src/dht/gnunet-dht-put.c:175
+msgid "how many replicas to create"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
-#, c-format
-msgid ""
-"When trying to read hostkey file `%s' I found %u bytes but I need at least "
-"%u.\n"
+#: src/dht/gnunet-dht-put.c:178
+msgid "the type to insert data as"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
-#, fuzzy, c-format
-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
-msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
-
-#: src/util/crypto_rsa.c:738
-#, fuzzy, c-format
-msgid "I am host `%s'.  Read private key from `%s'.\n"
-msgstr "Aufruf von `%s' mit Schlüssel `%s'.\n"
-
-#: src/util/crypto_rsa.c:959
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
-
-#: src/nse/gnunet-nse-profiler.c:882 src/dht/gnunet-dht-get.c:213
-#: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:596
-#: src/fs/gnunet-download.c:263
-msgid "be verbose (print progress information)"
+#: src/dht/gnunet-dht-put.c:203
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:900
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:588
+#: src/testing/testing.c:2087 src/testing/testing.c:2121
 #, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "Auf den Dienst konnte nicht zugegriffen werden"
+msgid "Failed to connect to transport service!\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/nse/gnunet-service-nse.c:938
-#, c-format
-msgid "Proof of work invalid: %llu!\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_clients.c:371
+#, fuzzy
+msgid "# GET requests from clients injected"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/nse/gnunet-service-nse.c:1393 src/nse/gnunet-service-nse.c:1412
-#: src/nse/gnunet-service-nse.c:1433
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_clients.c:462
+#, fuzzy
+msgid "# PUT requests received from clients"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/nse/gnunet-service-nse.c:1400
+#: src/dht/gnunet-service-dht_clients.c:529
 #, fuzzy
-msgid "Invalid work requirement for NSE service. Exiting.\n"
-msgstr "Ungültige Parameter. Abbruch.\n"
+msgid "# GET requests received from clients"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/nse/gnunet-service-nse.c:1421
+#: src/dht/gnunet-service-dht_clients.c:624
 #, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+msgid "# GET STOP requests received from clients"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
-#, 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:195
-msgid "# peers known"
+#: src/dht/gnunet-service-dht_clients.c:854
+msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+#: src/dht/gnunet-service-dht_clients.c:869
+msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
-"Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
-"Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/dht/gnunet-service-dht_clients.c:906
 #, fuzzy, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
+msgid "Unsupported block type (%u) in request!\n"
+msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:258
-#, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
-
-#: src/peerinfo/peerinfo_api.c:279
-#, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
-
-#: src/peerinfo/peerinfo_api.c:435
+#: src/dht/gnunet-service-dht_clients.c:928
 #, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
+msgid "# RESULTS queued for clients"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
-#, fuzzy
-msgid "Received invalid message from `PEERINFO' service.\n"
-msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
+#: src/dht/gnunet-service-dht_clients.c:979
+#: src/dht/gnunet-service-dht_clients.c:1022
+msgid "# REPLIES ignored for CLIENTS (no match)"
+msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:523
+#: src/dht/gnunet-service-dht_clients.c:989
 #, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+msgid "Could not pass reply to client, message too big!\n"
+msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/peerinfo/peerinfo_api.c:557
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_datacache.c:93
+#, fuzzy, c-format
+msgid "%s request received, but have no datacache!\n"
+msgstr "# Bytes empfangen über TCP"
 
-#: src/datacache/plugin_datacache_sqlite.c:424
-msgid "Sqlite datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:103
+msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/datacache/datacache.c:183
-#, c-format
-msgid "Loading `%s' datacache plugin\n"
+#: src/dht/gnunet-service-dht_datacache.c:209
+msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/datacache.c:191
-#, fuzzy, c-format
-msgid "Failed to load datacache plugin for `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#: src/datacache/datacache.c:281
-#, fuzzy
-msgid "# requests received"
-msgstr "# Client Trace-Anfragen empfangen"
-
-#: src/datacache/datacache.c:291
-msgid "# requests filtered by bloom filter"
+#: src/dht/gnunet-service-dht_datacache.c:220
+msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
-
-#: src/datacache/plugin_datacache_postgres.c:500
-msgid "Postgres datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:226
+msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/plugin_datacache_template.c:121
-msgid "Template datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:238
+msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:979
-msgid "MySQL datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:241
+#, c-format
+msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
+#: src/dht/gnunet-service-dht_datacache.c:271
+#, fuzzy
+msgid "# GET requests given to datacache"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/dht/gnunet-service-dht_hello.c:82
+#, fuzzy
+msgid "# HELLOs obtained from peerinfo"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
 #: src/dht/gnunet-service-dht_neighbours.c:481
 msgid "# Preference updates given to core"
 msgstr ""
@@ -1515,459 +1472,351 @@
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/dht_api.c:282
+#: src/dht/gnunet-service-dht_nse.c:59
 #, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+msgid "# Network size estimates received"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht.c:163
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
-msgid "the query key"
+#: src/dht/gnunet-service-dht_routing.c:211
+msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204
-msgid "how many parallel requests (replicas) to create"
+#: src/dht/gnunet-service-dht_routing.c:220
+msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207
-msgid "the type of data to look for"
+#: src/dht/gnunet-service-dht_routing.c:226
+msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
-msgid "how long to execute this query before giving up?"
+#: src/dht/gnunet-service-dht_routing.c:236
+msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:232
-msgid "Issue a GET request to the GNUnet DHT, prints results."
+#: src/dht/gnunet-service-dht_routing.c:314
+#: src/dht/gnunet-service-dht_routing.c:368
+msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:371
-#, fuzzy
-msgid "# GET requests from clients injected"
-msgstr "# Client Trace-Anfragen empfangen"
-
-#: src/dht/gnunet-service-dht_clients.c:462
-#, fuzzy
-msgid "# PUT requests received from clients"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:529
-#, fuzzy
-msgid "# GET requests received from clients"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:624
-#, fuzzy
-msgid "# GET STOP requests received from clients"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:854
-msgid "# Key match, type mismatches in REPLY to CLIENT"
+#: src/dht/gnunet-service-dht_routing.c:324
+msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:869
-msgid "# Duplicate REPLIES to CLIENT request dropped"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:906
+#: src/dht/plugin_block_dht.c:124
 #, fuzzy, c-format
-msgid "Unsupported block type (%u) in request!\n"
-msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
+msgid "Block not of type %u\n"
+msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:928
-#, fuzzy
-msgid "# RESULTS queued for clients"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:979
-#: src/dht/gnunet-service-dht_clients.c:1022
-msgid "# REPLIES ignored for CLIENTS (no match)"
+#: src/dht/plugin_block_dht.c:131
+msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
-#, fuzzy
-msgid "Could not pass reply to client, message too big!\n"
-msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
-
-#: src/dht/gnunet-service-dht_nse.c:59
-#, fuzzy
-msgid "# Network size estimates received"
-msgstr "# Client Trace-Anfragen empfangen"
-
-#: src/dht/gnunet-dht-put.c:100
-#, fuzzy
-msgid "PUT request sent!\n"
-msgstr "# gap Anfragen insgesamt empfangen"
-
-#: src/dht/gnunet-dht-put.c:124
-msgid "Must provide KEY and DATA for DHT put!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:132
-#, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
-
-#: src/dht/gnunet-dht-put.c:137
-#, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
-
-#: src/dht/gnunet-dht-put.c:152
+#: src/dht/plugin_block_dht.c:140
 #, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:166
-msgid "the data to insert under the key"
+#: src/dns/gnunet-dns-monitor.c:337
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:169
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/dns/gnunet-dns-monitor.c:340
+msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:175
-msgid "how many replicas to create"
+#: src/dns/gnunet-dns-monitor.c:348
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:178
-msgid "the type to insert data as"
+#: src/dns/gnunet-dns-redirector.c:236
+msgid "set A records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:203
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+#: src/dns/gnunet-dns-redirector.c:239
+msgid "set AAAA records"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:211
-msgid "# Good REPLIES matched against routing table"
+#: src/dns/gnunet-dns-redirector.c:247
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Duplicate REPLIES matched against routing table"
-msgstr ""
+#: src/dns/gnunet-service-dns.c:480
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/dht/gnunet-service-dht_routing.c:226
-msgid "# Invalid REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:634
+msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:236
-msgid "# Unsupported REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:818
+msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:314
-#: src/dht/gnunet-service-dht_routing.c:368
-msgid "# Entries removed from routing table"
+#: src/dns/gnunet-service-dns.c:1001
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
-msgid "# Entries added to routing table"
+#: src/dns/gnunet-service-dns.c:1046
+msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:93
-#, fuzzy, c-format
-msgid "%s request received, but have no datacache!\n"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/dht/gnunet-service-dht_datacache.c:103
-msgid "# ITEMS stored in datacache"
+#: src/dns/gnunet-service-dns.c:1165
+msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:209
-msgid "# Good RESULTS found in datacache"
+#: src/dns/gnunet-service-dns.c:1198
+msgid "Changing DNS reply according to client specifications\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:220
-msgid "# Duplicate RESULTS found in datacache"
+#: src/dns/gnunet-service-dns.c:1279
+msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:226
-msgid "# Invalid RESULTS found in datacache"
+#: src/dns/gnunet-service-dns.c:1294
+msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
-msgid "# Unsupported RESULTS found in datacache"
+#: src/dns/gnunet-service-dns.c:1303
+#, c-format
+msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:241
-#, c-format
-msgid "Unsupported block type (%u) in local response!\n"
+#: src/dns/gnunet-service-dns.c:1312
+msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:271
+#: src/dns/gnunet-service-dns.c:1377
 #, fuzzy
-msgid "# GET requests given to datacache"
-msgstr "# Client Trace-Anfragen empfangen"
-
-#: src/dht/gnunet-service-dht_hello.c:82
-#, fuzzy
-msgid "# HELLOs obtained from peerinfo"
+msgid "# DNS requests received via TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/arm/gnunet-arm.c:149
-#, fuzzy, c-format
-msgid "Service `%s' is unknown to ARM.\n"
-msgstr "Namespace `%s' hat das Rating %d.\n"
+#: src/dns/gnunet-service-dns.c:1461
+#, c-format
+msgid "Configured DNS exit `%s' is not working / valid.\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:154
-#, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "Dienst gelöscht.\n"
+#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2671
+msgid "# Inbound MESH tunnels created"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:157
-#, fuzzy, c-format
-msgid "Service `%s' was already running.\n"
-msgstr "Diese Suche läuft bereits!\n"
+#: src/dns/gnunet-service-dns.c:1567
+msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:162
-#, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "Dienst gelöscht.\n"
+#: src/dv/dv_api.c:179
+#, fuzzy
+msgid "Failed to connect to the dv service!\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/dv/plugin_transport_dv.c:159
 #, fuzzy, c-format
-msgid "Service `%s' was already being stopped.\n"
-msgstr "Dienst gelöscht.\n"
+msgid "%s Received message from %s of type %d, distance %u!\n"
+msgstr "Beschädigte Nachricht von Knoten `%s' in %s:%d empfangen.\n"
 
-#: src/arm/gnunet-arm.c:169
-#, fuzzy, c-format
-msgid "Service `%s' was already not running.\n"
-msgstr "Diese Suche läuft bereits!\n"
+#: src/exit/gnunet-daemon-exit.c:508
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:173
+#: src/exit/gnunet-daemon-exit.c:563
 #, fuzzy
-msgid "Request ignored as ARM is shutting down.\n"
-msgstr "`%s' fährt herunter.\n"
+msgid "# Bytes transmitted via mesh tunnels"
+msgstr "# Bytes des Typs %d übertragen"
 
-#: src/arm/gnunet-arm.c:177
-#, fuzzy
-msgid "Error communicating with ARM service.\n"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+#: src/exit/gnunet-daemon-exit.c:678 src/exit/gnunet-daemon-exit.c:2066
+#: src/exit/gnunet-daemon-exit.c:2316 src/vpn/gnunet-service-vpn.c:1388
+#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+msgid "# ICMPv4 packets dropped (type not allowed)"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:181
-#, fuzzy
-msgid "Timeout communicating with ARM service.\n"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+#: src/exit/gnunet-daemon-exit.c:714 src/exit/gnunet-daemon-exit.c:2125
+#: src/exit/gnunet-daemon-exit.c:2375 src/vpn/gnunet-service-vpn.c:1444
+#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+msgid "# ICMPv6 packets dropped (type not allowed)"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:185
-#, fuzzy
-msgid "Operation failed.\n"
-msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+#: src/exit/gnunet-daemon-exit.c:754
+msgid "# ICMP packets dropped (not allowed)"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:189
-msgid "Unknown response code from ARM.\n"
+#: src/exit/gnunet-daemon-exit.c:761
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
-#, fuzzy, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
+#: src/exit/gnunet-daemon-exit.c:838
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
-"Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in der "
-"Sektion `%s' angegeben werden.\n"
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
-msgid "Fatal error initializing ARM API.\n"
+#: src/exit/gnunet-daemon-exit.c:913
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
-#, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+#: src/exit/gnunet-daemon-exit.c:966
+#, fuzzy
+msgid "# Packets received from TUN"
+msgstr "# Bytes empfangen über HTTP"
 
-#: src/arm/gnunet-arm.c:253
-#, fuzzy, c-format
-msgid "Failed to remove servicehome directory %s\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+#: src/exit/gnunet-daemon-exit.c:980
+#, fuzzy
+msgid "# Bytes received from TUN"
+msgstr "# Bytes empfangen über HTTP"
 
-#: src/arm/gnunet-arm.c:355
-msgid "stop all GNUnet services"
+#: src/exit/gnunet-daemon-exit.c:1006
+msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:357
-msgid "start a particular service"
+#: src/exit/gnunet-daemon-exit.c:1033
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
-msgid "stop a particular service"
+#: src/exit/gnunet-daemon-exit.c:1079
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
-msgid "start all GNUnet default services"
+#: src/exit/gnunet-daemon-exit.c:1087
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:364
-msgid "stop and start all GNUnet default services"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1468
+#, fuzzy
+msgid "# TCP packets sent via TUN"
+msgstr "# Bytes gesendet über UDP"
 
-#: src/arm/gnunet-arm.c:367
-msgid "delete config file and directory on exit"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1568
+#, fuzzy
+msgid "# TCP service creation requests received via mesh"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/arm/gnunet-arm.c:369
-msgid "don't print status messages"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:372
+#: src/exit/gnunet-daemon-exit.c:1571 src/exit/gnunet-daemon-exit.c:1650
+#: src/exit/gnunet-daemon-exit.c:1760 src/exit/gnunet-daemon-exit.c:1990
+#: src/exit/gnunet-daemon-exit.c:2232 src/exit/gnunet-daemon-exit.c:2513
+#: src/exit/gnunet-daemon-exit.c:2613
 #, fuzzy
-msgid "timeout for completing current operation"
-msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
+msgid "# Bytes received from MESH"
+msgstr "# Bytes empfangen über HTTP"
 
-#: src/arm/gnunet-arm.c:383
-msgid "Control services and the Automated Restart Manager (ARM)"
+#: src/exit/gnunet-daemon-exit.c:1604 src/exit/gnunet-daemon-exit.c:2635
+#, c-format
+msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:959
+#: src/exit/gnunet-daemon-exit.c:1608
 #, fuzzy
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr "Fehler beim Starten der Collection.\n"
+msgid "# TCP requests dropped (no such service)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/arm/mockup-service.c:46
-msgid "Transmitting shutdown ACK.\n"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1653
+#, fuzzy
+msgid "# TCP IP-exit creation requests received via mesh"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/arm/mockup-service.c:69
-msgid "Initiating shutdown as requested by client.\n"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1763
+#, fuzzy
+msgid "# TCP data requests received via mesh"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/arm/gnunet-service-arm.c:320
-#, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+#: src/exit/gnunet-daemon-exit.c:1777
+#, fuzzy
+msgid "# TCP DATA requests dropped (no session)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/arm/gnunet-service-arm.c:323
-#, fuzzy, c-format
-msgid "Starting service `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
+#: src/exit/gnunet-daemon-exit.c:1827
+#, fuzzy
+msgid "# ICMP packets sent via TUN"
+msgstr "# Bytes gesendet über UDP"
 
-#: src/arm/gnunet-service-arm.c:349
+#: src/exit/gnunet-daemon-exit.c:1993
 #, fuzzy
-msgid "Could not send status result to client\n"
-msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
+msgid "# ICMP IP-exit requests received via mesh"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/arm/gnunet-service-arm.c:476
-#, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "Fehler beim Anlegen des Benutzerkontos:"
+#: src/exit/gnunet-daemon-exit.c:2235
+#, fuzzy
+msgid "# ICMP service requests received via mesh"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/arm/gnunet-service-arm.c:498
-#, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+#: src/exit/gnunet-daemon-exit.c:2301 src/vpn/gnunet-service-vpn.c:1378
+#: src/vpn/gnunet-service-vpn.c:1945
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:512
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:2360 src/vpn/gnunet-service-vpn.c:1414
+#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:620
-#, fuzzy, c-format
-msgid "Preparing to stop `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
+#: src/exit/gnunet-daemon-exit.c:2410
+#, fuzzy
+msgid "# UDP packets sent via TUN"
+msgstr "# Bytes gesendet über UDP"
 
-#: src/arm/gnunet-service-arm.c:774
-#, fuzzy, c-format
-msgid "Restarting service `%s'.\n"
-msgstr "Collection `%s' begonnen.\n"
+#: src/exit/gnunet-daemon-exit.c:2516
+#, fuzzy
+msgid "# UDP IP-exit requests received via mesh"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/arm/gnunet-service-arm.c:869
-msgid "exit"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2616
+#, fuzzy
+msgid "# UDP service requests received via mesh"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/arm/gnunet-service-arm.c:874
-msgid "signal"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:879
+#: src/exit/gnunet-daemon-exit.c:2639
 #, fuzzy
-msgid "unknown"
-msgstr "Unbekannter Fehler"
+msgid "# UDP requests dropped (no such service)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/arm/gnunet-service-arm.c:913
+#: src/exit/gnunet-daemon-exit.c:2879
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1052
-#, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not valid: %s\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
-#: src/arm/gnunet-service-arm.c:1054
-msgid "option missing"
+#: src/exit/gnunet-daemon-exit.c:2893 src/exit/gnunet-daemon-exit.c:2905
+#, c-format
+msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1131
-#, fuzzy, c-format
-msgid "Starting default services `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
-
-#: src/arm/gnunet-service-arm.c:1142
+#: src/exit/gnunet-daemon-exit.c:2916
 #, c-format
-msgid "Default service `%s' not configured correctly!\n"
+msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1156
+#: src/exit/gnunet-daemon-exit.c:3045
 msgid ""
-"No default services configured, GNUnet will not really start right now.\n"
+"This system does not support IPv4, will disable IPv4 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/arm/arm_api.c:187
-#, fuzzy
-msgid "Failed to transmit shutdown request to client.\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/arm/arm_api.c:378
-#, fuzzy, c-format
-msgid "Configuration failes to specify option `%s' in section `%s'!\n"
+#: src/exit/gnunet-daemon-exit.c:3053
+msgid ""
+"This system does not support IPv6, will disable IPv6 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/arm/arm_api.c:392
-#, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+#: src/exit/gnunet-daemon-exit.c:3060
+msgid ""
+"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
+"ENABLE_IPv4=YES\n"
 msgstr ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/arm/arm_api.c:465
-#, fuzzy, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
-msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
-
-#: src/arm/arm_api.c:521
-#, c-format
-msgid "Requesting start of service `%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:3066
+msgid ""
+"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
+"ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/arm/arm_api.c:522
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:3072 src/pt/gnunet-daemon-pt.c:884
+msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:544
-#, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
+#: src/exit/gnunet-daemon-exit.c:3233
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/arm/arm_api.c:546
-#, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:579
-#, fuzzy, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
-msgstr "`%s': Nachricht wurde nicht innerhalb %llu ms empfangen.\n"
-
-#: src/arm/arm_api.c:652
-#, fuzzy, c-format
-msgid "Stopping service `%s' within %llu ms\n"
-msgstr "Keine Antwort innerhalb %llums erhalten.\n"
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -2018,261 +1867,342 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/statistics/gnunet-service-statistics.c:207
+#: src/fs/fs_api.c:284
 #, fuzzy, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
-msgstr "Dateien aus dem GNUnet herunterladen."
+msgid "Could not open file `%s': %s"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/statistics/gnunet-service-statistics.c:263
+#: src/fs/fs_api.c:293
 #, fuzzy, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
-msgstr "Dateien aus dem GNUnet herunterladen."
+msgid "Could not read file `%s': %s"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/statistics/statistics_api.c:390
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+#: src/fs/fs_api.c:299
+#, c-format
+msgid "Short read reading from file `%s'!"
+msgstr ""
 
-#: src/statistics/gnunet-statistics.c:98
-#, fuzzy
-msgid "Failed to obtain statistics.\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
-
-#: src/statistics/gnunet-statistics.c:126 src/fs/gnunet-pseudonym.c:151
+#: src/fs/fs_api.c:877
 #, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
+msgid "Failed to resume publishing information `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/statistics/gnunet-statistics.c:164
-msgid "limit output to statistics for the given NAME"
+#: src/fs/fs_api.c:1334
+#, c-format
+msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:167
-msgid "make the value being set persistent"
+#: src/fs/fs_api.c:1376
+#, c-format
+msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:170
-msgid "limit output to the given SUBSYSTEM"
-msgstr ""
+#: src/fs/fs_api.c:1392
+#, fuzzy, c-format
+msgid "Failed to resume publishing operation `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/statistics/gnunet-statistics.c:173
-msgid "just print the statistics value"
+#: src/fs/fs_api.c:2004
+#, c-format
+msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:180
-msgid "Print statistics about GNUnet operations."
-msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
+#: src/fs/fs_api.c:2014
+#, fuzzy, c-format
+msgid "Failed to resume unindexing operation `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-unindex.c:89
+#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#, fuzzy, c-format
+msgid "Failed to resume sub-download `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/fs/fs_api.c:2156
+#, fuzzy, c-format
+msgid "Failed to resume sub-search `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
 #, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:96
-#, fuzzy, c-format
-msgid "Error unindexing: %s.\n"
+#: src/fs/fs_api.c:2369
+#, c-format
+msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
-"\n"
-"Fehler beim Deindizieren der Datei: %s\n"
 
-#: src/fs/gnunet-unindex.c:101
-#, fuzzy
-msgid "Unindexing done.\n"
-msgstr "Dateien deindizieren."
+#: src/fs/fs_api.c:2615
+msgid "Could not resume running search, will resume as paused search\n"
+msgstr ""
 
-#: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
-#: src/fs/gnunet-publish.c:163 src/fs/gnunet-download.c:144
+#: src/fs/fs_api.c:2709
 #, c-format
-msgid "Unexpected status: %d\n"
+msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:131
-#, fuzzy, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
-msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
+#: src/fs/fs_directory.c:210
+#, fuzzy
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
-#: src/fs/gnunet-publish.c:417 src/fs/gnunet-download.c:203
-#, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
-
-#: src/fs/gnunet-unindex.c:148
+#: src/fs/fs_download.c:313
 #, fuzzy
-msgid "Could not start unindex operation.\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+msgid ""
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
+msgstr "Rekursiver Download des Verzeichnisses `%s' bei %llu von %llu Bytes.\n"
 
-#: src/fs/gnunet-unindex.c:176
-msgid "Unindex a file that was previously indexed with gnunet-publish."
+#: src/fs/fs_download.c:333
+msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:165
+#: src/fs/fs_download.c:491 src/fs/fs_download.c:503
 #, fuzzy, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr "Namespace `%s' hat das Rating %d.\n"
+msgid "Failed to open file `%s' for writing"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
+#: src/fs/fs_download.c:877
 #, fuzzy, c-format
-msgid "Option `%s' ignored\n"
-msgstr "%s: Option `%s' ist mehrdeutig\n"
+msgid "Failed to create directory for recursive download of `%s'\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:543
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
+#: src/fs/fs_download.c:963
+#, c-format
+msgid ""
+"Internal error or bogus download URI (expected %u bytes at depth %u and "
+"offset %llu/%llu, got %u bytes)\n"
+msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:272
-msgid "create or advertise namespace NAME"
+#: src/fs/fs_download.c:989
+msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
-msgid "delete namespace NAME "
+#: src/fs/fs_download.c:1012
+#, fuzzy, c-format
+msgid "Download failed: could not open file `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/fs/fs_download.c:1024
+#, fuzzy, c-format
+msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/fs/fs_download.c:1033
+#, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/fs_download.c:1875
 #, fuzzy
+msgid "Invalid URI"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/fs/fs_getopt.c:191
+#, c-format
 msgid ""
-"add an additional keyword for the advertisment (this option can be specified "
-"multiple times)"
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
-"Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
-"(diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:562
-msgid "set the meta-data for the given TYPE to the given VALUE"
-msgstr ""
-"Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
-"setzen"
+#: src/fs/fs_list_indexed.c:90
+#, fuzzy, c-format
+msgid "Failed to receive response for `%s' request from `%s' service.\n"
+msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/fs/gnunet-pseudonym.c:285
-#, fuzzy
-msgid "print names of local namespaces"
-msgstr "das Rating eines Namespaces setzen"
+#: src/fs/fs_list_indexed.c:113
+#, fuzzy, c-format
+msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
+msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/fs/gnunet-pseudonym.c:288
-msgid "use the given PRIORITY for the advertisments"
-msgstr ""
+#: src/fs/fs_list_indexed.c:151
+#, fuzzy, c-format
+msgid "Failed to not connect to `%s' service.\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-pseudonym.c:291
-msgid "do not print names of remote namespaces"
-msgstr ""
+#: src/fs/fs_misc.c:126
+#, fuzzy, c-format
+msgid "Did not find mime type `%s' in extension list.\n"
+msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:581
-msgid "set the desired replication LEVEL"
-msgstr ""
+#: src/fs/fs_namespace_advertise.c:150
+#, fuzzy
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/fs_namespace_advertise.c:238 src/fs/fs_namespace_advertise.c:259
 #, fuzzy
-msgid "specify ID of the root of the namespace"
-msgstr "das Rating eines Namespaces setzen"
+msgid "Failed to serialize meta data"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/fs_namespace_advertise.c:278
 #, fuzzy
-msgid "change rating of namespace ID by VALUE"
-msgstr "das Rating eines Namespaces setzen"
+msgid "Failed to connect to datastore service"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/gnunet-pseudonym.c:308
-msgid "Manage GNUnet pseudonyms."
-msgstr ""
-
-#: src/fs/fs_namespace.c:64 src/fs/fs_namespace.c:90
+#: src/fs/fs_namespace.c:57 src/fs/fs_namespace.c:83
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/fs/fs_namespace.c:119
+#: src/fs/fs_namespace.c:112
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_namespace.c:141 src/fs/fs_namespace.c:229
+#: src/fs/fs_namespace.c:134 src/fs/fs_namespace.c:222
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:338
-#, fuzzy
-msgid "Unknown error"
-msgstr "Unbekannter Fehler"
-
-#: src/fs/fs_namespace.c:427 src/fs/fs_namespace.c:448
-#, fuzzy
-msgid "Failed to serialize meta data"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
-
-#: src/fs/fs_namespace.c:467
-#, fuzzy
-msgid "Failed to connect to datastore service"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/fs/fs_namespace.c:510
+#: src/fs/fs_namespace.c:256
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/fs_namespace.c:612
+#: src/fs/fs_namespace.c:371
 #, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 "Der Eintrag konnte dem Namespace `%s' nicht hinzugefügt werden (existiert "
 "er?)\n"
 
-#: src/fs/fs_namespace.c:840 src/fs/fs_publish.c:1535
+#: src/fs/fs_namespace.c:588 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_namespace.c:884
+#: src/fs/fs_namespace.c:631
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/gnunet-search.c:111
-#, c-format
-msgid "Failed to write directory with search results to `%s'\n"
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:395
+#, fuzzy, c-format
+msgid "Publishing failed: %s"
 msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/gnunet-search.c:181
+#: src/fs/fs_publish.c:616 src/fs/fs_publish.c:633 src/fs/fs_publish.c:672
+#: src/fs/fs_publish.c:692 src/fs/fs_publish.c:717 src/fs/fs_publish.c:857
 #, fuzzy, c-format
-msgid "Error searching: %s.\n"
-msgstr "Fehler beim Verlassen der DHT.\n"
+msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/fs/gnunet-search.c:231
+#: src/fs/fs_publish.c:618
+msgid "timeout on index-start request to `fs' service"
+msgstr ""
+
+#: src/fs/fs_publish.c:630
 #, fuzzy
-msgid "Could not create keyword URI from arguments.\n"
-msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+msgid "unknown error"
+msgstr "Unbekannter Fehler"
 
-#: src/fs/gnunet-search.c:255
+#: src/fs/fs_publish.c:673
+msgid "failed to compute hash"
+msgstr ""
+
+#: src/fs/fs_publish.c:693
+msgid "filename too long"
+msgstr ""
+
+#: src/fs/fs_publish.c:718
 #, fuzzy
-msgid "Could not start searching.\n"
-msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+msgid "could not connect to `fs' service"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/gnunet-search.c:285 src/fs/gnunet-download.c:240
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
+#: src/fs/fs_publish.c:741
+#, fuzzy, c-format
+msgid "Failed to get file identifiers for `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-search.c:288 src/fs/gnunet-download.c:246
-msgid "only search the local peer (no P2P network search)"
+#: src/fs/fs_publish.c:806
+#, fuzzy, c-format
+msgid "Recursive upload failed at `%s': %s"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#: src/fs/fs_publish.c:812
+#, fuzzy, c-format
+msgid "Recursive upload failed: %s"
 msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/gnunet-search.c:291
-msgid "write search results to file starting with PREFIX"
+#: src/fs/fs_publish.c:858
+#, fuzzy
+msgid "needs to be an actual file"
+msgstr "`%s' ist keine normale Datei.\n"
+
+#: src/fs/fs_publish.c:1067
+#, c-format
+msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/gnunet-search.c:294
-msgid "automatically terminate search after VALUE ms"
+#: src/fs/fs_publish.c:1138
+#, c-format
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:301
-msgid "automatically terminate search after VALUE results are found"
+#: src/fs/fs_publish_ksk.c:258
+#, fuzzy
+msgid "Could not connect to datastore."
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/fs/fs_search.c:810
+#, c-format
+msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-search.c:308
-msgid "Search GNUnet for files that were published on GNUnet"
+#: src/fs/fs_test_lib.c:269
+#, fuzzy, c-format
+msgid "Failed to start daemon: %s\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/fs/fs_unindex.c:58
+msgid "Failed to find given position in file"
 msgstr ""
 
+#: src/fs/fs_unindex.c:63
+#, fuzzy
+msgid "Failed to read file"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/fs/fs_unindex.c:236
+msgid "Unexpected time for a response from `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:244
+msgid "Timeout waiting for `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:252
+#, fuzzy
+msgid "Invalid response from `fs' service."
+msgstr "Ungültige Antwort auf `%s'.\n"
+
+#: src/fs/fs_unindex.c:297
+#, fuzzy
+msgid "Failed to connect to FS service for unindexing."
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+
+#: src/fs/fs_unindex.c:332
+#, fuzzy
+msgid "Failed to connect to `datastore' service."
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#: src/fs/fs_unindex.c:345
+#, fuzzy
+msgid "Failed to open file for unindexing."
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+
+#: src/fs/fs_unindex.c:379
+#, fuzzy
+msgid "Failed to compute hash of file."
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+
 #: src/fs/fs_uri.c:220
 #, c-format
 msgid "`%' must be followed by HEX number"
@@ -2346,106 +2276,350 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:118
+#: src/fs/gnunet-directory.c:49
 #, c-format
+msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgstr ""
+
+#: src/fs/gnunet-directory.c:94
+#, fuzzy, c-format
+msgid "Directory `%s' meta data:\n"
+msgstr "==> Verzeichnis `%s':\n"
+
+#: src/fs/gnunet-directory.c:97
+#, fuzzy, c-format
+msgid "Directory `%s' contents:\n"
+msgstr "==> Verzeichnis `%s':\n"
+
+#: src/fs/gnunet-directory.c:132
+#, fuzzy
+msgid "You must specify a filename to inspect.\n"
+msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
+
+#: src/fs/gnunet-directory.c:145
+#, fuzzy, c-format
+msgid "Failed to read directory `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/fs/gnunet-directory.c:154
+#, fuzzy, c-format
+msgid "`%s' is not a GNUnet directory\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/fs/gnunet-directory.c:179
+#, fuzzy
+msgid "Display contents of a GNUnet directory"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/fs/gnunet-download.c:100
+#, fuzzy, c-format
+msgid "Starting download `%s'.\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/fs/gnunet-download.c:109
+#, fuzzy
+msgid "<unknown time>"
+msgstr "Unbekannter Fehler"
+
+#: src/fs/gnunet-download.c:118
+#, c-format
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:128
+#, fuzzy, c-format
+msgid "Error downloading: %s.\n"
+msgstr "Fehler beim Download: %s\n"
+
+#: src/fs/gnunet-download.c:136
+#, fuzzy, c-format
+msgid "Downloading `%s' done (%s/s).\n"
+msgstr "Upload abgewiesen!"
+
+#: src/fs/gnunet-download.c:151 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
+#, c-format
+msgid "Unexpected status: %d\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:176
+#, fuzzy
+msgid "You need to specify a URI argument.\n"
+msgstr "Sie müssen einen Empfänger angeben!\n"
+
+#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#, fuzzy, c-format
+msgid "Failed to parse URI: %s\n"
+msgstr "Datei `%s' hat URI: %s\n"
+
+#: src/fs/gnunet-download.c:189
+msgid "Only CHK or LOC URIs supported.\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:196
+msgid "Target filename must be specified.\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
+#, fuzzy, c-format
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#: src/fs/gnunet-download.c:247 src/fs/gnunet-search.c:285
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
+
+#: src/fs/gnunet-download.c:250
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
+msgstr ""
+
+#: src/fs/gnunet-download.c:253 src/fs/gnunet-search.c:288
+msgid "only search the local peer (no P2P network search)"
+msgstr ""
+
+#: src/fs/gnunet-download.c:256
+msgid "write the file to FILENAME"
+msgstr "Schreibe die Datei in DATEINAME"
+
+#: src/fs/gnunet-download.c:260
+msgid "set the maximum number of parallel downloads that is allowed"
+msgstr ""
+
+#: src/fs/gnunet-download.c:264
+msgid "set the maximum number of parallel requests for blocks that is allowed"
+msgstr ""
+
+#: src/fs/gnunet-download.c:267
+msgid "download a GNUnet directory recursively"
+msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
+
+#: src/fs/gnunet-download.c:277
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:117
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:124
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Alle Optionen anzeigen"
+
+#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/fs/gnunet-pseudonym.c:165
+#, fuzzy, c-format
+msgid "Namespace `%s' unknown.\n"
+msgstr "Namespace `%s' hat das Rating %d.\n"
+
+#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
+#: src/fs/gnunet-pseudonym.c:249
+#, fuzzy, c-format
+msgid "Option `%s' ignored\n"
+msgstr "%s: Option `%s' ist mehrdeutig\n"
+
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
+
+#: src/fs/gnunet-pseudonym.c:272
+msgid "create or advertise namespace NAME"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:275
+msgid "delete namespace NAME "
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:278
+#, fuzzy
+msgid ""
+"add an additional keyword for the advertisment (this option can be specified "
+"multiple times)"
+msgstr ""
+"Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
+"(diese Option kann mehrmals angegeben werden)"
+
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+msgid "set the meta-data for the given TYPE to the given VALUE"
+msgstr ""
+"Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
+"setzen"
+
+#: src/fs/gnunet-pseudonym.c:285
+#, fuzzy
+msgid "print names of local namespaces"
+msgstr "das Rating eines Namespaces setzen"
+
+#: src/fs/gnunet-pseudonym.c:288
+msgid "use the given PRIORITY for the advertisments"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:291
+msgid "do not print names of remote namespaces"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:297
+#, fuzzy
+msgid "specify ID of the root of the namespace"
+msgstr "das Rating eines Namespaces setzen"
+
+#: src/fs/gnunet-pseudonym.c:300
+#, fuzzy
+msgid "change rating of namespace ID by VALUE"
+msgstr "das Rating eines Namespaces setzen"
+
+#: src/fs/gnunet-pseudonym.c:308
+msgid "Manage GNUnet pseudonyms."
+msgstr ""
+
+#: src/fs/gnunet-publish.c:147
+#, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:126
+#: src/fs/gnunet-publish.c:155
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-publish.c:137
+#: src/fs/gnunet-publish.c:165
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:141
+#: src/fs/gnunet-publish.c:169
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:160
+#: src/fs/gnunet-publish.c:187
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:272
+#: src/fs/gnunet-publish.c:299
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:274
+#: src/fs/gnunet-publish.c:301
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:325
+#: src/fs/gnunet-publish.c:352
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-publish.c:367
+#: src/fs/gnunet-publish.c:427
+#, fuzzy
+msgid "Could not publish\n"
+msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
+
+#: src/fs/gnunet-publish.c:454
+#, fuzzy
+msgid "Could not start publishing.\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#: src/fs/gnunet-publish.c:485
+#, fuzzy, c-format
+msgid "Scanning directory `%s'.\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/fs/gnunet-publish.c:487
+#, fuzzy, c-format
+msgid "Scanning file `%s'.\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/fs/gnunet-publish.c:492
 #, c-format
+msgid "There was trouble processing file `%s', skipping it.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:497
+#, fuzzy
+msgid "Preprocessing complete.\n"
+msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
+
+#: src/fs/gnunet-publish.c:501
+#, fuzzy, c-format
+msgid "Extracting meta data from file `%s' complete.\n"
+msgstr "Daten des Moduls `%s' werden aktualisiert\n"
+
+#: src/fs/gnunet-publish.c:505
+msgid "Meta data extraction has finished.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:512
+#, fuzzy
+msgid "Internal error scanning directory.\n"
+msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
+
+#: src/fs/gnunet-publish.c:546
+#, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:374
+#: src/fs/gnunet-publish.c:553
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-publish.c:380
+#: src/fs/gnunet-publish.c:559
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-publish.c:388
+#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:398 src/fs/gnunet-publish.c:405
-#: src/transport/gnunet-transport.c:503
+#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
+#: src/transport/gnunet-transport.c:530
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:606
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-publish.c:439 src/fs/gnunet-download.c:175
+#: src/fs/gnunet-publish.c:639
 #, fuzzy, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "Datei `%s' hat URI: %s\n"
+msgid "Failed to access `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-publish.c:472
-#, fuzzy, c-format
-msgid "Could not access file: %s\n"
-msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
+#: src/fs/gnunet-publish.c:651
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:497
-#, fuzzy, c-format
-msgid "Could not publish `%s': %s\n"
-msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
-
-#: src/fs/gnunet-publish.c:520
-#, fuzzy
-msgid "Could not start publishing.\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/fs/gnunet-publish.c:547
+#: src/fs/gnunet-publish.c:676
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:550
+#: src/fs/gnunet-publish.c:679
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:554
+#: src/fs/gnunet-publish.c:683
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2453,7 +2627,7 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:558
+#: src/fs/gnunet-publish.c:687
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2461,7 +2635,7 @@
 "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:694
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2469,7 +2643,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/fs/gnunet-publish.c:570
+#: src/fs/gnunet-publish.c:699
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2477,110 +2651,313 @@
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlich "
 "werden soll. (nur für das Einfügen in Namespaces)"
 
-#: src/fs/gnunet-publish.c:574
+#: src/fs/gnunet-publish.c:703
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-publish.c:578
+#: src/fs/gnunet-publish.c:707
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namespace)"
 
-#: src/fs/gnunet-publish.c:584
+#: src/fs/gnunet-publish.c:713
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:588
+#: src/fs/gnunet-publish.c:717
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namespaces)"
 
-#: src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-publish.c:721
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:736
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_search.c:810
+#: src/fs/gnunet-search.c:111
 #, c-format
-msgid "Got result with unknown block type `%d', ignoring"
+msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
-#: src/fs/gnunet-service-fs_lc.c:490
+#: src/fs/gnunet-search.c:181
+#, fuzzy, c-format
+msgid "Error searching: %s.\n"
+msgstr "Fehler beim Verlassen der DHT.\n"
+
+#: src/fs/gnunet-search.c:231
 #, fuzzy
+msgid "Could not create keyword URI from arguments.\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/fs/gnunet-search.c:255
+#, fuzzy
+msgid "Could not start searching.\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/fs/gnunet-search.c:291
+msgid "write search results to file starting with PREFIX"
+msgstr ""
+
+#: src/fs/gnunet-search.c:294
+msgid "automatically terminate search after VALUE ms"
+msgstr ""
+
+#: src/fs/gnunet-search.c:301
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
+
+#: src/fs/gnunet-search.c:308
+msgid "Search GNUnet for files that were published on GNUnet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:240
+msgid "# running average P2P latency (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
+#, fuzzy
+msgid "# Loopback routes suppressed"
+msgstr "# gap Routing erfolgreich (insgesamt)"
+
+#: src/fs/gnunet-service-fs.c:583 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/topology/gnunet-daemon-topology.c:1290
+#: src/topology/gnunet-daemon-topology.c:1297
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' service.\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1546
+#: src/topology/gnunet-daemon-topology.c:654
+#: src/topology/gnunet-daemon-topology.c:756
+#: src/transport/gnunet-service-transport_neighbours.c:960
+#: src/transport/gnunet-service-transport_neighbours.c:1289
+#: src/transport/gnunet-service-transport_neighbours.c:1841
+#: src/transport/gnunet-service-transport_neighbours.c:2499
+#: src/transport/gnunet-service-transport_neighbours.c:2566
+#, fuzzy
+msgid "# peers connected"
+msgstr "# verbundener Knoten"
+
+#: src/fs/gnunet-service-fs_cp.c:696
+#, fuzzy
+msgid "# migration stop messages received"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#: src/fs/gnunet-service-fs_cp.c:700
+#, c-format
+msgid "Migration of content to peer `%s' blocked for %llu ms\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:735
+#, fuzzy
+msgid "# replies transmitted to other peers"
+msgstr "# Bytes des Typs %d übertragen"
+
+#: src/fs/gnunet-service-fs_cp.c:741
+msgid "# replies dropped"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1336
+msgid "# P2P searches active"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:858
+msgid "# artificial delays introduced (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:911
+#, fuzzy
+msgid "# replies dropped due to type mismatch"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/fs/gnunet-service-fs_cp.c:921
+#, fuzzy
+msgid "# replies received for other peers"
+msgstr "# Bytes des Typs %d empfangen"
+
+#: src/fs/gnunet-service-fs_cp.c:935
+msgid "# replies dropped due to insufficient cover traffic"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:973
+msgid "# P2P searches destroyed due to ultimate reply"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1040
+#, fuzzy
+msgid "# requests done for free (low load)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/fs/gnunet-service-fs_cp.c:1064
+msgid "# request dropped, priority insufficient"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1074
+#, fuzzy
+msgid "# requests done for a price (normal load)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/fs/gnunet-service-fs_cp.c:1153
+msgid "# GET requests received (from other peers)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1187
+#, fuzzy
+msgid "# requests dropped due to initiator not being connected"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/fs/gnunet-service-fs_cp.c:1211
+#, fuzzy
+msgid "# requests dropped due to missing reverse route"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/fs/gnunet-service-fs_cp.c:1277
+#, fuzzy
+msgid "# requests dropped due TTL underflow"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/fs/gnunet-service-fs_cp.c:1305
+#, fuzzy
+msgid "# requests dropped due to higher-TTL request"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/fs/gnunet-service-fs_cp.c:1334
+#, fuzzy
+msgid "# P2P query messages received and processed"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#: src/fs/gnunet-service-fs_cp.c:1701
+#, fuzzy
+msgid "# migration stop messages sent"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#: src/fs/gnunet-service-fs_indexing.c:113
+#: src/fs/gnunet-service-fs_indexing.c:163
+#, fuzzy, c-format
+msgid "Configuration option `%s' in section `%s' missing.\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#: src/fs/gnunet-service-fs_indexing.c:121
+#: src/fs/gnunet-service-fs_indexing.c:177
+#, fuzzy, c-format
+msgid "Could not open `%s'.\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/fs/gnunet-service-fs_indexing.c:137
+#, fuzzy, c-format
+msgid "Error writing `%s'.\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/fs/gnunet-service-fs_indexing.c:228
+#, c-format
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:266
+#, c-format
+msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:490
+#, fuzzy, c-format
+msgid "Failed to delete bogus block: %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/fs/gnunet-service-fs_indexing.c:548
+msgid "# index blocks removed: original file inaccessible"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:563
+#, fuzzy, c-format
+msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
+msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
+
+#: src/fs/gnunet-service-fs_indexing.c:565
+#, fuzzy
+msgid "not indexed"
+msgstr "Deindizierung schlug fehl."
+
+#: src/fs/gnunet-service-fs_indexing.c:580
+#, fuzzy, c-format
+msgid "Indexed file `%s' changed at offset %llu\n"
+msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
+
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
+#: src/fs/gnunet-service-fs_lc.c:494
+#, fuzzy
 msgid "# client searches active"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:254
+#: src/fs/gnunet-service-fs_lc.c:256
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:319
+#: src/fs/gnunet-service-fs_lc.c:323
 #, fuzzy
 msgid "# client searches received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:358
+#: src/fs/gnunet-service-fs_lc.c:362
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
+#: src/fs/gnunet-service-fs_pe.c:265
+msgid "# average retransmission delay (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:394
 #, fuzzy
-msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+msgid "# transmission failed (core has no bandwidth)"
+msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/fs/fs_misc.c:126
-#, fuzzy, c-format
-msgid "Did not find mime type `%s' in extension list.\n"
-msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
+#: src/fs/gnunet-service-fs_pe.c:425
+#, fuzzy
+msgid "# query messages sent to other peers"
+msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/fs/gnunet-directory.c:49
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
+#: src/fs/gnunet-service-fs_pe.c:478
+msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
-#, fuzzy, c-format
-msgid "Directory `%s' meta data:\n"
-msgstr "==> Verzeichnis `%s':\n"
+#: src/fs/gnunet-service-fs_pe.c:485
+#, fuzzy
+msgid "# query plans executed"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-directory.c:97
-#, fuzzy, c-format
-msgid "Directory `%s' contents:\n"
-msgstr "==> Verzeichnis `%s':\n"
+#: src/fs/gnunet-service-fs_pe.c:549
+#, fuzzy
+msgid "# requests merged"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-directory.c:132
+#: src/fs/gnunet-service-fs_pe.c:555
 #, fuzzy
-msgid "You must specify a filename to inspect."
-msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
+msgid "# requests refreshed"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-directory.c:145
-#, fuzzy, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+#: src/fs/gnunet-service-fs_pe.c:608 src/fs/gnunet-service-fs_pe.c:694
+#: src/fs/gnunet-service-fs_pe.c:761
+msgid "# query plan entries"
+msgstr ""
 
-#: src/fs/gnunet-directory.c:176
-#, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
 #: src/fs/gnunet-service-fs_pr.c:287
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:623
+#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:622
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
@@ -2590,1002 +2967,1745 @@
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:816
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:830
+#: src/fs/gnunet-service-fs_pr.c:832
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:845
+#: src/fs/gnunet-service-fs_pr.c:847
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:965
+#: src/fs/gnunet-service-fs_pr.c:969
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:992
+#: src/fs/gnunet-service-fs_pr.c:996
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_pr.c:1027
+#: src/fs/gnunet-service-fs_pr.c:1031
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1120
+#: src/fs/gnunet-service-fs_pr.c:1124
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1141
+#: src/fs/gnunet-service-fs_pr.c:1145
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
+#: src/fs/gnunet-service-fs_pr.c:1192
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1202
+#: src/fs/gnunet-service-fs_pr.c:1206
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1215
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1227
+#: src/fs/gnunet-service-fs_pr.c:1231
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1248
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1257
+#: src/fs/gnunet-service-fs_pr.c:1261
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1266
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1289 src/fs/gnunet-service-fs_pr.c:1329
-#: src/fs/gnunet-service-fs_pr.c:1469
+#: src/fs/gnunet-service-fs_pr.c:1293 src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1473
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1347
+#: src/fs/gnunet-service-fs_pr.c:1351
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1360
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1446
+#: src/fs/gnunet-service-fs_pr.c:1450
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1530
+#: src/fs/gnunet-service-fs_pr.c:1534
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:1629 src/fs/gnunet-service-fs_pr.c:1638
+#: src/fs/gnunet-service-fs_pr.c:1633 src/fs/gnunet-service-fs_pr.c:1642
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:265
-msgid "# average retransmission delay (ms)"
+#: src/fs/gnunet-service-fs_push.c:653
+#, c-format
+msgid ""
+"Invalid value specified for option `%s' in section `%s', content pushing "
+"disabled\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:394
+#: src/fs/gnunet-unindex.c:89
+#, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:96
+#, fuzzy, c-format
+msgid "Error unindexing: %s.\n"
+msgstr ""
+"\n"
+"Fehler beim Deindizieren der Datei: %s\n"
+
+#: src/fs/gnunet-unindex.c:101
 #, fuzzy
-msgid "# transmission failed (core has no bandwidth)"
-msgstr "Kein Transport des Typs %d bekannt.\n"
+msgid "Unindexing done.\n"
+msgstr "Dateien deindizieren."
 
-#: src/fs/gnunet-service-fs_pe.c:425
+#: src/fs/gnunet-unindex.c:131
+#, fuzzy, c-format
+msgid "You must specify one and only one filename for unindexing.\n"
+msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
+
+#: src/fs/gnunet-unindex.c:148
 #, fuzzy
-msgid "# query messages sent to other peers"
-msgstr "# Bytes ausgehender Nachrichten verworfen"
+msgid "Could not start unindex operation.\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:478
-msgid "# delay heap timeout"
+#: src/fs/gnunet-unindex.c:176
+msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:485
-#, fuzzy
-msgid "# query plans executed"
-msgstr "# dht Anfragen weitergeleitet"
+#: src/fs/plugin_block_fs.c:131
+msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:549
+#: src/gns/gns_api.c:221
 #, fuzzy
-msgid "# requests merged"
-msgstr "# Client Trace-Anfragen empfangen"
+msgid "Failed to connect to the GNS service!\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:555
-#, fuzzy
-msgid "# requests refreshed"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/gns/gnunet-gns-lookup.c:216
+msgid "Issue a request to the GNUnet Naming System, prints results."
+msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:608 src/fs/gnunet-service-fs_pe.c:694
-#: src/fs/gnunet-service-fs_pe.c:736
-msgid "# query plan entries"
+#: src/hostlist/gnunet-daemon-hostlist.c:264
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1544
-#: src/transport/gnunet-service-transport_neighbours.c:936
-#: src/transport/gnunet-service-transport_neighbours.c:1263
-#: src/transport/gnunet-service-transport_neighbours.c:1735
-#: src/transport/gnunet-service-transport_neighbours.c:2369
-#: src/transport/gnunet-service-transport_neighbours.c:2437
-#: src/topology/gnunet-daemon-topology.c:654
-#: src/topology/gnunet-daemon-topology.c:756
+#: src/hostlist/gnunet-daemon-hostlist.c:317
+msgid "advertise our hostlist to other peers"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:322
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:325
+msgid "enable learning about hostlist servers from other peers"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:329
+msgid "provide a hostlist server"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:341
+msgid "GNUnet hostlist server and client"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:286
+msgid "# bytes downloaded from hostlist servers"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
 #, fuzzy
-msgid "# peers connected"
-msgstr "# verbundener Knoten"
+msgid "# invalid HELLOs downloaded from hostlist servers"
+msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/fs/gnunet-service-fs_cp.c:696
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#, fuzzy, c-format
+msgid "Invalid `%s' message received from hostlist at `%s'\n"
+msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
+
+#: src/hostlist/hostlist-client.c:330
 #, fuzzy
-msgid "# migration stop messages received"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
+msgid "# valid HELLOs downloaded from hostlist servers"
+msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/fs/gnunet-service-fs_cp.c:700
+#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %llu ms\n"
+msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:735
-#, fuzzy
-msgid "# replies transmitted to other peers"
-msgstr "# Bytes des Typs %d übertragen"
+#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
+#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
+#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
+#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
+#: src/transport/plugin_transport_http_client.c:108
+#: src/transport/plugin_transport_http_client.c:123
+#, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:741
-msgid "# replies dropped"
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1334
-msgid "# P2P searches active"
+#: src/hostlist/hostlist-client.c:622
+#, c-format
+msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:858
-msgid "# artificial delays introduced (ms)"
+#: src/hostlist/hostlist-client.c:663
+#, c-format
+msgid ""
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:909
-#, fuzzy
-msgid "# replies dropped due to type mismatch"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+#: src/hostlist/hostlist-client.c:805
+#, fuzzy, c-format
+msgid "Timeout trying to download hostlist from `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-service-fs_cp.c:919
+#: src/hostlist/hostlist-client.c:822
+#, c-format
+msgid "Download limit of %u bytes exceeded, stopping download\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:842
+#, fuzzy, c-format
+msgid "%s failed for `%s' at %s:%d: `%s'\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#: src/hostlist/hostlist-client.c:848
+#, fuzzy, c-format
+msgid "Download of hostlist `%s' completed.\n"
+msgstr ""
+"Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
+"beträgt %8.3f KB/s.\n"
+
+#: src/hostlist/hostlist-client.c:856
+#, c-format
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:909
+#, c-format
+msgid "Bootstrapping using hostlist at `%s'.\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:917
+msgid "# hostlist downloads initiated"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+msgid "# milliseconds between hostlist downloads"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1054
+#, c-format
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1092
+msgid "Scheduled saving of hostlists\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1096
+#, c-format
+msgid "Hostlists will be saved to file again in %llums\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
 #, fuzzy
-msgid "# replies received for other peers"
-msgstr "# Bytes des Typs %d empfangen"
+msgid "# active connections"
+msgstr "GNUnet Konfiguration"
 
-#: src/fs/gnunet-service-fs_cp.c:933
-msgid "# replies dropped due to insufficient cover traffic"
+#: src/hostlist/hostlist-client.c:1253
+#, c-format
+msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:971
-msgid "# P2P searches destroyed due to ultimate reply"
+#: src/hostlist/hostlist-client.c:1284
+#, c-format
+msgid ""
+"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1038
+#: src/hostlist/hostlist-client.c:1290
+#, fuzzy, c-format
+msgid "Loading saved hostlist entries from file `%s' \n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/hostlist/hostlist-client.c:1294
+#, c-format
+msgid "Hostlist file `%s' is not existing\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1305
+#, fuzzy, c-format
+msgid "Could not open file `%s' for reading to load hostlists: %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/hostlist/hostlist-client.c:1338
+#, c-format
+msgid "%u hostlist URIs loaded from file\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1340
+msgid "# hostlist URIs read from file"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1373
+#, c-format
+msgid ""
+"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1387
+#, fuzzy, c-format
+msgid "Could not open file `%s' for writing to save hostlists: %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/hostlist/hostlist-client.c:1392
+#, fuzzy, c-format
+msgid "Writing %u hostlist URIs to `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#, c-format
+msgid "Error writing hostlist URIs to file `%s'\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1428
+msgid "# hostlist URIs written to file"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1480
+msgid "Learning is enabled on this peer\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1483
+#, c-format
+msgid "Hostlists will be saved to file again in  %llums\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1492
+msgid "Learning is not enabled on this peer\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1504
+#, c-format
+msgid ""
+"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1508
+#, fuzzy, c-format
+msgid "Hostlist file `%s' could not be removed\n"
+msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
+
+#: src/hostlist/hostlist-server.c:134
 #, fuzzy
-msgid "# requests done for free (low load)"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+msgid "bytes in hostlist"
+msgstr "# bytes in der Datenbank"
 
-#: src/fs/gnunet-service-fs_cp.c:1062
-msgid "# request dropped, priority insufficient"
+#: src/hostlist/hostlist-server.c:157
+msgid "expired addresses encountered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1072
+#: src/hostlist/hostlist-server.c:184
+#: src/topology/gnunet-daemon-topology.c:875
+#, fuzzy, c-format
+msgid "Error in communication with PEERINFO service: %s\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/hostlist/hostlist-server.c:205
+msgid "HELLOs without addresses encountered (ignored)"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:221
+msgid "bytes not included in hostlist (size limit)"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:269
+#, fuzzy, c-format
+msgid "Refusing `%s' request to hostlist server\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/hostlist/hostlist-server.c:272
 #, fuzzy
-msgid "# requests done for a price (normal load)"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+msgid "hostlist requests refused (not HTTP GET)"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1151
-msgid "# GET requests received (from other peers)"
+#: src/hostlist/hostlist-server.c:280
+msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1185
+#: src/hostlist/hostlist-server.c:287
+#, c-format
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:291
 #, fuzzy
-msgid "# requests dropped due to initiator not being connected"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+msgid "hostlist requests refused (upload data)"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1209
+#: src/hostlist/hostlist-server.c:299
+msgid "Could not handle hostlist request since I do not have a response yet\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:302
 #, fuzzy
-msgid "# requests dropped due to missing reverse route"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+msgid "hostlist requests refused (not ready)"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1275
+#: src/hostlist/hostlist-server.c:306
+msgid "Received request for our hostlist\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:307
 #, fuzzy
-msgid "# requests dropped due TTL underflow"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+msgid "hostlist requests processed"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1303
+#: src/hostlist/hostlist-server.c:350
 #, fuzzy
-msgid "# requests dropped due to higher-TTL request"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+msgid "# hostlist advertisements send"
+msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:1332
+#: src/hostlist/hostlist-server.c:397
+msgid "Advertisement message could not be queued by core\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:565
+#, fuzzy, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr "Ungültige Parameter. Abbruch.\n"
+
+#: src/hostlist/hostlist-server.c:574
+#, c-format
+msgid "Hostlist service starts on %s:%llu\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:588
+#, fuzzy, c-format
+msgid "Address to obtain hostlist: `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/hostlist/hostlist-server.c:626
+#, fuzzy, c-format
+msgid "Could not start hostlist HTTP server on port %u\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#: src/mesh/gnunet-service-mesh.c:4595
+msgid "Wrong CORE service\n"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:4789
 #, fuzzy
-msgid "# P2P query messages received and processed"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
+msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
+msgstr "GNUnet Konfiguration"
 
-#: src/fs/gnunet-service-fs_cp.c:1699
+#: src/mesh/gnunet-service-mesh.c:4798
 #, fuzzy
-msgid "# migration stop messages sent"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/fs/gnunet-service-fs_push.c:653
+#: src/nat/gnunet-nat-server.c:289
 #, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
+msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:113
-#: src/fs/gnunet-service-fs_indexing.c:163
-#, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing.\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+#: src/nat/gnunet-nat-server.c:328
+msgid "GNUnet NAT traversal test helper daemon"
+msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:121
-#: src/fs/gnunet-service-fs_indexing.c:177
+#: src/nat/nat.c:803
+#, c-format
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgstr ""
+
+#: src/nat/nat.c:852
 #, fuzzy, c-format
-msgid "Could not open `%s'.\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "Failed to start %s\n"
+msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:137
+#: src/nat/nat.c:1121
 #, fuzzy, c-format
-msgid "Error writing `%s'.\n"
-msgstr "Fehler beim Anlegen des Benutzers"
+msgid "Malformed %s `%s' given in configuration!\n"
+msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/fs/gnunet-service-fs_indexing.c:228
+#: src/nat/nat.c:1187 src/nat/nat.c:1197
 #, c-format
 msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:266
+#: src/nat/nat.c:1329
+msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+msgstr ""
+
+#: src/nat/nat.c:1341
 #, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
+msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:490
-#, fuzzy, c-format
-msgid "Failed to delete bogus block: %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+#: src/nat/nat_test.c:348
+#, fuzzy
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:548
-msgid "# index blocks removed: original file inaccessible"
+#: src/nat/nat_test.c:418
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:563
-#, fuzzy, c-format
-msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
-msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
+#: src/nse/gnunet-nse-profiler.c:926
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/fs/gnunet-service-fs_indexing.c:565
+#: src/nse/gnunet-service-nse.c:936
+#, c-format
+msgid "Proof of work invalid: %llu!\n"
+msgstr ""
+
+#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
+#: src/nse/gnunet-service-nse.c:1431
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+msgstr ""
+
+#: src/nse/gnunet-service-nse.c:1398
 #, fuzzy
-msgid "not indexed"
-msgstr "Deindizierung schlug fehl."
+msgid "Invalid work requirement for NSE service. Exiting.\n"
+msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:580
+#: src/nse/gnunet-service-nse.c:1419
+#, fuzzy
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:133
 #, fuzzy, c-format
-msgid "Indexed file `%s' changed at offset %llu\n"
-msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/fs/fs_list_indexed.c:90
+#: src/peerinfo/gnunet-service-peerinfo.c:195
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:239
+#, 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. "
+"Datei wurde entfernt.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:305
 #, fuzzy, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
-msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
+msgid "Still no peers found in `%s'!\n"
+msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/fs/fs_list_indexed.c:117
+#: src/peerinfo/peerinfo_api.c:279
 #, fuzzy, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
+msgid "Failed to transmit message to `%s' service.\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#: src/peerinfo/peerinfo_api.c:435
+#, fuzzy
+msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/fs/fs_list_indexed.c:164
+#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
+#, fuzzy
+msgid "Received invalid message from `PEERINFO' service.\n"
+msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
+
+#: src/peerinfo/peerinfo_api.c:523
+#, fuzzy
+msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/peerinfo/peerinfo_api.c:557
+msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api_notify.c:258
 #, fuzzy, c-format
-msgid "Failed to not connect to `%s' service.\n"
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+msgid "Could not connect to `%s' service.\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_unindex.c:58
-msgid "Failed to find given position in file"
+#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#, fuzzy, c-format
+msgid "Could not find option `%s:%s' in configuration.\n"
+msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#, fuzzy, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#, c-format
+msgid "I am peer `%s'.\n"
+msgstr "Ich bin Peer `%s'.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:255
+msgid "output only the identity strings"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+msgid "output our own identity only"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
 #, fuzzy
-msgid "Failed to read file"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+msgid "Print information about peers."
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/fs/fs_unindex.c:236
-msgid "Unexpected time for a response from `fs' service."
+#: src/pt/gnunet-daemon-pt.c:264
+#, fuzzy
+msgid "Failed to pack DNS request.  Dropping.\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/pt/gnunet-daemon-pt.c:270
+#, fuzzy
+msgid "# DNS requests mapped to VPN"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/pt/gnunet-daemon-pt.c:323
+msgid "# DNS records modified"
 msgstr ""
 
-#: src/fs/fs_unindex.c:244
-msgid "Timeout waiting for `fs' service."
+#: src/pt/gnunet-daemon-pt.c:500
+msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/fs/fs_unindex.c:252
+#: src/pt/gnunet-daemon-pt.c:506
 #, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "Ungültige Antwort auf `%s'.\n"
+msgid "Failed to parse DNS request.  Dropping.\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/fs/fs_unindex.c:297
+#: src/pt/gnunet-daemon-pt.c:602
 #, fuzzy
-msgid "Failed to connect to FS service for unindexing."
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+msgid "# DNS requests dropped (timeout)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/fs_unindex.c:332
+#: src/pt/gnunet-daemon-pt.c:632
 #, fuzzy
-msgid "Failed to connect to `datastore' service."
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+msgid "# DNS requests intercepted"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/fs_unindex.c:345
+#: src/pt/gnunet-daemon-pt.c:637
 #, fuzzy
-msgid "Failed to open file for unindexing."
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+msgid "# DNS requests dropped (DNS mesh tunnel down)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/fs_unindex.c:379
+#: src/pt/gnunet-daemon-pt.c:645
 #, fuzzy
-msgid "Failed to compute hash of file."
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+msgid "# DNS requests dropped (malformed)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-download.c:100
+#: src/pt/gnunet-daemon-pt.c:716
+#, fuzzy
+msgid "# DNS replies received"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/pt/gnunet-daemon-pt.c:730
+#, fuzzy
+msgid "# DNS replies dropped (too late?)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/pt/gnunet-daemon-pt.c:748 src/pt/gnunet-daemon-pt.c:760
+msgid "# DNS requests aborted (tunnel down)"
+msgstr ""
+
+#: src/pt/gnunet-daemon-pt.c:898 src/pt/gnunet-daemon-pt.c:907
+#: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
 #, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "Collection `%s' begonnen.\n"
+msgid "Failed to connect to %s service.  Exiting.\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-download.c:112
-#, c-format
-msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
+#: src/pt/gnunet-daemon-pt.c:973
+msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-download.c:121
+#: src/statistics/gnunet-service-statistics.c:209
 #, fuzzy, c-format
-msgid "Error downloading: %s.\n"
-msgstr "Fehler beim Download: %s\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
+msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/fs/gnunet-download.c:129
+#: src/statistics/gnunet-service-statistics.c:267
 #, fuzzy, c-format
-msgid "Downloading `%s' done (%s/s).\n"
-msgstr "Upload abgewiesen!"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/fs/gnunet-download.c:169
+#: src/statistics/gnunet-statistics.c:98
 #, fuzzy
-msgid "You need to specify a URI argument.\n"
-msgstr "Sie müssen einen Empfänger angeben!\n"
+msgid "Failed to obtain statistics.\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/fs/gnunet-download.c:182
-msgid "Only CHK or LOC URIs supported.\n"
+#: src/statistics/gnunet-statistics.c:164
+msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
-msgid "Target filename must be specified.\n"
+#: src/statistics/gnunet-statistics.c:167
+msgid "make the value being set persistent"
 msgstr ""
 
-#: src/fs/gnunet-download.c:243
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
+#: src/statistics/gnunet-statistics.c:170
+msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/fs/gnunet-download.c:249
-msgid "write the file to FILENAME"
-msgstr "Schreibe die Datei in DATEINAME"
+#: src/statistics/gnunet-statistics.c:173
+msgid "just print the statistics value"
+msgstr ""
 
-#: src/fs/gnunet-download.c:253
-msgid "set the maximum number of parallel downloads that is allowed"
+#: src/statistics/gnunet-statistics.c:180
+msgid "Print statistics about GNUnet operations."
+msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
+
+#: src/statistics/statistics_api.c:390
+#, fuzzy
+msgid "Failed to connect to statistics service!\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/template/gnunet-template.c:68
+#, fuzzy
+msgid "help text"
+msgstr "Hilfetext für -t"
+
+#: src/testing/gnunet-testing.c:157
+#, fuzzy
+msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/testing/gnunet-testing.c:159
+#, c-format
+msgid "Specified hostkey file `%s' not found!\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
-msgid "set the maximum number of parallel requests for blocks that is allowed"
+#: src/testing/gnunet-testing.c:273
+#, fuzzy
+msgid "create unique configuration files"
 msgstr ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/fs/gnunet-download.c:260
-msgid "download a GNUnet directory recursively"
-msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
+#: src/testing/gnunet-testing.c:275
+msgid "create hostkey files from pre-computed hostkey list"
+msgstr ""
 
-#: src/fs/gnunet-download.c:270
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+#: src/testing/gnunet-testing.c:277
+msgid "host key file"
 msgstr ""
 
-#: src/fs/fs_getopt.c:191
-#, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+#: src/testing/gnunet-testing.c:279
+#, fuzzy
+msgid "number of unique configuration files or hostkeys to create"
 msgstr ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/fs/fs_publish.c:150 src/fs/fs_publish.c:421
+#: src/testing/gnunet-testing.c:281
+#, fuzzy
+msgid "configuration template"
+msgstr "GNUnet Konfiguration"
+
+#: src/testing/gnunet-testing.c:287
+msgid "Command line tool to access the testing library"
+msgstr ""
+
+#: src/testing/helper.c:56
+#, fuzzy
+msgid "Peer is lacking HOSTKEY configuration setting.\n"
+msgstr "GNUnet Konfiguration"
+
+#: src/testing/helper.c:64
+#, fuzzy
+msgid "Could not access hostkey.\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/testing/testing.c:214
+msgid "`scp' does not seem to terminate (timeout copying config).\n"
+msgstr ""
+
+#: src/testing/testing.c:228 src/testing/testing.c:849
+#, fuzzy
+msgid "`scp' did not complete cleanly.\n"
+msgstr "`%s' ist zu keinem Knoten verbunden.\n"
+
+#: src/testing/testing.c:251
+#, fuzzy
+msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/testing/testing.c:252
+#, fuzzy
+msgid "Failed to create pipe for `ssh' process.\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/testing/testing.c:308
 #, fuzzy, c-format
-msgid "Publishing failed: %s"
+msgid "Could not start `%s' process to create hostkey.\n"
 msgstr ""
-"\n"
-"Fehler beim Uploaden der Datei: %s\n"
+"IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
+"der Konfigurationsdatei an.\n"
 
-#: src/fs/fs_publish.c:658 src/fs/fs_publish.c:675 src/fs/fs_publish.c:714
-#: src/fs/fs_publish.c:734 src/fs/fs_publish.c:761 src/fs/fs_publish.c:909
+#: src/testing/testing.c:315
+#, fuzzy
+msgid "Failed to start `gnunet-peerinfo' process.\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/testing/testing.c:316 src/testing/testing.c:514
+#, fuzzy
+msgid "Failed to start `ssh' process.\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/testing/testing.c:378
 #, fuzzy, c-format
-msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
-msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
+msgid "Error reading from gnunet-peerinfo: %s\n"
+msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
 
-#: src/fs/fs_publish.c:660
-msgid "timeout on index-start request to `fs' service"
+#: src/testing/testing.c:382
+#, fuzzy
+msgid "Malformed output from gnunet-peerinfo!\n"
+msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
+
+#: src/testing/testing.c:392
+#, fuzzy
+msgid "Failed to get hostkey!\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/testing/testing.c:426
+msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:672
+#: src/testing/testing.c:506
+#, fuzzy, c-format
+msgid "Could not start `%s' process to start GNUnet.\n"
+msgstr ""
+"IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
+"der Konfigurationsdatei an.\n"
+
+#: src/testing/testing.c:513
 #, fuzzy
-msgid "unknown error"
-msgstr "Unbekannter Fehler"
+msgid "Failed to start `gnunet-arm' process.\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:715
-msgid "failed to compute hash"
+#: src/testing/testing.c:537 src/testing/testing.c:647
+msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:735
-msgid "filename too long"
+#: src/testing/testing.c:538 src/testing/testing.c:648
+#: src/testing/testing.c:668
+msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:762
+#: src/testing/testing.c:617
+msgid "Unable to get HELLO for peer!\n"
+msgstr ""
+
+#: src/testing/testing.c:667
+msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
+msgstr ""
+
+#: src/testing/testing.c:690 src/testing/testing.c:724
+msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
+msgstr ""
+
+#: src/testing/testing.c:705 src/testing/testing.c:762
 #, fuzzy
-msgid "could not connect to `fs' service"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
+msgstr "`%s' ist zu keinem Knoten verbunden.\n"
 
-#: src/fs/fs_publish.c:786
+#: src/testing/testing.c:837
+msgid "`scp' does not seem to terminate.\n"
+msgstr ""
+
+#: src/testing/testing.c:1015
 #, fuzzy, c-format
-msgid "Failed to get file identifiers for `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "Starting service %s for peer `%4s'\n"
+msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/fs_publish.c:856
+#: src/testing/testing.c:1299 src/testing/testing_group.c:6278
 #, fuzzy, c-format
-msgid "Recursive upload failed at `%s': %s"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+msgid "Could not start `%s' process to copy configuration directory.\n"
+msgstr ""
+"IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
+"der Konfigurationsdatei an.\n"
 
-#: src/fs/fs_publish.c:862
+#: src/testing/testing.c:1387 src/testing/testing.c:1470
+#: src/testing/testing.c:1608
 #, fuzzy, c-format
-msgid "Recursive upload failed: %s"
+msgid "Terminating peer `%4s'\n"
+msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
+
+#: src/testing/testing.c:1560
+#, fuzzy, c-format
+msgid "Setting d->dead on peer `%4s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/testing/testing.c:1698
+msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
-"\n"
-"Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:910
+#: src/testing/testing.c:1706
 #, fuzzy
-msgid "needs to be an actual file"
-msgstr "`%s' ist keine normale Datei.\n"
+msgid "Failed to write new configuration to disk."
+msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/fs/fs_publish.c:1092
-#, c-format
-msgid "Insufficient space for publishing: %s"
+#: src/testing/testing.c:1737
+#, fuzzy, c-format
+msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr ""
+"IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
+"der Konfigurationsdatei an.\n"
 
-#: src/fs/fs_publish.c:1163
-#, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
-msgstr ""
+#: src/testing/testing.c:1740
+#, fuzzy
+msgid "Failed to copy new configuration to remote machine."
+msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/fs/fs_publish.c:1499
+#: src/testing/testing.c:1895
 #, fuzzy
-msgid "Could not connect to datastore."
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+msgid "Peers failed to connect"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_api.c:284
+#: src/testing/testing.c:2035
+#, fuzzy
+msgid "Failed to connect to core service of first peer!\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#: src/testing/testing.c:2274
+msgid "Peers are not fully running yet, can not connect!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:1910 src/testing/testing_group.c:1922
+#: src/testing/testing_group.c:2023 src/testing/testing_group.c:2082
+#: src/testing/testing_group.c:2171 src/testing/testing_group.c:2191
+#: src/testing/testing_group.c:2328 src/testing/testing_peergroup.c:940
 #, fuzzy, c-format
-msgid "Could not open file `%s': %s"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/fs/fs_api.c:293
+#: src/testing/testing_group.c:1932
 #, fuzzy, c-format
-msgid "Could not read file `%s': %s"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "Target is %d connections per peer."
+msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/fs/fs_api.c:299
+#: src/testing/testing_group.c:2179
 #, c-format
-msgid "Short read reading from file `%s'!"
+msgid ""
+"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
+"greater than 0\n"
 msgstr ""
 
-#: src/fs/fs_api.c:877
-#, fuzzy, c-format
-msgid "Failed to resume publishing information `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+#: src/testing/testing_group.c:2209 src/testing/testing_group.c:2402
+#, c-format
+msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
+msgstr ""
 
-#: src/fs/fs_api.c:1323
+#: src/testing/testing_group.c:2246
 #, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
+msgid "natural log of %d is %d, will run %d iterations\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1365
+#: src/testing/testing_group.c:2249
 #, c-format
-msgid "Failure while resuming publishing operation `%s': %s\n"
+msgid "Total connections added thus far: %u!\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1381
-#, fuzzy, c-format
-msgid "Failed to resume publishing operation `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+#: src/testing/testing_group.c:2290
+#, c-format
+msgid "Total connections added for small world: %d!\n"
+msgstr ""
 
-#: src/fs/fs_api.c:1993
+#: src/testing/testing_group.c:2342
 #, c-format
-msgid "Failure while resuming unindexing operation `%s': %s\n"
+msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2003
+#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
 #, fuzzy, c-format
-msgid "Failed to resume unindexing operation `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid ""
+"No `%s' specified in peer configuration in section `%s', cannot copy friends "
+"file!\n"
+msgstr ""
+"Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
+"gesetzt, sie wird auf %dm gesetzt.\n"
 
-#: src/fs/fs_api.c:2129 src/fs/fs_api.c:2368
+#: src/testing/testing_group.c:3020
+msgid "Finished copying all friend files!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3133
 #, fuzzy, c-format
-msgid "Failed to resume sub-download `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "Copying file with command cp %s %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/fs/fs_api.c:2146
+#: src/testing/testing_group.c:3156
 #, fuzzy, c-format
-msgid "Failed to resume sub-search `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "Copying file with command scp %s %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/fs/fs_api.c:2158 src/fs/fs_api.c:2177 src/fs/fs_api.c:2653
+#: src/testing/testing_group.c:3173
 #, c-format
-msgid "Failure while resuming search operation `%s': %s\n"
+msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2359
+#: src/testing/testing_group.c:3191
 #, c-format
-msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
+msgid "File %d copied\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2605
-msgid "Could not resume running search, will resume as paused search\n"
+#: src/testing/testing_group.c:3206
+#, fuzzy
+msgid "Finished copying all blacklist files!\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
+#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
+msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2691
+#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
+#: src/testing/testing_group.c:5035
 #, c-format
-msgid "Failure while resuming download operation `%s': %s\n"
+msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/fs/fs_download.c:309
+#: src/testing/testing_group.c:3608
+#, fuzzy, c-format
+msgid "Offering HELLO of peer %s to peer %s\n"
+msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
+
+#: src/testing/testing_group.c:3734
+#, c-format
+msgid "Creating connection, outstanding_connections is %d (max %d)\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3988
+msgid "Creating clique topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3993
+msgid "Creating small world (ring) topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3998
+msgid "Creating small world (2d-torus) topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4002
+msgid "Creating ring topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4006
+msgid "Creating 2d torus topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4010
+msgid "Creating Erdos-Renyi topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4014
+msgid "Creating InterNAT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4018
+msgid "Creating Scale Free topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4023
+msgid "Creating straight line topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4027
+msgid "Creating topology from file!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4043
+msgid "Creating no allowed topology (all peers can connect at core level)\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4058
+msgid "Failed during friend file copying!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4064
+msgid "Friend files created/copied successfully!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4081
+msgid "Blacklisting all but clique topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4087
+msgid "Blacklisting all but small world (ring) topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4093
+msgid "Blacklisting all but small world (2d-torus) topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4099
+msgid "Blacklisting all but ring topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4105
+msgid "Blacklisting all but 2d torus topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4111
+msgid "Blacklisting all but Erdos-Renyi topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4117
+msgid "Blacklisting all but InterNAT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4152
+msgid "Blacklisting all but Scale Free topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4158
+msgid "Blacklisting all but straight line topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4173
 #, fuzzy
-msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
-msgstr "Rekursiver Download des Verzeichnisses `%s' bei %llu von %llu Bytes.\n"
+msgid "Failed during blacklist file copying!\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_download.c:329
-msgid "Directory too large for system address space\n"
+#: src/testing/testing_group.c:4179
+msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
-#, fuzzy, c-format
-msgid "Failed to open file `%s' for writing"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+#: src/testing/testing_group.c:5263
+msgid "Creating clique CONNECT topology\n"
+msgstr ""
 
-#: src/fs/fs_download.c:873
+#: src/testing/testing_group.c:5270
+msgid "Creating small world (ring) CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5277
+msgid "Creating small world (2d-torus) CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5283
+msgid "Creating ring CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5290
+msgid "Creating 2d torus CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5297
+msgid "Creating Erdos-Renyi CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5304
+msgid "Creating InterNAT CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5311
+msgid "Creating Scale Free CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5318
+msgid "Creating straight line CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5324
+msgid "Creating no CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5330
+#, fuzzy
+msgid "Unknown topology specification, can't connect peers!\n"
+msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
+
+#: src/testing/testing_group.c:5340
+#, c-format
+msgid "Connecting random subset (%'.2f percent) of possible peers\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5348
+#, c-format
+msgid "Connecting a minimum of %u peers each (if possible)\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5357
+#, c-format
+msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5367
+#, c-format
+msgid "Finding additional %u closest peers each (if possible)\n"
+msgstr ""
+
+#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:648
+#, fuzzy
+msgid "Could not read hostkeys file!\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/testing/testing_group.c:6131
 #, fuzzy, c-format
-msgid "Failed to create directory for recursive download of `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/fs/fs_download.c:959
+#: src/topology/gnunet-daemon-topology.c:244
+msgid "# peers blacklisted"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:380
+#, fuzzy
+msgid "# connect requests issued to transport"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/topology/gnunet-daemon-topology.c:675
+#: src/topology/gnunet-daemon-topology.c:761
+#, fuzzy
+msgid "# friends connected"
+msgstr "# verbundener Knoten"
+
+#: src/topology/gnunet-daemon-topology.c:950
+msgid "Failed to connect to core service, can not manage topology!\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:982
 #, c-format
-msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/fs/fs_download.c:986
-msgid "internal error decrypting content"
+#: src/topology/gnunet-daemon-topology.c:994
+#, fuzzy, c-format
+msgid "Could not read friends list `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/topology/gnunet-daemon-topology.c:1000
+#, c-format
+msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1009
+#: src/topology/gnunet-daemon-topology.c:1009
 #, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "Failed to read friends list from `%s': out of memory\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_download.c:1021
+#: src/topology/gnunet-daemon-topology.c:1017
+#, c-format
+msgid "Failed to read friends list from `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/topology/gnunet-daemon-topology.c:1037
 #, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes.\n"
+msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/fs/fs_download.c:1030
+#: src/topology/gnunet-daemon-topology.c:1050
+#, fuzzy, c-format
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
+msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
+
+#: src/topology/gnunet-daemon-topology.c:1060
+#, fuzzy, c-format
+msgid "Found friend `%s' in configuration\n"
+msgstr " gconfig\tGTK Konfiguration\n"
+
+#: src/topology/gnunet-daemon-topology.c:1066
 #, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1829
+#: src/topology/gnunet-daemon-topology.c:1076
 #, fuzzy
-msgid "Invalid URI"
-msgstr "Ungültiger Parameter: `%s'\n"
+msgid "# friends in configuration"
+msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/fs/gnunet-service-fs.c:240
-msgid "# running average P2P latency (ms)"
+#: src/topology/gnunet-daemon-topology.c:1082
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
+#: src/topology/gnunet-daemon-topology.c:1089
+msgid ""
+"More friendly connections required than target total number of connections.\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:1126
 #, fuzzy
-msgid "# Loopback routes suppressed"
-msgstr "# gap Routing erfolgreich (insgesamt)"
+msgid "# HELLO messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
-#: src/topology/gnunet-daemon-topology.c:1297
-#: src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/topology/gnunet-daemon-topology.c:1183
+#, fuzzy
+msgid "# HELLO messages gossipped"
+msgstr "# ausgehender Nachrichten verworfen"
+
+#: src/topology/gnunet-daemon-topology.c:1323
+msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:247
 #, fuzzy, c-format
-msgid "Failed to connect to `%s' service.\n"
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+msgid "Could not read blacklist file `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_file_information.c:356
+#: src/transport/gnunet-service-transport_blacklist.c:254
+#, c-format
+msgid "Blacklist file `%s' is empty.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:266
 #, fuzzy, c-format
-msgid "`%s' failed on file `%s': %s"
-msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
+msgid "Failed to read blacklist from `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:468
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:298
+#: src/transport/gnunet-service-transport_blacklist.c:336
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:350
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:364
+#, c-format
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:523
+#: src/transport/gnunet-service-transport_blacklist.c:764
+msgid "# disconnects due to blacklist"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:158
+#, fuzzy
+msgid "# bytes payload discarded due to not connected peer "
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/transport/gnunet-service-transport.c:572
+msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:581
+msgid "Transport service could not access hostkey.  Exiting.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:353
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:358
+#, fuzzy
+msgid "# messages dropped due to slow client"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/transport/gnunet-service-transport_clients.c:510
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:628
+#, fuzzy
+msgid "# bytes payload received for other peers"
+msgstr "# Bytes des Typs %d empfangen"
+
+#: src/transport/gnunet-service-transport_clients.c:645
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:696
+#, fuzzy
+msgid "# REQUEST CONNECT messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/gnunet-service-transport_hello.c:172
+msgid "# refreshed my HELLO"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:482
 msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:859
+#: src/transport/gnunet-service-transport_neighbours.c:883
 #, fuzzy
 msgid "# peers disconnected due to external request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_neighbours.c:942
+#: src/transport/gnunet-service-transport_neighbours.c:966
 #, fuzzy
 msgid "# fast reconnects failed"
 msgstr "# verbundener Knoten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:998
+#: src/transport/gnunet-service-transport_neighbours.c:1022
 #, fuzzy
 msgid "# peers disconnected due to timeout"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1023
+#: src/transport/gnunet-service-transport_neighbours.c:1047
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1065
+#: src/transport/gnunet-service-transport_neighbours.c:1088
 #, fuzzy
 msgid "# peers disconnected due to global disconnect"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1781
-#: src/transport/gnunet-service-transport_neighbours.c:1802
+#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1909
 #, fuzzy
 msgid "# messages not sent (no such peer or not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1818
+#: src/transport/gnunet-service-transport_neighbours.c:1925
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1870
+#: src/transport/gnunet-service-transport_neighbours.c:1977
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
+#: src/transport/gnunet-service-transport_neighbours.c:2013
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1924
+#: src/transport/gnunet-service-transport_neighbours.c:2031
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1953
+#: src/transport/gnunet-service-transport_neighbours.c:2060
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2005
+#: src/transport/gnunet-service-transport_neighbours.c:2113
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2013
+#: src/transport/gnunet-service-transport_neighbours.c:2121
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2079
+#: src/transport/gnunet-service-transport_neighbours.c:2187
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2097
+#: src/transport/gnunet-service-transport_neighbours.c:2205
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2215
+#: src/transport/gnunet-service-transport_neighbours.c:2323
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2228
+#: src/transport/gnunet-service-transport_neighbours.c:2336
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2305
+#: src/transport/gnunet-service-transport_neighbours.c:2411
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2322
+#: src/transport/gnunet-service-transport_neighbours.c:2453
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2415
+#: src/transport/gnunet-service-transport_neighbours.c:2544
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
-#, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:254
-#, c-format
-msgid "Blacklist file `%s' is empty.\n"
+#: src/transport/gnunet-service-transport_plugins.c:111
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/transport/gnunet-service-transport_plugins.c:118
 #, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "Starting transport plugins `%s'\n"
+msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
+#: src/transport/gnunet-service-transport_plugins.c:122
 #, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
+msgid "Loading `%s' transport plugin\n"
+msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/transport/gnunet-service-transport_plugins.c:150
 #, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
-msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
+#: src/transport/gnunet-service-transport_validation.c:410
+msgid "# address records discarded"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/transport/gnunet-service-transport_validation.c:459
 #, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgid ""
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:756
-msgid "# disconnects due to blacklist"
+#: src/transport/gnunet-service-transport_validation.c:508
+#, fuzzy
+msgid "# PING without HELLO messages sent"
+msgstr "# Klartext PING Nachrichten gesendet"
+
+#: src/transport/gnunet-service-transport_validation.c:566
+msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:191
+#: src/transport/gnunet-service-transport_validation.c:798
+#, fuzzy
+msgid "# PING message for different peer received"
+msgstr "# PING Nachrichten erstellt"
+
+#: src/transport/gnunet-service-transport_validation.c:833
+#, c-format
 msgid ""
-"Could not create a new TLS certificate, program `gnunet-transport-"
-"certificate-creation' could not be started!\n"
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:215
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/transport/gnunet-service-transport_validation.c:919
+msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:172
-msgid "# refreshed my HELLO"
+#: src/transport/gnunet-service-transport_validation.c:928
+msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1567
-#, fuzzy
-msgid "# IPv4 broadcast HELLO beacons received via udp"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+#: src/transport/gnunet-service-transport_validation.c:1050
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1610
-#, fuzzy
-msgid "# IPv6 multicast HELLO beacons received via udp"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
-
-#: src/transport/plugin_transport_udp.c:2106
-#: src/transport/plugin_transport_udp_new.c:1220
-#, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+#: src/transport/gnunet-service-transport_validation.c:1075
+msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2157
-#: src/transport/plugin_transport_udp_new.c:1270
+#: src/transport/gnunet-service-transport_validation.c:1134
 #, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
+msgid "Adding `%s' without addresses for peer `%s'\n"
+msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/plugin_transport_udp.c:2301
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+#: src/transport/gnunet-transport.c:256
+msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2372
-#: src/transport/plugin_transport_udp_new.c:1398
-#, fuzzy
-msgid "Failed to open UDP sockets\n"
-msgstr "Fehler beim Binden an UDP6 Port %d.\n"
-
-#: src/transport/plugin_transport_http_client.c:108
-#: src/transport/plugin_transport_http_client.c:123
-#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
-#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
-#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
+#: src/transport/gnunet-transport.c:269
 #, c-format
-msgid "%s failed at %s:%d: `%s'\n"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+msgid "No port configured for plugin `%s', cannot test it\n"
+msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:620
+#: src/transport/gnunet-transport.c:319
 #, c-format
-msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
+msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:514
+#: src/transport/gnunet-transport.c:326
 #, c-format
-msgid "Unexpected address length: %u bytes\n"
+msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:601
-#: src/transport/plugin_transport_tcp.c:690
-#: src/transport/plugin_transport_tcp.c:742
-#: src/transport/plugin_transport_tcp.c:831
-#: src/transport/plugin_transport_tcp.c:1173
-#: src/transport/plugin_transport_tcp.c:1254
-#, fuzzy
-msgid "# bytes currently in TCP buffers"
-msgstr "# Bytes gesendet über TCP"
+#: src/transport/gnunet-transport.c:359
+#, fuzzy, c-format
+msgid "Transmitting %u bytes to %s\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/plugin_transport_tcp.c:607
-#: src/transport/plugin_transport_tcp.c:857
-#: src/transport/plugin_transport_tcp.c:1828
-#, fuzzy
-msgid "# TCP sessions active"
-msgstr "# Sitzungsschlüssel akzeptiert"
+#: src/transport/gnunet-transport.c:379
+#, fuzzy, c-format
+msgid "Connected to %s\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/plugin_transport_tcp.c:694
-#, fuzzy
-msgid "# bytes discarded by TCP (timeout)"
-msgstr "# Bytes verworfen von TCP (ausgehend)"
+#: src/transport/gnunet-transport.c:410
+#, fuzzy, c-format
+msgid "Disconnected from %s\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/plugin_transport_tcp.c:745
-#, fuzzy
-msgid "# bytes transmitted via TCP"
-msgstr "# Bytes des Typs %d übertragen"
+#: src/transport/gnunet-transport.c:439
+#, fuzzy, c-format
+msgid "Received %u bytes from %s\n"
+msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/transport/plugin_transport_tcp.c:835
-#, fuzzy
-msgid "# bytes discarded by TCP (disconnect)"
-msgstr "# Bytes verworfen von TCP (ausgehend)"
+#: src/transport/gnunet-transport.c:453
+#, fuzzy, c-format
+msgid "Peer `%s': %s %s\n"
+msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/plugin_transport_tcp.c:956
-#, fuzzy
-msgid "# bytes TCP was asked to transmit"
-msgstr "# Bytes des Typs %d übertragen"
+#: src/transport/gnunet-transport.c:483
+#, fuzzy, c-format
+msgid "Peer `%s' disconnected\n"
+msgstr "# verbundener Knoten"
 
-#: src/transport/plugin_transport_tcp.c:1007
-msgid "# bytes discarded by TCP (no address and no connection)"
-msgstr ""
+#: src/transport/gnunet-transport.c:539
+#, fuzzy, c-format
+msgid "Failed to parse peer identity `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/plugin_transport_tcp.c:1050
-#: src/transport/plugin_transport_tcp.c:1368
-#, c-format
-msgid "Address of unexpected length: %u\n"
+#: src/transport/gnunet-transport.c:587
+msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1067
-#: src/transport/plugin_transport_tcp.c:1404
-msgid "Found valid IPv4 NAT address (creating session)!\n"
-msgstr ""
+#: src/transport/gnunet-transport.c:590
+#, fuzzy
+msgid "try to connect to the given peer"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/plugin_transport_tcp.c:1118
+#: src/transport/gnunet-transport.c:593
 #, fuzzy
-msgid "# bytes discarded by TCP (failed to connect)"
-msgstr "# Bytes verworfen von TCP (ausgehend)"
+msgid "provide information about all current connections (once)"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/plugin_transport_tcp.c:1508
-msgid "# transport-service disconnect requests for TCP"
-msgstr ""
+#: src/transport/gnunet-transport.c:596
+#, fuzzy
+msgid "provide information about all current connections (continuously)"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/plugin_transport_tcp.c:1871
+#: src/transport/gnunet-transport.c:599
 #, fuzzy
-msgid "# TCP WELCOME messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+msgid "do not resolve hostnames"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/plugin_transport_tcp.c:2021
-msgid "# bytes received via TCP"
-msgstr "# Bytes empfangen über TCP"
+#: src/transport/gnunet-transport.c:603
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
+msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2089
-msgid "# network-level TCP disconnect events"
+#: src/transport/gnunet-transport.c:606
+msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2242
+#: src/transport/gnunet-transport.c:614
 #, fuzzy
-msgid "Failed to start service.\n"
-msgstr "Fehler beim Starten der Collection.\n"
-
-#: src/transport/plugin_transport_tcp.c:2307
-#, fuzzy, c-format
-msgid "Failed to find option %s in section %s!\n"
-msgstr "Fehler beim Binden an UDP Port %d.\n"
-
-#: src/transport/plugin_transport_tcp.c:2330
-#, fuzzy, c-format
-msgid "TCP transport listening on port %llu\n"
+msgid "Direct access to transport service."
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_tcp.c:2334
-msgid "TCP transport not listening on any port (client only)\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2338
-#, c-format
-msgid "TCP transport advertises itself as being on port %llu\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:984
+#: src/transport/plugin_transport_http.c:981
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1032
+#: src/transport/plugin_transport_http.c:1029
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/transport/plugin_transport_http.c:1179
+#: src/transport/plugin_transport_http.c:1054 src/util/service.c:986
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/transport/plugin_transport_http.c:1071 src/util/service.c:1003
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "Fehler beim Binden an UDP Port %d.\n"
+
+#: src/transport/plugin_transport_http.c:1176
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1192
+#: src/transport/plugin_transport_http.c:1189
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1267
+#: src/transport/plugin_transport_http.c:1264
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
 
-#: src/transport/plugin_transport_http.c:1280
+#: src/transport/plugin_transport_http.c:1277
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/transport/plugin_transport_http.c:1291
+#: src/transport/plugin_transport_http.c:1288
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1311
+#: src/transport/plugin_transport_http.c:1308
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1341
+#: src/transport/plugin_transport_http.c:1338
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1096
-#, fuzzy
-msgid "Failed to open UNIX sockets\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+#: src/transport/plugin_transport_http_client.c:621
+#, c-format
+msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
+msgstr ""
 
+#: src/transport/plugin_transport_http_server.c:189
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:213
+msgid "No usable TLS certificate found and creating one failed!\n"
+msgstr ""
+
 #: src/transport/plugin_transport_smtp.c:370
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -3636,25 +4756,132 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/gnunet-service-transport_plugins.c:111
-msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+#: src/transport/plugin_transport_tcp.c:512
+#, c-format
+msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:118
+#: src/transport/plugin_transport_tcp.c:616
+#: src/transport/plugin_transport_tcp.c:705
+#: src/transport/plugin_transport_tcp.c:757
+#: src/transport/plugin_transport_tcp.c:830
+#: src/transport/plugin_transport_tcp.c:909
+#, fuzzy
+msgid "# bytes currently in TCP buffers"
+msgstr "# Bytes gesendet über TCP"
+
+#: src/transport/plugin_transport_tcp.c:622
+#: src/transport/plugin_transport_tcp.c:856
+#: src/transport/plugin_transport_tcp.c:1561
+#, fuzzy
+msgid "# TCP sessions active"
+msgstr "# Sitzungsschlüssel akzeptiert"
+
+#: src/transport/plugin_transport_tcp.c:709
+#, fuzzy
+msgid "# bytes discarded by TCP (timeout)"
+msgstr "# Bytes verworfen von TCP (ausgehend)"
+
+#: src/transport/plugin_transport_tcp.c:760
+#, fuzzy
+msgid "# bytes transmitted via TCP"
+msgstr "# Bytes des Typs %d übertragen"
+
+#: src/transport/plugin_transport_tcp.c:834
+#, fuzzy
+msgid "# bytes discarded by TCP (disconnect)"
+msgstr "# Bytes verworfen von TCP (ausgehend)"
+
+#: src/transport/plugin_transport_tcp.c:1081
+#, c-format
+msgid "Address of unexpected length: %u\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1116
+msgid "Found valid IPv4 NAT address (creating session)!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1186
+msgid "# transport-service disconnect requests for TCP"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1603
+#, fuzzy
+msgid "# TCP WELCOME messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/plugin_transport_tcp.c:1756
+msgid "# bytes received via TCP"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/transport/plugin_transport_tcp.c:1823
+msgid "# network-level TCP disconnect events"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1976
+#, fuzzy
+msgid "Failed to start service.\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/transport/plugin_transport_tcp.c:2039
 #, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Teste Transport(e) %s\n"
+msgid "Failed to find option %s in section %s!\n"
+msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:122
+#: src/transport/plugin_transport_tcp.c:2062
 #, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Teste Transport(e) %s\n"
+msgid "TCP transport listening on port %llu\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:150
+#: src/transport/plugin_transport_tcp.c:2066
+msgid "TCP transport not listening on any port (client only)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2070
+#, c-format
+msgid "TCP transport advertises itself as being on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:130
+#, fuzzy
+msgid "# IPv6 multicast HELLO beacons received via udp"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:172
+#, fuzzy
+msgid "# IPv4 broadcast HELLO beacons received via udp"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:393
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:1971
+#, fuzzy
+msgid "Failed to open UDP sockets\n"
+msgstr "Fehler beim Binden an UDP6 Port %d.\n"
+
+#: src/transport/plugin_transport_udp.c:2054
+#, c-format
+msgid "Given `%s' option is out of range: %llu > %u\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2098
 #, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+msgid "Invalid IPv6 address: `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
 
+#: src/transport/plugin_transport_unix.c:1051
+#, fuzzy
+msgid "Failed to open UNIX sockets\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
 #: src/transport/plugin_transport_wlan.c:880
 #, fuzzy
 msgid "# wlan session timeouts"
@@ -3669,8 +4896,8 @@
 #: src/transport/plugin_transport_wlan.c:1151
 #: src/transport/plugin_transport_wlan.c:1172
 #: src/transport/plugin_transport_wlan.c:1203
-#: src/transport/plugin_transport_wlan.c:2378
-#: src/transport/plugin_transport_wlan.c:3240
+#: src/transport/plugin_transport_wlan.c:2398
+#: src/transport/plugin_transport_wlan.c:3260
 msgid "# wlan pending sessions"
 msgstr ""
 
@@ -3706,1076 +4933,966 @@
 msgid "# wlan fragments send"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:2245
+#: src/transport/plugin_transport_wlan.c:2223
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2250
-#, fuzzy
-msgid "# wlan messages queued"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
-
-#: src/transport/plugin_transport_wlan.c:2339
-#: src/transport/plugin_transport_wlan.c:2996
-#: src/transport/plugin_transport_wlan.c:3243
+#: src/transport/plugin_transport_wlan.c:2359
+#: src/transport/plugin_transport_wlan.c:3016
+#: src/transport/plugin_transport_wlan.c:3263
 msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2567
+#: src/transport/plugin_transport_wlan.c:2587
 #, fuzzy
 msgid "# wlan whole messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2770
+#: src/transport/plugin_transport_wlan.c:2790
 #, fuzzy
 msgid "# wlan hello messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2807
+#: src/transport/plugin_transport_wlan.c:2827
 #, fuzzy
 msgid "# wlan fragments received"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:2859
+#: src/transport/plugin_transport_wlan.c:2879
 #, fuzzy
 msgid "# wlan acks received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2956
+#: src/transport/plugin_transport_wlan.c:2976
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2980
+#: src/transport/plugin_transport_wlan.c:3000
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:3038
+#: src/transport/plugin_transport_wlan.c:3058
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3094
+#: src/transport/plugin_transport_wlan.c:3114
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:3105
+#: src/transport/plugin_transport_wlan.c:3125
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/transport/gnunet-transport.c:251
-msgid "No transport plugins configured, peer will never communicate\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:264
-#, c-format
-msgid "No port configured for plugin `%s', cannot test it\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:314
-#, c-format
-msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:321
-#, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:354
+#: src/transport/transport_api.c:588
 #, fuzzy, c-format
-msgid "Transmitting %u bytes to %s\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "Received unexpected message of type %u in %s:%u\n"
+msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
 
-#: src/transport/gnunet-transport.c:374
+#: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
-msgid "Connected to %s\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
+msgid "Error reading `%s': %s"
+msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/transport/gnunet-transport.c:405
-#, fuzzy, c-format
-msgid "Disconnected from %s\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
-
-#: src/transport/gnunet-transport.c:434
-#, fuzzy, c-format
-msgid "Received %u bytes from %s\n"
-msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
-
-#: src/transport/gnunet-transport.c:448
-#, fuzzy, c-format
-msgid "Peer `%s': %s %s\n"
-msgstr "Ich bin Peer `%s'.\n"
-
-#: src/transport/gnunet-transport.c:512
-#, fuzzy, c-format
-msgid "Failed to parse peer identity `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/transport/gnunet-transport.c:549
-msgid "measure how fast we are receiving data (until CTRL-C)"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:552
+#: src/util/bio.c:143
 #, fuzzy
-msgid "try to connect to the given peer"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+msgid "End of file"
+msgstr "Eine Konfigurationsdatei laden"
 
-#: src/transport/gnunet-transport.c:555
-#, fuzzy
-msgid "provide information about all current connections (once)"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/transport/gnunet-transport.c:559
-msgid "send data for benchmarking to the other peer (until CTRL-C)"
+#: src/util/bio.c:195
+#, c-format
+msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:562
-msgid "test transport configuration (involves external server)"
+#: src/util/bio.c:205
+#, c-format
+msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:565
-#, fuzzy
-msgid "do not resolve hostnames"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/transport/gnunet-transport.c:573
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-
-#: src/transport/gnunet-service-transport_validation.c:410
-msgid "# address records discarded"
+#: src/util/bio.c:250
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:459
+#: src/util/bio.c:264
 #, c-format
-msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:496
-#, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# Klartext PING Nachrichten gesendet"
-
-#: src/transport/gnunet-service-transport_validation.c:554
-msgid "# address revalidations started"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:775
-#, fuzzy
-msgid "# PING message for different peer received"
-msgstr "# PING Nachrichten erstellt"
-
-#: src/transport/gnunet-service-transport_validation.c:810
+#: src/util/client.c:304
 #, c-format
 msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+"Could not determine valid hostname and port for service `%s' from "
+"configuration.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:878
-msgid "# PONGs unicast via reliable transport"
+#: src/util/client.c:312
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:887
-msgid "# PONGs multicast to all available addresses"
+#: src/util/client.c:657
+msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1009
-msgid "# PONGs dropped, no matching pending validation"
+#: src/util/client.c:717 src/util/service.c:919
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1034
-msgid "# PONGs dropped, signature expired"
-msgstr ""
+#: src/util/client.c:859
+#, fuzzy, c-format
+msgid "Could not connect to service `%s', must not be running.\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1093
+#: src/util/client.c:875
 #, fuzzy, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
-msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
+msgid "Failure to transmit request to service `%s'\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:253
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+#: src/util/client.c:1143
+msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:258
-#, fuzzy
-msgid "# messages dropped due to slow client"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+#: src/util/common_logging.c:239 src/util/common_logging.c:889
+msgid "DEBUG"
+msgstr "DEBUG"
 
-#: src/transport/gnunet-service-transport_clients.c:405
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
-msgstr ""
+#: src/util/common_logging.c:241 src/util/common_logging.c:887
+msgid "INFO"
+msgstr "INFO"
 
-#: src/transport/gnunet-service-transport_clients.c:523
-#, fuzzy
-msgid "# bytes payload received for other peers"
-msgstr "# Bytes des Typs %d empfangen"
+#: src/util/common_logging.c:243 src/util/common_logging.c:885
+msgid "WARNING"
+msgstr "WARNUNG"
 
-#: src/transport/gnunet-service-transport_clients.c:540
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/util/common_logging.c:245 src/util/common_logging.c:883
+msgid "ERROR"
+msgstr "FEHLER"
+
+#: src/util/common_logging.c:247 src/util/common_logging.c:891
+msgid "NONE"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:591
-#, fuzzy
-msgid "# REQUEST CONNECT messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
-
-#: src/transport/transport_api.c:588
+#: src/util/common_logging.c:609
 #, fuzzy, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
-msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
+msgid "Failed to create or access directory for log file `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/transport/gnunet-service-transport.c:158
-#, fuzzy
-msgid "# bytes payload discarded due to not connected peer "
-msgstr "# Knotenankündigungen empfangen"
-
-#: src/transport/gnunet-service-transport.c:555
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+#: src/util/common_logging.c:724
+#, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:564
-msgid "Transport service could not access hostkey.  Exiting.\n"
+#: src/util/common_logging.c:892
+msgid "INVALID"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:159
-#, fuzzy, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
-msgstr "Beschädigte Nachricht von Knoten `%s' in %s:%d empfangen.\n"
-
-#: src/dv/dv_api.c:179
+#: src/util/common_logging.c:991
 #, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+msgid "unknown address"
+msgstr "Unbekannter Fehler"
 
-#: src/topology/gnunet-daemon-topology.c:244
-msgid "# peers blacklisted"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:380
+#: src/util/common_logging.c:1029
 #, fuzzy
-msgid "# connect requests issued to transport"
-msgstr "# Client Trace-Anfragen empfangen"
+msgid "invalid address"
+msgstr "Ungültige Parameter: "
 
-#: src/topology/gnunet-daemon-topology.c:675
-#: src/topology/gnunet-daemon-topology.c:761
-#, fuzzy
-msgid "# friends connected"
-msgstr "# verbundener Knoten"
-
-#: src/topology/gnunet-daemon-topology.c:875
-#: src/hostlist/hostlist-server.c:184
+#: src/util/configuration.c:245
 #, fuzzy, c-format
-msgid "Error in communication with PEERINFO service: %s\n"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+msgid "Syntax error in configuration file `%s' at line %u.\n"
+msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/topology/gnunet-daemon-topology.c:950
-msgid "Failed to connect to core service, can not manage topology!\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:982
+#: src/util/configuration.c:817
 #, c-format
-msgid "Option `%s' in section `%s' not specified!\n"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:994
+#: src/util/connection.c:461
 #, fuzzy, c-format
-msgid "Could not read friends list `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "Access denied to `%s'\n"
+msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1000
+#: src/util/connection.c:476
 #, c-format
-msgid "Friends file `%s' is empty.\n"
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/util/connection.c:642
 #, fuzzy, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid ""
+"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
+msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1017
-#, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/topology/gnunet-daemon-topology.c:1037
+#: src/util/connection.c:852 src/util/connection.c:1025
 #, fuzzy, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
-msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
+msgid "Trying to connect to `%s' (%p)\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/util/connection.c:862
 #, fuzzy, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
-msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
+msgid "Failed to connect to `%s' (%p)\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1060
+#: src/util/connection.c:1015
 #, fuzzy, c-format
-msgid "Found friend `%s' in configuration\n"
-msgstr " gconfig\tGTK Konfiguration\n"
+msgid "Attempt to connect to `%s' failed\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1066
+#: src/util/connection.c:1528
 #, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
+msgid ""
+"Could not satisfy pending transmission request, socket closed or connect "
+"failed (%p).\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1076
-#, fuzzy
-msgid "# friends in configuration"
-msgstr " gconfig\tGTK Konfiguration\n"
+#: src/util/connection.c:1564
+#, fuzzy, c-format
+msgid "Failed to send to `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1082
+#: src/util/container_bloomfilter.c:507
+#, c-format
 msgid ""
-"Fewer friends specified than required by minimum friend count. Will only "
-"connect to friends.\n"
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1089
-msgid ""
-"More friendly connections required than target total number of connections.\n"
+#: src/util/crypto_random.c:280
+#, c-format
+msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1126
-#, fuzzy
-msgid "# HELLO messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
-
-#: src/topology/gnunet-daemon-topology.c:1183
-#, fuzzy
-msgid "# HELLO messages gossipped"
-msgstr "# ausgehender Nachrichten verworfen"
-
-#: src/topology/gnunet-daemon-topology.c:1323
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/util/crypto_random.c:308
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
+"libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/chat/chat.c:175
-#, fuzzy
-msgid "Could not transmit confirmation receipt\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
-
-#: src/chat/chat.c:283
-msgid "The current user must be the the first one joined\n"
-msgstr ""
-
-#: src/chat/chat.c:412
+#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
 #, fuzzy, c-format
-msgid "Unknown message type: '%u'\n"
-msgstr "Unbekannte Operation `%s'\n"
+msgid "Could not aquire lock on file `%s': %s...\n"
+msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/chat/chat.c:472
-#, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
-#: src/chat/chat.c:480
-#, fuzzy, c-format
-msgid "Failed to access chat home directory `%s'\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#: src/chat/chat.c:498
-#, fuzzy, c-format
-msgid "Failed to create/open key in file `%s'\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/chat/chat.c:559
+#: src/util/crypto_rsa.c:623
 #, fuzzy
-msgid "Could not serialize metadata\n"
-msgstr "Konnte libgnunetutil nicht initialisieren!\n"
+msgid "Creating a new private key.  This may take a while.\n"
+msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
 
-#: src/chat/chat.c:674
-#, fuzzy
-msgid "Failed to connect to the chat service\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/chat/chat.c:680
-msgid "Undefined mandatory parameter: joinCallback\n"
+#: src/util/crypto_rsa.c:641
+#, c-format
+msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/chat/chat.c:686
-msgid "Undefined mandatory parameter: messageCallback\n"
+#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/chat/chat.c:692
-msgid "Undefined mandatory parameter: memberCallback\n"
+#: src/util/crypto_rsa.c:700
+#, c-format
+msgid ""
+"When trying to read hostkey file `%s' I found %u bytes but I need at least "
+"%u.\n"
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:267
-#, fuzzy
-msgid "Failed to queue a message notification\n"
-msgstr "Fehler beim Speichern der Konfiguration!"
-
-#: src/chat/gnunet-service-chat.c:546
-#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "Fehler beim Abfragen der Netzwerkverkehrsbedingungen von gnunetd.\n"
-
-#: src/chat/gnunet-service-chat.c:729
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "Fehler beim Speichern der Konfiguration!"
-
-#: src/chat/gnunet-service-chat.c:907
-#, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "Fehler beim Speichern der Konfiguration!"
-
-#: src/chat/gnunet-chat.c:92
-msgid "Joined\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:124
-msgid "anonymous"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:130
+#: src/util/crypto_rsa.c:720
 #, fuzzy, c-format
-msgid "(%s) `%s' said: %s\n"
-msgstr "`%s' %s schlug fehl: %s\n"
+msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/util/crypto_rsa.c:738
 #, fuzzy, c-format
-msgid "(%s) `%s' said to you: %s\n"
-msgstr "`%s' %s schlug fehl: %s\n"
+msgid "I am host `%s'.  Read private key from `%s'.\n"
+msgstr "Aufruf von `%s' mit Schlüssel `%s'.\n"
 
-#: src/chat/gnunet-chat.c:139
+#: src/util/crypto_rsa.c:959
+#, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
+msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
+
+#: src/util/disk.c:479
 #, fuzzy, c-format
-msgid "(%s) `%s' said for sure: %s\n"
+msgid "`%s' failed for drive `%S': %u\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/chat/gnunet-chat.c:142
+#: src/util/disk.c:1087
 #, fuzzy, c-format
-msgid "(%s) `%s' said to you for sure: %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+msgid "Expected `%s' to be a directory!\n"
+msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/chat/gnunet-chat.c:145
+#: src/util/disk.c:1441 src/util/service.c:1580
 #, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you received: %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/chat/gnunet-chat.c:148
+#: src/util/disk.c:1759
 #, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+msgid "No `%s' specified for service `%s' in configuration.\n"
+msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/chat/gnunet-chat.c:151
-#, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+#: src/util/getopt.c:672
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/chat/gnunet-chat.c:156
-#, fuzzy, c-format
-msgid ""
-"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+#: src/util/getopt.c:696
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: Option '--%s' erlaubt keinen Parameter\n"
 
-#: src/chat/gnunet-chat.c:159
-#, fuzzy, c-format
-msgid "(%s) `%s' said off the record: %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+#: src/util/getopt.c:701
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s: Option '%c%s' erlaubt keinen Parameter\n"
 
-#: src/chat/gnunet-chat.c:162
+#: src/util/getopt.c:718 src/util/getopt.c:886
 #, c-format
-msgid "(%s) <%s> said using an unknown message type: %s\n"
-msgstr ""
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: Option `%s' benötigt einen Parameter\n"
 
-#: src/chat/gnunet-chat.c:193
+#: src/util/getopt.c:747
 #, c-format
-msgid "'%s' acknowledged message #%d\n"
-msgstr ""
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: unbekannte Option '--%s'\n"
 
-#: src/chat/gnunet-chat.c:224
+#: src/util/getopt.c:751
 #, c-format
-msgid "`%s' entered the room\n"
-msgstr ""
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: unbekannte Option '%c%s'\n"
 
-#: src/chat/gnunet-chat.c:224
-#, fuzzy, c-format
-msgid "`%s' left the room\n"
-msgstr "Fehler beim Binden an UDP Port %d.\n"
+#: src/util/getopt.c:776
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: unerlaubte Option -- %c\n"
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
-#, fuzzy
-msgid "Could not change username\n"
-msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+#: src/util/getopt.c:778
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ungültige Option -- %c\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
-#, fuzzy, c-format
-msgid "Joining room `%s' as user `%s'...\n"
-msgstr "Ungültige Antwort auf `%s' von Knoten `%s' empfangen.\n"
+#: src/util/getopt.c:806 src/util/getopt.c:934
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: Option benötigt einen Parameter -- %c\n"
 
-#: src/chat/gnunet-chat.c:320
-#, fuzzy, c-format
-msgid "Changed username to `%s'\n"
-msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
+#: src/util/getopt.c:854
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: Option '-W %s' ist mehrdeutig\n"
 
-#: src/chat/gnunet-chat.c:333
+#: src/util/getopt.c:872
 #, c-format
-msgid "Users in room `%s': "
-msgstr ""
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s: Option '-W %s' erlaubt keinen Parameter\n"
 
-#: src/chat/gnunet-chat.c:371
-msgid "Syntax: /msg USERNAME MESSAGE"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:379
+#: src/util/getopt.c:1038
 #, fuzzy, c-format
-msgid "Unknown user `%s'\n"
-msgstr "Unbekannte Operation `%s'\n"
+msgid "Use %s to get a list of options.\n"
+msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
 
-#: src/chat/gnunet-chat.c:395
+#: src/util/getopt_helpers.c:84
 #, c-format
-msgid "User `%s' is currently not in the room!\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
+"Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
+"Optionen zwingend.\n"
 
-#: src/chat/gnunet-chat.c:448
-#, fuzzy, c-format
-msgid "Unknown command `%s'\n"
-msgstr "Unbekannte Operation `%s'\n"
+#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "Sie müssen für die Option `%s' zusätzlich eine Zahl angeben.\n"
 
-#: src/chat/gnunet-chat.c:459
-msgid ""
-"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
-"leave the current room"
+#: src/util/gnunet-resolver.c:148
+msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:463
-msgid ""
-"Use `/nick nickname' to change your nickname.  This will cause you to leave "
-"the current room and immediately rejoin it with the new name."
+#: src/util/gnunet-resolver.c:154
+msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
-msgid ""
-"Use `/msg nickname message' to send a private message to the specified user"
-msgstr ""
+#: src/util/gnunet-service-resolver.c:288
+#, fuzzy, c-format
+msgid "Could not resolve `%s' (%s): %s\n"
+msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/chat/gnunet-chat.c:470
-msgid "The `/notice' command is an alias for `/msg'"
-msgstr ""
+#: src/util/gnunet-service-resolver.c:358
+#: src/util/gnunet-service-resolver.c:399
+#, c-format
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/chat/gnunet-chat.c:472
-msgid "The `/query' command is an alias for `/msg'"
+#: src/util/gnunet-service-resolver.c:494
+#, c-format
+msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
-msgid "Use `/sig message' to send a signed public message"
+#: src/util/gnunet-service-resolver.c:529
+#, c-format
+msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
-msgid "Use `/ack message' to require signed acknowledgment of the message"
-msgstr ""
+#: src/util/helper.c:239
+#, fuzzy, c-format
+msgid "Error reading from `%s': %s\n"
+msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/chat/gnunet-chat.c:480
-msgid "Use `/anonymous message' to send a public anonymous message"
+#: src/util/helper.c:254
+#, c-format
+msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
-msgid "The `/anon' command is an alias for `/anonymous'"
-msgstr ""
+#: src/util/helper.c:264
+#, fuzzy, c-format
+msgid "Got %u bytes from helper `%s'\n"
+msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/chat/gnunet-chat.c:484
-msgid "Use `/quit' to terminate gnunet-chat"
-msgstr ""
+#: src/util/helper.c:273
+#, fuzzy, c-format
+msgid "Failed to parse inbound message from helper `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/chat/gnunet-chat.c:486
-msgid "The `/leave' command is an alias for `/quit'"
-msgstr ""
+#: src/util/helper.c:431
+#, fuzzy, c-format
+msgid "Error writing to `%s': %s\n"
+msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/chat/gnunet-chat.c:489
-msgid "Use `/names' to list all of the current members in the chat room"
+#: src/util/network.c:1204
+#, c-format
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
-msgid "Use `/help command' to get help for a specific command"
+#: src/util/os_installation.c:299
+#, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:606
-#, fuzzy
-msgid "You must specify a nickname\n"
-msgstr "Sie müssen einen Empfänger angeben!\n"
+#: src/util/os_installation.c:486
+#, fuzzy, c-format
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/chat/gnunet-chat.c:622
+#: src/util/os_installation.c:492
 #, fuzzy, c-format
-msgid "Failed to join room `%s'\n"
-msgstr "Fehler beim Binden an UDP Port %d.\n"
+msgid "access (%s, X_OK) failed: %s\n"
+msgstr "`%s' schlug fehl: %s\n"
 
-#: src/chat/gnunet-chat.c:655
-msgid "set the nickname to use (required)"
-msgstr ""
+#: src/util/os_installation.c:507
+#, fuzzy, c-format
+msgid "stat (%s) failed: %s\n"
+msgstr "`%s' schlug fehl: %s\n"
 
-#: src/chat/gnunet-chat.c:658
-msgid "set the chat room to join"
+#: src/util/os_priority.c:117
+#, c-format
+msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:670
-msgid "Join a chat on GNUnet."
-msgstr ""
-
-#: src/nat/gnunet-nat-server.c:289
+#: src/util/plugin.c:89
 #, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
-msgstr ""
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
 
-#: src/nat/gnunet-nat-server.c:328
-msgid "GNUnet NAT traversal test helper daemon"
+#: src/util/plugin.c:146
+#, fuzzy, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
+"`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
 
-#: src/nat/nat.c:803
-#, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
-msgstr ""
+#: src/util/plugin.c:219
+#, fuzzy, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
 
-#: src/nat/nat.c:852
+#: src/util/plugin.c:349
+#, fuzzy
+msgid "Could not determine plugin installation path.\n"
+msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+
+#: src/util/pseudonym.c:273
 #, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "Fehler beim Starten der Collection.\n"
+msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/nat/nat.c:1121
+#: src/util/pseudonym.c:338
+#, fuzzy
+msgid "no-name"
+msgstr "Name anzeigen"
+
+#: src/util/resolver_api.c:202
 #, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "Fehler beim Speichern der Konfiguration!"
+msgid "Must specify `%s' for `%s' in configuration!\n"
+msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
 
-#: src/nat/nat.c:1187 src/nat/nat.c:1197
-#, c-format
+#: src/util/resolver_api.c:221
+#, fuzzy, c-format
 msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
+"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
+"Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
+"positive Zahl angeben.\n"
 
-#: src/nat/nat.c:1329
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+#: src/util/resolver_api.c:351
+#, fuzzy, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
+
+#: src/util/resolver_api.c:355
+#, fuzzy, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/util/resolver_api.c:426
+#, c-format
+msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/util/resolver_api.c:807
 #, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
+msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_test.c:348
-#, fuzzy
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/nat/nat_test.c:418
+#: src/util/resolver_api.c:901
 #, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:124
+#: src/util/resolver_api.c:906
 #, fuzzy, c-format
-msgid "Block not of type %u\n"
-msgstr "Kein Transport des Typs %d bekannt.\n"
+msgid "Could not resolve our FQDN : %s\n"
+msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/dht/plugin_block_dht.c:131
-msgid "Size mismatch for block\n"
+#: src/util/resolver_api.c:938
+#, c-format
+msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:140
-#, c-format
-msgid "Block of type %u is malformed\n"
+#: src/util/scheduler.c:870
+msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/fs/plugin_block_fs.c:131
-msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+#: src/util/scheduler.c:1000
+#, c-format
+msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/block/block.c:105
+#: src/util/server.c:397
 #, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
-msgstr "Teste Transport(e) %s\n"
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/mesh/gnunet-service-mesh.c:4214
-msgid "MESH: Wrong CORE service\n"
-msgstr ""
+#: src/util/server.c:406
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/mesh/gnunet-service-mesh.c:4419
-#, fuzzy
-msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
-msgstr "GNUnet Konfiguration"
-
-#: src/mesh/gnunet-service-mesh.c:4428
-#, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
-
-#: src/hostlist/hostlist-client.c:286
-msgid "# bytes downloaded from hostlist servers"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
-#, fuzzy
-msgid "# invalid HELLOs downloaded from hostlist servers"
-msgstr "# Hellos per HTTP heruntergeladen"
-
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/util/server.c:411
 #, fuzzy, c-format
-msgid "Invalid `%s' message received from hostlist at `%s'\n"
-msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/hostlist/hostlist-client.c:330
-#, fuzzy
-msgid "# valid HELLOs downloaded from hostlist servers"
-msgstr "# Hellos per HTTP heruntergeladen"
-
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#: src/util/server.c:640
 #, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
+msgid ""
+"Processing code for message of type %u did not call "
+"GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
-msgid "# advertised hostlist URIs"
-msgstr ""
+#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
+#: src/util/service.c:207 src/util/service.c:214
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/hostlist/hostlist-client.c:622
+#: src/util/service.c:170
 #, c-format
-msgid "# advertised URI `%s' downloaded"
-msgstr ""
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/hostlist/hostlist-client.c:663
+#: src/util/service.c:263
 #, c-format
-msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
-msgstr ""
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
 
-#: src/hostlist/hostlist-client.c:805
+#: src/util/service.c:296
 #, fuzzy, c-format
-msgid "Timeout trying to download hostlist from `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/hostlist/hostlist-client.c:822
+#: src/util/service.c:326
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Falsches Format `%s' für Netzwerk: %s\n"
+
+#: src/util/service.c:668
 #, c-format
-msgid "Download limit of %u bytes exceeded, stopping download\n"
+msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/util/service.c:673
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+msgid "Unknown address family %d\n"
+msgstr "Unbekannte Operation `%s'\n"
 
-#: src/hostlist/hostlist-client.c:848
-#, fuzzy, c-format
-msgid "Download of hostlist `%s' completed.\n"
+#: src/util/service.c:680
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
-"Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
-"beträgt %8.3f KB/s.\n"
 
-#: src/hostlist/hostlist-client.c:856
+#: src/util/service.c:724
 #, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:909
+#: src/util/service.c:752
 #, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
-msgid "# hostlist downloads initiated"
+#: src/util/service.c:869
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
-msgid "# milliseconds between hostlist downloads"
+#: src/util/service.c:939
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/util/service.c:956
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
-msgid "Scheduled saving of hostlists\n"
+#: src/util/service.c:1191
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/util/service.c:1242 src/util/service.c:1260
 #, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
-#, fuzzy
-msgid "# active connections"
-msgstr "GNUnet Konfiguration"
-
-#: src/hostlist/hostlist-client.c:1253
+#: src/util/service.c:1287
 #, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1284
-#, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
-msgstr ""
+#: src/util/service.c:1442
+#, fuzzy, c-format
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/util/service.c:1475
 #, fuzzy, c-format
-msgid "Loading saved hostlist entries from file `%s' \n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "Service `%s' runs at %s\n"
+msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1294
-#, c-format
-msgid "Hostlist file `%s' is not existing\n"
+#: src/util/service.c:1521
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1305
-#, fuzzy, c-format
-msgid "Could not open file `%s' for reading to load hostlists: %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+#: src/util/service.c:1525
+msgid "Service process could not initialize server function\n"
+msgstr ""
 
-#: src/hostlist/hostlist-client.c:1338
-#, c-format
-msgid "%u hostlist URIs loaded from file\n"
+#: src/util/service.c:1529
+msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1340
-msgid "# hostlist URIs read from file"
+#: src/util/service.c:1581
+msgid "No such user"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/util/service.c:1594
 #, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
+
+#: src/util/service.c:1657
+msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1387
+#: src/util/signal.c:80
 #, fuzzy, c-format
-msgid "Could not open file `%s' for writing to save hostlists: %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "signal (%d, %p) returned %d.\n"
+msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/hostlist/hostlist-client.c:1392
-#, fuzzy, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+#: src/util/strings.c:143
+msgid "b"
+msgstr "b"
 
-#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#: src/util/strings.c:354
 #, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
+msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1428
-msgid "# hostlist URIs written to file"
+#: src/util/strings.c:462
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1480
-msgid "Learning is enabled on this peer\n"
-msgstr ""
+#: src/util/strings.c:554
+msgid "ms"
+msgstr "ms"
 
-#: src/hostlist/hostlist-client.c:1483
-#, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
+#: src/util/strings.c:559
+msgid "eternity"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
-msgid "Learning is not enabled on this peer\n"
-msgstr ""
+#: src/util/strings.c:563
+msgid "s"
+msgstr "s"
 
-#: src/hostlist/hostlist-client.c:1504
-#, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
-msgstr ""
+#: src/util/strings.c:567
+msgid "m"
+msgstr "m"
 
-#: src/hostlist/hostlist-client.c:1508
-#, fuzzy, c-format
-msgid "Hostlist file `%s' could not be removed\n"
-msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
+#: src/util/strings.c:571
+msgid "h"
+msgstr "h"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:264
-msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
-msgstr ""
+#: src/util/strings.c:575
+msgid " days"
+msgstr " Tage"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:317
-msgid "advertise our hostlist to other peers"
+#: src/util/strings.c:599
+msgid "end of time"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:322
-msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
-msgstr ""
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+#, fuzzy
+msgid "# Active tunnels"
+msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
-msgid "enable learning about hostlist servers from other peers"
-msgstr ""
+#: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
+#, fuzzy
+msgid "# Peers connected to mesh tunnels"
+msgstr "# verbundener Knoten"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
-msgid "provide a hostlist server"
-msgstr ""
+#: src/vpn/gnunet-service-vpn.c:699
+#, fuzzy
+msgid "# Bytes given to mesh for transmission"
+msgstr "# PING Nachrichten erstellt"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
-msgid "GNUnet hostlist server and client"
-msgstr ""
+#: src/vpn/gnunet-service-vpn.c:737
+#, fuzzy
+msgid "# Bytes dropped in mesh queue (overflow)"
+msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/hostlist/hostlist-server.c:134
+#: src/vpn/gnunet-service-vpn.c:772
 #, fuzzy
-msgid "bytes in hostlist"
-msgstr "# bytes in der Datenbank"
+msgid "# Mesh tunnels created"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/hostlist/hostlist-server.c:157
-msgid "expired addresses encountered"
+#: src/vpn/gnunet-service-vpn.c:795
+#, fuzzy
+msgid "Failed to setup mesh tunnel!\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/vpn/gnunet-service-vpn.c:967
+#, c-format
+msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:205
-msgid "HELLOs without addresses encountered (ignored)"
+#: src/vpn/gnunet-service-vpn.c:1285
+msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:221
-msgid "bytes not included in hostlist (size limit)"
+#: src/vpn/gnunet-service-vpn.c:1306
+msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:269
-#, fuzzy, c-format
-msgid "Refusing `%s' request to hostlist server\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/hostlist/hostlist-server.c:272
+#: src/vpn/gnunet-service-vpn.c:1511
 #, fuzzy
-msgid "hostlist requests refused (not HTTP GET)"
-msgstr "# Client Trace-Anfragen empfangen"
+msgid "# Packets received from TUN interface"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/hostlist/hostlist-server.c:280
-msgid "Sending 100 CONTINUE reply\n"
+#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#, c-format
+msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:287
+#: src/vpn/gnunet-service-vpn.c:1600
+msgid "Received IPv4 packet with options (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1614
 #, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\n"
+msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:291
+#: src/vpn/gnunet-service-vpn.c:1697
 #, fuzzy
-msgid "hostlist requests refused (upload data)"
-msgstr "# Client Trace-Anfragen empfangen"
+msgid "# ICMP packets received from mesh"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/hostlist/hostlist-server.c:299
-msgid "Could not handle hostlist request since I do not have a response yet\n"
-msgstr ""
+#: src/vpn/gnunet-service-vpn.c:2038
+#, fuzzy
+msgid "# UDP packets received from mesh"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/hostlist/hostlist-server.c:302
+#: src/vpn/gnunet-service-vpn.c:2196
 #, fuzzy
-msgid "hostlist requests refused (not ready)"
-msgstr "# Client Trace-Anfragen empfangen"
+msgid "# TCP packets received from mesh"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/hostlist/hostlist-server.c:306
-msgid "Received request for our hostlist\n"
+#: src/vpn/gnunet-service-vpn.c:2347
+msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:307
+#: src/vpn/gnunet-service-vpn.c:2402
 #, fuzzy
-msgid "hostlist requests processed"
-msgstr "# Client Trace-Anfragen empfangen"
+msgid "Failed to find unallocated IPv6 address in VPN's range\n"
+msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
 
-#: src/hostlist/hostlist-server.c:350
+#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
 #, fuzzy
-msgid "# hostlist advertisements send"
-msgstr "# Bekanntmachungen von anderen übertragen"
+msgid "# Active destinations"
+msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/hostlist-server.c:397
-msgid "Advertisement message could not be queued by core\n"
+#: src/vpn/gnunet-service-vpn.c:2726
+msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
-#, fuzzy, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
-msgstr "Ungültige Parameter. Abbruch.\n"
+#: src/vpn/gnunet-service-vpn.c:3133
+msgid "IPv6 support disabled as this system does not support IPv6\n"
+msgstr ""
 
-#: src/hostlist/hostlist-server.c:574
-#, c-format
-msgid "Hostlist service starts on %s:%llu\n"
+#: src/vpn/gnunet-service-vpn.c:3165
+msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/vpn/gnunet-vpn.c:151
+#, fuzzy
+msgid "Error creating tunnel\n"
+msgstr "Hostkey wurde erfolgreich erzeugt.\n"
+
+#: src/vpn/gnunet-vpn.c:195 src/vpn/gnunet-vpn.c:226
 #, fuzzy, c-format
-msgid "Address to obtain hostlist: `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "Option `%s' makes no sense with option `%s'.\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/hostlist/hostlist-server.c:626
+#: src/vpn/gnunet-vpn.c:208
 #, fuzzy, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/vpn/gnunet-vpn.c:220
 #, fuzzy, c-format
-msgid "Could not find option `%s:%s' in configuration.\n"
-msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/vpn/gnunet-vpn.c:238
 #, fuzzy, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "`%s' ist nicht verfügbar."
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
-#, c-format
-msgid "I am peer `%s'.\n"
-msgstr "Ich bin Peer `%s'.\n"
+#: src/vpn/gnunet-vpn.c:260
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "`%s' ist nicht verfügbar."
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
-msgid "output only the identity strings"
+#: src/vpn/gnunet-vpn.c:296
+msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
-msgid "output our own identity only"
+#: src/vpn/gnunet-vpn.c:299
+msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
-#, fuzzy
-msgid "Print information about peers."
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+#: src/vpn/gnunet-vpn.c:302
+msgid "print IP address only after mesh tunnel has been created"
+msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:144
-msgid "print this help"
-msgstr "Gibt diese Hilfe aus"
+#: src/vpn/gnunet-vpn.c:305
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:154
-msgid "print the version number"
-msgstr "Versionsnummer ausgeben"
+#: src/vpn/gnunet-vpn.c:308
+msgid "destination IP for the tunnel"
+msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:163
-msgid "configure logging to write logs to LOGFILE"
+#: src/vpn/gnunet-vpn.c:311
+msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:172
-msgid "configure logging to use LOGLEVEL"
+#: src/vpn/gnunet-vpn.c:314
+msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:181
-msgid "be verbose"
-msgstr "umfangreiche Meldungen ausgeben"
+#: src/vpn/gnunet-vpn.c:317
+#, fuzzy
+msgid "service is offered via TCP"
+msgstr "# Bytes empfangen über TCP"
 
-#: src/include/gnunet_getopt_lib.h:190
-msgid "use configuration file FILENAME"
-msgstr "Konfigurationsdatei FILENAME verwenden"
+#: src/vpn/gnunet-vpn.c:320
+#, fuzzy
+msgid "service is offered via UDP"
+msgstr "# Bytes empfangen über UDP"
 
-#: src/include/gnunet_common.h:430 src/include/gnunet_common.h:435
-#: src/include/gnunet_common.h:441
+#: src/vpn/gnunet-vpn.c:329
+msgid "Setup tunnels via VPN."
+msgstr ""
+
+#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
+#: src/include/gnunet_common.h:490
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:451
+#: src/include/gnunet_common.h:500
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:472 src/include/gnunet_common.h:479
+#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "Could not access file: %s\n"
+#~ msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
+
+#, fuzzy
+#~ msgid "`%s' failed on file `%s': %s"
+#~ msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
+
+#, fuzzy
+#~ msgid "# bytes TCP was asked to transmit"
+#~ msgstr "# Bytes des Typs %d übertragen"
+
+#, fuzzy
+#~ msgid "# bytes discarded by TCP (failed to connect)"
+#~ msgstr "# Bytes verworfen von TCP (ausgehend)"
+
+#, fuzzy
+#~ msgid "# wlan messages queued"
+#~ msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#~ msgid "print this help"
+#~ msgstr "Gibt diese Hilfe aus"
+
+#~ msgid "print the version number"
+#~ msgstr "Versionsnummer ausgeben"
+
+#~ msgid "be verbose"
+#~ msgstr "umfangreiche Meldungen ausgeben"
+
+#~ msgid "use configuration file FILENAME"
+#~ msgstr "Konfigurationsdatei FILENAME verwenden"
+
+#, fuzzy
 #~ msgid "Failed to stop service `%s'!\n"
 #~ msgstr "Fehler beim Binden an UDP Port %d.\n"
 
@@ -4826,105 +5943,10 @@
 #~ msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
 #, fuzzy
-#~ msgid "Target is %d connections per peer."
-#~ msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "No `%s' specified in peer configuration in section `%s', cannot copy "
-#~ "friends file!\n"
-#~ msgstr ""
-#~ "Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
-#~ "gesetzt, sie wird auf %dm gesetzt.\n"
-
-#, fuzzy
-#~ msgid "Copying file with command cp %s %s\n"
-#~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#, fuzzy
-#~ msgid "Offering Hello of peer %s to peer %s\n"
-#~ msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
-
-#, fuzzy
-#~ msgid "Unknown topology specification, can't connect peers!\n"
-#~ msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
-
-#, fuzzy
-#~ msgid "Could not read hostkeys file!\n"
-#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#, fuzzy
-#~ msgid "`scp' did not complete cleanly.\n"
-#~ msgstr "`%s' ist zu keinem Knoten verbunden.\n"
-
-#, fuzzy
-#~ msgid "Failed to create pipe for `ssh' process.\n"
-#~ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#, fuzzy
-#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
-#~ msgstr "Fehler beim Starten der Collection.\n"
-
-#, fuzzy
-#~ msgid "Failed to start `ssh' process.\n"
-#~ msgstr "Fehler beim Starten der Collection.\n"
-
-#, fuzzy
-#~ msgid "Error reading from gnunet-peerinfo: %s\n"
-#~ msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
-
-#, fuzzy
-#~ msgid "`Failed to get hostkey!\n"
-#~ msgstr ""
-#~ "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
-
-#, fuzzy
-#~ msgid "Failed to start `gnunet-arm' process.\n"
-#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#, fuzzy
-#~ msgid "Starting service %s for peer `%4s'\n"
-#~ msgstr "Collection `%s' begonnen.\n"
-
-#, fuzzy
-#~ msgid "Terminating peer `%4s'\n"
-#~ msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
-
-#, fuzzy
-#~ msgid "Setting d->dead on peer `%4s'\n"
-#~ msgstr "Collection `%s' begonnen.\n"
-
-#, fuzzy
-#~ msgid "Failed to write new configuration to disk."
-#~ msgstr "Fehler beim Speichern der Konfiguration!"
-
-#, fuzzy
-#~ msgid "Could not start `%s' process to copy configuration file.\n"
-#~ msgstr ""
-#~ "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP "
-#~ "in der Konfigurationsdatei an.\n"
-
-#, fuzzy
-#~ msgid "Failed to copy new configuration to remote machine."
-#~ msgstr "Fehler beim Speichern der Konfiguration!"
-
-#, fuzzy
-#~ msgid "Peers failed to connect"
-#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
-
-#, fuzzy
-#~ msgid "Failed to connect to core service of first peer!\n"
-#~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-
-#, fuzzy
 #~ msgid "Could not resolve our FQDN : %s %u\n"
 #~ msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
 #, fuzzy
-#~ msgid "Failed to start daemon: %s\n"
-#~ msgstr "Fehler beim Starten der Collection.\n"
-
-#, fuzzy
 #~ msgid "Failed to load dhtlog plugin for `%s'\n"
 #~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
@@ -5011,10 +6033,6 @@
 #~ msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
 #, fuzzy
-#~ msgid "# connection requests received"
-#~ msgstr "# Client Trace-Anfragen empfangen"
-
-#, fuzzy
 #~ msgid "# PING messages decrypted"
 #~ msgstr "# PING Nachrichten erstellt"
 
@@ -5359,10 +6377,6 @@
 #~ msgstr "Fehler: Dienst konnte nicht gelöscht werden: %s\n"
 
 #, fuzzy
-#~ msgid "Configuration saved."
-#~ msgstr "GNUnet Konfiguration"
-
-#, fuzzy
 #~ msgid "Configuration changed. Save?"
 #~ msgstr ""
 #~ "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
@@ -5386,19 +6400,10 @@
 #~ msgid "generate configuration for gnunetd, the GNUnet daemon"
 #~ msgstr "Generiere Konfiguration für gnunetd, den GNUnet Daemon"
 
-#~ msgid "print a value from the configuration file to stdout"
-#~ msgstr ""
-#~ "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
-
 #~ msgid "Tool to setup GNUnet."
 #~ msgstr "Werkzeug für die Einrichtung von GNUnet."
 
 #, fuzzy
-#~ msgid "update a value in the configuration file"
-#~ msgstr ""
-#~ "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
-
-#, fuzzy
 #~ msgid "Too many arguments.\n"
 #~ msgstr "Ungültige Kommandozeilen Parameter.\n"
 
@@ -5417,10 +6422,6 @@
 #~ msgstr "Weitere Einstellungen"
 
 #, fuzzy
-#~ msgid "`%s' is not available.\n"
-#~ msgstr "`%s' ist nicht verfügbar."
-
-#, fuzzy
 #~ msgid "Unknown operation '%s'.\n"
 #~ msgstr "Unbekannte Operation `%s'\n"
 
@@ -5837,10 +6838,6 @@
 #~ msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
 
 #, fuzzy
-#~ msgid "Done creating key.\n"
-#~ msgstr "Hostkey wurde erfolgreich erzeugt.\n"
-
-#, fuzzy
 #~ msgid "# max bytes allowed in dstore"
 #~ msgstr "# bytes erlaubt in der Datenbank"
 
@@ -6059,9 +7056,6 @@
 #~ "Sie müssen einen Namen für die PID Datei in Sektion `%s' unter `%s' "
 #~ "angeben.\n"
 
-#~ msgid "=\tError reading directory.\n"
-#~ msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
-
 #~ msgid "%d files found in directory.\n"
 #~ msgstr "%d Dateien im Verzeichnis gefunden.\n"
 
@@ -6637,12 +7631,6 @@
 #~ "MTU für `%s' ist möglicherweise zu gering (Fragmentierung ist nicht "
 #~ "implementiert!)\n"
 
-#~ msgid "# bytes received via UDP"
-#~ msgstr "# Bytes empfangen über UDP"
-
-#~ msgid "# bytes sent via UDP"
-#~ msgstr "# Bytes gesendet über UDP"
-
 #~ msgid "specify host on which gnunetd is running"
 #~ msgstr "Gibt an, auf welchem Host gnunetd läuft"
 
@@ -6743,10 +7731,6 @@
 #~ msgstr "Weitere Einstellungen"
 
 #, fuzzy
-#~ msgid "File-Sharing options"
-#~ msgstr "Alle Optionen anzeigen"
-
-#, fuzzy
 #~ msgid "Options related to gnunet-gtk"
 #~ msgstr "Nicht verbunden zu gnunetd."
 
@@ -7767,9 +8751,6 @@
 #~ msgid "Sorry, no help is available for this option.\n"
 #~ msgstr "Sorry, für diese Option steht keine Hilfe zur Verfügung.\n"
 
-#~ msgid "Failed to obtain my (external) IPv6 address!\n"
-#~ msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
-
 #~ msgid ""
 #~ "Cannot determine port to bind to.  Define in configuration file in "
 #~ "section `%s' under `%s' or in `%s' under %s/%s.\n"
@@ -8141,9 +9122,6 @@
 #~ msgid "Cron stopped\n"
 #~ msgstr "Cron angehalten\n"
 
-#~ msgid "Shutdown complete.\n"
-#~ msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
-
 #~ msgid "Caught signal %d.\n"
 #~ msgstr "Signal %d empfangen.\n"
 

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2012-02-24 15:12:56 UTC (rev 20010)
+++ gnunet/po/es.po     2012-02-24 15:14:18 UTC (rev 20011)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-01-07 20:53+0100\n"
+"POT-Creation-Date: 2012-02-24 16:13+0100\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -17,401 +17,535 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:61
-#: src/datastore/plugin_datastore_mysql.c:139
-#: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:613
-#: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685
-#: src/datastore/plugin_datastore_mysql.c:1362
-#: src/datastore/plugin_datastore_mysql.c:1376 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/datacache/plugin_datacache_sqlite.c:71
-#: src/datacache/plugin_datacache_sqlite.c:74
-#: src/datacache/plugin_datacache_mysql.c:103
-#: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:517
-#: src/datacache/plugin_datacache_mysql.c:526
-#: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:458
-#: src/include/gnunet_common.h:465
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "'%s' falló en %s: %d con el error: %s\n"
+#: src/arm/arm_api.c:187
+msgid "Failed to transmit shutdown request to client.\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/arm/arm_api.c:378
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%u with error: %s"
-msgstr "'%s' falló en %s: %d con el error: %s\n"
+msgid "Configuration failes to specify option `%s' in section `%s'!\n"
+msgstr ""
+"El fichero de configuración debe especificar el directorio para almacenar "
+"los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:239
+#: src/arm/arm_api.c:392
 #, fuzzy, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
-msgstr "¡Ninguna aplicación definida en la configuración!\n"
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr ""
+"El fichero de configuración debe especificar el directorio para almacenar "
+"los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:266
+#: src/arm/arm_api.c:465
 #, fuzzy, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "Imposible inicializar SQLite.\n"
+msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
+msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:414
-#: src/datacache/plugin_datacache_sqlite.c:457
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+#: src/arm/arm_api.c:521
+#, c-format
+msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:671
-#, fuzzy
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "Datos no válidos en %s.  Intentando fijar (por borrado).\n"
+#: src/arm/arm_api.c:522
+#, c-format
+msgid "Requesting termination of service `%s'.\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1161
-msgid "sqlite version to old to determine size, assuming zero\n"
+#: src/arm/arm_api.c:544
+#, c-format
+msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1180
+#: src/arm/arm_api.c:546
 #, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1220
-#, fuzzy
-msgid "Sqlite database running\n"
-msgstr "base de datos sqlite"
+#: src/arm/arm_api.c:579
+#, fuzzy, c-format
+msgid "Asked to start service `%s' within %llu ms\n"
+msgstr "'%s': No se recibió el mensaje en %llu ms.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:316
-#: src/datacache/plugin_datacache_mysql.c:224
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-msgstr "Intentando usar el fichero '%s' para la configuración de MySQL.\n"
+#: src/arm/arm_api.c:652
+#, fuzzy, c-format
+msgid "Stopping service `%s' within %llu ms\n"
+msgstr "No se ha recibido una respuesta en %llums.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:322
-#: src/datacache/plugin_datacache_mysql.c:230
+#: src/arm/gnunet-arm.c:149
 #, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "Imposible ejecutar '%s': %s\n"
+msgid "Service `%s' is unknown to ARM.\n"
+msgstr "El espacio '%s' ha sido valorado con un %d.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#: src/datastore/plugin_datastore_mysql.c:1336
+#: src/arm/gnunet-arm.c:154
 #, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "Falló al actualizar los datos del módulo '%s'\n"
+msgid "Service `%s' has been stopped.\n"
+msgstr "Servicio eliminado.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#: src/datastore/plugin_datastore_mysql.c:1346
+#: src/arm/gnunet-arm.c:157
 #, fuzzy, c-format
-msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
-msgstr "'%s' a '%s' falló en %s: %d con error %s\n"
+msgid "Service `%s' was already running.\n"
+msgstr "¡Esta búsqueda está aún pendiente!\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1581
-msgid "Mysql database running\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:162
+#, fuzzy, c-format
+msgid "Service `%s' has been started.\n"
+msgstr "Servicio eliminado.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:93
-#: src/datacache/plugin_datacache_postgres.c:79
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "'%s' falló en %s: %d con el error: %s\n"
+msgid "Service `%s' was already being stopped.\n"
+msgstr "Servicio eliminado.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:173
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "Imposible guardar el fichero de configuración '%s':"
+msgid "Service `%s' was already not running.\n"
+msgstr "¡Esta búsqueda está aún pendiente!\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1017
-msgid "Postgres database running\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:173
+#, fuzzy
+msgid "Request ignored as ARM is shutting down.\n"
+msgstr "'%s' se esta cerrando.\n"
 
-#: src/datastore/datastore_api.c:289
+#: src/arm/gnunet-arm.c:177
 #, fuzzy
-msgid "Failed to transmit request to drop database.\n"
-msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
+msgid "Error communicating with ARM service.\n"
+msgstr "Imprime información de los pares de GNUnet."
 
-#: src/datastore/datastore_api.c:372
-msgid "# queue entry timeouts"
+#: src/arm/gnunet-arm.c:181
+#, fuzzy
+msgid "Timeout communicating with ARM service.\n"
+msgstr "Imprime información de los pares de GNUnet."
+
+#: src/arm/gnunet-arm.c:185
+#, fuzzy
+msgid "Operation failed.\n"
+msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
+
+#: src/arm/gnunet-arm.c:189
+msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:418
-msgid "# queue overflows"
+#: src/arm/gnunet-arm.c:216
+#, c-format
+msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:445
-msgid "# queue entries created"
+#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:465
-#, fuzzy
-msgid "# Requests dropped from datastore queue"
-msgstr "# Anuncios de los pares recibidos"
+#: src/arm/gnunet-arm.c:247
+#, fuzzy, c-format
+msgid "Failed to remove configuration file %s\n"
+msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/datastore/datastore_api.c:513
-msgid "# datastore connections (re)created"
+#: src/arm/gnunet-arm.c:253
+#, fuzzy, c-format
+msgid "Failed to remove servicehome directory %s\n"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: src/arm/gnunet-arm.c:355
+msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/datastore/datastore_api.c:540
-msgid "# reconnected to DATASTORE"
+#: src/arm/gnunet-arm.c:357
+msgid "start a particular service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
-#, fuzzy
-msgid "# transmission request failures"
-msgstr "# mensajes de texto mandados por PING"
+#: src/arm/gnunet-arm.c:359
+msgid "stop a particular service"
+msgstr ""
 
-#: src/datastore/datastore_api.c:631
-#, fuzzy
-msgid "# bytes sent to datastore"
-msgstr "# bytes en la base de datos"
+#: src/arm/gnunet-arm.c:361
+msgid "start all GNUnet default services"
+msgstr ""
 
-#: src/datastore/datastore_api.c:772
-#, fuzzy
-msgid "Failed to receive status response from database."
+#: src/arm/gnunet-arm.c:364
+msgid "stop and start all GNUnet default services"
 msgstr ""
-"\n"
-"Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/datastore/datastore_api.c:786
-msgid "Error reading response from datastore service"
+#: src/arm/gnunet-arm.c:367
+msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
-#, fuzzy
-msgid "Invalid error message received from datastore service"
-msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
+#: src/arm/gnunet-arm.c:369
+msgid "don't print status messages"
+msgstr ""
 
-#: src/datastore/datastore_api.c:810
+#: src/arm/gnunet-arm.c:372
 #, fuzzy
-msgid "# status messages received"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "timeout for completing current operation"
+msgstr "tiempo para esperar hasta completar una iteración (en ms)"
 
-#: src/datastore/datastore_api.c:883
-#, fuzzy
-msgid "# PUT requests executed"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/datastore/datastore_api.c:954
-msgid "# RESERVE requests executed"
+#: src/arm/gnunet-arm.c:383
+msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1019
-msgid "# RELEASE RESERVE requests executed"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:321
+#, fuzzy, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "Falló al comenzar la recolección.\n"
 
-#: src/datastore/datastore_api.c:1080
-#, fuzzy
-msgid "# UPDATE requests executed"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/arm/gnunet-service-arm.c:324
+#, fuzzy, c-format
+msgid "Starting service `%s'\n"
+msgstr "Iniciada colección '%s'.\n"
 
-#: src/datastore/datastore_api.c:1148
+#: src/arm/gnunet-service-arm.c:350
 #, fuzzy
-msgid "# REMOVE requests executed"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "Could not send status result to client\n"
+msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/datastore/datastore_api.c:1193
-#, fuzzy
-msgid "Failed to receive response from database.\n"
+#: src/arm/gnunet-service-arm.c:477
+#, fuzzy, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Imposible crear la cuenta de usuario:"
+
+#: src/arm/gnunet-service-arm.c:499
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
-"\n"
-"Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1253
-#, fuzzy
-msgid "# Results received"
-msgstr "# bytes recibidos por TCP"
+#: src/arm/gnunet-service-arm.c:513
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgstr ""
 
-#: src/datastore/datastore_api.c:1324
-msgid "# GET REPLICATION requests executed"
+#: src/arm/gnunet-service-arm.c:621
+#, fuzzy, c-format
+msgid "Preparing to stop `%s'\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/arm/gnunet-service-arm.c:775
+#, fuzzy, c-format
+msgid "Restarting service `%s'.\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/arm/gnunet-service-arm.c:870
+msgid "exit"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1391
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/arm/gnunet-service-arm.c:875
+msgid "signal"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1455
-#, fuzzy
-msgid "# GET requests executed"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/arm/gnunet-service-arm.c:880
+msgid "unknown"
+msgstr "desconocido"
 
-#: src/datastore/plugin_datastore_template.c:241
-msgid "Template database running\n"
+#: src/arm/gnunet-service-arm.c:914
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/arm/gnunet-service-arm.c:960 src/arm/mockup-service.c:41
 #, fuzzy
-msgid "# bytes expired"
-msgstr "# bytes recibidos por TCP"
+msgid "Failed to transmit shutdown ACK.\n"
+msgstr "Falló al comenzar la recolección.\n"
 
-#: src/datastore/gnunet-service-datastore.c:426
-msgid "# bytes purged (low-priority)"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:1060
+#, fuzzy, c-format
+msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/datastore/gnunet-service-datastore.c:486
-msgid "Transmission to client failed!\n"
+#: src/arm/gnunet-service-arm.c:1062
+msgid "option missing"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:640
-msgid "# results found"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:1139
+#, fuzzy, c-format
+msgid "Starting default services `%s'\n"
+msgstr "Iniciada colección '%s'.\n"
 
-#: src/datastore/gnunet-service-datastore.c:685
+#: src/arm/gnunet-service-arm.c:1150
 #, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
-"%llu bytes\n"
+msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
-#, c-format
+#: src/arm/gnunet-service-arm.c:1164
 msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+"No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:700
-msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+#: src/arm/mockup-service.c:46
+msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:706
-msgid "Insufficient space to satisfy request"
+#: src/arm/mockup-service.c:69
+msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
-#: src/datastore/gnunet-service-datastore.c:765
-#: src/datastore/gnunet-service-datastore.c:986
-#: src/datastore/gnunet-service-datastore.c:1465
-msgid "# reserved"
-msgstr ""
+#: src/block/block.c:105
+#, fuzzy, c-format
+msgid "Loading block plugin `%s'\n"
+msgstr "Probando transporte(s) %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:780
-msgid "Could not find matching reservation"
+#: src/chat/chat.c:175
+#, fuzzy
+msgid "Could not transmit confirmation receipt\n"
+msgstr "Imposible acceder a la información del espacio.\n"
+
+#: src/chat/chat.c:283
+msgid "The current user must be the the first one joined\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:854 src/datacache/datacache.c:118
-#: src/datacache/datacache.c:255
+#: src/chat/chat.c:412
+#, fuzzy, c-format
+msgid "Unknown message type: '%u'\n"
+msgstr "Operación desconocida '%s'\n"
+
+#: src/chat/chat.c:472
+#, fuzzy, c-format
+msgid "Configuration option `%s' in section `%s' missing\n"
+msgstr "Fichero de configuración '%s' creado.\n"
+
+#: src/chat/chat.c:480
+#, fuzzy, c-format
+msgid "Failed to access chat home directory `%s'\n"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: src/chat/chat.c:498
+#, fuzzy, c-format
+msgid "Failed to create/open key in file `%s'\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/chat/chat.c:559
 #, fuzzy
-msgid "# bytes stored"
-msgstr "# bytes en la base de datos"
+msgid "Could not serialize metadata\n"
+msgstr "¡Imposible inicializar libgnunetutil!\n"
 
-#: src/datastore/gnunet-service-datastore.c:868
-#, c-format
-msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
+#: src/chat/chat.c:674
+#, fuzzy
+msgid "Failed to connect to the chat service\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/chat/chat.c:680
+msgid "Undefined mandatory parameter: joinCallback\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1034
-#, fuzzy
-msgid "# GET requests received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/chat/chat.c:686
+msgid "Undefined mandatory parameter: messageCallback\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1048
-msgid "# requests filtered by bloomfilter"
+#: src/chat/chat.c:692
+msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1076
-#, fuzzy
-msgid "# UPDATE requests received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/chat/gnunet-chat.c:92
+msgid "Joined\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1110
-#, fuzzy
-msgid "# GET REPLICATION requests received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/chat/gnunet-chat.c:124
+msgid "anonymous"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1145
-#, fuzzy
-msgid "# GET ZERO ANONYMITY requests received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/chat/gnunet-chat.c:130
+#, fuzzy, c-format
+msgid "(%s) `%s' said: %s\n"
+msgstr "'%s' %s falló: %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1172
-#, fuzzy
-msgid "Content not found"
-msgstr "¡Comando '%s' no encontrado!\n"
+#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#, fuzzy, c-format
+msgid "(%s) `%s' said to you: %s\n"
+msgstr "'%s' %s falló: %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1182
-msgid "# bytes removed (explicit request)"
+#: src/chat/gnunet-chat.c:139
+#, fuzzy, c-format
+msgid "(%s) `%s' said for sure: %s\n"
+msgstr "'%s' %s falló: %s\n"
+
+#: src/chat/gnunet-chat.c:142
+#, fuzzy, c-format
+msgid "(%s) `%s' said to you for sure: %s\n"
+msgstr "'%s' falló con el código de error %s: %s"
+
+#: src/chat/gnunet-chat.c:145
+#, fuzzy, c-format
+msgid "(%s) `%s' was confirmed that you received: %s\n"
+msgstr "'%s' falló con el código de error %d: %s"
+
+#: src/chat/gnunet-chat.c:148
+#, fuzzy, c-format
+msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
+msgstr "'%s' falló con el código de error %d: %s"
+
+#: src/chat/gnunet-chat.c:151
+#, fuzzy, c-format
+msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
+msgstr "'%s' falló con el código de error %d: %s"
+
+#: src/chat/gnunet-chat.c:156
+#, fuzzy, c-format
+msgid ""
+"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
+msgstr "'%s' falló con el código de error %d: %s"
+
+#: src/chat/gnunet-chat.c:159
+#, fuzzy, c-format
+msgid "(%s) `%s' said off the record: %s\n"
+msgstr "'%s' falló con el código de error %s: %s"
+
+#: src/chat/gnunet-chat.c:162
+#, c-format
+msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1216
-#, fuzzy
-msgid "# REMOVE requests received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/chat/gnunet-chat.c:193
+#, c-format
+msgid "'%s' acknowledged message #%d\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1260
+#: src/chat/gnunet-chat.c:224
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid "`%s' entered the room\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1323
+#: src/chat/gnunet-chat.c:224
 #, c-format
-msgid "Loading `%s' datastore plugin\n"
+msgid "`%s' left the room\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1332
+#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#, fuzzy
+msgid "Could not change username\n"
+msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
+
+#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
 #, fuzzy, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
+msgid "Joining room `%s' as user `%s'...\n"
+msgstr "Respuesta inválida a '%s' del par '%s'.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1531
-#: src/datastore/gnunet-service-datastore.c:1542 src/datacache/datacache.c:144
-#: src/datacache/datacache.c:151
+#: src/chat/gnunet-chat.c:320
 #, fuzzy, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr "¡Ninguna aplicación definida en la configuración!\n"
+msgid "Changed username to `%s'\n"
+msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1536
+#: src/chat/gnunet-chat.c:333
 #, fuzzy, c-format
-msgid "# bytes used in file-sharing datastore `%s'"
-msgstr "# bytes en la base de datos"
+msgid "Users in room `%s': "
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1547
-msgid "# quota"
+#: src/chat/gnunet-chat.c:371
+msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1549
-msgid "# cache size"
-msgstr ""
+#: src/chat/gnunet-chat.c:379
+#, fuzzy, c-format
+msgid "Unknown user `%s'\n"
+msgstr "Operación desconocida '%s'\n"
 
-#: src/datastore/gnunet-service-datastore.c:1562
+#: src/chat/gnunet-chat.c:395
 #, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+msgid "User `%s' is currently not in the room!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1580
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/chat/gnunet-chat.c:448
 #, fuzzy, c-format
-msgid "Failed to remove bogus bloomfilter file `%s'\n"
-msgstr "Imposible guardar el fichero de configuración '%s':"
+msgid "Unknown command `%s'\n"
+msgstr "Operación desconocida '%s'\n"
 
-#: src/datastore/gnunet-service-datastore.c:1626
-#, fuzzy
-msgid "Failed to initialize bloomfilter.\n"
-msgstr "Imposible inicializar SQLite.\n"
+#: src/chat/gnunet-chat.c:459
+msgid ""
+"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
+"leave the current room"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1655
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
+#: src/chat/gnunet-chat.c:463
+msgid ""
+"Use `/nick nickname' to change your nickname.  This will cause you to leave "
+"the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1660
-msgid "Plugin does not support get_keys function. Please fix!\n"
+#: src/chat/gnunet-chat.c:467
+msgid ""
+"Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1663
-msgid "Bloomfilter construction complete.\n"
+#: src/chat/gnunet-chat.c:470
+msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
+#: src/chat/gnunet-chat.c:472
+msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:238
-msgid "# type map refreshes sent"
+#: src/chat/gnunet-chat.c:474
+msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:414
-msgid "# messages discarded (expired prior to transmission)"
+#: src/chat/gnunet-chat.c:477
+msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
+#: src/chat/gnunet-chat.c:480
+msgid "Use `/anonymous message' to send a public anonymous message"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:482
+msgid "The `/anon' command is an alias for `/anonymous'"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:484
+msgid "Use `/quit' to terminate gnunet-chat"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:486
+msgid "The `/leave' command is an alias for `/quit'"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:489
+msgid "Use `/names' to list all of the current members in the chat room"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:491
+msgid "Use `/help command' to get help for a specific command"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:606
+#, fuzzy
+msgid "You must specify a nickname\n"
+msgstr "¡Debes especificar un receptor!\n"
+
+#: src/chat/gnunet-chat.c:622
+#, fuzzy, c-format
+msgid "Failed to join room `%s'\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/chat/gnunet-chat.c:655
+msgid "set the nickname to use (required)"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:658
+msgid "set the chat room to join"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:670
+msgid "Join a chat on GNUnet."
+msgstr ""
+
+#: src/chat/gnunet-service-chat.c:267
+#, fuzzy
+msgid "Failed to queue a message notification\n"
+msgstr "Imposible guardar la configuración"
+
+#: src/chat/gnunet-service-chat.c:546
+#, fuzzy
+msgid "Failed to queue a join notification\n"
+msgstr "Imposible guardar la configuración"
+
+#: src/chat/gnunet-service-chat.c:729
+#, fuzzy
+msgid "Failed to queue a confirmation receipt\n"
+msgstr "Imposible guardar la configuración"
+
+#: src/chat/gnunet-service-chat.c:907
+#, fuzzy
+msgid "Failed to queue a leave notification\n"
+msgstr "Imposible guardar la configuración"
+
+#: src/core/core_api.c:798
+msgid "Client was disconnected from core service, trying to reconnect.\n"
+msgstr ""
+
 #: src/core/gnunet-core-list-connections.c:77
 #: src/peerinfo-tool/gnunet-peerinfo.c:60
 #, fuzzy, c-format
@@ -434,6 +568,11 @@
 msgid "Print information about connected peers."
 msgstr "Imprime información de los pares de GNUnet."
 
+#: src/core/gnunet-service-core.c:99
+#, c-format
+msgid "Core service of `%4s' ready.\n"
+msgstr ""
+
 #: src/core/gnunet-service-core_clients.c:360
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
@@ -449,40 +588,6 @@
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de ruido recibidos"
 
-#: src/core/gnunet-service-core.c:99
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
-#, fuzzy
-msgid "# type maps received"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/core/gnunet-service-core_typemap.c:151
-msgid "# updates to my type map"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:163
-#, fuzzy
-msgid "# sessions terminated by transport disconnect"
-msgstr "# Anuncios de los pares recibidos"
-
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:343
-msgid "# neighbour entries allocated"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:252
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:431
-#, fuzzy, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
-msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
-
 #: src/core/gnunet-service-core_kx.c:493
 msgid "# bytes encrypted"
 msgstr "# bytes encriptados"
@@ -525,7 +630,7 @@
 msgstr "# mensajes defragmentados"
 
 #: src/core/gnunet-service-core_kx.c:880
-#: src/transport/gnunet-service-transport_validation.c:780
+#: src/transport/gnunet-service-transport_validation.c:803
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -553,7 +658,7 @@
 msgstr "# mensajes PONG encriptados recibidos"
 
 #: src/core/gnunet-service-core_kx.c:1092
-#: src/transport/gnunet-service-transport_validation.c:985
+#: src/transport/gnunet-service-transport_validation.c:1026
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -612,807 +717,654 @@
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1541
-#: src/transport/gnunet-service-transport.c:578
-#: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/core/gnunet-service-core_kx.c:1541 src/hostlist/hostlist-server.c:555
+#: src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/transport/gnunet-service-transport.c:595
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/core/core_api.c:798
-msgid "Client was disconnected from core service, trying to reconnect.\n"
-msgstr ""
-
-#: src/vpn/gnunet-daemon-exit.c:1496
-msgid "Daemon to run to provide an IP exit node for the VPN"
-msgstr ""
-
-#: src/vpn/gnunet-daemon-vpn.c:1804
+#: src/core/gnunet-service-core_neighbours.c:163
 #, fuzzy
-msgid "help text"
-msgstr "texto de ayuda para -t"
+msgid "# sessions terminated by transport disconnect"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/util/getopt_helpers.c:84
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
+#: src/core/gnunet-service-core_neighbours.c:180
+#: src/core/gnunet-service-core_neighbours.c:342
+msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "Tienes que introducir un número en la opción '%s'.\n"
-
-#: src/util/common_logging.c:239 src/util/common_logging.c:890
-msgid "DEBUG"
-msgstr "DEPURACIÓN"
-
-#: src/util/common_logging.c:241 src/util/common_logging.c:888
-msgid "INFO"
-msgstr "INFORMACIÓN"
-
-#: src/util/common_logging.c:243 src/util/common_logging.c:886
-msgid "WARNING"
-msgstr "PELIGRO"
-
-#: src/util/common_logging.c:245 src/util/common_logging.c:884
-msgid "ERROR"
-msgstr "ERROR"
-
-#: src/util/common_logging.c:247 src/util/common_logging.c:892
-msgid "NONE"
+#: src/core/gnunet-service-core_neighbours.c:251
+msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/util/common_logging.c:610
+#: src/core/gnunet-service-core_neighbours.c:430
 #, fuzzy, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
-msgstr "Imposible pasar el fichero de configuración '%s'.\n"
+msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
+msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/util/common_logging.c:725
-#, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
+#: src/core/gnunet-service-core_sessions.c:208
+#: src/core/gnunet-service-core_sessions.c:273
+msgid "# entries in session map"
 msgstr ""
 
-#: src/util/common_logging.c:893
-msgid "INVALID"
+#: src/core/gnunet-service-core_sessions.c:238
+msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/util/common_logging.c:975
-#, fuzzy
-msgid "unknown address"
-msgstr "desconocido"
+#: src/core/gnunet-service-core_sessions.c:414
+msgid "# messages discarded (expired prior to transmission)"
+msgstr ""
 
-#: src/util/common_logging.c:1013
+#: src/core/gnunet-service-core_typemap.c:110
+#: src/core/gnunet-service-core_typemap.c:121
 #, fuzzy
-msgid "invalid address"
-msgstr "Argumentos inválidos: "
+msgid "# type maps received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/plugin.c:89
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "¡El mecanismo de iniciación de los plugins falló: %s!\n"
+#: src/core/gnunet-service-core_typemap.c:151
+msgid "# updates to my type map"
+msgstr ""
 
-#: src/util/plugin.c:146
-#, fuzzy, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
-msgstr "'%s' falló al resolver el método '%s%s' en %s:%d con un error: %s\n"
-
-#: src/util/plugin.c:219
-#, fuzzy, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
-msgstr "'%s' falló en la biblioteca '%s' en %s:%d con un error: %s\n"
-
-#: src/util/plugin.c:349
+#: src/datacache/datacache.c:118 src/datacache/datacache.c:255
+#: src/datastore/gnunet-service-datastore.c:854
 #, fuzzy
-msgid "Could not determine plugin installation path.\n"
-msgstr "Imposible determinar mi dirección IPv6 pública.\n"
+msgid "# bytes stored"
+msgstr "# bytes en la base de datos"
 
-#: src/util/configuration.c:245
+#: src/datacache/datacache.c:144 src/datacache/datacache.c:151
+#: src/datastore/gnunet-service-datastore.c:1531
+#: src/datastore/gnunet-service-datastore.c:1542
 #, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
-msgstr ""
-"Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/util/configuration.c:817
+#: src/datacache/datacache.c:183
 #, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
+msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/util/getopt.c:672
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: la opción '%s' es ambigua\n"
+#: src/datacache/datacache.c:191
+#, fuzzy, c-format
+msgid "Failed to load datacache plugin for `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/util/getopt.c:696
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: la opción '--%s' no permite un argumento\n"
+#: src/datacache/datacache.c:281
+#, fuzzy
+msgid "# requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/getopt.c:701
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s: la opción '%c%s' no permite un argumento\n"
+#: src/datacache/datacache.c:291
+msgid "# requests filtered by bloom filter"
+msgstr ""
 
-#: src/util/getopt.c:718 src/util/getopt.c:886
+#: src/datacache/plugin_datacache_mysql.c:103
+#: src/datacache/plugin_datacache_mysql.c:110
+#: src/datacache/plugin_datacache_mysql.c:517
+#: src/datacache/plugin_datacache_mysql.c:526
+#: src/datacache/plugin_datacache_mysql.c:598
+#: src/datacache/plugin_datacache_mysql.c:614
+#: src/datacache/plugin_datacache_sqlite.c:71
+#: src/datacache/plugin_datacache_sqlite.c:74
+#: src/datastore/plugin_datastore_mysql.c:139
+#: src/datastore/plugin_datastore_mysql.c:146
+#: src/datastore/plugin_datastore_mysql.c:613
+#: src/datastore/plugin_datastore_mysql.c:673
+#: src/datastore/plugin_datastore_mysql.c:685
+#: src/datastore/plugin_datastore_mysql.c:1362
+#: src/datastore/plugin_datastore_mysql.c:1376
+#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
+#: src/include/gnunet_common.h:514
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: la opción '%s' requiere un argumento\n"
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/util/getopt.c:747
+#: src/datacache/plugin_datacache_mysql.c:224
+#: src/datastore/plugin_datastore_mysql.c:316
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opción no reconocida '--%s'\n"
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr "Intentando usar el fichero '%s' para la configuración de MySQL.\n"
 
-#: src/util/getopt.c:751
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opción no reconocida '%c%s'\n"
+#: src/datacache/plugin_datacache_mysql.c:230
+#: src/datastore/plugin_datastore_mysql.c:322
+#, fuzzy, c-format
+msgid "Could not access file `%s': %s\n"
+msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/util/getopt.c:776
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opción ilegal -- %c\n"
+#: src/datacache/plugin_datacache_mysql.c:979
+msgid "MySQL datacache running\n"
+msgstr ""
 
-#: src/util/getopt.c:778
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: opción no válida -- %c\n"
+#: src/datacache/plugin_datacache_postgres.c:79
+#: src/datastore/plugin_datastore_postgres.c:93
+#, fuzzy, c-format
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/util/getopt.c:806 src/util/getopt.c:934
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: la opción requiere un argumento --%c\n"
+#: src/datacache/plugin_datacache_postgres.c:149
+#, fuzzy, c-format
+msgid "Unable to initialize Postgres: %s"
+msgstr "Imposible inicializar SQLite.\n"
 
-#: src/util/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: la opción '-W %s' es ambigua\n"
+#: src/datacache/plugin_datacache_postgres.c:499
+msgid "Postgres datacache running\n"
+msgstr ""
 
-#: src/util/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s: la opción '-W %s' no permite un argumento\n"
+#: src/datacache/plugin_datacache_sqlite.c:424
+msgid "Sqlite datacache running\n"
+msgstr ""
 
-#: src/util/getopt.c:1038
-#, fuzzy, c-format
-msgid "Use %s to get a list of options.\n"
-msgstr "Usar --help para obtener una lista de opciones.\n"
-
-#: src/util/scheduler.c:870
-msgid "Looks like we're busy waiting...\n"
+#: src/datacache/plugin_datacache_sqlite.c:457
+#: src/datastore/plugin_datastore_sqlite.c:414
+#: src/namestore/plugin_namestore_sqlite.c:381
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/util/scheduler.c:1000
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
+#: src/datacache/plugin_datacache_template.c:121
+msgid "Template datacache running\n"
 msgstr ""
 
-#: src/util/connection.c:461
-#, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "Permiso denegado para '%s' en %s:%d.\n"
+#: src/datastore/datastore_api.c:289
+#, fuzzy
+msgid "Failed to transmit request to drop database.\n"
+msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
 
-#: src/util/connection.c:476
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
+#: src/datastore/datastore_api.c:372
+msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/util/connection.c:642
-#, fuzzy, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
-msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
+#: src/datastore/datastore_api.c:418
+msgid "# queue overflows"
+msgstr ""
 
-#: src/util/connection.c:852 src/util/connection.c:1025
-#, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+#: src/datastore/datastore_api.c:445
+msgid "# queue entries created"
+msgstr ""
 
-#: src/util/connection.c:862
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+#: src/datastore/datastore_api.c:465
+#, fuzzy
+msgid "# Requests dropped from datastore queue"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/util/connection.c:1015
-#, fuzzy, c-format
-msgid "Attempt to connect to `%s' failed\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+#: src/datastore/datastore_api.c:513
+msgid "# datastore connections (re)created"
+msgstr ""
 
-#: src/util/connection.c:1528
-#, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
+#: src/datastore/datastore_api.c:540
+msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/util/connection.c:1564
-#, fuzzy, c-format
-msgid "Failed to send to `%s': %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
+#: src/datastore/datastore_api.c:608
+#, fuzzy
+msgid "# transmission request failures"
+msgstr "# mensajes de texto mandados por PING"
 
-#: src/util/signal.c:80
-#, fuzzy, c-format
-msgid "signal (%d, %p) returned %d.\n"
-msgstr "La llamada a '%s' devuelve %d.\n"
+#: src/datastore/datastore_api.c:631
+#, fuzzy
+msgid "# bytes sent to datastore"
+msgstr "# bytes en la base de datos"
 
-#: src/util/network.c:1204
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+#: src/datastore/datastore_api.c:772
+#, fuzzy
+msgid "Failed to receive status response from database."
 msgstr ""
+"\n"
+"Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/util/os_installation.c:299
-#, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+#: src/datastore/datastore_api.c:786
+msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/util/os_installation.c:486
-#, fuzzy, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
+#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+#, fuzzy
+msgid "Invalid error message received from datastore service"
+msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
 
-#: src/util/os_installation.c:492
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "'%s' %s falló: %s\n"
+#: src/datastore/datastore_api.c:810
+#, fuzzy
+msgid "# status messages received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/strings.c:143
-msgid "b"
-msgstr "b"
+#: src/datastore/datastore_api.c:883
+#, fuzzy
+msgid "# PUT requests executed"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/strings.c:354
-#, c-format
-msgid "Character sets requested were `%s'->`%s'\n"
+#: src/datastore/datastore_api.c:954
+msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/util/strings.c:462
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+#: src/datastore/datastore_api.c:1019
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/util/strings.c:554
-msgid "ms"
-msgstr "ms"
+#: src/datastore/datastore_api.c:1080
+#, fuzzy
+msgid "# UPDATE requests executed"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/strings.c:559
-msgid "eternity"
+#: src/datastore/datastore_api.c:1148
+#, fuzzy
+msgid "# REMOVE requests executed"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/datastore/datastore_api.c:1193
+#, fuzzy
+msgid "Failed to receive response from database.\n"
 msgstr ""
+"\n"
+"Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/util/strings.c:563
-msgid "s"
-msgstr "s"
+#: src/datastore/datastore_api.c:1253
+#, fuzzy
+msgid "# Results received"
+msgstr "# bytes recibidos por TCP"
 
-#: src/util/strings.c:567
-msgid "m"
-msgstr "m"
+#: src/datastore/datastore_api.c:1324
+msgid "# GET REPLICATION requests executed"
+msgstr ""
 
-#: src/util/strings.c:571
-msgid "h"
-msgstr "h"
+#: src/datastore/datastore_api.c:1391
+msgid "# GET ZERO ANONYMITY requests executed"
+msgstr ""
 
-#: src/util/strings.c:575
-msgid " days"
-msgstr " días"
+#: src/datastore/datastore_api.c:1455
+#, fuzzy
+msgid "# GET requests executed"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/strings.c:599
-msgid "end of time"
+#: src/datastore/gnunet-service-datastore.c:351
+#, fuzzy
+msgid "# bytes expired"
+msgstr "# bytes recibidos por TCP"
+
+#: src/datastore/gnunet-service-datastore.c:426
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/util/server.c:388
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "'%s' falló para la unidad %s: %u\n"
-
-#: src/util/server.c:397
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
+#: src/datastore/gnunet-service-datastore.c:486
+msgid "Transmission to client failed!\n"
 msgstr ""
-"'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:402
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
+#: src/datastore/gnunet-service-datastore.c:640
+msgid "# results found"
 msgstr ""
-"'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:617
+#: src/datastore/gnunet-service-datastore.c:685
 #, c-format
 msgid ""
-"Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/util/crypto_random.c:280
+#: src/datastore/gnunet-service-datastore.c:696
 #, c-format
-msgid "Starting `%s' process to generate entropy\n"
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:308
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
+#: src/datastore/gnunet-service-datastore.c:700
+msgid ""
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
-"libgcrypt no está en la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/disk.c:479
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%S': %u\n"
-msgstr "'%s' falló para la unidad %s: %u\n"
+#: src/datastore/gnunet-service-datastore.c:706
+msgid "Insufficient space to satisfy request"
+msgstr ""
 
-#: src/util/disk.c:883
-#, fuzzy, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
+#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:765
+#: src/datastore/gnunet-service-datastore.c:986
+#: src/datastore/gnunet-service-datastore.c:1465
+msgid "# reserved"
+msgstr ""
 
-#: src/util/disk.c:1235 src/util/service.c:1541
-#, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
+#: src/datastore/gnunet-service-datastore.c:780
+msgid "Could not find matching reservation"
+msgstr ""
 
-#: src/util/disk.c:1553
-#, fuzzy, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
-msgstr "¡Ninguna aplicación definida en la configuración!\n"
-
-#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
-#: src/util/service.c:207 src/util/service.c:214
+#: src/datastore/gnunet-service-datastore.c:868
 #, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Formato no válido para la IP: '%s'\n"
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
+msgstr ""
 
-#: src/util/service.c:170
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Notación de red no válida ('/%d' no es válido en IPv4 CIDR)."
+#: src/datastore/gnunet-service-datastore.c:1034
+#, fuzzy
+msgid "# GET requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/service.c:263
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Notación de red no válida (no termina con ';': '%s')\n"
-
-#: src/util/service.c:296
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Formato '%s' erróneo para la máscara de red: %s\n"
-
-#: src/util/service.c:326
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Formato '%s' erróneo para la red: %s\n"
-
-#: src/util/service.c:629
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
+#: src/datastore/gnunet-service-datastore.c:1048
+msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/util/service.c:634
-#, fuzzy, c-format
-msgid "Unknown address family %d\n"
-msgstr "Operación desconocida '%s'\n"
+#: src/datastore/gnunet-service-datastore.c:1076
+#, fuzzy
+msgid "# UPDATE requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/service.c:641
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1110
+#, fuzzy
+msgid "# GET REPLICATION requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/service.c:685
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1145
+#, fuzzy
+msgid "# GET ZERO ANONYMITY requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/service.c:713
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1172
+#, fuzzy
+msgid "Content not found"
+msgstr "¡Comando '%s' no encontrado!\n"
 
-#: src/util/service.c:830
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+#: src/datastore/gnunet-service-datastore.c:1182
+msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:2228
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1216
+#, fuzzy
+msgid "# REMOVE requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/service.c:880 src/util/client.c:707
+#: src/datastore/gnunet-service-datastore.c:1260
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/util/service.c:900
+#: src/datastore/gnunet-service-datastore.c:1323
 #, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/util/service.c:917
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
-msgstr ""
-
-#: src/util/service.c:947 src/transport/plugin_transport_http.c:1057
+#: src/datastore/gnunet-service-datastore.c:1332
 #, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Failed to load datastore plugin for `%s'\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/util/service.c:964 src/transport/plugin_transport_http.c:1074
+#: src/datastore/gnunet-service-datastore.c:1536
 #, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+msgid "# bytes used in file-sharing datastore `%s'"
+msgstr "# bytes en la base de datos"
 
-#: src/util/service.c:1152
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
+#: src/datastore/gnunet-service-datastore.c:1547
+msgid "# quota"
 msgstr ""
 
-#: src/util/service.c:1203 src/util/service.c:1221
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
+#: src/datastore/gnunet-service-datastore.c:1549
+msgid "# cache size"
 msgstr ""
 
-#: src/util/service.c:1248
+#: src/datastore/gnunet-service-datastore.c:1562
 #, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/util/service.c:1403
+#: src/datastore/gnunet-service-datastore.c:1580
+#: src/datastore/gnunet-service-datastore.c:1596
 #, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/util/service.c:1436
-#, fuzzy, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
+#: src/datastore/gnunet-service-datastore.c:1626
+#, fuzzy
+msgid "Failed to initialize bloomfilter.\n"
+msgstr "Imposible inicializar SQLite.\n"
 
-#: src/util/service.c:1482
-msgid "Service process failed to initialize\n"
+#: src/datastore/gnunet-service-datastore.c:1655
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/util/service.c:1486
-msgid "Service process could not initialize server function\n"
+#: src/datastore/gnunet-service-datastore.c:1660
+msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/util/service.c:1490
-msgid "Service process failed to report status\n"
+#: src/datastore/gnunet-service-datastore.c:1663
+msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/util/service.c:1542
-msgid "No such user"
-msgstr ""
+#: src/datastore/plugin_datastore_mysql.c:529
+#: src/datastore/plugin_datastore_mysql.c:1336
+#, fuzzy, c-format
+msgid "Failed to prepare statement `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/util/service.c:1555
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
+#: src/datastore/plugin_datastore_mysql.c:622
+#: src/datastore/plugin_datastore_mysql.c:1346
+#, fuzzy, c-format
+msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
+msgstr "'%s' a '%s' falló en %s: %d con error %s\n"
 
-#: src/util/service.c:1618
-msgid "do daemonize (detach from terminal)"
+#: src/datastore/plugin_datastore_mysql.c:1581
+msgid "Mysql database running\n"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:76
-msgid "Test GNUnet DNS resolver code."
-msgstr ""
+#: src/datastore/plugin_datastore_postgres.c:173
+#, fuzzy, c-format
+msgid "Unable to initialize Postgres with configuration `%s': %s"
+msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/util/container_bloomfilter.c:507
-#, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
+#: src/datastore/plugin_datastore_postgres.c:1017
+msgid "Postgres database running\n"
 msgstr ""
 
-#: src/util/os_priority.c:117
-#, c-format
-msgid "Not installing a handler because $%s=%s\n"
-msgstr ""
-
-#: src/util/resolver_api.c:202
+#: src/datastore/plugin_datastore_sqlite.c:61
 #, fuzzy, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
-msgstr "Intentando usar el fichero '%s' para la configuración de MySQL.\n"
+msgid "`%s' failed at %s:%u with error: %s"
+msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/util/resolver_api.c:221
+#: src/datastore/plugin_datastore_sqlite.c:239
+#: src/namestore/plugin_namestore_sqlite.c:223
 #, fuzzy, c-format
-msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
-msgstr ""
-"Debes especificar un número positivo para '%s' en la configuración en la "
-"sección '%s'.\n"
+msgid "Option `%s' in section `%s' missing in configuration!\n"
+msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/util/resolver_api.c:358
+#: src/datastore/plugin_datastore_sqlite.c:266
+#: src/namestore/plugin_namestore_sqlite.c:248
 #, fuzzy, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr "GNUnet usa ahora la dirección IP %u.%u.%u.%u.\n"
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "Imposible inicializar SQLite.\n"
 
-#: src/util/resolver_api.c:362
-#, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr ""
+#: src/datastore/plugin_datastore_sqlite.c:669
+#, fuzzy
+msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+msgstr "Datos no válidos en %s.  Intentando fijar (por borrado).\n"
 
-#: src/util/resolver_api.c:430
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
+#: src/datastore/plugin_datastore_sqlite.c:1159
+msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/util/resolver_api.c:791
+#: src/datastore/plugin_datastore_sqlite.c:1178
 #, c-format
-msgid "Resolver returns `%s'.\n"
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/util/resolver_api.c:875
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
-msgstr ""
+#: src/datastore/plugin_datastore_sqlite.c:1218
+#: src/namestore/plugin_namestore_sqlite.c:779
+#, fuzzy
+msgid "Sqlite database running\n"
+msgstr "base de datos sqlite"
 
-#: src/util/resolver_api.c:880
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s\n"
-msgstr "Imposible resolver '%s': %s\n"
-
-#: src/util/resolver_api.c:912
-#, c-format
-msgid "Resolving our hostname `%s'\n"
+#: src/datastore/plugin_datastore_template.c:241
+msgid "Template database running\n"
 msgstr ""
 
-#: src/util/pseudonym.c:273
-#, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
-
-#: src/util/pseudonym.c:337
+#: src/dht/dht_api.c:280
 #, fuzzy
-msgid "no-name"
-msgstr "Mostrar el nombre"
+msgid "Failed to connect to the DHT service!\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/gnunet-service-resolver.c:261
-#, fuzzy, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "Imposible resolver '%s': %s\n"
-
-#: src/util/gnunet-service-resolver.c:317
-#: src/util/gnunet-service-resolver.c:362
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr "Imposible encontrar la IP del host '%s': %s\n"
-
-#: src/util/gnunet-service-resolver.c:460
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
+#: src/gns/gnunet-gns-lookup.c:185
+msgid "the query key"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:508
-#, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
+#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:188
+msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/util/bio.c:136 src/util/bio.c:142
-#, fuzzy, c-format
-msgid "Error reading `%s': %s"
-msgstr "Error creando usuario"
-
-#: src/util/bio.c:143
-#, fuzzy
-msgid "End of file"
-msgstr "Cargar un fichero de configuración"
-
-#: src/util/bio.c:195
-#, c-format
-msgid "Error reading length of string `%s'"
+#: src/dht/gnunet-dht-get.c:207 src/gns/gnunet-gns-lookup.c:191
+msgid "the type of data to look for"
 msgstr ""
 
-#: src/util/bio.c:205
-#, c-format
-msgid "String `%s' longer than allowed (%u > %u)"
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
+#: src/gns/gnunet-gns-lookup.c:194
+msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/util/bio.c:250
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
+#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
+#: src/gns/gnunet-gns-lookup.c:197 src/nse/gnunet-nse-profiler.c:908
+msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/util/bio.c:264
-#, c-format
-msgid "Metadata `%s' failed to deserialize"
+#: src/dht/gnunet-dht-get.c:232
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/util/client.c:301
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
+#: src/dht/gnunet-dht-put.c:100
+msgid "PUT request sent!\n"
 msgstr ""
 
-#: src/util/client.c:309
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+#: src/dht/gnunet-dht-put.c:124
+msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/util/client.c:647
-msgid "Failure to transmit TEST request.\n"
-msgstr ""
-
-#: src/util/client.c:849
+#: src/dht/gnunet-dht-put.c:132
 #, fuzzy, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
+msgid "Could not connect to %s service!\n"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/util/client.c:865
+#: src/dht/gnunet-dht-put.c:137
 #, fuzzy, c-format
-msgid "Failure to transmit request to service `%s'\n"
-msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
+msgid "Connected to %s service!\n"
+msgstr "'%s' conectado a '%s'.\n"
 
-#: src/util/client.c:1133
-msgid "Could not submit request, not expecting to receive a response.\n"
+#: src/dht/gnunet-dht-put.c:152
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
-#, fuzzy, c-format
-msgid "Could not aquire lock on file `%s': %s...\n"
-msgstr "Imposible escribir PID al fichero '%s': %s.\n"
+#: src/dht/gnunet-dht-put.c:166
+msgid "the data to insert under the key"
+msgstr ""
 
-#: src/util/crypto_rsa.c:623
-#, fuzzy
-msgid "Creating a new private key.  This may take a while.\n"
-msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
-
-#: src/util/crypto_rsa.c:641
-#, c-format
-msgid "I am host `%s'.  Stored new private key in `%s'.\n"
+#: src/dht/gnunet-dht-put.c:169
+msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
-msgid "This may be ok if someone is currently generating a hostkey.\n"
+#: src/dht/gnunet-dht-put.c:175
+msgid "how many replicas to create"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
-#, c-format
-msgid ""
-"When trying to read hostkey file `%s' I found %u bytes but I need at least "
-"%u.\n"
+#: src/dht/gnunet-dht-put.c:178
+msgid "the type to insert data as"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
-#, fuzzy, c-format
-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
-msgstr "El fichero '%s' no contiene un pseudónimo.\n"
-
-#: src/util/crypto_rsa.c:738
-#, fuzzy, c-format
-msgid "I am host `%s'.  Read private key from `%s'.\n"
-msgstr "Llamada a '%s' con la clave '%s'.\n"
-
-#: src/util/crypto_rsa.c:959
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
-
-#: src/nse/gnunet-nse-profiler.c:882 src/dht/gnunet-dht-get.c:213
-#: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:596
-#: src/fs/gnunet-download.c:263
-msgid "be verbose (print progress information)"
+#: src/dht/gnunet-dht-put.c:203
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:900
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:588
+#: src/testing/testing.c:2087 src/testing/testing.c:2121
 #, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "Imposible acceder al servicio"
+msgid "Failed to connect to transport service!\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/nse/gnunet-service-nse.c:938
-#, c-format
-msgid "Proof of work invalid: %llu!\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_clients.c:371
+#, fuzzy
+msgid "# GET requests from clients injected"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/nse/gnunet-service-nse.c:1393 src/nse/gnunet-service-nse.c:1412
-#: src/nse/gnunet-service-nse.c:1433
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_clients.c:462
+#, fuzzy
+msgid "# PUT requests received from clients"
+msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/nse/gnunet-service-nse.c:1400
+#: src/dht/gnunet-service-dht_clients.c:529
 #, fuzzy
-msgid "Invalid work requirement for NSE service. Exiting.\n"
-msgstr "Argumentos no válidos. Saliendo.\n"
+msgid "# GET requests received from clients"
+msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/nse/gnunet-service-nse.c:1421
+#: src/dht/gnunet-service-dht_clients.c:624
 #, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "Imposible acceder a la información del espacio.\n"
+msgid "# GET STOP requests received from clients"
+msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
-#, fuzzy, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Transporte(s) disponible(s): %s\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:195
-msgid "# peers known"
+#: src/dht/gnunet-service-dht_clients.c:854
+msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+#: src/dht/gnunet-service-dht_clients.c:869
+msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
-"El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
-"Eliminando.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/dht/gnunet-service-dht_clients.c:906
 #, fuzzy, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
+msgid "Unsupported block type (%u) in request!\n"
+msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:258
-#, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "Imposible conectar con gnunetd.\n"
-
-#: src/peerinfo/peerinfo_api.c:279
-#, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "Falló al inicializar el servicio '%s'.\n"
-
-#: src/peerinfo/peerinfo_api.c:435
+#: src/dht/gnunet-service-dht_clients.c:928
 #, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
+msgid "# RESULTS queued for clients"
+msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
-#, fuzzy
-msgid "Received invalid message from `PEERINFO' service.\n"
-msgstr "Recibido mensaje UDP6 inválido de %s:%d, omitiendo.\n"
+#: src/dht/gnunet-service-dht_clients.c:979
+#: src/dht/gnunet-service-dht_clients.c:1022
+msgid "# REPLIES ignored for CLIENTS (no match)"
+msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:523
+#: src/dht/gnunet-service-dht_clients.c:989
 #, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
-msgstr "Falló al inicializar el servicio '%s'.\n"
+msgid "Could not pass reply to client, message too big!\n"
+msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/peerinfo/peerinfo_api.c:557
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_datacache.c:93
+#, fuzzy, c-format
+msgid "%s request received, but have no datacache!\n"
+msgstr "# bytes recibidos por TCP"
 
-#: src/datacache/plugin_datacache_sqlite.c:424
-msgid "Sqlite datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:103
+msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/datacache/datacache.c:183
-#, c-format
-msgid "Loading `%s' datacache plugin\n"
+#: src/dht/gnunet-service-dht_datacache.c:209
+msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/datacache.c:191
-#, fuzzy, c-format
-msgid "Failed to load datacache plugin for `%s'\n"
-msgstr "Falló al actualizar los datos del módulo '%s'\n"
-
-#: src/datacache/datacache.c:281
-#, fuzzy
-msgid "# requests received"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/datacache/datacache.c:291
-msgid "# requests filtered by bloom filter"
+#: src/dht/gnunet-service-dht_datacache.c:220
+msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "Imposible inicializar SQLite.\n"
-
-#: src/datacache/plugin_datacache_postgres.c:500
-msgid "Postgres datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:226
+msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/plugin_datacache_template.c:121
-msgid "Template datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:238
+msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:979
-msgid "MySQL datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:241
+#, c-format
+msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
+#: src/dht/gnunet-service-dht_datacache.c:271
+#, fuzzy
+msgid "# GET requests given to datacache"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/dht/gnunet-service-dht_hello.c:82
+#, fuzzy
+msgid "# HELLOs obtained from peerinfo"
+msgstr "El mensaje recibido del cliente es inválido\n"
+
 #: src/dht/gnunet-service-dht_neighbours.c:481
 msgid "# Preference updates given to core"
 msgstr ""
@@ -1511,454 +1463,351 @@
 msgid "# P2P RESULTS received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/dht/dht_api.c:282
+#: src/dht/gnunet-service-dht_nse.c:59
 #, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+msgid "# Network size estimates received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht.c:163
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
-msgid "the query key"
+#: src/dht/gnunet-service-dht_routing.c:211
+msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204
-msgid "how many parallel requests (replicas) to create"
+#: src/dht/gnunet-service-dht_routing.c:220
+msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207
-msgid "the type of data to look for"
+#: src/dht/gnunet-service-dht_routing.c:226
+msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
-msgid "how long to execute this query before giving up?"
+#: src/dht/gnunet-service-dht_routing.c:236
+msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:232
-msgid "Issue a GET request to the GNUnet DHT, prints results."
+#: src/dht/gnunet-service-dht_routing.c:314
+#: src/dht/gnunet-service-dht_routing.c:368
+msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:371
-#, fuzzy
-msgid "# GET requests from clients injected"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/dht/gnunet-service-dht_clients.c:462
-#, fuzzy
-msgid "# PUT requests received from clients"
-msgstr "El mensaje recibido del cliente es inválido\n"
-
-#: src/dht/gnunet-service-dht_clients.c:529
-#, fuzzy
-msgid "# GET requests received from clients"
-msgstr "El mensaje recibido del cliente es inválido\n"
-
-#: src/dht/gnunet-service-dht_clients.c:624
-#, fuzzy
-msgid "# GET STOP requests received from clients"
-msgstr "El mensaje recibido del cliente es inválido\n"
-
-#: src/dht/gnunet-service-dht_clients.c:854
-msgid "# Key match, type mismatches in REPLY to CLIENT"
+#: src/dht/gnunet-service-dht_routing.c:324
+msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:869
-msgid "# Duplicate REPLIES to CLIENT request dropped"
+#: src/dht/plugin_block_dht.c:124
+#, c-format
+msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:906
-#, fuzzy, c-format
-msgid "Unsupported block type (%u) in request!\n"
-msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:928
-#, fuzzy
-msgid "# RESULTS queued for clients"
-msgstr "El mensaje recibido del cliente es inválido\n"
-
-#: src/dht/gnunet-service-dht_clients.c:979
-#: src/dht/gnunet-service-dht_clients.c:1022
-msgid "# REPLIES ignored for CLIENTS (no match)"
+#: src/dht/plugin_block_dht.c:131
+msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
-#, fuzzy
-msgid "Could not pass reply to client, message too big!\n"
-msgstr "Imposible mandar el mensaje a gnunetd\n"
-
-#: src/dht/gnunet-service-dht_nse.c:59
-#, fuzzy
-msgid "# Network size estimates received"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/dht/gnunet-dht-put.c:100
-msgid "PUT request sent!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:124
-msgid "Must provide KEY and DATA for DHT put!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:132
-#, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
-msgstr "Imposible conectar con gnunetd.\n"
-
-#: src/dht/gnunet-dht-put.c:137
-#, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "'%s' conectado a '%s'.\n"
-
-#: src/dht/gnunet-dht-put.c:152
+#: src/dht/plugin_block_dht.c:140
 #, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:166
-msgid "the data to insert under the key"
+#: src/dns/gnunet-dns-monitor.c:337
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:169
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/dns/gnunet-dns-monitor.c:340
+msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:175
-msgid "how many replicas to create"
+#: src/dns/gnunet-dns-monitor.c:348
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:178
-msgid "the type to insert data as"
+#: src/dns/gnunet-dns-redirector.c:236
+msgid "set A records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:203
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+#: src/dns/gnunet-dns-redirector.c:239
+msgid "set AAAA records"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:211
-msgid "# Good REPLIES matched against routing table"
+#: src/dns/gnunet-dns-redirector.c:247
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Duplicate REPLIES matched against routing table"
-msgstr ""
+#: src/dns/gnunet-service-dns.c:480
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "Imposible encontrar la IP del host '%s': %s\n"
 
-#: src/dht/gnunet-service-dht_routing.c:226
-msgid "# Invalid REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:634
+msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:236
-msgid "# Unsupported REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:818
+msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:314
-#: src/dht/gnunet-service-dht_routing.c:368
-msgid "# Entries removed from routing table"
+#: src/dns/gnunet-service-dns.c:1001
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
-msgid "# Entries added to routing table"
+#: src/dns/gnunet-service-dns.c:1046
+msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:93
-#, fuzzy, c-format
-msgid "%s request received, but have no datacache!\n"
-msgstr "# bytes recibidos por TCP"
-
-#: src/dht/gnunet-service-dht_datacache.c:103
-msgid "# ITEMS stored in datacache"
+#: src/dns/gnunet-service-dns.c:1165
+msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:209
-msgid "# Good RESULTS found in datacache"
+#: src/dns/gnunet-service-dns.c:1198
+msgid "Changing DNS reply according to client specifications\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:220
-msgid "# Duplicate RESULTS found in datacache"
+#: src/dns/gnunet-service-dns.c:1279
+msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:226
-msgid "# Invalid RESULTS found in datacache"
+#: src/dns/gnunet-service-dns.c:1294
+msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
-msgid "# Unsupported RESULTS found in datacache"
+#: src/dns/gnunet-service-dns.c:1303
+#, c-format
+msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:241
-#, c-format
-msgid "Unsupported block type (%u) in local response!\n"
+#: src/dns/gnunet-service-dns.c:1312
+msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:271
+#: src/dns/gnunet-service-dns.c:1377
 #, fuzzy
-msgid "# GET requests given to datacache"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/dht/gnunet-service-dht_hello.c:82
-#, fuzzy
-msgid "# HELLOs obtained from peerinfo"
+msgid "# DNS requests received via TUN interface"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/arm/gnunet-arm.c:149
-#, fuzzy, c-format
-msgid "Service `%s' is unknown to ARM.\n"
-msgstr "El espacio '%s' ha sido valorado con un %d.\n"
+#: src/dns/gnunet-service-dns.c:1461
+#, c-format
+msgid "Configured DNS exit `%s' is not working / valid.\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:154
-#, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "Servicio eliminado.\n"
+#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2671
+msgid "# Inbound MESH tunnels created"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:157
-#, fuzzy, c-format
-msgid "Service `%s' was already running.\n"
-msgstr "¡Esta búsqueda está aún pendiente!\n"
+#: src/dns/gnunet-service-dns.c:1567
+msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:162
-#, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "Servicio eliminado.\n"
+#: src/dv/dv_api.c:179
+#, fuzzy
+msgid "Failed to connect to the dv service!\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/dv/plugin_transport_dv.c:159
 #, fuzzy, c-format
-msgid "Service `%s' was already being stopped.\n"
-msgstr "Servicio eliminado.\n"
+msgid "%s Received message from %s of type %d, distance %u!\n"
+msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:169
-#, fuzzy, c-format
-msgid "Service `%s' was already not running.\n"
-msgstr "¡Esta búsqueda está aún pendiente!\n"
+#: src/exit/gnunet-daemon-exit.c:508
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:173
+#: src/exit/gnunet-daemon-exit.c:563
 #, fuzzy
-msgid "Request ignored as ARM is shutting down.\n"
-msgstr "'%s' se esta cerrando.\n"
+msgid "# Bytes transmitted via mesh tunnels"
+msgstr "# bytes desencriptados"
 
-#: src/arm/gnunet-arm.c:177
-#, fuzzy
-msgid "Error communicating with ARM service.\n"
-msgstr "Imprime información de los pares de GNUnet."
+#: src/exit/gnunet-daemon-exit.c:678 src/exit/gnunet-daemon-exit.c:2066
+#: src/exit/gnunet-daemon-exit.c:2316 src/vpn/gnunet-service-vpn.c:1388
+#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+msgid "# ICMPv4 packets dropped (type not allowed)"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:181
-#, fuzzy
-msgid "Timeout communicating with ARM service.\n"
-msgstr "Imprime información de los pares de GNUnet."
+#: src/exit/gnunet-daemon-exit.c:714 src/exit/gnunet-daemon-exit.c:2125
+#: src/exit/gnunet-daemon-exit.c:2375 src/vpn/gnunet-service-vpn.c:1444
+#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+msgid "# ICMPv6 packets dropped (type not allowed)"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:185
-#, fuzzy
-msgid "Operation failed.\n"
-msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
+#: src/exit/gnunet-daemon-exit.c:754
+msgid "# ICMP packets dropped (not allowed)"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:189
-msgid "Unknown response code from ARM.\n"
+#: src/exit/gnunet-daemon-exit.c:761
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
-#, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
+#: src/exit/gnunet-daemon-exit.c:838
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
-msgid "Fatal error initializing ARM API.\n"
+#: src/exit/gnunet-daemon-exit.c:913
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
-#, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "Imposible guardar el fichero de configuración '%s':"
+#: src/exit/gnunet-daemon-exit.c:966
+#, fuzzy
+msgid "# Packets received from TUN"
+msgstr "# bytes recibidos vía HTTP"
 
-#: src/arm/gnunet-arm.c:253
-#, fuzzy, c-format
-msgid "Failed to remove servicehome directory %s\n"
-msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+#: src/exit/gnunet-daemon-exit.c:980
+#, fuzzy
+msgid "# Bytes received from TUN"
+msgstr "# bytes recibidos vía HTTP"
 
-#: src/arm/gnunet-arm.c:355
-msgid "stop all GNUnet services"
+#: src/exit/gnunet-daemon-exit.c:1006
+msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:357
-msgid "start a particular service"
+#: src/exit/gnunet-daemon-exit.c:1033
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
-msgid "stop a particular service"
+#: src/exit/gnunet-daemon-exit.c:1079
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
-msgid "start all GNUnet default services"
+#: src/exit/gnunet-daemon-exit.c:1087
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:364
-msgid "stop and start all GNUnet default services"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1468
+#, fuzzy
+msgid "# TCP packets sent via TUN"
+msgstr "# bytes enviados vía UDP"
 
-#: src/arm/gnunet-arm.c:367
-msgid "delete config file and directory on exit"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1568
+#, fuzzy
+msgid "# TCP service creation requests received via mesh"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/arm/gnunet-arm.c:369
-msgid "don't print status messages"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:372
+#: src/exit/gnunet-daemon-exit.c:1571 src/exit/gnunet-daemon-exit.c:1650
+#: src/exit/gnunet-daemon-exit.c:1760 src/exit/gnunet-daemon-exit.c:1990
+#: src/exit/gnunet-daemon-exit.c:2232 src/exit/gnunet-daemon-exit.c:2513
+#: src/exit/gnunet-daemon-exit.c:2613
 #, fuzzy
-msgid "timeout for completing current operation"
-msgstr "tiempo para esperar hasta completar una iteración (en ms)"
+msgid "# Bytes received from MESH"
+msgstr "# bytes recibidos vía HTTP"
 
-#: src/arm/gnunet-arm.c:383
-msgid "Control services and the Automated Restart Manager (ARM)"
+#: src/exit/gnunet-daemon-exit.c:1604 src/exit/gnunet-daemon-exit.c:2635
+#, c-format
+msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:959
+#: src/exit/gnunet-daemon-exit.c:1608
 #, fuzzy
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr "Falló al comenzar la recolección.\n"
+msgid "# TCP requests dropped (no such service)"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/arm/mockup-service.c:46
-msgid "Transmitting shutdown ACK.\n"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1653
+#, fuzzy
+msgid "# TCP IP-exit creation requests received via mesh"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/arm/mockup-service.c:69
-msgid "Initiating shutdown as requested by client.\n"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1763
+#, fuzzy
+msgid "# TCP data requests received via mesh"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/arm/gnunet-service-arm.c:320
-#, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "Falló al comenzar la recolección.\n"
+#: src/exit/gnunet-daemon-exit.c:1777
+#, fuzzy
+msgid "# TCP DATA requests dropped (no session)"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/arm/gnunet-service-arm.c:323
-#, fuzzy, c-format
-msgid "Starting service `%s'\n"
-msgstr "Iniciada colección '%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:1827
+#, fuzzy
+msgid "# ICMP packets sent via TUN"
+msgstr "# bytes enviados vía UDP"
 
-#: src/arm/gnunet-service-arm.c:349
+#: src/exit/gnunet-daemon-exit.c:1993
 #, fuzzy
-msgid "Could not send status result to client\n"
-msgstr "Imposible mandar el mensaje a gnunetd\n"
+msgid "# ICMP IP-exit requests received via mesh"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/arm/gnunet-service-arm.c:476
-#, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "Imposible crear la cuenta de usuario:"
+#: src/exit/gnunet-daemon-exit.c:2235
+#, fuzzy
+msgid "# ICMP service requests received via mesh"
+msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/arm/gnunet-service-arm.c:498
-#, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+#: src/exit/gnunet-daemon-exit.c:2301 src/vpn/gnunet-service-vpn.c:1378
+#: src/vpn/gnunet-service-vpn.c:1945
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:512
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:2360 src/vpn/gnunet-service-vpn.c:1414
+#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:620
-#, fuzzy, c-format
-msgid "Preparing to stop `%s'\n"
-msgstr "Iniciada colección '%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:2410
+#, fuzzy
+msgid "# UDP packets sent via TUN"
+msgstr "# bytes enviados vía UDP"
 
-#: src/arm/gnunet-service-arm.c:774
-#, fuzzy, c-format
-msgid "Restarting service `%s'.\n"
-msgstr "Iniciada colección '%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:2516
+#, fuzzy
+msgid "# UDP IP-exit requests received via mesh"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/arm/gnunet-service-arm.c:869
-msgid "exit"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2616
+#, fuzzy
+msgid "# UDP service requests received via mesh"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/arm/gnunet-service-arm.c:874
-msgid "signal"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2639
+#, fuzzy
+msgid "# UDP requests dropped (no such service)"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/arm/gnunet-service-arm.c:879
-msgid "unknown"
-msgstr "desconocido"
-
-#: src/arm/gnunet-service-arm.c:913
+#: src/exit/gnunet-daemon-exit.c:2879
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1052
-#, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not valid: %s\n"
-msgstr "Fichero de configuración '%s' creado.\n"
-
-#: src/arm/gnunet-service-arm.c:1054
-msgid "option missing"
+#: src/exit/gnunet-daemon-exit.c:2893 src/exit/gnunet-daemon-exit.c:2905
+#, c-format
+msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1131
-#, fuzzy, c-format
-msgid "Starting default services `%s'\n"
-msgstr "Iniciada colección '%s'.\n"
-
-#: src/arm/gnunet-service-arm.c:1142
+#: src/exit/gnunet-daemon-exit.c:2916
 #, c-format
-msgid "Default service `%s' not configured correctly!\n"
+msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1156
+#: src/exit/gnunet-daemon-exit.c:3045
 msgid ""
-"No default services configured, GNUnet will not really start right now.\n"
+"This system does not support IPv4, will disable IPv4 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/arm/arm_api.c:187
-msgid "Failed to transmit shutdown request to client.\n"
+#: src/exit/gnunet-daemon-exit.c:3053
+msgid ""
+"This system does not support IPv6, will disable IPv6 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/arm/arm_api.c:378
-#, fuzzy, c-format
-msgid "Configuration failes to specify option `%s' in section `%s'!\n"
+#: src/exit/gnunet-daemon-exit.c:3060
+msgid ""
+"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
+"ENABLE_IPv4=YES\n"
 msgstr ""
-"El fichero de configuración debe especificar el directorio para almacenar "
-"los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/arm/arm_api.c:392
-#, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+#: src/exit/gnunet-daemon-exit.c:3066
+msgid ""
+"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
+"ENABLE_IPv6=YES\n"
 msgstr ""
-"El fichero de configuración debe especificar el directorio para almacenar "
-"los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/arm/arm_api.c:465
-#, fuzzy, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
-msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
-
-#: src/arm/arm_api.c:521
-#, c-format
-msgid "Requesting start of service `%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:3072 src/pt/gnunet-daemon-pt.c:884
+msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:522
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:3233
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/arm/arm_api.c:544
-#, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:546
-#, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:579
-#, fuzzy, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
-msgstr "'%s': No se recibió el mensaje en %llu ms.\n"
-
-#: src/arm/arm_api.c:652
-#, fuzzy, c-format
-msgid "Stopping service `%s' within %llu ms\n"
-msgstr "No se ha recibido una respuesta en %llums.\n"
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -2009,257 +1858,341 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/statistics/gnunet-service-statistics.c:207
+#: src/fs/fs_api.c:284
 #, fuzzy, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
-msgstr "Descarga los ficheros de GNUnet"
+msgid "Could not open file `%s': %s"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/statistics/gnunet-service-statistics.c:263
+#: src/fs/fs_api.c:293
 #, fuzzy, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
-msgstr "Descarga los ficheros de GNUnet"
+msgid "Could not read file `%s': %s"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/statistics/statistics_api.c:390
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+#: src/fs/fs_api.c:299
+#, c-format
+msgid "Short read reading from file `%s'!"
+msgstr ""
 
-#: src/statistics/gnunet-statistics.c:98
-#, fuzzy
-msgid "Failed to obtain statistics.\n"
-msgstr "Fallo en las estadísticas del tráfico.\n"
-
-#: src/statistics/gnunet-statistics.c:126 src/fs/gnunet-pseudonym.c:151
+#: src/fs/fs_api.c:877
 #, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Argumento no válido: '%s'\n"
+msgid "Failed to resume publishing information `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/statistics/gnunet-statistics.c:164
-msgid "limit output to statistics for the given NAME"
+#: src/fs/fs_api.c:1334
+#, c-format
+msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:167
-msgid "make the value being set persistent"
+#: src/fs/fs_api.c:1376
+#, c-format
+msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:170
-msgid "limit output to the given SUBSYSTEM"
-msgstr ""
+#: src/fs/fs_api.c:1392
+#, fuzzy, c-format
+msgid "Failed to resume publishing operation `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/statistics/gnunet-statistics.c:173
-msgid "just print the statistics value"
+#: src/fs/fs_api.c:2004
+#, c-format
+msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:180
-msgid "Print statistics about GNUnet operations."
-msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
+#: src/fs/fs_api.c:2014
+#, fuzzy, c-format
+msgid "Failed to resume unindexing operation `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-unindex.c:89
+#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#, fuzzy, c-format
+msgid "Failed to resume sub-download `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/fs/fs_api.c:2156
+#, fuzzy, c-format
+msgid "Failed to resume sub-search `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
 #, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:96
-#, fuzzy, c-format
-msgid "Error unindexing: %s.\n"
+#: src/fs/fs_api.c:2369
+#, c-format
+msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
-"\n"
-"Error desindexando el fichero: %s\n"
 
-#: src/fs/gnunet-unindex.c:101
+#: src/fs/fs_api.c:2615
+msgid "Could not resume running search, will resume as paused search\n"
+msgstr ""
+
+#: src/fs/fs_api.c:2709
+#, c-format
+msgid "Failure while resuming download operation `%s': %s\n"
+msgstr ""
+
+#: src/fs/fs_directory.c:210
 #, fuzzy
-msgid "Unindexing done.\n"
-msgstr "Desindexar los ficheros."
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
-#: src/fs/gnunet-publish.c:163 src/fs/gnunet-download.c:144
-#, fuzzy, c-format
-msgid "Unexpected status: %d\n"
-msgstr "Estado de descarga inesperado."
+#: src/fs/fs_download.c:313
+msgid ""
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
+msgstr ""
 
-#: src/fs/gnunet-unindex.c:131
+#: src/fs/fs_download.c:333
+msgid "Directory too large for system address space\n"
+msgstr ""
+
+#: src/fs/fs_download.c:491 src/fs/fs_download.c:503
 #, fuzzy, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
-msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
+msgid "Failed to open file `%s' for writing"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
-#: src/fs/gnunet-publish.c:417 src/fs/gnunet-download.c:203
+#: src/fs/fs_download.c:877
 #, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "Falló al inicializar el servicio '%s'.\n"
+msgid "Failed to create directory for recursive download of `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/gnunet-unindex.c:148
-#, fuzzy
-msgid "Could not start unindex operation.\n"
-msgstr "Imposible acceder a la información del espacio.\n"
+#: src/fs/fs_download.c:963
+#, c-format
+msgid ""
+"Internal error or bogus download URI (expected %u bytes at depth %u and "
+"offset %llu/%llu, got %u bytes)\n"
+msgstr ""
 
-#: src/fs/gnunet-unindex.c:176
-msgid "Unindex a file that was previously indexed with gnunet-publish."
+#: src/fs/fs_download.c:989
+msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:165
+#: src/fs/fs_download.c:1012
 #, fuzzy, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr "El espacio '%s' ha sido valorado con un %d.\n"
+msgid "Download failed: could not open file `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
+#: src/fs/fs_download.c:1024
 #, fuzzy, c-format
-msgid "Option `%s' ignored\n"
-msgstr "%s: la opción '%s' es ambigua\n"
+msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:543
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr "seleccione el NIVEL deseado de anonimato al enviar"
-
-#: src/fs/gnunet-pseudonym.c:272
-msgid "create or advertise namespace NAME"
+#: src/fs/fs_download.c:1033
+#, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
-msgid "delete namespace NAME "
-msgstr ""
+#: src/fs/fs_download.c:1875
+#, fuzzy
+msgid "Invalid URI"
+msgstr "Argumento no válido: '%s'\n"
 
-#: src/fs/gnunet-pseudonym.c:278
-#, fuzzy
+#: src/fs/fs_getopt.c:191
+#, c-format
 msgid ""
-"add an additional keyword for the advertisment (this option can be specified "
-"multiple times)"
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
-"añade una clave adicional para todos los ficheros y directorios (esta opción "
-"puede ser especificada varias veces)"
+"Tipo de metadatos desconocido en la opción de metadatos '%s'.  Usando el "
+"tipo de metadatos 'desconocido' en su lugar.\n"
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:562
-msgid "set the meta-data for the given TYPE to the given VALUE"
-msgstr "cambia el meta-dato para el TIPO dado al VALOR dado"
+#: src/fs/fs_list_indexed.c:90
+#, fuzzy, c-format
+msgid "Failed to receive response for `%s' request from `%s' service.\n"
+msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
 
-#: src/fs/gnunet-pseudonym.c:285
-#, fuzzy
-msgid "print names of local namespaces"
-msgstr "cambia la valoración de un espacio"
+#: src/fs/fs_list_indexed.c:113
+#, fuzzy, c-format
+msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
+msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
 
-#: src/fs/gnunet-pseudonym.c:288
-msgid "use the given PRIORITY for the advertisments"
-msgstr ""
+#: src/fs/fs_list_indexed.c:151
+#, fuzzy, c-format
+msgid "Failed to not connect to `%s' service.\n"
+msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/fs/gnunet-pseudonym.c:291
-msgid "do not print names of remote namespaces"
-msgstr ""
+#: src/fs/fs_misc.c:126
+#, fuzzy, c-format
+msgid "Did not find mime type `%s' in extension list.\n"
+msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:581
-msgid "set the desired replication LEVEL"
-msgstr ""
+#: src/fs/fs_namespace_advertise.c:150
+#, fuzzy
+msgid "Unknown error"
+msgstr "Error desconocido"
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/fs_namespace_advertise.c:238 src/fs/fs_namespace_advertise.c:259
 #, fuzzy
-msgid "specify ID of the root of the namespace"
-msgstr "cambia la valoración de un espacio"
+msgid "Failed to serialize meta data"
+msgstr "Imposible inicializar SQLite.\n"
 
-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/fs_namespace_advertise.c:278
 #, fuzzy
-msgid "change rating of namespace ID by VALUE"
-msgstr "cambia la valoración de un espacio"
+msgid "Failed to connect to datastore service"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/gnunet-pseudonym.c:308
-msgid "Manage GNUnet pseudonyms."
-msgstr ""
-
-#: src/fs/fs_namespace.c:64 src/fs/fs_namespace.c:90
+#: src/fs/fs_namespace.c:57 src/fs/fs_namespace.c:83
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr ""
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/fs/fs_namespace.c:119
+#: src/fs/fs_namespace.c:112
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_namespace.c:141 src/fs/fs_namespace.c:229
+#: src/fs/fs_namespace.c:134 src/fs/fs_namespace.c:222
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/fs_namespace.c:338
-#, fuzzy
-msgid "Unknown error"
-msgstr "Error desconocido"
-
-#: src/fs/fs_namespace.c:427 src/fs/fs_namespace.c:448
-#, fuzzy
-msgid "Failed to serialize meta data"
-msgstr "Imposible inicializar SQLite.\n"
-
-#: src/fs/fs_namespace.c:467
-#, fuzzy
-msgid "Failed to connect to datastore service"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/fs/fs_namespace.c:510
+#: src/fs/fs_namespace.c:256
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/fs_namespace.c:612
+#: src/fs/fs_namespace.c:371
 #, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr "Fallo al añadir la entrada al espacio '%s' (¿existe?)\n"
 
-#: src/fs/fs_namespace.c:840 src/fs/fs_publish.c:1535
+#: src/fs/fs_namespace.c:588 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "Error desconocido.\n"
 
-#: src/fs/fs_namespace.c:884
+#: src/fs/fs_namespace.c:631
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/gnunet-search.c:111
-#, c-format
-msgid "Failed to write directory with search results to `%s'\n"
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:395
+#, fuzzy, c-format
+msgid "Publishing failed: %s"
 msgstr ""
+"\n"
+"Error subiendo el fichero %s\n"
 
-#: src/fs/gnunet-search.c:181
+#: src/fs/fs_publish.c:616 src/fs/fs_publish.c:633 src/fs/fs_publish.c:672
+#: src/fs/fs_publish.c:692 src/fs/fs_publish.c:717 src/fs/fs_publish.c:857
 #, fuzzy, c-format
-msgid "Error searching: %s.\n"
-msgstr "Error abandonando DHT.\n"
+msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgstr "Indexación del fichero '%s' fallida. Intentando insertar fichero...\n"
 
-#: src/fs/gnunet-search.c:231
+#: src/fs/fs_publish.c:618
+msgid "timeout on index-start request to `fs' service"
+msgstr ""
+
+#: src/fs/fs_publish.c:630
 #, fuzzy
-msgid "Could not create keyword URI from arguments.\n"
-msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
+msgid "unknown error"
+msgstr "Error desconocido"
 
-#: src/fs/gnunet-search.c:255
+#: src/fs/fs_publish.c:673
+msgid "failed to compute hash"
+msgstr ""
+
+#: src/fs/fs_publish.c:693
+msgid "filename too long"
+msgstr ""
+
+#: src/fs/fs_publish.c:718
 #, fuzzy
-msgid "Could not start searching.\n"
-msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
+msgid "could not connect to `fs' service"
+msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/fs/gnunet-search.c:285 src/fs/gnunet-download.c:240
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "seleccione el NIVEL deseado de anonimidad-del-receptor"
+#: src/fs/fs_publish.c:741
+#, fuzzy, c-format
+msgid "Failed to get file identifiers for `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/gnunet-search.c:288 src/fs/gnunet-download.c:246
-msgid "only search the local peer (no P2P network search)"
+#: src/fs/fs_publish.c:806
+#, fuzzy, c-format
+msgid "Recursive upload failed at `%s': %s"
+msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+
+#: src/fs/fs_publish.c:812
+#, fuzzy, c-format
+msgid "Recursive upload failed: %s"
 msgstr ""
+"\n"
+"Error subiendo el fichero %s\n"
 
-#: src/fs/gnunet-search.c:291
-msgid "write search results to file starting with PREFIX"
+#: src/fs/fs_publish.c:858
+#, fuzzy
+msgid "needs to be an actual file"
+msgstr "'%s' no es un fichero regular.\n"
+
+#: src/fs/fs_publish.c:1067
+#, c-format
+msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/gnunet-search.c:294
-msgid "automatically terminate search after VALUE ms"
+#: src/fs/fs_publish.c:1138
+#, c-format
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:301
-msgid "automatically terminate search after VALUE results are found"
+#: src/fs/fs_publish_ksk.c:258
+#, fuzzy
+msgid "Could not connect to datastore."
+msgstr "Imposible conectar con gnunetd.\n"
+
+#: src/fs/fs_search.c:810
+#, c-format
+msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-search.c:308
-msgid "Search GNUnet for files that were published on GNUnet"
+#: src/fs/fs_test_lib.c:269
+#, fuzzy, c-format
+msgid "Failed to start daemon: %s\n"
+msgstr "Falló al comenzar la recolección.\n"
+
+#: src/fs/fs_unindex.c:58
+msgid "Failed to find given position in file"
 msgstr ""
 
+#: src/fs/fs_unindex.c:63
+#, fuzzy
+msgid "Failed to read file"
+msgstr "Falló al entregar el mensaje '%s'.\n"
+
+#: src/fs/fs_unindex.c:236
+msgid "Unexpected time for a response from `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:244
+msgid "Timeout waiting for `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:252
+#, fuzzy
+msgid "Invalid response from `fs' service."
+msgstr "Respuesta inválida a '%s'.\n"
+
+#: src/fs/fs_unindex.c:297
+#, fuzzy
+msgid "Failed to connect to FS service for unindexing."
+msgstr "Fallo al conectarse a gnunetd"
+
+#: src/fs/fs_unindex.c:332
+#, fuzzy
+msgid "Failed to connect to `datastore' service."
+msgstr "Falló al inicializar el servicio '%s'.\n"
+
+#: src/fs/fs_unindex.c:345
+#, fuzzy
+msgid "Failed to open file for unindexing."
+msgstr "Fallo al conectarse a gnunetd"
+
+#: src/fs/fs_unindex.c:379
+#, fuzzy
+msgid "Failed to compute hash of file."
+msgstr "Fallo al conectarse a gnunetd"
+
 #: src/fs/fs_uri.c:220
 #, c-format
 msgid "`%' must be followed by HEX number"
@@ -2333,106 +2266,347 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:118
+#: src/fs/gnunet-directory.c:49
 #, c-format
+msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgstr ""
+
+#: src/fs/gnunet-directory.c:94
+#, fuzzy, c-format
+msgid "Directory `%s' meta data:\n"
+msgstr "==> Directorio '%s':\n"
+
+#: src/fs/gnunet-directory.c:97
+#, fuzzy, c-format
+msgid "Directory `%s' contents:\n"
+msgstr "==> Directorio '%s':\n"
+
+#: src/fs/gnunet-directory.c:132
+#, fuzzy
+msgid "You must specify a filename to inspect.\n"
+msgstr "Debes especificar una lista de ficheros a insertar.\n"
+
+#: src/fs/gnunet-directory.c:145
+#, fuzzy, c-format
+msgid "Failed to read directory `%s'\n"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: src/fs/gnunet-directory.c:154
+#, fuzzy, c-format
+msgid "`%s' is not a GNUnet directory\n"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: src/fs/gnunet-directory.c:179
+#, fuzzy
+msgid "Display contents of a GNUnet directory"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: src/fs/gnunet-download.c:100
+#, fuzzy, c-format
+msgid "Starting download `%s'.\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/fs/gnunet-download.c:109
+#, fuzzy
+msgid "<unknown time>"
+msgstr "Error desconocido"
+
+#: src/fs/gnunet-download.c:118
+#, c-format
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:128
+#, fuzzy, c-format
+msgid "Error downloading: %s.\n"
+msgstr "Error descargando: %s\n"
+
+#: src/fs/gnunet-download.c:136
+#, fuzzy, c-format
+msgid "Downloading `%s' done (%s/s).\n"
+msgstr "¡Subida rechazada!"
+
+#: src/fs/gnunet-download.c:151 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
+#, fuzzy, c-format
+msgid "Unexpected status: %d\n"
+msgstr "Estado de descarga inesperado."
+
+#: src/fs/gnunet-download.c:176
+#, fuzzy
+msgid "You need to specify a URI argument.\n"
+msgstr "¡Debes especificar un receptor!\n"
+
+#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#, fuzzy, c-format
+msgid "Failed to parse URI: %s\n"
+msgstr "El fichero '%s' tiene la URI: '%s'\n"
+
+#: src/fs/gnunet-download.c:189
+msgid "Only CHK or LOC URIs supported.\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:196
+msgid "Target filename must be specified.\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
+#, fuzzy, c-format
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "Falló al inicializar el servicio '%s'.\n"
+
+#: src/fs/gnunet-download.c:247 src/fs/gnunet-search.c:285
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr "seleccione el NIVEL deseado de anonimidad-del-receptor"
+
+#: src/fs/gnunet-download.c:250
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
+msgstr ""
+
+#: src/fs/gnunet-download.c:253 src/fs/gnunet-search.c:288
+msgid "only search the local peer (no P2P network search)"
+msgstr ""
+
+#: src/fs/gnunet-download.c:256
+msgid "write the file to FILENAME"
+msgstr "escribe el fichero al FICHERO"
+
+#: src/fs/gnunet-download.c:260
+msgid "set the maximum number of parallel downloads that is allowed"
+msgstr ""
+
+#: src/fs/gnunet-download.c:264
+msgid "set the maximum number of parallel requests for blocks that is allowed"
+msgstr ""
+
+#: src/fs/gnunet-download.c:267
+msgid "download a GNUnet directory recursively"
+msgstr "descarga un directorio de GNUnet recursivamente"
+
+#: src/fs/gnunet-download.c:277
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:117
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:124
+msgid "Special file-sharing operations"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Argumento no válido: '%s'\n"
+
+#: src/fs/gnunet-pseudonym.c:165
+#, fuzzy, c-format
+msgid "Namespace `%s' unknown.\n"
+msgstr "El espacio '%s' ha sido valorado con un %d.\n"
+
+#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
+#: src/fs/gnunet-pseudonym.c:249
+#, fuzzy, c-format
+msgid "Option `%s' ignored\n"
+msgstr "%s: la opción '%s' es ambigua\n"
+
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr "seleccione el NIVEL deseado de anonimato al enviar"
+
+#: src/fs/gnunet-pseudonym.c:272
+msgid "create or advertise namespace NAME"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:275
+msgid "delete namespace NAME "
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:278
+#, fuzzy
+msgid ""
+"add an additional keyword for the advertisment (this option can be specified "
+"multiple times)"
+msgstr ""
+"añade una clave adicional para todos los ficheros y directorios (esta opción "
+"puede ser especificada varias veces)"
+
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+msgid "set the meta-data for the given TYPE to the given VALUE"
+msgstr "cambia el meta-dato para el TIPO dado al VALOR dado"
+
+#: src/fs/gnunet-pseudonym.c:285
+#, fuzzy
+msgid "print names of local namespaces"
+msgstr "cambia la valoración de un espacio"
+
+#: src/fs/gnunet-pseudonym.c:288
+msgid "use the given PRIORITY for the advertisments"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:291
+msgid "do not print names of remote namespaces"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:297
+#, fuzzy
+msgid "specify ID of the root of the namespace"
+msgstr "cambia la valoración de un espacio"
+
+#: src/fs/gnunet-pseudonym.c:300
+#, fuzzy
+msgid "change rating of namespace ID by VALUE"
+msgstr "cambia la valoración de un espacio"
+
+#: src/fs/gnunet-pseudonym.c:308
+msgid "Manage GNUnet pseudonyms."
+msgstr ""
+
+#: src/fs/gnunet-publish.c:147
+#, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:126
+#: src/fs/gnunet-publish.c:155
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Error descargando: %s\n"
 
-#: src/fs/gnunet-publish.c:137
+#: src/fs/gnunet-publish.c:165
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:141
+#: src/fs/gnunet-publish.c:169
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/fs/gnunet-publish.c:160
+#: src/fs/gnunet-publish.c:187
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "'%s' comienzo completo.\n"
 
-#: src/fs/gnunet-publish.c:272
+#: src/fs/gnunet-publish.c:299
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/fs/gnunet-publish.c:274
+#: src/fs/gnunet-publish.c:301
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Claves para los ficheros '%s':\n"
 
-#: src/fs/gnunet-publish.c:325
+#: src/fs/gnunet-publish.c:352
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:367
+#: src/fs/gnunet-publish.c:427
+#, fuzzy
+msgid "Could not publish\n"
+msgstr "Imposible ejecutar '%s': %s\n"
+
+#: src/fs/gnunet-publish.c:454
+#, fuzzy
+msgid "Could not start publishing.\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#: src/fs/gnunet-publish.c:485
+#, fuzzy, c-format
+msgid "Scanning directory `%s'.\n"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: src/fs/gnunet-publish.c:487
+#, fuzzy, c-format
+msgid "Scanning file `%s'.\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/fs/gnunet-publish.c:492
 #, c-format
+msgid "There was trouble processing file `%s', skipping it.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:497
+#, fuzzy
+msgid "Preprocessing complete.\n"
+msgstr "Cierre completado.\n"
+
+#: src/fs/gnunet-publish.c:501
+#, fuzzy, c-format
+msgid "Extracting meta data from file `%s' complete.\n"
+msgstr "Actualizando los datos del módulo '%s'\n"
+
+#: src/fs/gnunet-publish.c:505
+msgid "Meta data extraction has finished.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:512
+#, fuzzy
+msgid "Internal error scanning directory.\n"
+msgstr "=\tError leyendo el directorio.\n"
+
+#: src/fs/gnunet-publish.c:546
+#, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:374
+#: src/fs/gnunet-publish.c:553
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
-#: src/fs/gnunet-publish.c:380
+#: src/fs/gnunet-publish.c:559
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/fs/gnunet-publish.c:388
+#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/fs/gnunet-publish.c:398 src/fs/gnunet-publish.c:405
-#: src/transport/gnunet-transport.c:503
+#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
+#: src/transport/gnunet-transport.c:530
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:606
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:439 src/fs/gnunet-download.c:175
+#: src/fs/gnunet-publish.c:639
 #, fuzzy, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "El fichero '%s' tiene la URI: '%s'\n"
+msgid "Failed to access `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-publish.c:472
-#, fuzzy, c-format
-msgid "Could not access file: %s\n"
-msgstr "Imposible ejecutar '%s': %s\n"
+#: src/fs/gnunet-publish.c:651
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:497
-#, fuzzy, c-format
-msgid "Could not publish `%s': %s\n"
-msgstr "Imposible ejecutar '%s': %s\n"
-
-#: src/fs/gnunet-publish.c:520
-#, fuzzy
-msgid "Could not start publishing.\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
-
-#: src/fs/gnunet-publish.c:547
+#: src/fs/gnunet-publish.c:676
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:550
+#: src/fs/gnunet-publish.c:679
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:554
+#: src/fs/gnunet-publish.c:683
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2440,7 +2614,7 @@
 "imprime la lista de las claves extraidas que podrían ser usadas, pero no "
 "realiza la subida"
 
-#: src/fs/gnunet-publish.c:558
+#: src/fs/gnunet-publish.c:687
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2448,7 +2622,7 @@
 "añade una clave adicional para el fichero del nivel más alto o el directorio "
 "(esta opción puede ser especificada varias veces)"
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:694
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2456,7 +2630,7 @@
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "encriptada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:570
+#: src/fs/gnunet-publish.c:699
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2464,110 +2638,309 @@
 "especifica la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:574
+#: src/fs/gnunet-publish.c:703
 msgid "specify the priority of the content"
 msgstr "especifica la prioridad del contenido"
 
-#: src/fs/gnunet-publish.c:578
+#: src/fs/gnunet-publish.c:707
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publica los ficheros bajo el pseudónimo NOMBRE (coloca el fichero en el "
 "espacio)"
 
-#: src/fs/gnunet-publish.c:584
+#: src/fs/gnunet-publish.c:713
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:588
+#: src/fs/gnunet-publish.c:717
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "cambia la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-publish.c:721
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:736
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_search.c:810
+#: src/fs/gnunet-search.c:111
 #, c-format
-msgid "Got result with unknown block type `%d', ignoring"
+msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
-#: src/fs/gnunet-service-fs_lc.c:490
+#: src/fs/gnunet-search.c:181
+#, fuzzy, c-format
+msgid "Error searching: %s.\n"
+msgstr "Error abandonando DHT.\n"
+
+#: src/fs/gnunet-search.c:231
 #, fuzzy
-msgid "# client searches active"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "Could not create keyword URI from arguments.\n"
+msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-service-fs_lc.c:254
+#: src/fs/gnunet-search.c:255
 #, fuzzy
-msgid "# replies received for local clients"
-msgstr "El mensaje recibido del cliente es inválido\n"
+msgid "Could not start searching.\n"
+msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-service-fs_lc.c:319
+#: src/fs/gnunet-search.c:291
+msgid "write search results to file starting with PREFIX"
+msgstr ""
+
+#: src/fs/gnunet-search.c:294
+msgid "automatically terminate search after VALUE ms"
+msgstr ""
+
+#: src/fs/gnunet-search.c:301
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
+
+#: src/fs/gnunet-search.c:308
+msgid "Search GNUnet for files that were published on GNUnet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:240
+msgid "# running average P2P latency (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
+msgid "# Loopback routes suppressed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:583 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/topology/gnunet-daemon-topology.c:1290
+#: src/topology/gnunet-daemon-topology.c:1297
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' service.\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1546
+#: src/topology/gnunet-daemon-topology.c:654
+#: src/topology/gnunet-daemon-topology.c:756
+#: src/transport/gnunet-service-transport_neighbours.c:960
+#: src/transport/gnunet-service-transport_neighbours.c:1289
+#: src/transport/gnunet-service-transport_neighbours.c:1841
+#: src/transport/gnunet-service-transport_neighbours.c:2499
+#: src/transport/gnunet-service-transport_neighbours.c:2566
 #, fuzzy
-msgid "# client searches received"
+msgid "# peers connected"
+msgstr "# de pares conectados"
+
+#: src/fs/gnunet-service-fs_cp.c:696
+#, fuzzy
+msgid "# migration stop messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_lc.c:358
-msgid "# client searches updated (merged content seen list)"
+#: src/fs/gnunet-service-fs_cp.c:700
+#, c-format
+msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
+#: src/fs/gnunet-service-fs_cp.c:735
+msgid "# replies transmitted to other peers"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:741
+msgid "# replies dropped"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1336
+msgid "# P2P searches active"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:858
+msgid "# artificial delays introduced (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:911
 #, fuzzy
-msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
-msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+msgid "# replies dropped due to type mismatch"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/fs_misc.c:126
+#: src/fs/gnunet-service-fs_cp.c:921
+msgid "# replies received for other peers"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:935
+msgid "# replies dropped due to insufficient cover traffic"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:973
+msgid "# P2P searches destroyed due to ultimate reply"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1040
+#, fuzzy
+msgid "# requests done for free (low load)"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/fs/gnunet-service-fs_cp.c:1064
+msgid "# request dropped, priority insufficient"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1074
+#, fuzzy
+msgid "# requests done for a price (normal load)"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/fs/gnunet-service-fs_cp.c:1153
+msgid "# GET requests received (from other peers)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1187
+#, fuzzy
+msgid "# requests dropped due to initiator not being connected"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/fs/gnunet-service-fs_cp.c:1211
+#, fuzzy
+msgid "# requests dropped due to missing reverse route"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/fs/gnunet-service-fs_cp.c:1277
+#, fuzzy
+msgid "# requests dropped due TTL underflow"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/fs/gnunet-service-fs_cp.c:1305
+#, fuzzy
+msgid "# requests dropped due to higher-TTL request"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/fs/gnunet-service-fs_cp.c:1334
+#, fuzzy
+msgid "# P2P query messages received and processed"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_cp.c:1701
+#, fuzzy
+msgid "# migration stop messages sent"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_indexing.c:113
+#: src/fs/gnunet-service-fs_indexing.c:163
 #, fuzzy, c-format
-msgid "Did not find mime type `%s' in extension list.\n"
-msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
+msgid "Configuration option `%s' in section `%s' missing.\n"
+msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/fs/gnunet-directory.c:49
+#: src/fs/gnunet-service-fs_indexing.c:121
+#: src/fs/gnunet-service-fs_indexing.c:177
+#, fuzzy, c-format
+msgid "Could not open `%s'.\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/fs/gnunet-service-fs_indexing.c:137
+#, fuzzy, c-format
+msgid "Error writing `%s'.\n"
+msgstr "Error creando usuario"
+
+#: src/fs/gnunet-service-fs_indexing.c:228
 #, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
+#: src/fs/gnunet-service-fs_indexing.c:266
+#, c-format
+msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:490
 #, fuzzy, c-format
-msgid "Directory `%s' meta data:\n"
-msgstr "==> Directorio '%s':\n"
+msgid "Failed to delete bogus block: %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-directory.c:97
+#: src/fs/gnunet-service-fs_indexing.c:548
+msgid "# index blocks removed: original file inaccessible"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:563
 #, fuzzy, c-format
-msgid "Directory `%s' contents:\n"
-msgstr "==> Directorio '%s':\n"
+msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
+msgstr "Imposible resolver '%s': %s\n"
 
-#: src/fs/gnunet-directory.c:132
+#: src/fs/gnunet-service-fs_indexing.c:565
 #, fuzzy
-msgid "You must specify a filename to inspect."
-msgstr "Debes especificar una lista de ficheros a insertar.\n"
+msgid "not indexed"
+msgstr "El desindexado falló"
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-service-fs_indexing.c:580
 #, fuzzy, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+msgid "Indexed file `%s' changed at offset %llu\n"
+msgstr "La indexación de los datos falló en la posición %i.\n"
 
-#: src/fs/gnunet-directory.c:176
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
+#: src/fs/gnunet-service-fs_lc.c:494
 #, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+msgid "# client searches active"
+msgstr "# mensajes PONG encriptados recibidos"
 
+#: src/fs/gnunet-service-fs_lc.c:256
+#, fuzzy
+msgid "# replies received for local clients"
+msgstr "El mensaje recibido del cliente es inválido\n"
+
+#: src/fs/gnunet-service-fs_lc.c:323
+#, fuzzy
+msgid "# client searches received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_lc.c:362
+msgid "# client searches updated (merged content seen list)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:265
+msgid "# average retransmission delay (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:394
+msgid "# transmission failed (core has no bandwidth)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:425
+#, fuzzy
+msgid "# query messages sent to other peers"
+msgstr "# bytes de mensajes salientes omitidos"
+
+#: src/fs/gnunet-service-fs_pe.c:478
+msgid "# delay heap timeout"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:485
+#, fuzzy
+msgid "# query plans executed"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_pe.c:549
+#, fuzzy
+msgid "# requests merged"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_pe.c:555
+#, fuzzy
+msgid "# requests refreshed"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_pe.c:608 src/fs/gnunet-service-fs_pe.c:694
+#: src/fs/gnunet-service-fs_pe.c:761
+msgid "# query plan entries"
+msgstr ""
+
 #: src/fs/gnunet-service-fs_pr.c:287
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:623
+#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:622
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -2577,1000 +2950,1733 @@
 msgid "# replies received and matched"
 msgstr "# bytes recibidos por TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:816
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:830
+#: src/fs/gnunet-service-fs_pr.c:832
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:845
+#: src/fs/gnunet-service-fs_pr.c:847
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:965
+#: src/fs/gnunet-service-fs_pr.c:969
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:992
+#: src/fs/gnunet-service-fs_pr.c:996
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1027
+#: src/fs/gnunet-service-fs_pr.c:1031
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1120
+#: src/fs/gnunet-service-fs_pr.c:1124
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1141
+#: src/fs/gnunet-service-fs_pr.c:1145
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
+#: src/fs/gnunet-service-fs_pr.c:1192
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1202
+#: src/fs/gnunet-service-fs_pr.c:1206
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1215
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1227
+#: src/fs/gnunet-service-fs_pr.c:1231
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1248
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1257
+#: src/fs/gnunet-service-fs_pr.c:1261
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1266
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1289 src/fs/gnunet-service-fs_pr.c:1329
-#: src/fs/gnunet-service-fs_pr.c:1469
+#: src/fs/gnunet-service-fs_pr.c:1293 src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1473
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1347
+#: src/fs/gnunet-service-fs_pr.c:1351
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1360
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1446
+#: src/fs/gnunet-service-fs_pr.c:1450
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1530
+#: src/fs/gnunet-service-fs_pr.c:1534
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1629 src/fs/gnunet-service-fs_pr.c:1638
+#: src/fs/gnunet-service-fs_pr.c:1633 src/fs/gnunet-service-fs_pr.c:1642
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:265
-msgid "# average retransmission delay (ms)"
+#: src/fs/gnunet-service-fs_push.c:653
+#, c-format
+msgid ""
+"Invalid value specified for option `%s' in section `%s', content pushing "
+"disabled\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:394
-msgid "# transmission failed (core has no bandwidth)"
+#: src/fs/gnunet-unindex.c:89
+#, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:425
+#: src/fs/gnunet-unindex.c:96
+#, fuzzy, c-format
+msgid "Error unindexing: %s.\n"
+msgstr ""
+"\n"
+"Error desindexando el fichero: %s\n"
+
+#: src/fs/gnunet-unindex.c:101
 #, fuzzy
-msgid "# query messages sent to other peers"
-msgstr "# bytes de mensajes salientes omitidos"
+msgid "Unindexing done.\n"
+msgstr "Desindexar los ficheros."
 
-#: src/fs/gnunet-service-fs_pe.c:478
-msgid "# delay heap timeout"
+#: src/fs/gnunet-unindex.c:131
+#, fuzzy, c-format
+msgid "You must specify one and only one filename for unindexing.\n"
+msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
+
+#: src/fs/gnunet-unindex.c:148
+#, fuzzy
+msgid "Could not start unindex operation.\n"
+msgstr "Imposible acceder a la información del espacio.\n"
+
+#: src/fs/gnunet-unindex.c:176
+msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:485
+#: src/fs/plugin_block_fs.c:131
+msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+msgstr ""
+
+#: src/gns/gns_api.c:221
 #, fuzzy
-msgid "# query plans executed"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "Failed to connect to the GNS service!\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:549
+#: src/gns/gnunet-gns-lookup.c:216
+msgid "Issue a request to the GNUnet Naming System, prints results."
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:264
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:317
+msgid "advertise our hostlist to other peers"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:322
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:325
+msgid "enable learning about hostlist servers from other peers"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:329
+msgid "provide a hostlist server"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:341
+msgid "GNUnet hostlist server and client"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:286
+msgid "# bytes downloaded from hostlist servers"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
 #, fuzzy
-msgid "# requests merged"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "# invalid HELLOs downloaded from hostlist servers"
+msgstr "# saludos descargados vía HTTP"
 
-#: src/fs/gnunet-service-fs_pe.c:555
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#, fuzzy, c-format
+msgid "Invalid `%s' message received from hostlist at `%s'\n"
+msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
+
+#: src/hostlist/hostlist-client.c:330
 #, fuzzy
-msgid "# requests refreshed"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "# valid HELLOs downloaded from hostlist servers"
+msgstr "# saludos descargados vía HTTP"
 
-#: src/fs/gnunet-service-fs_pe.c:608 src/fs/gnunet-service-fs_pe.c:694
-#: src/fs/gnunet-service-fs_pe.c:736
-msgid "# query plan entries"
+#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#, c-format
+msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1544
-#: src/transport/gnunet-service-transport_neighbours.c:936
-#: src/transport/gnunet-service-transport_neighbours.c:1263
-#: src/transport/gnunet-service-transport_neighbours.c:1735
-#: src/transport/gnunet-service-transport_neighbours.c:2369
-#: src/transport/gnunet-service-transport_neighbours.c:2437
-#: src/topology/gnunet-daemon-topology.c:654
-#: src/topology/gnunet-daemon-topology.c:756
-#, fuzzy
-msgid "# peers connected"
-msgstr "# de pares conectados"
+#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
+#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
+#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
+#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
+#: src/transport/plugin_transport_http_client.c:108
+#: src/transport/plugin_transport_http_client.c:123
+#, fuzzy, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:696
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+msgid "# advertised hostlist URIs"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:622
+#, c-format
+msgid "# advertised URI `%s' downloaded"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:663
+#, c-format
+msgid ""
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:805
+#, c-format
+msgid "Timeout trying to download hostlist from `%s'\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:822
+#, c-format
+msgid "Download limit of %u bytes exceeded, stopping download\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:842
+#, fuzzy, c-format
+msgid "%s failed for `%s' at %s:%d: `%s'\n"
+msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+
+#: src/hostlist/hostlist-client.c:848
+#, fuzzy, c-format
+msgid "Download of hostlist `%s' completed.\n"
+msgstr ""
+"Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
+"kbps.\n"
+
+#: src/hostlist/hostlist-client.c:856
+#, c-format
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:909
+#, c-format
+msgid "Bootstrapping using hostlist at `%s'.\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:917
+msgid "# hostlist downloads initiated"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+msgid "# milliseconds between hostlist downloads"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1054
+#, c-format
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1092
+msgid "Scheduled saving of hostlists\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1096
+#, c-format
+msgid "Hostlists will be saved to file again in %llums\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
 #, fuzzy
-msgid "# migration stop messages received"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "# active connections"
+msgstr "Configuración de GNUnet"
 
-#: src/fs/gnunet-service-fs_cp.c:700
+#: src/hostlist/hostlist-client.c:1253
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %llu ms\n"
+msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:735
-msgid "# replies transmitted to other peers"
+#: src/hostlist/hostlist-client.c:1284
+#, c-format
+msgid ""
+"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:741
-msgid "# replies dropped"
+#: src/hostlist/hostlist-client.c:1290
+#, c-format
+msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1334
-msgid "# P2P searches active"
+#: src/hostlist/hostlist-client.c:1294
+#, c-format
+msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:858
-msgid "# artificial delays introduced (ms)"
+#: src/hostlist/hostlist-client.c:1305
+#, fuzzy, c-format
+msgid "Could not open file `%s' for reading to load hostlists: %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/hostlist/hostlist-client.c:1338
+#, c-format
+msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:909
+#: src/hostlist/hostlist-client.c:1340
+msgid "# hostlist URIs read from file"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1373
+#, c-format
+msgid ""
+"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1387
+#, fuzzy, c-format
+msgid "Could not open file `%s' for writing to save hostlists: %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/hostlist/hostlist-client.c:1392
+#, c-format
+msgid "Writing %u hostlist URIs to `%s'\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#, fuzzy, c-format
+msgid "Error writing hostlist URIs to file `%s'\n"
+msgstr "Error creando usuario"
+
+#: src/hostlist/hostlist-client.c:1428
+msgid "# hostlist URIs written to file"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1480
+msgid "Learning is enabled on this peer\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1483
+#, c-format
+msgid "Hostlists will be saved to file again in  %llums\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1492
+msgid "Learning is not enabled on this peer\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1504
+#, c-format
+msgid ""
+"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1508
+#, fuzzy, c-format
+msgid "Hostlist file `%s' could not be removed\n"
+msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
+
+#: src/hostlist/hostlist-server.c:134
 #, fuzzy
-msgid "# replies dropped due to type mismatch"
-msgstr "# Anuncios de los pares recibidos"
+msgid "bytes in hostlist"
+msgstr "# bytes en la base de datos"
 
-#: src/fs/gnunet-service-fs_cp.c:919
-msgid "# replies received for other peers"
+#: src/hostlist/hostlist-server.c:157
+msgid "expired addresses encountered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:933
-msgid "# replies dropped due to insufficient cover traffic"
+#: src/hostlist/hostlist-server.c:184
+#: src/topology/gnunet-daemon-topology.c:875
+#, fuzzy, c-format
+msgid "Error in communication with PEERINFO service: %s\n"
+msgstr "Imprime información de los pares de GNUnet."
+
+#: src/hostlist/hostlist-server.c:205
+msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:971
-msgid "# P2P searches destroyed due to ultimate reply"
+#: src/hostlist/hostlist-server.c:221
+msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1038
+#: src/hostlist/hostlist-server.c:269
+#, c-format
+msgid "Refusing `%s' request to hostlist server\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:272
 #, fuzzy
-msgid "# requests done for free (low load)"
-msgstr "# Anuncios de los pares recibidos"
+msgid "hostlist requests refused (not HTTP GET)"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1062
-msgid "# request dropped, priority insufficient"
+#: src/hostlist/hostlist-server.c:280
+msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1072
+#: src/hostlist/hostlist-server.c:287
+#, c-format
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:291
 #, fuzzy
-msgid "# requests done for a price (normal load)"
-msgstr "# Anuncios de los pares recibidos"
+msgid "hostlist requests refused (upload data)"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1151
-msgid "# GET requests received (from other peers)"
+#: src/hostlist/hostlist-server.c:299
+msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1185
+#: src/hostlist/hostlist-server.c:302
 #, fuzzy
-msgid "# requests dropped due to initiator not being connected"
-msgstr "# Anuncios de los pares recibidos"
+msgid "hostlist requests refused (not ready)"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1209
+#: src/hostlist/hostlist-server.c:306
+msgid "Received request for our hostlist\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:307
 #, fuzzy
-msgid "# requests dropped due to missing reverse route"
-msgstr "# Anuncios de los pares recibidos"
+msgid "hostlist requests processed"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1275
+#: src/hostlist/hostlist-server.c:350
 #, fuzzy
-msgid "# requests dropped due TTL underflow"
-msgstr "# Anuncios de los pares recibidos"
+msgid "# hostlist advertisements send"
+msgstr "# Anuncios a extraños mandados"
 
-#: src/fs/gnunet-service-fs_cp.c:1303
+#: src/hostlist/hostlist-server.c:397
+msgid "Advertisement message could not be queued by core\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:565
+#, fuzzy, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr "Argumentos no válidos. Saliendo.\n"
+
+#: src/hostlist/hostlist-server.c:574
+#, c-format
+msgid "Hostlist service starts on %s:%llu\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:588
+#, c-format
+msgid "Address to obtain hostlist: `%s'\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:626
+#, c-format
+msgid "Could not start hostlist HTTP server on port %u\n"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:4595
 #, fuzzy
-msgid "# requests dropped due to higher-TTL request"
-msgstr "# Anuncios de los pares recibidos"
+msgid "Wrong CORE service\n"
+msgstr "Deteniendo cron\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1332
+#: src/mesh/gnunet-service-mesh.c:4789
 #, fuzzy
-msgid "# P2P query messages received and processed"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
+msgstr "Configuración de GNUnet"
 
-#: src/fs/gnunet-service-fs_cp.c:1699
+#: src/mesh/gnunet-service-mesh.c:4798
 #, fuzzy
-msgid "# migration stop messages sent"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/fs/gnunet-service-fs_push.c:653
+#: src/nat/gnunet-nat-server.c:289
 #, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
+msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:113
-#: src/fs/gnunet-service-fs_indexing.c:163
-#, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing.\n"
-msgstr "Fichero de configuración '%s' creado.\n"
+#: src/nat/gnunet-nat-server.c:328
+msgid "GNUnet NAT traversal test helper daemon"
+msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:121
-#: src/fs/gnunet-service-fs_indexing.c:177
+#: src/nat/nat.c:803
+#, c-format
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgstr ""
+
+#: src/nat/nat.c:852
 #, fuzzy, c-format
-msgid "Could not open `%s'.\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Failed to start %s\n"
+msgstr "Falló al comenzar la recolección.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:137
+#: src/nat/nat.c:1121
 #, fuzzy, c-format
-msgid "Error writing `%s'.\n"
-msgstr "Error creando usuario"
+msgid "Malformed %s `%s' given in configuration!\n"
+msgstr "Imposible guardar la configuración"
 
-#: src/fs/gnunet-service-fs_indexing.c:228
+#: src/nat/nat.c:1187 src/nat/nat.c:1197
 #, c-format
 msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:266
+#: src/nat/nat.c:1329
+msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+msgstr ""
+
+#: src/nat/nat.c:1341
 #, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
+msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:490
-#, fuzzy, c-format
-msgid "Failed to delete bogus block: %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
+#: src/nat/nat_test.c:348
+#, fuzzy
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:548
-msgid "# index blocks removed: original file inaccessible"
+#: src/nat/nat_test.c:418
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:563
-#, fuzzy, c-format
-msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
-msgstr "Imposible resolver '%s': %s\n"
+#: src/nse/gnunet-nse-profiler.c:926
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "Imposible acceder al servicio"
 
-#: src/fs/gnunet-service-fs_indexing.c:565
+#: src/nse/gnunet-service-nse.c:936
+#, c-format
+msgid "Proof of work invalid: %llu!\n"
+msgstr ""
+
+#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
+#: src/nse/gnunet-service-nse.c:1431
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+msgstr ""
+
+#: src/nse/gnunet-service-nse.c:1398
 #, fuzzy
-msgid "not indexed"
-msgstr "El desindexado falló"
+msgid "Invalid work requirement for NSE service. Exiting.\n"
+msgstr "Argumentos no válidos. Saliendo.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:580
+#: src/nse/gnunet-service-nse.c:1419
+#, fuzzy
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr "Imposible acceder a la información del espacio.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:133
 #, fuzzy, c-format
-msgid "Indexed file `%s' changed at offset %llu\n"
-msgstr "La indexación de los datos falló en la posición %i.\n"
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/fs/fs_list_indexed.c:90
+#: src/peerinfo/gnunet-service-peerinfo.c:195
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:239
+#, 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. "
+"Eliminando.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:305
 #, fuzzy, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
-msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
+msgid "Still no peers found in `%s'!\n"
+msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
-#: src/fs/fs_list_indexed.c:117
+#: src/peerinfo/peerinfo_api.c:279
 #, fuzzy, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
+msgid "Failed to transmit message to `%s' service.\n"
+msgstr "Falló al inicializar el servicio '%s'.\n"
+
+#: src/peerinfo/peerinfo_api.c:435
+#, fuzzy
+msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
 
-#: src/fs/fs_list_indexed.c:164
-#, fuzzy, c-format
-msgid "Failed to not connect to `%s' service.\n"
+#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
+#, fuzzy
+msgid "Received invalid message from `PEERINFO' service.\n"
+msgstr "Recibido mensaje UDP6 inválido de %s:%d, omitiendo.\n"
+
+#: src/peerinfo/peerinfo_api.c:523
+#, fuzzy
+msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/fs/fs_unindex.c:58
-msgid "Failed to find given position in file"
+#: src/peerinfo/peerinfo_api.c:557
+msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/peerinfo/peerinfo_api_notify.c:258
+#, fuzzy, c-format
+msgid "Could not connect to `%s' service.\n"
+msgstr "Imposible conectar con gnunetd.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#, fuzzy, c-format
+msgid "Could not find option `%s:%s' in configuration.\n"
+msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#, fuzzy, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr "Analizando saludo de '%s' se produjo un fallo.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#, c-format
+msgid "I am peer `%s'.\n"
+msgstr "Yo soy el par '%s'.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:255
+msgid "output only the identity strings"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+msgid "output our own identity only"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
 #, fuzzy
-msgid "Failed to read file"
-msgstr "Falló al entregar el mensaje '%s'.\n"
+msgid "Print information about peers."
+msgstr "Imprime información de los pares de GNUnet."
 
-#: src/fs/fs_unindex.c:236
-msgid "Unexpected time for a response from `fs' service."
+#: src/pt/gnunet-daemon-pt.c:264
+#, fuzzy
+msgid "Failed to pack DNS request.  Dropping.\n"
+msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
+
+#: src/pt/gnunet-daemon-pt.c:270
+#, fuzzy
+msgid "# DNS requests mapped to VPN"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/pt/gnunet-daemon-pt.c:323
+msgid "# DNS records modified"
 msgstr ""
 
-#: src/fs/fs_unindex.c:244
-msgid "Timeout waiting for `fs' service."
+#: src/pt/gnunet-daemon-pt.c:500
+msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/fs/fs_unindex.c:252
+#: src/pt/gnunet-daemon-pt.c:506
 #, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "Respuesta inválida a '%s'.\n"
+msgid "Failed to parse DNS request.  Dropping.\n"
+msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
 
-#: src/fs/fs_unindex.c:297
+#: src/pt/gnunet-daemon-pt.c:602
 #, fuzzy
-msgid "Failed to connect to FS service for unindexing."
-msgstr "Fallo al conectarse a gnunetd"
+msgid "# DNS requests dropped (timeout)"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/fs_unindex.c:332
+#: src/pt/gnunet-daemon-pt.c:632
 #, fuzzy
-msgid "Failed to connect to `datastore' service."
-msgstr "Falló al inicializar el servicio '%s'.\n"
+msgid "# DNS requests intercepted"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/fs_unindex.c:345
+#: src/pt/gnunet-daemon-pt.c:637
 #, fuzzy
-msgid "Failed to open file for unindexing."
-msgstr "Fallo al conectarse a gnunetd"
+msgid "# DNS requests dropped (DNS mesh tunnel down)"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/fs_unindex.c:379
+#: src/pt/gnunet-daemon-pt.c:645
 #, fuzzy
-msgid "Failed to compute hash of file."
-msgstr "Fallo al conectarse a gnunetd"
+msgid "# DNS requests dropped (malformed)"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-download.c:100
+#: src/pt/gnunet-daemon-pt.c:716
+#, fuzzy
+msgid "# DNS replies received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/pt/gnunet-daemon-pt.c:730
+#, fuzzy
+msgid "# DNS replies dropped (too late?)"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/pt/gnunet-daemon-pt.c:748 src/pt/gnunet-daemon-pt.c:760
+msgid "# DNS requests aborted (tunnel down)"
+msgstr ""
+
+#: src/pt/gnunet-daemon-pt.c:898 src/pt/gnunet-daemon-pt.c:907
+#: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
 #, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "Iniciada colección '%s'.\n"
+msgid "Failed to connect to %s service.  Exiting.\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/gnunet-download.c:112
-#, c-format
-msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
+#: src/pt/gnunet-daemon-pt.c:973
+msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-download.c:121
+#: src/statistics/gnunet-service-statistics.c:209
 #, fuzzy, c-format
-msgid "Error downloading: %s.\n"
-msgstr "Error descargando: %s\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
+msgstr "Descarga los ficheros de GNUnet"
 
-#: src/fs/gnunet-download.c:129
+#: src/statistics/gnunet-service-statistics.c:267
 #, fuzzy, c-format
-msgid "Downloading `%s' done (%s/s).\n"
-msgstr "¡Subida rechazada!"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgstr "Descarga los ficheros de GNUnet"
 
-#: src/fs/gnunet-download.c:169
+#: src/statistics/gnunet-statistics.c:98
 #, fuzzy
-msgid "You need to specify a URI argument.\n"
-msgstr "¡Debes especificar un receptor!\n"
+msgid "Failed to obtain statistics.\n"
+msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/fs/gnunet-download.c:182
-msgid "Only CHK or LOC URIs supported.\n"
+#: src/statistics/gnunet-statistics.c:164
+msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
-msgid "Target filename must be specified.\n"
+#: src/statistics/gnunet-statistics.c:167
+msgid "make the value being set persistent"
 msgstr ""
 
-#: src/fs/gnunet-download.c:243
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
+#: src/statistics/gnunet-statistics.c:170
+msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/fs/gnunet-download.c:249
-msgid "write the file to FILENAME"
-msgstr "escribe el fichero al FICHERO"
+#: src/statistics/gnunet-statistics.c:173
+msgid "just print the statistics value"
+msgstr ""
 
-#: src/fs/gnunet-download.c:253
-msgid "set the maximum number of parallel downloads that is allowed"
+#: src/statistics/gnunet-statistics.c:180
+msgid "Print statistics about GNUnet operations."
+msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
+
+#: src/statistics/statistics_api.c:390
+#, fuzzy
+msgid "Failed to connect to statistics service!\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/template/gnunet-template.c:68
+#, fuzzy
+msgid "help text"
+msgstr "texto de ayuda para -t"
+
+#: src/testing/gnunet-testing.c:157
+#, fuzzy
+msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#: src/testing/gnunet-testing.c:159
+#, c-format
+msgid "Specified hostkey file `%s' not found!\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
-msgid "set the maximum number of parallel requests for blocks that is allowed"
+#: src/testing/gnunet-testing.c:273
+#, fuzzy
+msgid "create unique configuration files"
+msgstr "Imposible guardar el fichero de configuración '%s':"
+
+#: src/testing/gnunet-testing.c:275
+msgid "create hostkey files from pre-computed hostkey list"
 msgstr ""
 
-#: src/fs/gnunet-download.c:260
-msgid "download a GNUnet directory recursively"
-msgstr "descarga un directorio de GNUnet recursivamente"
+#: src/testing/gnunet-testing.c:277
+msgid "host key file"
+msgstr ""
 
-#: src/fs/gnunet-download.c:270
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+#: src/testing/gnunet-testing.c:279
+#, fuzzy
+msgid "number of unique configuration files or hostkeys to create"
+msgstr "Imposible guardar el fichero de configuración '%s':"
+
+#: src/testing/gnunet-testing.c:281
+#, fuzzy
+msgid "configuration template"
+msgstr "Configuración de GNUnet"
+
+#: src/testing/gnunet-testing.c:287
+msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/fs/fs_getopt.c:191
-#, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+#: src/testing/helper.c:56
+#, fuzzy
+msgid "Peer is lacking HOSTKEY configuration setting.\n"
+msgstr "Configuración de GNUnet"
+
+#: src/testing/helper.c:64
+#, fuzzy
+msgid "Could not access hostkey.\n"
+msgstr "Imposible pasar el fichero de configuración '%s'.\n"
+
+#: src/testing/testing.c:214
+msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
-"Tipo de metadatos desconocido en la opción de metadatos '%s'.  Usando el "
-"tipo de metadatos 'desconocido' en su lugar.\n"
 
-#: src/fs/fs_publish.c:150 src/fs/fs_publish.c:421
+#: src/testing/testing.c:228 src/testing/testing.c:849
+#, fuzzy
+msgid "`scp' did not complete cleanly.\n"
+msgstr "'%s' no esta conectado a ningún par.\n"
+
+#: src/testing/testing.c:251
+#, fuzzy
+msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+msgstr "Falló al comenzar la recolección.\n"
+
+#: src/testing/testing.c:252
+#, fuzzy
+msgid "Failed to create pipe for `ssh' process.\n"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: src/testing/testing.c:308
 #, fuzzy, c-format
-msgid "Publishing failed: %s"
-msgstr ""
-"\n"
-"Error subiendo el fichero %s\n"
+msgid "Could not start `%s' process to create hostkey.\n"
+msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/fs/fs_publish.c:658 src/fs/fs_publish.c:675 src/fs/fs_publish.c:714
-#: src/fs/fs_publish.c:734 src/fs/fs_publish.c:761 src/fs/fs_publish.c:909
+#: src/testing/testing.c:315
+#, fuzzy
+msgid "Failed to start `gnunet-peerinfo' process.\n"
+msgstr "Falló al comenzar la recolección.\n"
+
+#: src/testing/testing.c:316 src/testing/testing.c:514
+#, fuzzy
+msgid "Failed to start `ssh' process.\n"
+msgstr "Falló al comenzar la recolección.\n"
+
+#: src/testing/testing.c:378
 #, fuzzy, c-format
-msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
-msgstr "Indexación del fichero '%s' fallida. Intentando insertar fichero...\n"
+msgid "Error reading from gnunet-peerinfo: %s\n"
+msgstr "Se produjo un error leyendo información de gnunetd.\n"
 
-#: src/fs/fs_publish.c:660
-msgid "timeout on index-start request to `fs' service"
+#: src/testing/testing.c:382
+#, fuzzy
+msgid "Malformed output from gnunet-peerinfo!\n"
+msgstr "Se produjo un error leyendo información de gnunetd.\n"
+
+#: src/testing/testing.c:392
+#, fuzzy
+msgid "Failed to get hostkey!\n"
+msgstr "Fallo en las estadísticas del tráfico.\n"
+
+#: src/testing/testing.c:426
+msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:672
+#: src/testing/testing.c:506
+#, fuzzy, c-format
+msgid "Could not start `%s' process to start GNUnet.\n"
+msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
+
+#: src/testing/testing.c:513
 #, fuzzy
-msgid "unknown error"
-msgstr "Error desconocido"
+msgid "Failed to start `gnunet-arm' process.\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/fs_publish.c:715
-msgid "failed to compute hash"
+#: src/testing/testing.c:537 src/testing/testing.c:647
+msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:735
-msgid "filename too long"
+#: src/testing/testing.c:538 src/testing/testing.c:648
+#: src/testing/testing.c:668
+msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:762
+#: src/testing/testing.c:617
+msgid "Unable to get HELLO for peer!\n"
+msgstr ""
+
+#: src/testing/testing.c:667
+msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
+msgstr ""
+
+#: src/testing/testing.c:690 src/testing/testing.c:724
+msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
+msgstr ""
+
+#: src/testing/testing.c:705 src/testing/testing.c:762
 #, fuzzy
-msgid "could not connect to `fs' service"
-msgstr "Imposible conectar con gnunetd.\n"
+msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
+msgstr "'%s' no esta conectado a ningún par.\n"
 
-#: src/fs/fs_publish.c:786
+#: src/testing/testing.c:837
+msgid "`scp' does not seem to terminate.\n"
+msgstr ""
+
+#: src/testing/testing.c:1015
 #, fuzzy, c-format
-msgid "Failed to get file identifiers for `%s'\n"
-msgstr "Falló al actualizar los datos del módulo '%s'\n"
+msgid "Starting service %s for peer `%4s'\n"
+msgstr "Iniciada colección '%s'.\n"
 
-#: src/fs/fs_publish.c:856
+#: src/testing/testing.c:1299 src/testing/testing_group.c:6278
 #, fuzzy, c-format
-msgid "Recursive upload failed at `%s': %s"
-msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+msgid "Could not start `%s' process to copy configuration directory.\n"
+msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/fs/fs_publish.c:862
+#: src/testing/testing.c:1387 src/testing/testing.c:1470
+#: src/testing/testing.c:1608
 #, fuzzy, c-format
-msgid "Recursive upload failed: %s"
+msgid "Terminating peer `%4s'\n"
+msgstr "Permiso denegado para '%s' en %s:%d.\n"
+
+#: src/testing/testing.c:1560
+#, fuzzy, c-format
+msgid "Setting d->dead on peer `%4s'\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/testing/testing.c:1698
+msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
-"\n"
-"Error subiendo el fichero %s\n"
 
-#: src/fs/fs_publish.c:910
+#: src/testing/testing.c:1706
 #, fuzzy
-msgid "needs to be an actual file"
-msgstr "'%s' no es un fichero regular.\n"
+msgid "Failed to write new configuration to disk."
+msgstr "Imposible guardar la configuración"
 
-#: src/fs/fs_publish.c:1092
+#: src/testing/testing.c:1737
+#, fuzzy, c-format
+msgid "Could not start `%s' process to copy configuration file.\n"
+msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
+
+#: src/testing/testing.c:1740
+#, fuzzy
+msgid "Failed to copy new configuration to remote machine."
+msgstr "Imposible guardar la configuración"
+
+#: src/testing/testing.c:1895
+#, fuzzy
+msgid "Peers failed to connect"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/testing/testing.c:2035
+#, fuzzy
+msgid "Failed to connect to core service of first peer!\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/testing/testing.c:2274
+msgid "Peers are not fully running yet, can not connect!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:1910 src/testing/testing_group.c:1922
+#: src/testing/testing_group.c:2023 src/testing/testing_group.c:2082
+#: src/testing/testing_group.c:2171 src/testing/testing_group.c:2191
+#: src/testing/testing_group.c:2328 src/testing/testing_peergroup.c:940
+#, fuzzy, c-format
+msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+msgstr ""
+"El fichero de configuración debe especificar el directorio para almacenar "
+"los datos FS en la sección '%s' bajo '%s'.\n"
+
+#: src/testing/testing_group.c:1932
+#, fuzzy, c-format
+msgid "Target is %d connections per peer."
+msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
+
+#: src/testing/testing_group.c:2179
 #, c-format
-msgid "Insufficient space for publishing: %s"
+msgid ""
+"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
+"greater than 0\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1163
+#: src/testing/testing_group.c:2209 src/testing/testing_group.c:2402
 #, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
+msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1499
-#, fuzzy
-msgid "Could not connect to datastore."
-msgstr "Imposible conectar con gnunetd.\n"
+#: src/testing/testing_group.c:2246
+#, c-format
+msgid "natural log of %d is %d, will run %d iterations\n"
+msgstr ""
 
-#: src/fs/fs_api.c:284
+#: src/testing/testing_group.c:2249
+#, c-format
+msgid "Total connections added thus far: %u!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:2290
+#, c-format
+msgid "Total connections added for small world: %d!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:2342
+#, c-format
+msgid "rand is %f probability is %f\n"
+msgstr ""
+
+#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#, c-format
+msgid ""
+"No `%s' specified in peer configuration in section `%s', cannot copy friends "
+"file!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3020
+msgid "Finished copying all friend files!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3133
 #, fuzzy, c-format
-msgid "Could not open file `%s': %s"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Copying file with command cp %s %s\n"
+msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/fs/fs_api.c:293
+#: src/testing/testing_group.c:3156
 #, fuzzy, c-format
-msgid "Could not read file `%s': %s"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Copying file with command scp %s %s\n"
+msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/fs/fs_api.c:299
+#: src/testing/testing_group.c:3173
 #, c-format
-msgid "Short read reading from file `%s'!"
+msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/testing/testing_group.c:3191
+#, c-format
+msgid "File %d copied\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3206
+#, fuzzy
+msgid "Finished copying all blacklist files!\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
+#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
+msgid "Delaying connect, we have too many outstanding connections!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
+#: src/testing/testing_group.c:5035
+#, c-format
+msgid "Creating connection, outstanding_connections is %d\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3608
 #, fuzzy, c-format
-msgid "Failed to resume publishing information `%s': %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Offering HELLO of peer %s to peer %s\n"
+msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/fs/fs_api.c:1323
+#: src/testing/testing_group.c:3734
 #, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
+msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1365
+#: src/testing/testing_group.c:3988
+msgid "Creating clique topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3993
+msgid "Creating small world (ring) topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3998
+msgid "Creating small world (2d-torus) topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4002
+msgid "Creating ring topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4006
+msgid "Creating 2d torus topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4010
+msgid "Creating Erdos-Renyi topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4014
+msgid "Creating InterNAT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4018
+msgid "Creating Scale Free topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4023
+msgid "Creating straight line topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4027
+msgid "Creating topology from file!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4043
+msgid "Creating no allowed topology (all peers can connect at core level)\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4058
+msgid "Failed during friend file copying!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4064
+msgid "Friend files created/copied successfully!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4081
+msgid "Blacklisting all but clique topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4087
+msgid "Blacklisting all but small world (ring) topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4093
+msgid "Blacklisting all but small world (2d-torus) topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4099
+msgid "Blacklisting all but ring topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4105
+msgid "Blacklisting all but 2d torus topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4111
+msgid "Blacklisting all but Erdos-Renyi topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4117
+msgid "Blacklisting all but InterNAT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4152
+msgid "Blacklisting all but Scale Free topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4158
+msgid "Blacklisting all but straight line topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4173
+#, fuzzy
+msgid "Failed during blacklist file copying!\n"
+msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
+
+#: src/testing/testing_group.c:4179
+msgid "Blacklist files created/copied successfully!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5263
+msgid "Creating clique CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5270
+msgid "Creating small world (ring) CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5277
+msgid "Creating small world (2d-torus) CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5283
+msgid "Creating ring CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5290
+msgid "Creating 2d torus CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5297
+msgid "Creating Erdos-Renyi CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5304
+msgid "Creating InterNAT CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5311
+msgid "Creating Scale Free CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5318
+msgid "Creating straight line CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5324
+msgid "Creating no CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5330
+msgid "Unknown topology specification, can't connect peers!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5340
 #, c-format
-msgid "Failure while resuming publishing operation `%s': %s\n"
+msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1381
+#: src/testing/testing_group.c:5348
+#, c-format
+msgid "Connecting a minimum of %u peers each (if possible)\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5357
+#, c-format
+msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5367
+#, c-format
+msgid "Finding additional %u closest peers each (if possible)\n"
+msgstr ""
+
+#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:648
+#, fuzzy
+msgid "Could not read hostkeys file!\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#: src/testing/testing_group.c:6131
 #, fuzzy, c-format
-msgid "Failed to resume publishing operation `%s': %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/fs/fs_api.c:1993
+#: src/topology/gnunet-daemon-topology.c:244
+msgid "# peers blacklisted"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:380
+#, fuzzy
+msgid "# connect requests issued to transport"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/topology/gnunet-daemon-topology.c:675
+#: src/topology/gnunet-daemon-topology.c:761
+#, fuzzy
+msgid "# friends connected"
+msgstr "# de pares conectados"
+
+#: src/topology/gnunet-daemon-topology.c:950
+msgid "Failed to connect to core service, can not manage topology!\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:982
 #, c-format
-msgid "Failure while resuming unindexing operation `%s': %s\n"
+msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2003
+#: src/topology/gnunet-daemon-topology.c:994
 #, fuzzy, c-format
-msgid "Failed to resume unindexing operation `%s': %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Could not read friends list `%s'\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/fs/fs_api.c:2129 src/fs/fs_api.c:2368
+#: src/topology/gnunet-daemon-topology.c:1000
 #, fuzzy, c-format
-msgid "Failed to resume sub-download `%s': %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Friends file `%s' is empty.\n"
+msgstr "El formato del fichero '%s' no es válido.\n"
 
-#: src/fs/fs_api.c:2146
+#: src/topology/gnunet-daemon-topology.c:1009
 #, fuzzy, c-format
-msgid "Failed to resume sub-search `%s': %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Failed to read friends list from `%s': out of memory\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/fs/fs_api.c:2158 src/fs/fs_api.c:2177 src/fs/fs_api.c:2653
+#: src/topology/gnunet-daemon-topology.c:1017
 #, c-format
-msgid "Failure while resuming search operation `%s': %s\n"
+msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2359
+#: src/topology/gnunet-daemon-topology.c:1037
 #, c-format
-msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2605
-msgid "Could not resume running search, will resume as paused search\n"
+#: src/topology/gnunet-daemon-topology.c:1050
+#, c-format
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2691
+#: src/topology/gnunet-daemon-topology.c:1060
+#, fuzzy, c-format
+msgid "Found friend `%s' in configuration\n"
+msgstr " gconfig\tConfiguración GTK\n"
+
+#: src/topology/gnunet-daemon-topology.c:1066
 #, c-format
-msgid "Failure while resuming download operation `%s': %s\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:309
+#: src/topology/gnunet-daemon-topology.c:1076
+#, fuzzy
+msgid "# friends in configuration"
+msgstr " gconfig\tConfiguración GTK\n"
+
+#: src/topology/gnunet-daemon-topology.c:1082
 msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:329
-msgid "Directory too large for system address space\n"
+#: src/topology/gnunet-daemon-topology.c:1089
+msgid ""
+"More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
-#, fuzzy, c-format
-msgid "Failed to open file `%s' for writing"
-msgstr "Fichero almacenado en '%s'.\n"
+#: src/topology/gnunet-daemon-topology.c:1126
+#, fuzzy
+msgid "# HELLO messages received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/fs_download.c:873
+#: src/topology/gnunet-daemon-topology.c:1183
+#, fuzzy
+msgid "# HELLO messages gossipped"
+msgstr "# mensajes salientes omitidos"
+
+#: src/topology/gnunet-daemon-topology.c:1323
+msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:247
 #, fuzzy, c-format
-msgid "Failed to create directory for recursive download of `%s'\n"
-msgstr "Falló al actualizar los datos del módulo '%s'\n"
+msgid "Could not read blacklist file `%s'\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/fs/fs_download.c:959
+#: src/transport/gnunet-service-transport_blacklist.c:254
 #, c-format
-msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:986
-msgid "internal error decrypting content"
-msgstr ""
+#: src/transport/gnunet-service-transport_blacklist.c:266
+#, fuzzy, c-format
+msgid "Failed to read blacklist from `%s'\n"
+msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/fs/fs_download.c:1009
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
 #, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgstr ""
+"Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/fs/fs_download.c:1021
+#: src/transport/gnunet-service-transport_blacklist.c:298
+#: src/transport/gnunet-service-transport_blacklist.c:336
+#, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:350
 #, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr ""
+"Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/fs/fs_download.c:1030
+#: src/transport/gnunet-service-transport_blacklist.c:364
 #, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1829
+#: src/transport/gnunet-service-transport_blacklist.c:523
+#: src/transport/gnunet-service-transport_blacklist.c:764
+msgid "# disconnects due to blacklist"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:158
 #, fuzzy
-msgid "Invalid URI"
-msgstr "Argumento no válido: '%s'\n"
+msgid "# bytes payload discarded due to not connected peer "
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs.c:240
-msgid "# running average P2P latency (ms)"
+#: src/transport/gnunet-service-transport.c:572
+msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
-msgid "# Loopback routes suppressed"
+#: src/transport/gnunet-service-transport.c:581
+msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
-#: src/topology/gnunet-daemon-topology.c:1297
-#: src/hostlist/gnunet-daemon-hostlist.c:297
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' service.\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+#: src/transport/gnunet-service-transport_clients.c:353
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgstr ""
 
-#: src/fs/fs_file_information.c:356
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s': %s"
-msgstr "'%s' falló para la unidad %s: %u\n"
+#: src/transport/gnunet-service-transport_clients.c:358
+#, fuzzy
+msgid "# messages dropped due to slow client"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:468
+#: src/transport/gnunet-service-transport_clients.c:510
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:628
+#, fuzzy
+msgid "# bytes payload received for other peers"
+msgstr "# bytes recibidos por TCP"
+
+#: src/transport/gnunet-service-transport_clients.c:645
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:696
+#, fuzzy
+msgid "# REQUEST CONNECT messages received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/transport/gnunet-service-transport_hello.c:172
+msgid "# refreshed my HELLO"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:482
 msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:859
+#: src/transport/gnunet-service-transport_neighbours.c:883
 #, fuzzy
 msgid "# peers disconnected due to external request"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:942
+#: src/transport/gnunet-service-transport_neighbours.c:966
 #, fuzzy
 msgid "# fast reconnects failed"
 msgstr "# de pares conectados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:998
+#: src/transport/gnunet-service-transport_neighbours.c:1022
 #, fuzzy
 msgid "# peers disconnected due to timeout"
 msgstr "# de pares conectados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1023
+#: src/transport/gnunet-service-transport_neighbours.c:1047
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# claves de la sesión mandadas"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1065
+#: src/transport/gnunet-service-transport_neighbours.c:1088
 #, fuzzy
 msgid "# peers disconnected due to global disconnect"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1781
-#: src/transport/gnunet-service-transport_neighbours.c:1802
+#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1909
 #, fuzzy
 msgid "# messages not sent (no such peer or not connected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1818
+#: src/transport/gnunet-service-transport_neighbours.c:1925
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1870
+#: src/transport/gnunet-service-transport_neighbours.c:1977
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
+#: src/transport/gnunet-service-transport_neighbours.c:2013
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1924
+#: src/transport/gnunet-service-transport_neighbours.c:2031
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1953
+#: src/transport/gnunet-service-transport_neighbours.c:2060
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2005
+#: src/transport/gnunet-service-transport_neighbours.c:2113
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2013
+#: src/transport/gnunet-service-transport_neighbours.c:2121
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2079
+#: src/transport/gnunet-service-transport_neighbours.c:2187
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2097
+#: src/transport/gnunet-service-transport_neighbours.c:2205
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2215
+#: src/transport/gnunet-service-transport_neighbours.c:2323
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2228
+#: src/transport/gnunet-service-transport_neighbours.c:2336
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2305
+#: src/transport/gnunet-service-transport_neighbours.c:2411
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2322
+#: src/transport/gnunet-service-transport_neighbours.c:2453
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2415
+#: src/transport/gnunet-service-transport_neighbours.c:2544
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# de pares conectados"
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
+#: src/transport/gnunet-service-transport_plugins.c:111
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:118
 #, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
+msgid "Starting transport plugins `%s'\n"
+msgstr "Probando transporte(s) %s\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:254
-#, c-format
-msgid "Blacklist file `%s' is empty.\n"
-msgstr ""
+#: src/transport/gnunet-service-transport_plugins.c:122
+#, fuzzy, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr "Probando transporte(s) %s\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/transport/gnunet-service-transport_plugins.c:150
 #, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+#: src/transport/gnunet-service-transport_validation.c:410
+msgid "# address records discarded"
 msgstr ""
-"Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/transport/gnunet-service-transport_validation.c:459
 #, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgid ""
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+#: src/transport/gnunet-service-transport_validation.c:508
+#, fuzzy
+msgid "# PING without HELLO messages sent"
+msgstr "# mensajes de texto mandados por PING"
+
+#: src/transport/gnunet-service-transport_validation.c:566
+msgid "# address revalidations started"
 msgstr ""
-"Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/transport/gnunet-service-transport_validation.c:798
+#, fuzzy
+msgid "# PING message for different peer received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/transport/gnunet-service-transport_validation.c:833
 #, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgid ""
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:756
-msgid "# disconnects due to blacklist"
+#: src/transport/gnunet-service-transport_validation.c:919
+msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:191
-msgid ""
-"Could not create a new TLS certificate, program `gnunet-transport-"
-"certificate-creation' could not be started!\n"
+#: src/transport/gnunet-service-transport_validation.c:928
+msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:215
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/transport/gnunet-service-transport_validation.c:1050
+msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:172
-msgid "# refreshed my HELLO"
+#: src/transport/gnunet-service-transport_validation.c:1075
+msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1567
-#, fuzzy
-msgid "# IPv4 broadcast HELLO beacons received via udp"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/transport/gnunet-service-transport_validation.c:1134
+#, fuzzy, c-format
+msgid "Adding `%s' without addresses for peer `%s'\n"
+msgstr "Imposible obtener la dirección del par '%s'.\n"
 
-#: src/transport/plugin_transport_udp.c:1610
-#, fuzzy
-msgid "# IPv6 multicast HELLO beacons received via udp"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/transport/gnunet-transport.c:256
+msgid "No transport plugins configured, peer will never communicate\n"
+msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2106
-#: src/transport/plugin_transport_udp_new.c:1220
+#: src/transport/gnunet-transport.c:269
 #, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2157
-#: src/transport/plugin_transport_udp_new.c:1270
-#, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "Argumento no válido: '%s'\n"
-
-#: src/transport/plugin_transport_udp.c:2301
+#: src/transport/gnunet-transport.c:319
 #, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2372
-#: src/transport/plugin_transport_udp_new.c:1398
-#, fuzzy
-msgid "Failed to open UDP sockets\n"
-msgstr "Fichero almacenado en '%s'.\n"
-
-#: src/transport/plugin_transport_http_client.c:108
-#: src/transport/plugin_transport_http_client.c:123
-#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
-#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
-#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
-#, fuzzy, c-format
-msgid "%s failed at %s:%d: `%s'\n"
-msgstr "'%s' falló en %s: %d con error: '%s'.\n"
-
-#: src/transport/plugin_transport_http_client.c:620
+#: src/transport/gnunet-transport.c:326
 #, c-format
-msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
+msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:514
+#: src/transport/gnunet-transport.c:359
 #, c-format
-msgid "Unexpected address length: %u bytes\n"
+msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:601
-#: src/transport/plugin_transport_tcp.c:690
-#: src/transport/plugin_transport_tcp.c:742
-#: src/transport/plugin_transport_tcp.c:831
-#: src/transport/plugin_transport_tcp.c:1173
-#: src/transport/plugin_transport_tcp.c:1254
-#, fuzzy
-msgid "# bytes currently in TCP buffers"
-msgstr "# bytes enviados por TCP"
+#: src/transport/gnunet-transport.c:379
+#, fuzzy, c-format
+msgid "Connected to %s\n"
+msgstr "'%s' conectado a '%s'.\n"
 
-#: src/transport/plugin_transport_tcp.c:607
-#: src/transport/plugin_transport_tcp.c:857
-#: src/transport/plugin_transport_tcp.c:1828
-#, fuzzy
-msgid "# TCP sessions active"
-msgstr "# claves de la sesión aceptadas"
+#: src/transport/gnunet-transport.c:410
+#, fuzzy, c-format
+msgid "Disconnected from %s\n"
+msgstr "'%s' conectado a '%s'.\n"
 
-#: src/transport/plugin_transport_tcp.c:694
-#, fuzzy
-msgid "# bytes discarded by TCP (timeout)"
-msgstr "# bytes omitidos por TCP (salientes)"
+#: src/transport/gnunet-transport.c:439
+#, fuzzy, c-format
+msgid "Received %u bytes from %s\n"
+msgstr "GAP recibido contenido no válido de '%s'\n"
 
-#: src/transport/plugin_transport_tcp.c:745
-#, fuzzy
-msgid "# bytes transmitted via TCP"
-msgstr "# bytes desencriptados"
+#: src/transport/gnunet-transport.c:453
+#, fuzzy, c-format
+msgid "Peer `%s': %s %s\n"
+msgstr "Yo soy el par '%s'.\n"
 
-#: src/transport/plugin_transport_tcp.c:835
-#, fuzzy
-msgid "# bytes discarded by TCP (disconnect)"
-msgstr "# bytes omitidos por TCP (salientes)"
+#: src/transport/gnunet-transport.c:483
+#, fuzzy, c-format
+msgid "Peer `%s' disconnected\n"
+msgstr "# de pares conectados"
 
-#: src/transport/plugin_transport_tcp.c:956
-#, fuzzy
-msgid "# bytes TCP was asked to transmit"
-msgstr "# bytes desencriptados"
+#: src/transport/gnunet-transport.c:539
+#, fuzzy, c-format
+msgid "Failed to parse peer identity `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/transport/plugin_transport_tcp.c:1007
-msgid "# bytes discarded by TCP (no address and no connection)"
+#: src/transport/gnunet-transport.c:587
+msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1050
-#: src/transport/plugin_transport_tcp.c:1368
-#, c-format
-msgid "Address of unexpected length: %u\n"
-msgstr ""
+#: src/transport/gnunet-transport.c:590
+#, fuzzy
+msgid "try to connect to the given peer"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/plugin_transport_tcp.c:1067
-#: src/transport/plugin_transport_tcp.c:1404
-msgid "Found valid IPv4 NAT address (creating session)!\n"
-msgstr ""
+#: src/transport/gnunet-transport.c:593
+#, fuzzy
+msgid "provide information about all current connections (once)"
+msgstr "Imprime información de los pares de GNUnet."
 
-#: src/transport/plugin_transport_tcp.c:1118
+#: src/transport/gnunet-transport.c:596
 #, fuzzy
-msgid "# bytes discarded by TCP (failed to connect)"
-msgstr "# bytes omitidos por TCP (salientes)"
+msgid "provide information about all current connections (continuously)"
+msgstr "Imprime información de los pares de GNUnet."
 
-#: src/transport/plugin_transport_tcp.c:1508
-msgid "# transport-service disconnect requests for TCP"
+#: src/transport/gnunet-transport.c:599
+msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1871
-#, fuzzy
-msgid "# TCP WELCOME messages received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/transport/gnunet-transport.c:603
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
+msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2021
-msgid "# bytes received via TCP"
-msgstr "# bytes recibidos por TCP"
-
-#: src/transport/plugin_transport_tcp.c:2089
-msgid "# network-level TCP disconnect events"
+#: src/transport/gnunet-transport.c:606
+msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2242
+#: src/transport/gnunet-transport.c:614
 #, fuzzy
-msgid "Failed to start service.\n"
-msgstr "Falló al comenzar la recolección.\n"
-
-#: src/transport/plugin_transport_tcp.c:2307
-#, fuzzy, c-format
-msgid "Failed to find option %s in section %s!\n"
+msgid "Direct access to transport service."
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/plugin_transport_tcp.c:2330
-#, c-format
-msgid "TCP transport listening on port %llu\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2334
-msgid "TCP transport not listening on any port (client only)\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2338
-#, c-format
-msgid "TCP transport advertises itself as being on port %llu\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:984
+#: src/transport/plugin_transport_http.c:981
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1032
+#: src/transport/plugin_transport_http.c:1029
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/transport/plugin_transport_http.c:1179
+#: src/transport/plugin_transport_http.c:1054 src/util/service.c:986
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/transport/plugin_transport_http.c:1071 src/util/service.c:1003
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/transport/plugin_transport_http.c:1176
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1192
+#: src/transport/plugin_transport_http.c:1189
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1267
+#: src/transport/plugin_transport_http.c:1264
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "¡Advertencias de la red desconectadas por configuración!\n"
 
-#: src/transport/plugin_transport_http.c:1280
+#: src/transport/plugin_transport_http.c:1277
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/transport/plugin_transport_http.c:1291
+#: src/transport/plugin_transport_http.c:1288
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1311
+#: src/transport/plugin_transport_http.c:1308
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1341
+#: src/transport/plugin_transport_http.c:1338
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1096
-#, fuzzy
-msgid "Failed to open UNIX sockets\n"
-msgstr "Fichero almacenado en '%s'.\n"
+#: src/transport/plugin_transport_http_client.c:621
+#, c-format
+msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
+msgstr ""
 
+#: src/transport/plugin_transport_http_server.c:189
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:213
+msgid "No usable TLS certificate found and creating one failed!\n"
+msgstr ""
+
 #: src/transport/plugin_transport_smtp.c:370
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -3616,25 +4722,132 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/gnunet-service-transport_plugins.c:111
-msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+#: src/transport/plugin_transport_tcp.c:512
+#, c-format
+msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:118
-#, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Probando transporte(s) %s\n"
+#: src/transport/plugin_transport_tcp.c:616
+#: src/transport/plugin_transport_tcp.c:705
+#: src/transport/plugin_transport_tcp.c:757
+#: src/transport/plugin_transport_tcp.c:830
+#: src/transport/plugin_transport_tcp.c:909
+#, fuzzy
+msgid "# bytes currently in TCP buffers"
+msgstr "# bytes enviados por TCP"
 
-#: src/transport/gnunet-service-transport_plugins.c:122
+#: src/transport/plugin_transport_tcp.c:622
+#: src/transport/plugin_transport_tcp.c:856
+#: src/transport/plugin_transport_tcp.c:1561
+#, fuzzy
+msgid "# TCP sessions active"
+msgstr "# claves de la sesión aceptadas"
+
+#: src/transport/plugin_transport_tcp.c:709
+#, fuzzy
+msgid "# bytes discarded by TCP (timeout)"
+msgstr "# bytes omitidos por TCP (salientes)"
+
+#: src/transport/plugin_transport_tcp.c:760
+#, fuzzy
+msgid "# bytes transmitted via TCP"
+msgstr "# bytes desencriptados"
+
+#: src/transport/plugin_transport_tcp.c:834
+#, fuzzy
+msgid "# bytes discarded by TCP (disconnect)"
+msgstr "# bytes omitidos por TCP (salientes)"
+
+#: src/transport/plugin_transport_tcp.c:1081
+#, c-format
+msgid "Address of unexpected length: %u\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1116
+msgid "Found valid IPv4 NAT address (creating session)!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1186
+msgid "# transport-service disconnect requests for TCP"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1603
+#, fuzzy
+msgid "# TCP WELCOME messages received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/transport/plugin_transport_tcp.c:1756
+msgid "# bytes received via TCP"
+msgstr "# bytes recibidos por TCP"
+
+#: src/transport/plugin_transport_tcp.c:1823
+msgid "# network-level TCP disconnect events"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1976
+#, fuzzy
+msgid "Failed to start service.\n"
+msgstr "Falló al comenzar la recolección.\n"
+
+#: src/transport/plugin_transport_tcp.c:2039
 #, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Probando transporte(s) %s\n"
+msgid "Failed to find option %s in section %s!\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:150
+#: src/transport/plugin_transport_tcp.c:2062
+#, c-format
+msgid "TCP transport listening on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2066
+msgid "TCP transport not listening on any port (client only)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2070
+#, c-format
+msgid "TCP transport advertises itself as being on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:130
+#, fuzzy
+msgid "# IPv6 multicast HELLO beacons received via udp"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:172
+#, fuzzy
+msgid "# IPv4 broadcast HELLO beacons received via udp"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:393
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:1971
+#, fuzzy
+msgid "Failed to open UDP sockets\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/transport/plugin_transport_udp.c:2054
+#, c-format
+msgid "Given `%s' option is out of range: %llu > %u\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2098
 #, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
+msgid "Invalid IPv6 address: `%s'\n"
+msgstr "Argumento no válido: '%s'\n"
 
+#: src/transport/plugin_transport_unix.c:1051
+#, fuzzy
+msgid "Failed to open UNIX sockets\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
 #: src/transport/plugin_transport_wlan.c:880
 #, fuzzy
 msgid "# wlan session timeouts"
@@ -3649,8 +4862,8 @@
 #: src/transport/plugin_transport_wlan.c:1151
 #: src/transport/plugin_transport_wlan.c:1172
 #: src/transport/plugin_transport_wlan.c:1203
-#: src/transport/plugin_transport_wlan.c:2378
-#: src/transport/plugin_transport_wlan.c:3240
+#: src/transport/plugin_transport_wlan.c:2398
+#: src/transport/plugin_transport_wlan.c:3260
 msgid "# wlan pending sessions"
 msgstr ""
 
@@ -3686,1076 +4899,964 @@
 msgid "# wlan fragments send"
 msgstr "# fragmentos descartados"
 
-#: src/transport/plugin_transport_wlan.c:2245
+#: src/transport/plugin_transport_wlan.c:2223
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2250
-#, fuzzy
-msgid "# wlan messages queued"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/transport/plugin_transport_wlan.c:2339
-#: src/transport/plugin_transport_wlan.c:2996
-#: src/transport/plugin_transport_wlan.c:3243
+#: src/transport/plugin_transport_wlan.c:2359
+#: src/transport/plugin_transport_wlan.c:3016
+#: src/transport/plugin_transport_wlan.c:3263
 msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2567
+#: src/transport/plugin_transport_wlan.c:2587
 #, fuzzy
 msgid "# wlan whole messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2770
+#: src/transport/plugin_transport_wlan.c:2790
 #, fuzzy
 msgid "# wlan hello messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2807
+#: src/transport/plugin_transport_wlan.c:2827
 #, fuzzy
 msgid "# wlan fragments received"
 msgstr "# fragmentos descartados"
 
-#: src/transport/plugin_transport_wlan.c:2859
+#: src/transport/plugin_transport_wlan.c:2879
 #, fuzzy
 msgid "# wlan acks received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2956
+#: src/transport/plugin_transport_wlan.c:2976
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2980
+#: src/transport/plugin_transport_wlan.c:3000
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:3038
+#: src/transport/plugin_transport_wlan.c:3058
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3094
+#: src/transport/plugin_transport_wlan.c:3114
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:3105
+#: src/transport/plugin_transport_wlan.c:3125
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/gnunet-transport.c:251
-msgid "No transport plugins configured, peer will never communicate\n"
-msgstr ""
+#: src/transport/transport_api.c:588
+#, fuzzy, c-format
+msgid "Received unexpected message of type %u in %s:%u\n"
+msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:264
+#: src/util/bio.c:136 src/util/bio.c:142
+#, fuzzy, c-format
+msgid "Error reading `%s': %s"
+msgstr "Error creando usuario"
+
+#: src/util/bio.c:143
+#, fuzzy
+msgid "End of file"
+msgstr "Cargar un fichero de configuración"
+
+#: src/util/bio.c:195
 #, c-format
-msgid "No port configured for plugin `%s', cannot test it\n"
+msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:314
+#: src/util/bio.c:205
 #, c-format
-msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
+msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:321
+#: src/util/bio.c:250
 #, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
+msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:354
+#: src/util/bio.c:264
 #, c-format
-msgid "Transmitting %u bytes to %s\n"
+msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:374
-#, fuzzy, c-format
-msgid "Connected to %s\n"
-msgstr "'%s' conectado a '%s'.\n"
-
-#: src/transport/gnunet-transport.c:405
-#, fuzzy, c-format
-msgid "Disconnected from %s\n"
-msgstr "'%s' conectado a '%s'.\n"
-
-#: src/transport/gnunet-transport.c:434
-#, fuzzy, c-format
-msgid "Received %u bytes from %s\n"
-msgstr "GAP recibido contenido no válido de '%s'\n"
-
-#: src/transport/gnunet-transport.c:448
-#, fuzzy, c-format
-msgid "Peer `%s': %s %s\n"
-msgstr "Yo soy el par '%s'.\n"
-
-#: src/transport/gnunet-transport.c:512
-#, fuzzy, c-format
-msgid "Failed to parse peer identity `%s'\n"
-msgstr "Falló al actualizar los datos del módulo '%s'\n"
-
-#: src/transport/gnunet-transport.c:549
-msgid "measure how fast we are receiving data (until CTRL-C)"
+#: src/util/client.c:304
+#, c-format
+msgid ""
+"Could not determine valid hostname and port for service `%s' from "
+"configuration.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:552
-#, fuzzy
-msgid "try to connect to the given peer"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/transport/gnunet-transport.c:555
-#, fuzzy
-msgid "provide information about all current connections (once)"
-msgstr "Imprime información de los pares de GNUnet."
-
-#: src/transport/gnunet-transport.c:559
-msgid "send data for benchmarking to the other peer (until CTRL-C)"
+#: src/util/client.c:312
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:562
-msgid "test transport configuration (involves external server)"
+#: src/util/client.c:657
+msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:565
-msgid "do not resolve hostnames"
+#: src/util/client.c:717 src/util/service.c:919
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:573
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "Fallo al conectar a gnunetd.\n"
+#: src/util/client.c:859
+#, fuzzy, c-format
+msgid "Could not connect to service `%s', must not be running.\n"
+msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:410
-msgid "# address records discarded"
-msgstr ""
+#: src/util/client.c:875
+#, fuzzy, c-format
+msgid "Failure to transmit request to service `%s'\n"
+msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
 
-#: src/transport/gnunet-service-transport_validation.c:459
-#, c-format
-msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+#: src/util/client.c:1143
+msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:496
-#, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# mensajes de texto mandados por PING"
+#: src/util/common_logging.c:239 src/util/common_logging.c:889
+msgid "DEBUG"
+msgstr "DEPURACIÓN"
 
-#: src/transport/gnunet-service-transport_validation.c:554
-msgid "# address revalidations started"
-msgstr ""
+#: src/util/common_logging.c:241 src/util/common_logging.c:887
+msgid "INFO"
+msgstr "INFORMACIÓN"
 
-#: src/transport/gnunet-service-transport_validation.c:775
-#, fuzzy
-msgid "# PING message for different peer received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/util/common_logging.c:243 src/util/common_logging.c:885
+msgid "WARNING"
+msgstr "PELIGRO"
 
-#: src/transport/gnunet-service-transport_validation.c:810
-#, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
-msgstr ""
+#: src/util/common_logging.c:245 src/util/common_logging.c:883
+msgid "ERROR"
+msgstr "ERROR"
 
-#: src/transport/gnunet-service-transport_validation.c:878
-msgid "# PONGs unicast via reliable transport"
+#: src/util/common_logging.c:247 src/util/common_logging.c:891
+msgid "NONE"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:887
-msgid "# PONGs multicast to all available addresses"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1009
-msgid "# PONGs dropped, no matching pending validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1034
-msgid "# PONGs dropped, signature expired"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1093
+#: src/util/common_logging.c:609
 #, fuzzy, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
-msgstr "Imposible obtener la dirección del par '%s'.\n"
+msgid "Failed to create or access directory for log file `%s'\n"
+msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:253
+#: src/util/common_logging.c:724
 #, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:258
-#, fuzzy
-msgid "# messages dropped due to slow client"
-msgstr "# Anuncios de los pares recibidos"
-
-#: src/transport/gnunet-service-transport_clients.c:405
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
+#: src/util/common_logging.c:892
+msgid "INVALID"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:523
+#: src/util/common_logging.c:991
 #, fuzzy
-msgid "# bytes payload received for other peers"
-msgstr "# bytes recibidos por TCP"
+msgid "unknown address"
+msgstr "desconocido"
 
-#: src/transport/gnunet-service-transport_clients.c:540
-msgid "# bytes payload dropped (other peer was not connected)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:591
+#: src/util/common_logging.c:1029
 #, fuzzy
-msgid "# REQUEST CONNECT messages received"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "invalid address"
+msgstr "Argumentos inválidos: "
 
-#: src/transport/transport_api.c:588
+#: src/util/configuration.c:245
 #, fuzzy, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
-msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
-
-#: src/transport/gnunet-service-transport.c:158
-#, fuzzy
-msgid "# bytes payload discarded due to not connected peer "
-msgstr "# Anuncios de los pares recibidos"
-
-#: src/transport/gnunet-service-transport.c:555
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr ""
+"Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/transport/gnunet-service-transport.c:564
-msgid "Transport service could not access hostkey.  Exiting.\n"
+#: src/util/configuration.c:817
+#, c-format
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:159
+#: src/util/connection.c:461
 #, fuzzy, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
-msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
+msgid "Access denied to `%s'\n"
+msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/dv/dv_api.c:179
-#, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/topology/gnunet-daemon-topology.c:244
-msgid "# peers blacklisted"
+#: src/util/connection.c:476
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:380
-#, fuzzy
-msgid "# connect requests issued to transport"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/topology/gnunet-daemon-topology.c:675
-#: src/topology/gnunet-daemon-topology.c:761
-#, fuzzy
-msgid "# friends connected"
-msgstr "# de pares conectados"
-
-#: src/topology/gnunet-daemon-topology.c:875
-#: src/hostlist/hostlist-server.c:184
+#: src/util/connection.c:642
 #, fuzzy, c-format
-msgid "Error in communication with PEERINFO service: %s\n"
-msgstr "Imprime información de los pares de GNUnet."
+msgid ""
+"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
+msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
 
-#: src/topology/gnunet-daemon-topology.c:950
-msgid "Failed to connect to core service, can not manage topology!\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:982
-#, c-format
-msgid "Option `%s' in section `%s' not specified!\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:994
+#: src/util/connection.c:852 src/util/connection.c:1025
 #, fuzzy, c-format
-msgid "Could not read friends list `%s'\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
+msgid "Trying to connect to `%s' (%p)\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1000
+#: src/util/connection.c:862
 #, fuzzy, c-format
-msgid "Friends file `%s' is empty.\n"
-msgstr "El formato del fichero '%s' no es válido.\n"
+msgid "Failed to connect to `%s' (%p)\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/util/connection.c:1015
 #, fuzzy, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
+msgid "Attempt to connect to `%s' failed\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1017
+#: src/util/connection.c:1528
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1037
-#, c-format
 msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
+"Could not satisfy pending transmission request, socket closed or connect "
+"failed (%p).\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1050
-#, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1060
+#: src/util/connection.c:1564
 #, fuzzy, c-format
-msgid "Found friend `%s' in configuration\n"
-msgstr " gconfig\tConfiguración GTK\n"
+msgid "Failed to send to `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1066
+#: src/util/container_bloomfilter.c:507
 #, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1076
-#, fuzzy
-msgid "# friends in configuration"
-msgstr " gconfig\tConfiguración GTK\n"
-
-#: src/topology/gnunet-daemon-topology.c:1082
 msgid ""
-"Fewer friends specified than required by minimum friend count. Will only "
-"connect to friends.\n"
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1089
-msgid ""
-"More friendly connections required than target total number of connections.\n"
+#: src/util/crypto_random.c:280
+#, c-format
+msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1126
-#, fuzzy
-msgid "# HELLO messages received"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/topology/gnunet-daemon-topology.c:1183
-#, fuzzy
-msgid "# HELLO messages gossipped"
-msgstr "# mensajes salientes omitidos"
-
-#: src/topology/gnunet-daemon-topology.c:1323
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/util/crypto_random.c:308
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
+"libgcrypt no está en la versión esperada (se necesita la versión %s).\n"
 
-#: src/chat/chat.c:175
-#, fuzzy
-msgid "Could not transmit confirmation receipt\n"
-msgstr "Imposible acceder a la información del espacio.\n"
-
-#: src/chat/chat.c:283
-msgid "The current user must be the the first one joined\n"
-msgstr ""
-
-#: src/chat/chat.c:412
+#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
 #, fuzzy, c-format
-msgid "Unknown message type: '%u'\n"
-msgstr "Operación desconocida '%s'\n"
+msgid "Could not aquire lock on file `%s': %s...\n"
+msgstr "Imposible escribir PID al fichero '%s': %s.\n"
 
-#: src/chat/chat.c:472
-#, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing\n"
-msgstr "Fichero de configuración '%s' creado.\n"
-
-#: src/chat/chat.c:480
-#, fuzzy, c-format
-msgid "Failed to access chat home directory `%s'\n"
-msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
-
-#: src/chat/chat.c:498
-#, fuzzy, c-format
-msgid "Failed to create/open key in file `%s'\n"
-msgstr "Fichero almacenado en '%s'.\n"
-
-#: src/chat/chat.c:559
+#: src/util/crypto_rsa.c:623
 #, fuzzy
-msgid "Could not serialize metadata\n"
-msgstr "¡Imposible inicializar libgnunetutil!\n"
+msgid "Creating a new private key.  This may take a while.\n"
+msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
 
-#: src/chat/chat.c:674
-#, fuzzy
-msgid "Failed to connect to the chat service\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/chat/chat.c:680
-msgid "Undefined mandatory parameter: joinCallback\n"
+#: src/util/crypto_rsa.c:641
+#, c-format
+msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/chat/chat.c:686
-msgid "Undefined mandatory parameter: messageCallback\n"
+#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/chat/chat.c:692
-msgid "Undefined mandatory parameter: memberCallback\n"
+#: src/util/crypto_rsa.c:700
+#, c-format
+msgid ""
+"When trying to read hostkey file `%s' I found %u bytes but I need at least "
+"%u.\n"
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:267
-#, fuzzy
-msgid "Failed to queue a message notification\n"
-msgstr "Imposible guardar la configuración"
-
-#: src/chat/gnunet-service-chat.c:546
-#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "Imposible guardar la configuración"
-
-#: src/chat/gnunet-service-chat.c:729
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "Imposible guardar la configuración"
-
-#: src/chat/gnunet-service-chat.c:907
-#, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "Imposible guardar la configuración"
-
-#: src/chat/gnunet-chat.c:92
-msgid "Joined\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:124
-msgid "anonymous"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:130
+#: src/util/crypto_rsa.c:720
 #, fuzzy, c-format
-msgid "(%s) `%s' said: %s\n"
-msgstr "'%s' %s falló: %s\n"
+msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/util/crypto_rsa.c:738
 #, fuzzy, c-format
-msgid "(%s) `%s' said to you: %s\n"
-msgstr "'%s' %s falló: %s\n"
+msgid "I am host `%s'.  Read private key from `%s'.\n"
+msgstr "Llamada a '%s' con la clave '%s'.\n"
 
-#: src/chat/gnunet-chat.c:139
-#, fuzzy, c-format
-msgid "(%s) `%s' said for sure: %s\n"
-msgstr "'%s' %s falló: %s\n"
+#: src/util/crypto_rsa.c:959
+#, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
+msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/chat/gnunet-chat.c:142
+#: src/util/disk.c:479
 #, fuzzy, c-format
-msgid "(%s) `%s' said to you for sure: %s\n"
-msgstr "'%s' falló con el código de error %s: %s"
+msgid "`%s' failed for drive `%S': %u\n"
+msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/chat/gnunet-chat.c:145
+#: src/util/disk.c:1087
 #, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you received: %s\n"
-msgstr "'%s' falló con el código de error %d: %s"
+msgid "Expected `%s' to be a directory!\n"
+msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/chat/gnunet-chat.c:148
+#: src/util/disk.c:1441 src/util/service.c:1580
 #, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
-msgstr "'%s' falló con el código de error %d: %s"
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
 
-#: src/chat/gnunet-chat.c:151
+#: src/util/disk.c:1759
 #, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
-msgstr "'%s' falló con el código de error %d: %s"
+msgid "No `%s' specified for service `%s' in configuration.\n"
+msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/chat/gnunet-chat.c:156
-#, fuzzy, c-format
-msgid ""
-"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
-msgstr "'%s' falló con el código de error %d: %s"
+#: src/util/getopt.c:672
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/chat/gnunet-chat.c:159
-#, fuzzy, c-format
-msgid "(%s) `%s' said off the record: %s\n"
-msgstr "'%s' falló con el código de error %s: %s"
+#: src/util/getopt.c:696
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: la opción '--%s' no permite un argumento\n"
 
-#: src/chat/gnunet-chat.c:162
+#: src/util/getopt.c:701
 #, c-format
-msgid "(%s) <%s> said using an unknown message type: %s\n"
-msgstr ""
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s: la opción '%c%s' no permite un argumento\n"
 
-#: src/chat/gnunet-chat.c:193
+#: src/util/getopt.c:718 src/util/getopt.c:886
 #, c-format
-msgid "'%s' acknowledged message #%d\n"
-msgstr ""
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: la opción '%s' requiere un argumento\n"
 
-#: src/chat/gnunet-chat.c:224
+#: src/util/getopt.c:747
 #, c-format
-msgid "`%s' entered the room\n"
-msgstr ""
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opción no reconocida '--%s'\n"
 
-#: src/chat/gnunet-chat.c:224
+#: src/util/getopt.c:751
 #, c-format
-msgid "`%s' left the room\n"
-msgstr ""
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opción no reconocida '%c%s'\n"
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
-#, fuzzy
-msgid "Could not change username\n"
-msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
+#: src/util/getopt.c:776
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opción ilegal -- %c\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
-#, fuzzy, c-format
-msgid "Joining room `%s' as user `%s'...\n"
-msgstr "Respuesta inválida a '%s' del par '%s'.\n"
+#: src/util/getopt.c:778
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opción no válida -- %c\n"
 
-#: src/chat/gnunet-chat.c:320
-#, fuzzy, c-format
-msgid "Changed username to `%s'\n"
-msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
+#: src/util/getopt.c:806 src/util/getopt.c:934
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: la opción requiere un argumento --%c\n"
 
-#: src/chat/gnunet-chat.c:333
-#, fuzzy, c-format
-msgid "Users in room `%s': "
-msgstr "Fichero almacenado en '%s'.\n"
+#: src/util/getopt.c:854
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: la opción '-W %s' es ambigua\n"
 
-#: src/chat/gnunet-chat.c:371
-msgid "Syntax: /msg USERNAME MESSAGE"
-msgstr ""
+#: src/util/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s: la opción '-W %s' no permite un argumento\n"
 
-#: src/chat/gnunet-chat.c:379
+#: src/util/getopt.c:1038
 #, fuzzy, c-format
-msgid "Unknown user `%s'\n"
-msgstr "Operación desconocida '%s'\n"
+msgid "Use %s to get a list of options.\n"
+msgstr "Usar --help para obtener una lista de opciones.\n"
 
-#: src/chat/gnunet-chat.c:395
+#: src/util/getopt_helpers.c:84
 #, c-format
-msgid "User `%s' is currently not in the room!\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:448
-#, fuzzy, c-format
-msgid "Unknown command `%s'\n"
-msgstr "Operación desconocida '%s'\n"
+#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "Tienes que introducir un número en la opción '%s'.\n"
 
-#: src/chat/gnunet-chat.c:459
-msgid ""
-"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
-"leave the current room"
+#: src/util/gnunet-resolver.c:148
+msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:463
-msgid ""
-"Use `/nick nickname' to change your nickname.  This will cause you to leave "
-"the current room and immediately rejoin it with the new name."
+#: src/util/gnunet-resolver.c:154
+msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
-msgid ""
-"Use `/msg nickname message' to send a private message to the specified user"
-msgstr ""
+#: src/util/gnunet-service-resolver.c:288
+#, fuzzy, c-format
+msgid "Could not resolve `%s' (%s): %s\n"
+msgstr "Imposible resolver '%s': %s\n"
 
-#: src/chat/gnunet-chat.c:470
-msgid "The `/notice' command is an alias for `/msg'"
-msgstr ""
+#: src/util/gnunet-service-resolver.c:358
+#: src/util/gnunet-service-resolver.c:399
+#, c-format
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "Imposible encontrar la IP del host '%s': %s\n"
 
-#: src/chat/gnunet-chat.c:472
-msgid "The `/query' command is an alias for `/msg'"
+#: src/util/gnunet-service-resolver.c:494
+#, c-format
+msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
-msgid "Use `/sig message' to send a signed public message"
+#: src/util/gnunet-service-resolver.c:529
+#, c-format
+msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
-msgid "Use `/ack message' to require signed acknowledgment of the message"
-msgstr ""
+#: src/util/helper.c:239
+#, fuzzy, c-format
+msgid "Error reading from `%s': %s\n"
+msgstr "Error creando usuario"
 
-#: src/chat/gnunet-chat.c:480
-msgid "Use `/anonymous message' to send a public anonymous message"
+#: src/util/helper.c:254
+#, c-format
+msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
-msgid "The `/anon' command is an alias for `/anonymous'"
-msgstr ""
+#: src/util/helper.c:264
+#, fuzzy, c-format
+msgid "Got %u bytes from helper `%s'\n"
+msgstr "GAP recibido contenido no válido de '%s'\n"
 
-#: src/chat/gnunet-chat.c:484
-msgid "Use `/quit' to terminate gnunet-chat"
-msgstr ""
+#: src/util/helper.c:273
+#, fuzzy, c-format
+msgid "Failed to parse inbound message from helper `%s'\n"
+msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/chat/gnunet-chat.c:486
-msgid "The `/leave' command is an alias for `/quit'"
-msgstr ""
+#: src/util/helper.c:431
+#, fuzzy, c-format
+msgid "Error writing to `%s': %s\n"
+msgstr "Error creando usuario"
 
-#: src/chat/gnunet-chat.c:489
-msgid "Use `/names' to list all of the current members in the chat room"
+#: src/util/network.c:1204
+#, c-format
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
-msgid "Use `/help command' to get help for a specific command"
+#: src/util/os_installation.c:299
+#, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:606
-#, fuzzy
-msgid "You must specify a nickname\n"
-msgstr "¡Debes especificar un receptor!\n"
+#: src/util/os_installation.c:486
+#, fuzzy, c-format
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/chat/gnunet-chat.c:622
+#: src/util/os_installation.c:492
 #, fuzzy, c-format
-msgid "Failed to join room `%s'\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "access (%s, X_OK) failed: %s\n"
+msgstr "'%s' %s falló: %s\n"
 
-#: src/chat/gnunet-chat.c:655
-msgid "set the nickname to use (required)"
-msgstr ""
+#: src/util/os_installation.c:507
+#, fuzzy, c-format
+msgid "stat (%s) failed: %s\n"
+msgstr "'%s' %s falló: %s\n"
 
-#: src/chat/gnunet-chat.c:658
-msgid "set the chat room to join"
+#: src/util/os_priority.c:117
+#, c-format
+msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:670
-msgid "Join a chat on GNUnet."
-msgstr ""
-
-#: src/nat/gnunet-nat-server.c:289
+#: src/util/plugin.c:89
 #, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
-msgstr ""
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "¡El mecanismo de iniciación de los plugins falló: %s!\n"
 
-#: src/nat/gnunet-nat-server.c:328
-msgid "GNUnet NAT traversal test helper daemon"
-msgstr ""
+#: src/util/plugin.c:146
+#, fuzzy, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgstr "'%s' falló al resolver el método '%s%s' en %s:%d con un error: %s\n"
 
-#: src/nat/nat.c:803
-#, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
-msgstr ""
+#: src/util/plugin.c:219
+#, fuzzy, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "'%s' falló en la biblioteca '%s' en %s:%d con un error: %s\n"
 
-#: src/nat/nat.c:852
+#: src/util/plugin.c:349
+#, fuzzy
+msgid "Could not determine plugin installation path.\n"
+msgstr "Imposible determinar mi dirección IPv6 pública.\n"
+
+#: src/util/pseudonym.c:273
 #, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "Falló al comenzar la recolección.\n"
+msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/nat/nat.c:1121
+#: src/util/pseudonym.c:338
+#, fuzzy
+msgid "no-name"
+msgstr "Mostrar el nombre"
+
+#: src/util/resolver_api.c:202
 #, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "Imposible guardar la configuración"
+msgid "Must specify `%s' for `%s' in configuration!\n"
+msgstr "Intentando usar el fichero '%s' para la configuración de MySQL.\n"
 
-#: src/nat/nat.c:1187 src/nat/nat.c:1197
-#, c-format
+#: src/util/resolver_api.c:221
+#, fuzzy, c-format
 msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
+"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
+"Debes especificar un número positivo para '%s' en la configuración en la "
+"sección '%s'.\n"
 
-#: src/nat/nat.c:1329
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
-msgstr ""
+#: src/util/resolver_api.c:351
+#, fuzzy, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr "GNUnet usa ahora la dirección IP %u.%u.%u.%u.\n"
 
-#: src/nat/nat.c:1341
+#: src/util/resolver_api.c:355
 #, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
+msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_test.c:348
-#, fuzzy
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/nat/nat_test.c:418
+#: src/util/resolver_api.c:426
 #, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:124
+#: src/util/resolver_api.c:807
 #, c-format
-msgid "Block not of type %u\n"
+msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:131
-msgid "Size mismatch for block\n"
-msgstr ""
-
-#: src/dht/plugin_block_dht.c:140
+#: src/util/resolver_api.c:901
 #, c-format
-msgid "Block of type %u is malformed\n"
+msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/fs/plugin_block_fs.c:131
-msgid "Reply mismatched in terms of namespace.  Discarded.\n"
-msgstr ""
-
-#: src/block/block.c:105
+#: src/util/resolver_api.c:906
 #, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
-msgstr "Probando transporte(s) %s\n"
+msgid "Could not resolve our FQDN : %s\n"
+msgstr "Imposible resolver '%s': %s\n"
 
-#: src/mesh/gnunet-service-mesh.c:4214
-msgid "MESH: Wrong CORE service\n"
+#: src/util/resolver_api.c:938
+#, c-format
+msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4419
-#, fuzzy
-msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
-msgstr "Configuración de GNUnet"
+#: src/util/scheduler.c:870
+msgid "Looks like we're busy waiting...\n"
+msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4428
-#, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
-msgstr "Imposible acceder a la información del espacio.\n"
-
-#: src/hostlist/hostlist-client.c:286
-msgid "# bytes downloaded from hostlist servers"
+#: src/util/scheduler.c:1000
+#, c-format
+msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
-#, fuzzy
-msgid "# invalid HELLOs downloaded from hostlist servers"
-msgstr "# saludos descargados vía HTTP"
+#: src/util/server.c:397
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/util/server.c:406
 #, fuzzy, c-format
-msgid "Invalid `%s' message received from hostlist at `%s'\n"
-msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
-
-#: src/hostlist/hostlist-client.c:330
-#, fuzzy
-msgid "# valid HELLOs downloaded from hostlist servers"
-msgstr "# saludos descargados vía HTTP"
-
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
-#, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
+msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
+"'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
-msgid "# advertised hostlist URIs"
+#: src/util/server.c:411
+#, fuzzy, c-format
+msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
+"'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/hostlist/hostlist-client.c:622
+#: src/util/server.c:640
 #, c-format
-msgid "# advertised URI `%s' downloaded"
+msgid ""
+"Processing code for message of type %u did not call "
+"GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:663
+#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
+#: src/util/service.c:207 src/util/service.c:214
 #, c-format
-msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
-msgstr ""
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Formato no válido para la IP: '%s'\n"
 
-#: src/hostlist/hostlist-client.c:805
+#: src/util/service.c:170
 #, c-format
-msgid "Timeout trying to download hostlist from `%s'\n"
-msgstr ""
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Notación de red no válida ('/%d' no es válido en IPv4 CIDR)."
 
-#: src/hostlist/hostlist-client.c:822
+#: src/util/service.c:263
 #, c-format
-msgid "Download limit of %u bytes exceeded, stopping download\n"
-msgstr ""
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Notación de red no válida (no termina con ';': '%s')\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/util/service.c:296
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Formato '%s' erróneo para la máscara de red: %s\n"
 
-#: src/hostlist/hostlist-client.c:848
+#: src/util/service.c:326
 #, fuzzy, c-format
-msgid "Download of hostlist `%s' completed.\n"
-msgstr ""
-"Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
-"kbps.\n"
+msgid "Wrong format `%s' for network\n"
+msgstr "Formato '%s' erróneo para la red: %s\n"
 
-#: src/hostlist/hostlist-client.c:856
+#: src/util/service.c:668
 #, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
+msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:909
+#: src/util/service.c:673
+#, fuzzy, c-format
+msgid "Unknown address family %d\n"
+msgstr "Operación desconocida '%s'\n"
+
+#: src/util/service.c:680
 #, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
-msgid "# hostlist downloads initiated"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
-msgid "# milliseconds between hostlist downloads"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1054
+#: src/util/service.c:724
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
-msgid "Scheduled saving of hostlists\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1096
+#: src/util/service.c:752
 #, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
-#, fuzzy
-msgid "# active connections"
-msgstr "Configuración de GNUnet"
-
-#: src/hostlist/hostlist-client.c:1253
+#: src/util/service.c:869
 #, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1284
+#: src/util/service.c:939
 #, c-format
 msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/util/service.c:956
 #, c-format
-msgid "Loading saved hostlist entries from file `%s' \n"
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1294
-#, c-format
-msgid "Hostlist file `%s' is not existing\n"
+#: src/util/service.c:1191
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1305
-#, fuzzy, c-format
-msgid "Could not open file `%s' for reading to load hostlists: %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
-
-#: src/hostlist/hostlist-client.c:1338
+#: src/util/service.c:1242 src/util/service.c:1260
 #, c-format
-msgid "%u hostlist URIs loaded from file\n"
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1340
-msgid "# hostlist URIs read from file"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1373
+#: src/util/service.c:1287
 #, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1387
+#: src/util/service.c:1442
 #, fuzzy, c-format
-msgid "Could not open file `%s' for writing to save hostlists: %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/hostlist/hostlist-client.c:1392
-#, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#: src/util/service.c:1475
 #, fuzzy, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
-msgstr "Error creando usuario"
+msgid "Service `%s' runs at %s\n"
+msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: src/hostlist/hostlist-client.c:1428
-msgid "# hostlist URIs written to file"
+#: src/util/service.c:1521
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1480
-msgid "Learning is enabled on this peer\n"
+#: src/util/service.c:1525
+msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
-#, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
+#: src/util/service.c:1529
+msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
-msgid "Learning is not enabled on this peer\n"
+#: src/util/service.c:1581
+msgid "No such user"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1504
+#: src/util/service.c:1594
 #, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
+
+#: src/util/service.c:1657
+msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1508
+#: src/util/signal.c:80
 #, fuzzy, c-format
-msgid "Hostlist file `%s' could not be removed\n"
-msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
+msgid "signal (%d, %p) returned %d.\n"
+msgstr "La llamada a '%s' devuelve %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:264
-msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
-msgstr ""
+#: src/util/strings.c:143
+msgid "b"
+msgstr "b"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:317
-msgid "advertise our hostlist to other peers"
+#: src/util/strings.c:354
+#, c-format
+msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:322
-msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
+#: src/util/strings.c:462
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
-msgid "enable learning about hostlist servers from other peers"
-msgstr ""
+#: src/util/strings.c:554
+msgid "ms"
+msgstr "ms"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
-msgid "provide a hostlist server"
+#: src/util/strings.c:559
+msgid "eternity"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
-msgid "GNUnet hostlist server and client"
+#: src/util/strings.c:563
+msgid "s"
+msgstr "s"
+
+#: src/util/strings.c:567
+msgid "m"
+msgstr "m"
+
+#: src/util/strings.c:571
+msgid "h"
+msgstr "h"
+
+#: src/util/strings.c:575
+msgid " days"
+msgstr " días"
+
+#: src/util/strings.c:599
+msgid "end of time"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:134
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
 #, fuzzy
-msgid "bytes in hostlist"
-msgstr "# bytes en la base de datos"
+msgid "# Active tunnels"
+msgstr "Configuración de GNUnet"
 
-#: src/hostlist/hostlist-server.c:157
-msgid "expired addresses encountered"
-msgstr ""
+#: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
+#, fuzzy
+msgid "# Peers connected to mesh tunnels"
+msgstr "# de pares conectados"
 
-#: src/hostlist/hostlist-server.c:205
-msgid "HELLOs without addresses encountered (ignored)"
+#: src/vpn/gnunet-service-vpn.c:699
+#, fuzzy
+msgid "# Bytes given to mesh for transmission"
+msgstr "# bytes de mensajes salientes omitidos"
+
+#: src/vpn/gnunet-service-vpn.c:737
+#, fuzzy
+msgid "# Bytes dropped in mesh queue (overflow)"
+msgstr "# bytes omitidos por UDP (salientes)"
+
+#: src/vpn/gnunet-service-vpn.c:772
+#, fuzzy
+msgid "# Mesh tunnels created"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/vpn/gnunet-service-vpn.c:795
+#, fuzzy
+msgid "Failed to setup mesh tunnel!\n"
+msgstr "Fallo en las estadísticas del tráfico.\n"
+
+#: src/vpn/gnunet-service-vpn.c:967
+#, c-format
+msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:221
-msgid "bytes not included in hostlist (size limit)"
+#: src/vpn/gnunet-service-vpn.c:1285
+msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:269
-#, c-format
-msgid "Refusing `%s' request to hostlist server\n"
+#: src/vpn/gnunet-service-vpn.c:1306
+msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
+#: src/vpn/gnunet-service-vpn.c:1511
 #, fuzzy
-msgid "hostlist requests refused (not HTTP GET)"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "# Packets received from TUN interface"
+msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/hostlist/hostlist-server.c:280
-msgid "Sending 100 CONTINUE reply\n"
+#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#, c-format
+msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:287
+#: src/vpn/gnunet-service-vpn.c:1600
+msgid "Received IPv4 packet with options (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1614
 #, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\n"
+msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:291
+#: src/vpn/gnunet-service-vpn.c:1697
 #, fuzzy
-msgid "hostlist requests refused (upload data)"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "# ICMP packets received from mesh"
+msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/hostlist/hostlist-server.c:299
-msgid "Could not handle hostlist request since I do not have a response yet\n"
-msgstr ""
+#: src/vpn/gnunet-service-vpn.c:2038
+#, fuzzy
+msgid "# UDP packets received from mesh"
+msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/hostlist/hostlist-server.c:302
+#: src/vpn/gnunet-service-vpn.c:2196
 #, fuzzy
-msgid "hostlist requests refused (not ready)"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "# TCP packets received from mesh"
+msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/hostlist/hostlist-server.c:306
-msgid "Received request for our hostlist\n"
+#: src/vpn/gnunet-service-vpn.c:2347
+msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:307
+#: src/vpn/gnunet-service-vpn.c:2402
 #, fuzzy
-msgid "hostlist requests processed"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "Failed to find unallocated IPv6 address in VPN's range\n"
+msgstr "¡Falló al obtener mi dirección IPv6 (externa)!\n"
 
-#: src/hostlist/hostlist-server.c:350
+#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
 #, fuzzy
-msgid "# hostlist advertisements send"
-msgstr "# Anuncios a extraños mandados"
+msgid "# Active destinations"
+msgstr "Configuración de GNUnet"
 
-#: src/hostlist/hostlist-server.c:397
-msgid "Advertisement message could not be queued by core\n"
+#: src/vpn/gnunet-service-vpn.c:2726
+msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
-#, fuzzy, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
-msgstr "Argumentos no válidos. Saliendo.\n"
-
-#: src/hostlist/hostlist-server.c:574
-#, c-format
-msgid "Hostlist service starts on %s:%llu\n"
+#: src/vpn/gnunet-service-vpn.c:3133
+msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
-#, c-format
-msgid "Address to obtain hostlist: `%s'\n"
+#: src/vpn/gnunet-service-vpn.c:3165
+msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:626
-#, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
-msgstr ""
+#: src/vpn/gnunet-vpn.c:151
+#, fuzzy
+msgid "Error creating tunnel\n"
+msgstr "Correcto al crear la clave local.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/vpn/gnunet-vpn.c:195 src/vpn/gnunet-vpn.c:226
 #, fuzzy, c-format
-msgid "Could not find option `%s:%s' in configuration.\n"
-msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
+msgid "Option `%s' makes no sense with option `%s'.\n"
+msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/vpn/gnunet-vpn.c:208
 #, fuzzy, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr "Analizando saludo de '%s' se produjo un fallo.\n"
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
-#, c-format
-msgid "I am peer `%s'.\n"
-msgstr "Yo soy el par '%s'.\n"
+#: src/vpn/gnunet-vpn.c:220
+#, fuzzy, c-format
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
+msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
-msgid "output only the identity strings"
+#: src/vpn/gnunet-vpn.c:238
+#, fuzzy, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "'%s' no esta disponible."
+
+#: src/vpn/gnunet-vpn.c:260
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "'%s' no esta disponible."
+
+#: src/vpn/gnunet-vpn.c:296
+msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
-msgid "output our own identity only"
+#: src/vpn/gnunet-vpn.c:299
+msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
-#, fuzzy
-msgid "Print information about peers."
-msgstr "Imprime información de los pares de GNUnet."
+#: src/vpn/gnunet-vpn.c:302
+msgid "print IP address only after mesh tunnel has been created"
+msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:144
-msgid "print this help"
-msgstr "imprime esta ayuda"
+#: src/vpn/gnunet-vpn.c:305
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:154
-msgid "print the version number"
-msgstr "imprime el número de versión"
-
-#: src/include/gnunet_getopt_lib.h:163
-msgid "configure logging to write logs to LOGFILE"
+#: src/vpn/gnunet-vpn.c:308
+msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:172
-msgid "configure logging to use LOGLEVEL"
+#: src/vpn/gnunet-vpn.c:311
+msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:181
-msgid "be verbose"
+#: src/vpn/gnunet-vpn.c:314
+msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:190
+#: src/vpn/gnunet-vpn.c:317
 #, fuzzy
-msgid "use configuration file FILENAME"
-msgstr "usa el fichero de configuración FILENAME"
+msgid "service is offered via TCP"
+msgstr "# bytes recibidos por TCP"
 
-#: src/include/gnunet_common.h:430 src/include/gnunet_common.h:435
-#: src/include/gnunet_common.h:441
+#: src/vpn/gnunet-vpn.c:320
+#, fuzzy
+msgid "service is offered via UDP"
+msgstr "# bytes recibidos vía UDP"
+
+#: src/vpn/gnunet-vpn.c:329
+msgid "Setup tunnels via VPN."
+msgstr ""
+
+#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
+#: src/include/gnunet_common.h:490
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_common.h:451
+#: src/include/gnunet_common.h:500
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_common.h:472 src/include/gnunet_common.h:479
+#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 
 #, fuzzy
+#~ msgid "Could not access file: %s\n"
+#~ msgstr "Imposible ejecutar '%s': %s\n"
+
+#, fuzzy
+#~ msgid "`%s' failed on file `%s': %s"
+#~ msgstr "'%s' falló para la unidad %s: %u\n"
+
+#, fuzzy
+#~ msgid "# bytes TCP was asked to transmit"
+#~ msgstr "# bytes desencriptados"
+
+#, fuzzy
+#~ msgid "# bytes discarded by TCP (failed to connect)"
+#~ msgstr "# bytes omitidos por TCP (salientes)"
+
+#, fuzzy
+#~ msgid "# wlan messages queued"
+#~ msgstr "# mensajes PONG encriptados recibidos"
+
+#~ msgid "print this help"
+#~ msgstr "imprime esta ayuda"
+
+#~ msgid "print the version number"
+#~ msgstr "imprime el número de versión"
+
+#, fuzzy
+#~ msgid "use configuration file FILENAME"
+#~ msgstr "usa el fichero de configuración FILENAME"
+
+#, fuzzy
 #~ msgid "Failed to stop service `%s'!\n"
 #~ msgstr "Fichero almacenado en '%s'.\n"
 
@@ -4772,10 +5873,6 @@
 #~ msgstr "La verificación de la firma falló: el par '%s' no es conocido.\n"
 
 #, fuzzy
-#~ msgid "Stopping all services\n"
-#~ msgstr "Deteniendo cron\n"
-
-#, fuzzy
 #~ msgid "Service `%s' stopped\n"
 #~ msgstr "Servicio eliminado.\n"
 
@@ -4816,86 +5913,10 @@
 #~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
 #, fuzzy
-#~ msgid "Target is %d connections per peer."
-#~ msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
-
-#, fuzzy
-#~ msgid "Copying file with command cp %s %s\n"
-#~ msgstr "'%s' falló con el código de error %s: %s"
-
-#, fuzzy
-#~ msgid "Offering Hello of peer %s to peer %s\n"
-#~ msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
-
-#, fuzzy
-#~ msgid "Could not read hostkeys file!\n"
-#~ msgstr "Imposible inicializar la aplicación '%s'\n"
-
-#, fuzzy
-#~ msgid "`scp' did not complete cleanly.\n"
-#~ msgstr "'%s' no esta conectado a ningún par.\n"
-
-#, fuzzy
-#~ msgid "Failed to create pipe for `ssh' process.\n"
-#~ msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
-
-#, fuzzy
-#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
-#~ msgstr "Falló al comenzar la recolección.\n"
-
-#, fuzzy
-#~ msgid "Failed to start `ssh' process.\n"
-#~ msgstr "Falló al comenzar la recolección.\n"
-
-#, fuzzy
-#~ msgid "Error reading from gnunet-peerinfo: %s\n"
-#~ msgstr "Se produjo un error leyendo información de gnunetd.\n"
-
-#, fuzzy
-#~ msgid "`Failed to get hostkey!\n"
-#~ msgstr "Fallo en las estadísticas del tráfico.\n"
-
-#, fuzzy
-#~ msgid "Failed to start `gnunet-arm' process.\n"
-#~ msgstr "Fallo al conectar a gnunetd.\n"
-
-#, fuzzy
-#~ msgid "Starting service %s for peer `%4s'\n"
-#~ msgstr "Iniciada colección '%s'.\n"
-
-#, fuzzy
-#~ msgid "Terminating peer `%4s'\n"
-#~ msgstr "Permiso denegado para '%s' en %s:%d.\n"
-
-#, fuzzy
-#~ msgid "Setting d->dead on peer `%4s'\n"
-#~ msgstr "Iniciada colección '%s'.\n"
-
-#, fuzzy
-#~ msgid "Failed to write new configuration to disk."
-#~ msgstr "Imposible guardar la configuración"
-
-#, fuzzy
-#~ msgid "Failed to copy new configuration to remote machine."
-#~ msgstr "Imposible guardar la configuración"
-
-#, fuzzy
-#~ msgid "Peers failed to connect"
-#~ msgstr "Fallo al conectar a gnunetd.\n"
-
-#, fuzzy
-#~ msgid "Failed to connect to core service of first peer!\n"
-#~ msgstr "Fallo al conectar a gnunetd.\n"
-
-#, fuzzy
 #~ msgid "Could not resolve our FQDN : %s %u\n"
 #~ msgstr "Imposible resolver '%s': %s\n"
 
 #, fuzzy
-#~ msgid "Failed to start daemon: %s\n"
-#~ msgstr "Falló al comenzar la recolección.\n"
-
-#, fuzzy
 #~ msgid "Failed to load dhtlog plugin for `%s'\n"
 #~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
@@ -4976,10 +5997,6 @@
 #~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
 #, fuzzy
-#~ msgid "# connection requests received"
-#~ msgstr "# mensajes PONG encriptados recibidos"
-
-#, fuzzy
 #~ msgid "# PING messages decrypted"
 #~ msgstr "# mensajes defragmentados"
 
@@ -5318,10 +6335,6 @@
 #~ msgstr "Error: imposible borrar el servicio: %s\n"
 
 #, fuzzy
-#~ msgid "Configuration saved."
-#~ msgstr "Configuración de GNUnet"
-
-#, fuzzy
 #~ msgid "Configuration changed. Save?"
 #~ msgstr ""
 #~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
@@ -5345,18 +6358,10 @@
 #~ msgid "generate configuration for gnunetd, the GNUnet daemon"
 #~ msgstr "genera configuración para gnunetd, el demonio de GNUnet"
 
-#, fuzzy
-#~ msgid "print a value from the configuration file to stdout"
-#~ msgstr "Imposible guardar el fichero de configuración '%s':"
-
 #~ msgid "Tool to setup GNUnet."
 #~ msgstr "Herramienta de configuración de GNUnet."
 
 #, fuzzy
-#~ msgid "update a value in the configuration file"
-#~ msgstr "Imposible guardar el fichero de configuración '%s':"
-
-#, fuzzy
 #~ msgid "Too many arguments.\n"
 #~ msgstr "Argumentos en la linea de comandos inválidos.\n"
 
@@ -5375,10 +6380,6 @@
 #~ msgstr "Otras configuraciones"
 
 #, fuzzy
-#~ msgid "`%s' is not available.\n"
-#~ msgstr "'%s' no esta disponible."
-
-#, fuzzy
 #~ msgid "Unknown operation '%s'.\n"
 #~ msgstr "Operación desconocida '%s'\n"
 
@@ -5708,10 +6709,6 @@
 #~ msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
 
 #, fuzzy
-#~ msgid "Done creating key.\n"
-#~ msgstr "Correcto al crear la clave local.\n"
-
-#, fuzzy
 #~ msgid "# max bytes allowed in dstore"
 #~ msgstr "# bytes en la base de datos"
 
@@ -5897,9 +6894,6 @@
 #~ msgid "You must specify a name for the collection (`%s' option).\n"
 #~ msgstr "Debes especificar un apodo (use la opción '%s').\n"
 
-#~ msgid "=\tError reading directory.\n"
-#~ msgstr "=\tError leyendo el directorio.\n"
-
 #~ msgid "%d files found in directory.\n"
 #~ msgstr "%d ficheros encontrados en el directorio.\n"
 
@@ -6405,12 +7399,6 @@
 #~ msgid "Failed to obtain my (external) %s address!\n"
 #~ msgstr "¡Falló al obtener mi dirección IP (externa)!\n"
 
-#~ msgid "# bytes received via UDP"
-#~ msgstr "# bytes recibidos vía UDP"
-
-#~ msgid "# bytes sent via UDP"
-#~ msgstr "# bytes enviados vía UDP"
-
 #, fuzzy
 #~ msgid "specify host on which gnunetd is running"
 #~ msgstr "especifica el host en el que gnunetd esta ejecutandose"
@@ -7398,9 +8386,6 @@
 #~ msgid "Sorry, no help is available for this option.\n"
 #~ msgstr "Lo siento, no hay ayuda disponible para esta opción.\n"
 
-#~ msgid "Failed to obtain my (external) IPv6 address!\n"
-#~ msgstr "¡Falló al obtener mi dirección IPv6 (externa)!\n"
-
 #~ msgid "%s: Rejected connection from blacklisted address %s.\n"
 #~ msgstr "%s: Conexión rechazada de una dirección de la \"lista negra\" %s.\n"
 
@@ -7735,9 +8720,6 @@
 #~ msgid "Cron stopped\n"
 #~ msgstr "Cron detenido\n"
 
-#~ msgid "Shutdown complete.\n"
-#~ msgstr "Cierre completado.\n"
-
 #~ msgid "Caught signal %d.\n"
 #~ msgstr "Cogida señal %d.\n"
 

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2012-02-24 15:12:56 UTC (rev 20010)
+++ gnunet/po/sv.po     2012-02-24 15:14:18 UTC (rev 20011)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-01-07 20:53+0100\n"
+"POT-Creation-Date: 2012-02-24 16:13+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -16,390 +16,532 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:61
-#: src/datastore/plugin_datastore_mysql.c:139
-#: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:613
-#: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685
-#: src/datastore/plugin_datastore_mysql.c:1362
-#: src/datastore/plugin_datastore_mysql.c:1376 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/datacache/plugin_datacache_sqlite.c:71
-#: src/datacache/plugin_datacache_sqlite.c:74
-#: src/datacache/plugin_datacache_mysql.c:103
-#: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:517
-#: src/datacache/plugin_datacache_mysql.c:526
-#: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:458
-#: src/include/gnunet_common.h:465
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+#: src/arm/arm_api.c:187
+msgid "Failed to transmit shutdown request to client.\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/arm/arm_api.c:378
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%u with error: %s"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+msgid "Configuration failes to specify option `%s' in section `%s'!\n"
+msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:239
+#: src/arm/arm_api.c:392
 #, fuzzy, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:266
-#, fuzzy, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "Kunde inte initiera SQLite.\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:414
-#: src/datacache/plugin_datacache_sqlite.c:457
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+#: src/arm/arm_api.c:465
+#, c-format
+msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:671
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+#: src/arm/arm_api.c:521
+#, c-format
+msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1161
-msgid "sqlite version to old to determine size, assuming zero\n"
+#: src/arm/arm_api.c:522
+#, c-format
+msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1180
+#: src/arm/arm_api.c:544
 #, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1220
-msgid "Sqlite database running\n"
+#: src/arm/arm_api.c:546
+#, c-format
+msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:316
-#: src/datacache/plugin_datacache_mysql.c:224
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
+#: src/arm/arm_api.c:579
+#, fuzzy, c-format
+msgid "Asked to start service `%s' within %llu ms\n"
+msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:322
-#: src/datacache/plugin_datacache_mysql.c:230
+#: src/arm/arm_api.c:652
 #, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "Kunde inte köra \"%s\": %s\n"
+msgid "Stopping service `%s' within %llu ms\n"
+msgstr "Inget svar mottaget inom %llums.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#: src/datastore/plugin_datastore_mysql.c:1336
+#: src/arm/gnunet-arm.c:149
 #, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Service `%s' is unknown to ARM.\n"
+msgstr "\"%s\" är inte en fil.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#: src/datastore/plugin_datastore_mysql.c:1346
+#: src/arm/gnunet-arm.c:154
 #, fuzzy, c-format
-msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
-msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
+msgid "Service `%s' has been stopped.\n"
+msgstr "Tjänst borttagen.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1581
-msgid "Mysql database running\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:157
+#, fuzzy, c-format
+msgid "Service `%s' was already running.\n"
+msgstr "\"%s\" är inte en fil.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:93
-#: src/datacache/plugin_datacache_postgres.c:79
+#: src/arm/gnunet-arm.c:162
 #, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+msgid "Service `%s' has been started.\n"
+msgstr "Tjänst borttagen.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:173
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+msgid "Service `%s' was already being stopped.\n"
+msgstr "Tjänst borttagen.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1017
-msgid "Postgres database running\n"
+#: src/arm/gnunet-arm.c:169
+#, fuzzy, c-format
+msgid "Service `%s' was already not running.\n"
+msgstr "\"%s\" är inte en fil.\n"
+
+#: src/arm/gnunet-arm.c:173
+msgid "Request ignored as ARM is shutting down.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:289
+#: src/arm/gnunet-arm.c:177
 #, fuzzy
-msgid "Failed to transmit request to drop database.\n"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+msgid "Error communicating with ARM service.\n"
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/datastore/datastore_api.c:372
-msgid "# queue entry timeouts"
-msgstr ""
+#: src/arm/gnunet-arm.c:181
+#, fuzzy
+msgid "Timeout communicating with ARM service.\n"
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/datastore/datastore_api.c:418
-msgid "# queue overflows"
-msgstr ""
-
-#: src/datastore/datastore_api.c:445
+#: src/arm/gnunet-arm.c:185
 #, fuzzy
-msgid "# queue entries created"
-msgstr "# PING-meddelanden skapade"
+msgid "Operation failed.\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/datastore/datastore_api.c:465
-msgid "# Requests dropped from datastore queue"
+#: src/arm/gnunet-arm.c:189
+msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:513
-#, fuzzy
-msgid "# datastore connections (re)created"
-msgstr "Nätverksanslutning"
+#: src/arm/gnunet-arm.c:216
+#, c-format
+msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
+msgstr ""
 
-#: src/datastore/datastore_api.c:540
-msgid "# reconnected to DATASTORE"
+#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
-#, fuzzy
-msgid "# transmission request failures"
-msgstr "# klartext PONG-meddelanden mottagna"
+#: src/arm/gnunet-arm.c:247
+#, fuzzy, c-format
+msgid "Failed to remove configuration file %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/datastore_api.c:631
-#, fuzzy
-msgid "# bytes sent to datastore"
-msgstr "# byte krypterade"
+#: src/arm/gnunet-arm.c:253
+#, fuzzy, c-format
+msgid "Failed to remove servicehome directory %s\n"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/datastore/datastore_api.c:772
-#, fuzzy
-msgid "Failed to receive status response from database."
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+#: src/arm/gnunet-arm.c:355
+msgid "stop all GNUnet services"
+msgstr ""
 
-#: src/datastore/datastore_api.c:786
-msgid "Error reading response from datastore service"
+#: src/arm/gnunet-arm.c:357
+msgid "start a particular service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
-#, fuzzy
-msgid "Invalid error message received from datastore service"
-msgstr "Ogiltigt meddelande mottogs den %s:%d."
+#: src/arm/gnunet-arm.c:359
+msgid "stop a particular service"
+msgstr ""
 
-#: src/datastore/datastore_api.c:810
-#, fuzzy
-msgid "# status messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+#: src/arm/gnunet-arm.c:361
+msgid "start all GNUnet default services"
+msgstr ""
 
-#: src/datastore/datastore_api.c:883
-msgid "# PUT requests executed"
+#: src/arm/gnunet-arm.c:364
+msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/datastore/datastore_api.c:954
-msgid "# RESERVE requests executed"
+#: src/arm/gnunet-arm.c:367
+msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1019
-msgid "# RELEASE RESERVE requests executed"
+#: src/arm/gnunet-arm.c:369
+msgid "don't print status messages"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1080
-msgid "# UPDATE requests executed"
+#: src/arm/gnunet-arm.c:372
+msgid "timeout for completing current operation"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1148
-msgid "# REMOVE requests executed"
+#: src/arm/gnunet-arm.c:383
+msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1193
-#, fuzzy
-msgid "Failed to receive response from database.\n"
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+#: src/arm/gnunet-service-arm.c:321
+#, fuzzy, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
 
-#: src/datastore/datastore_api.c:1253
+#: src/arm/gnunet-service-arm.c:324
+#, fuzzy, c-format
+msgid "Starting service `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/arm/gnunet-service-arm.c:350
 #, fuzzy
-msgid "# Results received"
-msgstr "# byte mottogs via TCP"
+msgid "Could not send status result to client\n"
+msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1324
-msgid "# GET REPLICATION requests executed"
+#: src/arm/gnunet-service-arm.c:477
+#, fuzzy, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Kunde inte skapa användarkonto:"
+
+#: src/arm/gnunet-service-arm.c:499
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1391
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/arm/gnunet-service-arm.c:513
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1455
-msgid "# GET requests executed"
+#: src/arm/gnunet-service-arm.c:621
+#, fuzzy, c-format
+msgid "Preparing to stop `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/arm/gnunet-service-arm.c:775
+#, fuzzy, c-format
+msgid "Restarting service `%s'.\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/arm/gnunet-service-arm.c:870
+msgid "exit"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:241
-msgid "Template database running\n"
+#: src/arm/gnunet-service-arm.c:875
+msgid "signal"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/arm/gnunet-service-arm.c:880
 #, fuzzy
-msgid "# bytes expired"
-msgstr "# byte mottogs via TCP"
+msgid "unknown"
+msgstr "Okänt fel"
 
-#: src/datastore/gnunet-service-datastore.c:426
-msgid "# bytes purged (low-priority)"
+#: src/arm/gnunet-service-arm.c:914
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:486
-msgid "Transmission to client failed!\n"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:960 src/arm/mockup-service.c:41
+#, fuzzy
+msgid "Failed to transmit shutdown ACK.\n"
+msgstr "Misslyckades att starta samling.\n"
 
-#: src/datastore/gnunet-service-datastore.c:640
-msgid "# results found"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:1060
+#, fuzzy, c-format
+msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/datastore/gnunet-service-datastore.c:685
-#, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
-"%llu bytes\n"
+#: src/arm/gnunet-service-arm.c:1062
+msgid "option missing"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/arm/gnunet-service-arm.c:1139
+#, fuzzy, c-format
+msgid "Starting default services `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/arm/gnunet-service-arm.c:1150
 #, c-format
-msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:700
+#: src/arm/gnunet-service-arm.c:1164
 msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+"No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:706
-msgid "Insufficient space to satisfy request"
+#: src/arm/mockup-service.c:46
+msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
-#: src/datastore/gnunet-service-datastore.c:765
-#: src/datastore/gnunet-service-datastore.c:986
-#: src/datastore/gnunet-service-datastore.c:1465
-msgid "# reserved"
+#: src/arm/mockup-service.c:69
+msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:780
-msgid "Could not find matching reservation"
-msgstr ""
+#: src/block/block.c:105
+#, fuzzy, c-format
+msgid "Loading block plugin `%s'\n"
+msgstr "Testar transport(er) %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:854 src/datacache/datacache.c:118
-#: src/datacache/datacache.c:255
+#: src/chat/chat.c:175
 #, fuzzy
-msgid "# bytes stored"
-msgstr "# byte krypterade"
+msgid "Could not transmit confirmation receipt\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/datastore/gnunet-service-datastore.c:868
-#, c-format
-msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
+#: src/chat/chat.c:283
+msgid "The current user must be the the first one joined\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1034
+#: src/chat/chat.c:412
+#, fuzzy, c-format
+msgid "Unknown message type: '%u'\n"
+msgstr "Okänd operation \"%s\"\n"
+
+#: src/chat/chat.c:472
+#, fuzzy, c-format
+msgid "Configuration option `%s' in section `%s' missing\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/chat/chat.c:480
+#, fuzzy, c-format
+msgid "Failed to access chat home directory `%s'\n"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: src/chat/chat.c:498
+#, fuzzy, c-format
+msgid "Failed to create/open key in file `%s'\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/chat/chat.c:559
 #, fuzzy
-msgid "# GET requests received"
-msgstr "# byte mottogs via TCP"
+msgid "Could not serialize metadata\n"
+msgstr "Kunde inte initiera libgnunetutil!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1048
-msgid "# requests filtered by bloomfilter"
+#: src/chat/chat.c:674
+#, fuzzy
+msgid "Failed to connect to the chat service\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/chat/chat.c:680
+msgid "Undefined mandatory parameter: joinCallback\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1076
-#, fuzzy
-msgid "# UPDATE requests received"
-msgstr "# byte mottogs via TCP"
+#: src/chat/chat.c:686
+msgid "Undefined mandatory parameter: messageCallback\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1110
-msgid "# GET REPLICATION requests received"
+#: src/chat/chat.c:692
+msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1145
-msgid "# GET ZERO ANONYMITY requests received"
+#: src/chat/gnunet-chat.c:92
+msgid "Joined\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1172
-#, fuzzy
-msgid "Content not found"
-msgstr "Kommando \"%s\" hittades inte!\n"
+#: src/chat/gnunet-chat.c:124
+msgid "anonymous"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1182
-msgid "# bytes removed (explicit request)"
+#: src/chat/gnunet-chat.c:130
+#, fuzzy, c-format
+msgid "(%s) `%s' said: %s\n"
+msgstr "\"%s\" %s misslyckades: %s\n"
+
+#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#, fuzzy, c-format
+msgid "(%s) `%s' said to you: %s\n"
+msgstr "\"%s\" %s misslyckades: %s\n"
+
+# drive = hard drive ?
+#: src/chat/gnunet-chat.c:139
+#, fuzzy, c-format
+msgid "(%s) `%s' said for sure: %s\n"
+msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+
+# drive = hard drive ?
+#: src/chat/gnunet-chat.c:142
+#, fuzzy, c-format
+msgid "(%s) `%s' said to you for sure: %s\n"
+msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+
+#: src/chat/gnunet-chat.c:145
+#, c-format
+msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1216
-#, fuzzy
-msgid "# REMOVE requests received"
-msgstr "# byte mottogs via TCP"
+#: src/chat/gnunet-chat.c:148
+#, c-format
+msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1260
+#: src/chat/gnunet-chat.c:151
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1323
+#: src/chat/gnunet-chat.c:156
 #, c-format
-msgid "Loading `%s' datastore plugin\n"
+msgid ""
+"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1332
+#: src/chat/gnunet-chat.c:159
 #, fuzzy, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+msgid "(%s) `%s' said off the record: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1531
-#: src/datastore/gnunet-service-datastore.c:1542 src/datacache/datacache.c:144
-#: src/datacache/datacache.c:151
+#: src/chat/gnunet-chat.c:162
+#, c-format
+msgid "(%s) <%s> said using an unknown message type: %s\n"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:193
+#, c-format
+msgid "'%s' acknowledged message #%d\n"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:224
+#, c-format
+msgid "`%s' entered the room\n"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:224
+#, c-format
+msgid "`%s' left the room\n"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#, fuzzy
+msgid "Could not change username\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
 #, fuzzy, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
+msgid "Joining room `%s' as user `%s'...\n"
+msgstr "Ogiltigt svar till \"%s\" från motpart \"%s\".\n"
 
-#: src/datastore/gnunet-service-datastore.c:1536
+#: src/chat/gnunet-chat.c:320
 #, fuzzy, c-format
-msgid "# bytes used in file-sharing datastore `%s'"
-msgstr "# byte krypterade"
+msgid "Changed username to `%s'\n"
+msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1547
-msgid "# quota"
+#: src/chat/gnunet-chat.c:333
+#, c-format
+msgid "Users in room `%s': "
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1549
-msgid "# cache size"
+#: src/chat/gnunet-chat.c:371
+msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1562
+#: src/chat/gnunet-chat.c:379
+#, fuzzy, c-format
+msgid "Unknown user `%s'\n"
+msgstr "Okänd operation \"%s\"\n"
+
+#: src/chat/gnunet-chat.c:395
 #, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+msgid "User `%s' is currently not in the room!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1580
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/chat/gnunet-chat.c:448
 #, fuzzy, c-format
-msgid "Failed to remove bogus bloomfilter file `%s'\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+msgid "Unknown command `%s'\n"
+msgstr "Okänd operation \"%s\"\n"
 
-#: src/datastore/gnunet-service-datastore.c:1626
-#, fuzzy
-msgid "Failed to initialize bloomfilter.\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+#: src/chat/gnunet-chat.c:459
+msgid ""
+"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
+"leave the current room"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1655
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
+#: src/chat/gnunet-chat.c:463
+msgid ""
+"Use `/nick nickname' to change your nickname.  This will cause you to leave "
+"the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1660
-msgid "Plugin does not support get_keys function. Please fix!\n"
+#: src/chat/gnunet-chat.c:467
+msgid ""
+"Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1663
-msgid "Bloomfilter construction complete.\n"
+#: src/chat/gnunet-chat.c:470
+msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
+#: src/chat/gnunet-chat.c:472
+msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:238
-msgid "# type map refreshes sent"
+#: src/chat/gnunet-chat.c:474
+msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:414
-msgid "# messages discarded (expired prior to transmission)"
+#: src/chat/gnunet-chat.c:477
+msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
+#: src/chat/gnunet-chat.c:480
+msgid "Use `/anonymous message' to send a public anonymous message"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:482
+msgid "The `/anon' command is an alias for `/anonymous'"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:484
+msgid "Use `/quit' to terminate gnunet-chat"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:486
+msgid "The `/leave' command is an alias for `/quit'"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:489
+msgid "Use `/names' to list all of the current members in the chat room"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:491
+msgid "Use `/help command' to get help for a specific command"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:606
+#, fuzzy
+msgid "You must specify a nickname\n"
+msgstr "Du måste ange en mottagare!\n"
+
+#: src/chat/gnunet-chat.c:622
+#, fuzzy, c-format
+msgid "Failed to join room `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/chat/gnunet-chat.c:655
+msgid "set the nickname to use (required)"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:658
+msgid "set the chat room to join"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:670
+msgid "Join a chat on GNUnet."
+msgstr ""
+
+#: src/chat/gnunet-service-chat.c:267
+#, fuzzy
+msgid "Failed to queue a message notification\n"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/chat/gnunet-service-chat.c:546
+#, fuzzy
+msgid "Failed to queue a join notification\n"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/chat/gnunet-service-chat.c:729
+#, fuzzy
+msgid "Failed to queue a confirmation receipt\n"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/chat/gnunet-service-chat.c:907
+#, fuzzy
+msgid "Failed to queue a leave notification\n"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/core/core_api.c:798
+msgid "Client was disconnected from core service, trying to reconnect.\n"
+msgstr ""
+
 #: src/core/gnunet-core-list-connections.c:77
 #: src/peerinfo-tool/gnunet-peerinfo.c:60
 #, fuzzy, c-format
@@ -422,6 +564,11 @@
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
+#: src/core/gnunet-service-core.c:99
+#, c-format
+msgid "Core service of `%4s' ready.\n"
+msgstr ""
+
 #: src/core/gnunet-service-core_clients.c:360
 msgid "# send requests dropped (disconnected)"
 msgstr ""
@@ -436,40 +583,6 @@
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core.c:99
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
-#, fuzzy
-msgid "# type maps received"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/core/gnunet-service-core_typemap.c:151
-msgid "# updates to my type map"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:163
-#, fuzzy
-msgid "# sessions terminated by transport disconnect"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:343
-msgid "# neighbour entries allocated"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:252
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:431
-#, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
-msgstr ""
-
 #: src/core/gnunet-service-core_kx.c:493
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
@@ -512,7 +625,7 @@
 msgstr "# PING-meddelanden skapade"
 
 #: src/core/gnunet-service-core_kx.c:880
-#: src/transport/gnunet-service-transport_validation.c:780
+#: src/transport/gnunet-service-transport_validation.c:803
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
@@ -540,7 +653,7 @@
 msgstr "# PING-meddelanden i klartext skickade"
 
 #: src/core/gnunet-service-core_kx.c:1092
-#: src/transport/gnunet-service-transport_validation.c:985
+#: src/transport/gnunet-service-transport_validation.c:1026
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -599,803 +712,643 @@
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1541
-#: src/transport/gnunet-service-transport.c:578
-#: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/core/gnunet-service-core_kx.c:1541 src/hostlist/hostlist-server.c:555
+#: src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/transport/gnunet-service-transport.c:595
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/core/core_api.c:798
-msgid "Client was disconnected from core service, trying to reconnect.\n"
-msgstr ""
-
-#: src/vpn/gnunet-daemon-exit.c:1496
-msgid "Daemon to run to provide an IP exit node for the VPN"
-msgstr ""
-
-#: src/vpn/gnunet-daemon-vpn.c:1804
+#: src/core/gnunet-service-core_neighbours.c:163
 #, fuzzy
-msgid "help text"
-msgstr "hjälptext för -t"
+msgid "# sessions terminated by transport disconnect"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/util/getopt_helpers.c:84
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
+#: src/core/gnunet-service-core_neighbours.c:180
+#: src/core/gnunet-service-core_neighbours.c:342
+msgid "# neighbour entries allocated"
 msgstr ""
-"Argument som är obligatoriska för långa flaggor är också obligatoriska för "
-"korta flaggor.\n"
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
-
-#: src/util/common_logging.c:239 src/util/common_logging.c:890
-msgid "DEBUG"
-msgstr "FELSÖKNING"
-
-#: src/util/common_logging.c:241 src/util/common_logging.c:888
-msgid "INFO"
-msgstr "INFO"
-
-#: src/util/common_logging.c:243 src/util/common_logging.c:886
-msgid "WARNING"
-msgstr "VARNING"
-
-#: src/util/common_logging.c:245 src/util/common_logging.c:884
-msgid "ERROR"
-msgstr "FEL"
-
-#: src/util/common_logging.c:247 src/util/common_logging.c:892
-msgid "NONE"
+#: src/core/gnunet-service-core_neighbours.c:251
+msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/util/common_logging.c:610
-#, fuzzy, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/util/common_logging.c:725
+#: src/core/gnunet-service-core_neighbours.c:430
 #, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:893
-msgid "INVALID"
+#: src/core/gnunet-service-core_sessions.c:208
+#: src/core/gnunet-service-core_sessions.c:273
+msgid "# entries in session map"
 msgstr ""
 
-#: src/util/common_logging.c:975
-msgid "unknown address"
+#: src/core/gnunet-service-core_sessions.c:238
+msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/util/common_logging.c:1013
-msgid "invalid address"
+#: src/core/gnunet-service-core_sessions.c:414
+msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/util/plugin.c:89
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
+#: src/core/gnunet-service-core_typemap.c:110
+#: src/core/gnunet-service-core_typemap.c:121
+#, fuzzy
+msgid "# type maps received"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/util/plugin.c:146
-#, fuzzy, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
-msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
+#: src/core/gnunet-service-core_typemap.c:151
+msgid "# updates to my type map"
+msgstr ""
 
-#: src/util/plugin.c:219
-#, fuzzy, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/util/plugin.c:349
+#: src/datacache/datacache.c:118 src/datacache/datacache.c:255
+#: src/datastore/gnunet-service-datastore.c:854
 #, fuzzy
-msgid "Could not determine plugin installation path.\n"
-msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
+msgid "# bytes stored"
+msgstr "# byte krypterade"
 
-#: src/util/configuration.c:245
+#: src/datacache/datacache.c:144 src/datacache/datacache.c:151
+#: src/datastore/gnunet-service-datastore.c:1531
+#: src/datastore/gnunet-service-datastore.c:1542
 #, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
-msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/util/configuration.c:817
+#: src/datacache/datacache.c:183
 #, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
+msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/util/getopt.c:672
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
+#: src/datacache/datacache.c:191
+#, fuzzy, c-format
+msgid "Failed to load datacache plugin for `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/getopt.c:696
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
+#: src/datacache/datacache.c:281
+#, fuzzy
+msgid "# requests received"
+msgstr "# byte mottogs via TCP"
 
-#: src/util/getopt.c:701
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s: flagga \"%c%s\" tillåter inte ett argument\n"
+#: src/datacache/datacache.c:291
+msgid "# requests filtered by bloom filter"
+msgstr ""
 
-#: src/util/getopt.c:718 src/util/getopt.c:886
+#: src/datacache/plugin_datacache_mysql.c:103
+#: src/datacache/plugin_datacache_mysql.c:110
+#: src/datacache/plugin_datacache_mysql.c:517
+#: src/datacache/plugin_datacache_mysql.c:526
+#: src/datacache/plugin_datacache_mysql.c:598
+#: src/datacache/plugin_datacache_mysql.c:614
+#: src/datacache/plugin_datacache_sqlite.c:71
+#: src/datacache/plugin_datacache_sqlite.c:74
+#: src/datastore/plugin_datastore_mysql.c:139
+#: src/datastore/plugin_datastore_mysql.c:146
+#: src/datastore/plugin_datastore_mysql.c:613
+#: src/datastore/plugin_datastore_mysql.c:673
+#: src/datastore/plugin_datastore_mysql.c:685
+#: src/datastore/plugin_datastore_mysql.c:1362
+#: src/datastore/plugin_datastore_mysql.c:1376
+#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
+#: src/include/gnunet_common.h:514
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: flagga \"%s\" kräver ett argument\n"
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/getopt.c:747
+#: src/datacache/plugin_datacache_mysql.c:224
+#: src/datastore/plugin_datastore_mysql.c:316
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: okänd flagga \"--%s\"\n"
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 
-#: src/util/getopt.c:751
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: okänd flagga \"%c%s\"\n"
+#: src/datacache/plugin_datacache_mysql.c:230
+#: src/datastore/plugin_datastore_mysql.c:322
+#, fuzzy, c-format
+msgid "Could not access file `%s': %s\n"
+msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/util/getopt.c:776
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: otillåten flagga -- %c\n"
+#: src/datacache/plugin_datacache_mysql.c:979
+msgid "MySQL datacache running\n"
+msgstr ""
 
-#: src/util/getopt.c:778
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ogiltig flagga -- %c\n"
+#: src/datacache/plugin_datacache_postgres.c:79
+#: src/datastore/plugin_datastore_postgres.c:93
+#, fuzzy, c-format
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/getopt.c:806 src/util/getopt.c:934
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: flagga kräver ett argument -- %c\n"
-
-#: src/util/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: flagga \"-W %s\" är tvetydig\n"
-
-#: src/util/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
-
-#: src/util/getopt.c:1038
+#: src/datacache/plugin_datacache_postgres.c:149
 #, fuzzy, c-format
-msgid "Use %s to get a list of options.\n"
-msgstr "Använd --help för att få en lista på flaggor.\n"
+msgid "Unable to initialize Postgres: %s"
+msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/util/scheduler.c:870
-msgid "Looks like we're busy waiting...\n"
+#: src/datacache/plugin_datacache_postgres.c:499
+msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/util/scheduler.c:1000
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
+#: src/datacache/plugin_datacache_sqlite.c:424
+msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/util/connection.c:461
-#, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
-
-#: src/util/connection.c:476
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
+#: src/datacache/plugin_datacache_sqlite.c:457
+#: src/datastore/plugin_datastore_sqlite.c:414
+#: src/namestore/plugin_namestore_sqlite.c:381
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/util/connection.c:642
-#, fuzzy, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/util/connection.c:852 src/util/connection.c:1025
-#, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
-
-#: src/util/connection.c:862
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
-
-#: src/util/connection.c:1015
-#, fuzzy, c-format
-msgid "Attempt to connect to `%s' failed\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/util/connection.c:1528
-#, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
+#: src/datacache/plugin_datacache_template.c:121
+msgid "Template datacache running\n"
 msgstr ""
 
-#: src/util/connection.c:1564
-#, fuzzy, c-format
-msgid "Failed to send to `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+#: src/datastore/datastore_api.c:289
+#, fuzzy
+msgid "Failed to transmit request to drop database.\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/util/signal.c:80
-#, fuzzy, c-format
-msgid "signal (%d, %p) returned %d.\n"
-msgstr "Anrop till \"%s\" returnerade %d.\n"
-
-#: src/util/network.c:1204
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+#: src/datastore/datastore_api.c:372
+msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/util/os_installation.c:299
-#, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+#: src/datastore/datastore_api.c:418
+msgid "# queue overflows"
 msgstr ""
 
-#: src/util/os_installation.c:486
-#, fuzzy, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+#: src/datastore/datastore_api.c:445
+#, fuzzy
+msgid "# queue entries created"
+msgstr "# PING-meddelanden skapade"
 
-#: src/util/os_installation.c:492
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "\"%s\" %s misslyckades: %s\n"
-
-#: src/util/strings.c:143
-msgid "b"
-msgstr "b"
-
-#: src/util/strings.c:354
-#, c-format
-msgid "Character sets requested were `%s'->`%s'\n"
+#: src/datastore/datastore_api.c:465
+msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/util/strings.c:462
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr ""
+#: src/datastore/datastore_api.c:513
+#, fuzzy
+msgid "# datastore connections (re)created"
+msgstr "Nätverksanslutning"
 
-#: src/util/strings.c:554
-msgid "ms"
-msgstr "ms"
-
-#: src/util/strings.c:559
-msgid "eternity"
+#: src/datastore/datastore_api.c:540
+msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/util/strings.c:563
-msgid "s"
-msgstr "s"
+#: src/datastore/datastore_api.c:608
+#, fuzzy
+msgid "# transmission request failures"
+msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/util/strings.c:567
-msgid "m"
-msgstr "m"
+#: src/datastore/datastore_api.c:631
+#, fuzzy
+msgid "# bytes sent to datastore"
+msgstr "# byte krypterade"
 
-#: src/util/strings.c:571
-msgid "h"
-msgstr "h"
+#: src/datastore/datastore_api.c:772
+#, fuzzy
+msgid "Failed to receive status response from database."
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/util/strings.c:575
-msgid " days"
-msgstr " dagar"
-
-#: src/util/strings.c:599
-msgid "end of time"
+#: src/datastore/datastore_api.c:786
+msgid "Error reading response from datastore service"
 msgstr ""
 
-# drive = hard drive ?
-#: src/util/server.c:388
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+#, fuzzy
+msgid "Invalid error message received from datastore service"
+msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/util/server.c:397
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
+#: src/datastore/datastore_api.c:810
+#, fuzzy
+msgid "# status messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/util/server.c:402
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
+#: src/datastore/datastore_api.c:883
+msgid "# PUT requests executed"
+msgstr ""
 
-#: src/util/server.c:617
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+#: src/datastore/datastore_api.c:954
+msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/util/crypto_random.c:280
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
+#: src/datastore/datastore_api.c:1019
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/util/crypto_random.c:308
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
+#: src/datastore/datastore_api.c:1080
+msgid "# UPDATE requests executed"
+msgstr ""
 
-# drive = hard drive ?
-#: src/util/disk.c:479
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%S': %u\n"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+#: src/datastore/datastore_api.c:1148
+msgid "# REMOVE requests executed"
+msgstr ""
 
-#: src/util/disk.c:883
-#, fuzzy, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
+#: src/datastore/datastore_api.c:1193
+#, fuzzy
+msgid "Failed to receive response from database.\n"
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/util/disk.c:1235 src/util/service.c:1541
-#, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
+#: src/datastore/datastore_api.c:1253
+#, fuzzy
+msgid "# Results received"
+msgstr "# byte mottogs via TCP"
 
-#: src/util/disk.c:1553
-#, fuzzy, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
+#: src/datastore/datastore_api.c:1324
+msgid "# GET REPLICATION requests executed"
+msgstr ""
 
-#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
-#: src/util/service.c:207 src/util/service.c:214
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Ogiltigt format för IP: \"%s\"\n"
+#: src/datastore/datastore_api.c:1391
+msgid "# GET ZERO ANONYMITY requests executed"
+msgstr ""
 
-#: src/util/service.c:170
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
-
-#: src/util/service.c:263
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
-
-#: src/util/service.c:296
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Fel format \"%s\" för nätmask: %s\n"
-
-#: src/util/service.c:326
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Fel format \"%s\" för nätverk: %s\n"
-
-#: src/util/service.c:629
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
+#: src/datastore/datastore_api.c:1455
+msgid "# GET requests executed"
 msgstr ""
 
-#: src/util/service.c:634
-#, fuzzy, c-format
-msgid "Unknown address family %d\n"
-msgstr "Okänd operation \"%s\"\n"
+#: src/datastore/gnunet-service-datastore.c:351
+#, fuzzy
+msgid "# bytes expired"
+msgstr "# byte mottogs via TCP"
 
-#: src/util/service.c:641
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
+#: src/datastore/gnunet-service-datastore.c:426
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/util/service.c:685
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+#: src/datastore/gnunet-service-datastore.c:486
+msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/util/service.c:713
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+#: src/datastore/gnunet-service-datastore.c:640
+msgid "# results found"
 msgstr ""
 
-#: src/util/service.c:830
+#: src/datastore/gnunet-service-datastore.c:685
 #, c-format
 msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:2228
+#: src/datastore/gnunet-service-datastore.c:696
 #, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/util/service.c:880 src/util/client.c:707
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/service.c:900
-#, c-format
+#: src/datastore/gnunet-service-datastore.c:700
 msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/util/service.c:917
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+#: src/datastore/gnunet-service-datastore.c:706
+msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/util/service.c:947 src/transport/plugin_transport_http.c:1057
-#, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/util/service.c:964 src/transport/plugin_transport_http.c:1074
-#, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
-
-#: src/util/service.c:1152
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
+#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:765
+#: src/datastore/gnunet-service-datastore.c:986
+#: src/datastore/gnunet-service-datastore.c:1465
+msgid "# reserved"
 msgstr ""
 
-#: src/util/service.c:1203 src/util/service.c:1221
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
+#: src/datastore/gnunet-service-datastore.c:780
+msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/util/service.c:1248
+#: src/datastore/gnunet-service-datastore.c:868
 #, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/util/service.c:1403
-#, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "Fel vid %s:%d.\n"
+#: src/datastore/gnunet-service-datastore.c:1034
+#, fuzzy
+msgid "# GET requests received"
+msgstr "# byte mottogs via TCP"
 
-#: src/util/service.c:1436
-#, fuzzy, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
-
-#: src/util/service.c:1482
-msgid "Service process failed to initialize\n"
+#: src/datastore/gnunet-service-datastore.c:1048
+msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/util/service.c:1486
-msgid "Service process could not initialize server function\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1076
+#, fuzzy
+msgid "# UPDATE requests received"
+msgstr "# byte mottogs via TCP"
 
-#: src/util/service.c:1490
-msgid "Service process failed to report status\n"
+#: src/datastore/gnunet-service-datastore.c:1110
+msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/util/service.c:1542
-msgid "No such user"
+#: src/datastore/gnunet-service-datastore.c:1145
+msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/util/service.c:1555
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
+#: src/datastore/gnunet-service-datastore.c:1172
+#, fuzzy
+msgid "Content not found"
+msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/util/service.c:1618
-msgid "do daemonize (detach from terminal)"
+#: src/datastore/gnunet-service-datastore.c:1182
+msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:76
-msgid "Test GNUnet DNS resolver code."
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1216
+#, fuzzy
+msgid "# REMOVE requests received"
+msgstr "# byte mottogs via TCP"
 
-#: src/util/container_bloomfilter.c:507
+#: src/datastore/gnunet-service-datastore.c:1260
 #, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/util/os_priority.c:117
+#: src/datastore/gnunet-service-datastore.c:1323
 #, c-format
-msgid "Not installing a handler because $%s=%s\n"
+msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/util/resolver_api.c:202
+#: src/datastore/gnunet-service-datastore.c:1332
 #, fuzzy, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
-msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
+msgid "Failed to load datastore plugin for `%s'\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/resolver_api.c:221
+#: src/datastore/gnunet-service-datastore.c:1536
 #, fuzzy, c-format
-msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+msgid "# bytes used in file-sharing datastore `%s'"
+msgstr "# byte krypterade"
+
+#: src/datastore/gnunet-service-datastore.c:1547
+msgid "# quota"
 msgstr ""
-"Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
-"\".\n"
 
-#: src/util/resolver_api.c:358
+#: src/datastore/gnunet-service-datastore.c:1549
+msgid "# cache size"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1562
 #, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:362
+#: src/datastore/gnunet-service-datastore.c:1580
+#: src/datastore/gnunet-service-datastore.c:1596
 #, fuzzy, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/resolver_api.c:430
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
+#: src/datastore/gnunet-service-datastore.c:1626
+#, fuzzy
+msgid "Failed to initialize bloomfilter.\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/datastore/gnunet-service-datastore.c:1655
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:791
-#, c-format
-msgid "Resolver returns `%s'.\n"
+#: src/datastore/gnunet-service-datastore.c:1660
+msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:875
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
+#: src/datastore/gnunet-service-datastore.c:1663
+msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:880
+#: src/datastore/plugin_datastore_mysql.c:529
+#: src/datastore/plugin_datastore_mysql.c:1336
 #, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+msgid "Failed to prepare statement `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/resolver_api.c:912
-#, c-format
-msgid "Resolving our hostname `%s'\n"
+#: src/datastore/plugin_datastore_mysql.c:622
+#: src/datastore/plugin_datastore_mysql.c:1346
+#, fuzzy, c-format
+msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
+msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/datastore/plugin_datastore_mysql.c:1581
+msgid "Mysql database running\n"
 msgstr ""
 
-#: src/util/pseudonym.c:273
+#: src/datastore/plugin_datastore_postgres.c:173
 #, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Unable to initialize Postgres with configuration `%s': %s"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/pseudonym.c:337
-#, fuzzy
-msgid "no-name"
-msgstr "Visa namn"
+#: src/datastore/plugin_datastore_postgres.c:1017
+msgid "Postgres database running\n"
+msgstr ""
 
-#: src/util/gnunet-service-resolver.c:261
+#: src/datastore/plugin_datastore_sqlite.c:61
 #, fuzzy, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+msgid "`%s' failed at %s:%u with error: %s"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/gnunet-service-resolver.c:317
-#: src/util/gnunet-service-resolver.c:362
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
+#: src/datastore/plugin_datastore_sqlite.c:239
+#: src/namestore/plugin_namestore_sqlite.c:223
+#, fuzzy, c-format
+msgid "Option `%s' in section `%s' missing in configuration!\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#: src/datastore/plugin_datastore_sqlite.c:266
+#: src/namestore/plugin_namestore_sqlite.c:248
+#, fuzzy, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/datastore/plugin_datastore_sqlite.c:669
+msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:460
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
+#: src/datastore/plugin_datastore_sqlite.c:1159
+msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:508
+#: src/datastore/plugin_datastore_sqlite.c:1178
 #, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/util/bio.c:136 src/util/bio.c:142
-#, fuzzy, c-format
-msgid "Error reading `%s': %s"
-msgstr "Fel vid skapandet av användare"
+#: src/datastore/plugin_datastore_sqlite.c:1218
+#: src/namestore/plugin_namestore_sqlite.c:779
+msgid "Sqlite database running\n"
+msgstr ""
 
-#: src/util/bio.c:143
+#: src/datastore/plugin_datastore_template.c:241
+msgid "Template database running\n"
+msgstr ""
+
+#: src/dht/dht_api.c:280
 #, fuzzy
-msgid "End of file"
-msgstr "Läs in en konfigurationsfil"
+msgid "Failed to connect to the DHT service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/util/bio.c:195
-#, c-format
-msgid "Error reading length of string `%s'"
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
+#: src/gns/gnunet-gns-lookup.c:185
+msgid "the query key"
 msgstr ""
 
-#: src/util/bio.c:205
-#, c-format
-msgid "String `%s' longer than allowed (%u > %u)"
+#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:188
+msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/util/bio.c:250
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+#: src/dht/gnunet-dht-get.c:207 src/gns/gnunet-gns-lookup.c:191
+msgid "the type of data to look for"
 msgstr ""
 
-#: src/util/bio.c:264
-#, c-format
-msgid "Metadata `%s' failed to deserialize"
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
+#: src/gns/gnunet-gns-lookup.c:194
+msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/util/client.c:301
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
+#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
+#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
+#: src/gns/gnunet-gns-lookup.c:197 src/nse/gnunet-nse-profiler.c:908
+msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/util/client.c:309
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+#: src/dht/gnunet-dht-get.c:232
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/util/client.c:647
-msgid "Failure to transmit TEST request.\n"
+#: src/dht/gnunet-dht-put.c:100
+msgid "PUT request sent!\n"
 msgstr ""
 
-#: src/util/client.c:849
+#: src/dht/gnunet-dht-put.c:124
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:132
 #, fuzzy, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
+msgid "Could not connect to %s service!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/util/client.c:865
+#: src/dht/gnunet-dht-put.c:137
 #, fuzzy, c-format
-msgid "Failure to transmit request to service `%s'\n"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+msgid "Connected to %s service!\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/util/client.c:1133
-msgid "Could not submit request, not expecting to receive a response.\n"
+#: src/dht/gnunet-dht-put.c:152
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
-#, fuzzy, c-format
-msgid "Could not aquire lock on file `%s': %s...\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/util/crypto_rsa.c:623
-#, fuzzy
-msgid "Creating a new private key.  This may take a while.\n"
-msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
-
-#: src/util/crypto_rsa.c:641
-#, c-format
-msgid "I am host `%s'.  Stored new private key in `%s'.\n"
+#: src/dht/gnunet-dht-put.c:166
+msgid "the data to insert under the key"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
-msgid "This may be ok if someone is currently generating a hostkey.\n"
+#: src/dht/gnunet-dht-put.c:169
+msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
-#, c-format
-msgid ""
-"When trying to read hostkey file `%s' I found %u bytes but I need at least "
-"%u.\n"
+#: src/dht/gnunet-dht-put.c:175
+msgid "how many replicas to create"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
-#, fuzzy, c-format
-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
-msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
-
-#: src/util/crypto_rsa.c:738
-#, fuzzy, c-format
-msgid "I am host `%s'.  Read private key from `%s'.\n"
-msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
-
-#: src/util/crypto_rsa.c:959
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
+#: src/dht/gnunet-dht-put.c:178
+msgid "the type to insert data as"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:882 src/dht/gnunet-dht-get.c:213
-#: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:596
-#: src/fs/gnunet-download.c:263
-msgid "be verbose (print progress information)"
+#: src/dht/gnunet-dht-put.c:203
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:900
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:588
+#: src/testing/testing.c:2087 src/testing/testing.c:2121
 #, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "Kan inte tillgå tjänsten"
+msgid "Failed to connect to transport service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nse/gnunet-service-nse.c:938
-#, c-format
-msgid "Proof of work invalid: %llu!\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_clients.c:371
+#, fuzzy
+msgid "# GET requests from clients injected"
+msgstr "# byte mottogs via TCP"
 
-#: src/nse/gnunet-service-nse.c:1393 src/nse/gnunet-service-nse.c:1412
-#: src/nse/gnunet-service-nse.c:1433
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_clients.c:462
+#, fuzzy
+msgid "# PUT requests received from clients"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/nse/gnunet-service-nse.c:1400
+#: src/dht/gnunet-service-dht_clients.c:529
 #, fuzzy
-msgid "Invalid work requirement for NSE service. Exiting.\n"
-msgstr "Ogiltiga argument. Avslutar.\n"
+msgid "# GET requests received from clients"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/nse/gnunet-service-nse.c:1421
+#: src/dht/gnunet-service-dht_clients.c:624
 #, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+msgid "# GET STOP requests received from clients"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
-#, fuzzy, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Tillgängliga transport(er): %s\n"
+#: src/dht/gnunet-service-dht_clients.c:854
+msgid "# Key match, type mismatches in REPLY to CLIENT"
+msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
-msgid "# peers known"
+#: src/dht/gnunet-service-dht_clients.c:869
+msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/dht/gnunet-service-dht_clients.c:906
 #, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
-#, c-format
-msgid "Still no peers found in `%s'!\n"
+#: src/dht/gnunet-service-dht_clients.c:928
+#, fuzzy
+msgid "# RESULTS queued for clients"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#: src/dht/gnunet-service-dht_clients.c:979
+#: src/dht/gnunet-service-dht_clients.c:1022
+msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:258
-#, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
+#: src/dht/gnunet-service-dht_clients.c:989
+#, fuzzy
+msgid "Could not pass reply to client, message too big!\n"
+msgstr "Kunde inte skicka meddelande till gnunetd\n"
 
-#: src/peerinfo/peerinfo_api.c:279
+#: src/dht/gnunet-service-dht_datacache.c:93
 #, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+msgid "%s request received, but have no datacache!\n"
+msgstr "# byte mottagna av typen %d"
 
-#: src/peerinfo/peerinfo_api.c:435
-#, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+#: src/dht/gnunet-service-dht_datacache.c:103
+msgid "# ITEMS stored in datacache"
+msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
-#, fuzzy
-msgid "Received invalid message from `PEERINFO' service.\n"
-msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
+#: src/dht/gnunet-service-dht_datacache.c:209
+msgid "# Good RESULTS found in datacache"
+msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:523
-#, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+#: src/dht/gnunet-service-dht_datacache.c:220
+msgid "# Duplicate RESULTS found in datacache"
+msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:557
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+#: src/dht/gnunet-service-dht_datacache.c:226
+msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:424
-msgid "Sqlite datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:238
+msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/datacache.c:183
+#: src/dht/gnunet-service-dht_datacache.c:241
 #, c-format
-msgid "Loading `%s' datacache plugin\n"
+msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/datacache/datacache.c:191
-#, fuzzy, c-format
-msgid "Failed to load datacache plugin for `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/datacache/datacache.c:281
+#: src/dht/gnunet-service-dht_datacache.c:271
 #, fuzzy
-msgid "# requests received"
+msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
 
-#: src/datacache/datacache.c:291
-msgid "# requests filtered by bloom filter"
-msgstr ""
+#: src/dht/gnunet-service-dht_hello.c:82
+#, fuzzy
+msgid "# HELLOs obtained from peerinfo"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "Kunde inte initiera SQLite.\n"
-
-#: src/datacache/plugin_datacache_postgres.c:500
-msgid "Postgres datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_template.c:121
-msgid "Template datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_mysql.c:979
-msgid "MySQL datacache running\n"
-msgstr ""
-
 #: src/dht/gnunet-service-dht_neighbours.c:481
 msgid "# Preference updates given to core"
 msgstr ""
@@ -1493,449 +1446,350 @@
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/dht_api.c:282
+#: src/dht/gnunet-service-dht_nse.c:59
 #, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "# Network size estimates received"
+msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht.c:163
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/dht/gnunet-service-dht_routing.c:211
+msgid "# Good REPLIES matched against routing table"
+msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
-msgid "the query key"
+#: src/dht/gnunet-service-dht_routing.c:220
+msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204
-msgid "how many parallel requests (replicas) to create"
+#: src/dht/gnunet-service-dht_routing.c:226
+msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207
-msgid "the type of data to look for"
+#: src/dht/gnunet-service-dht_routing.c:236
+msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
-msgid "how long to execute this query before giving up?"
+#: src/dht/gnunet-service-dht_routing.c:314
+#: src/dht/gnunet-service-dht_routing.c:368
+msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:232
-msgid "Issue a GET request to the GNUnet DHT, prints results."
+#: src/dht/gnunet-service-dht_routing.c:324
+msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:371
-#, fuzzy
-msgid "# GET requests from clients injected"
-msgstr "# byte mottogs via TCP"
+#: src/dht/plugin_block_dht.c:124
+#, fuzzy, c-format
+msgid "Block not of type %u\n"
+msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:462
-#, fuzzy
-msgid "# PUT requests received from clients"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:529
-#, fuzzy
-msgid "# GET requests received from clients"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:624
-#, fuzzy
-msgid "# GET STOP requests received from clients"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:854
-msgid "# Key match, type mismatches in REPLY to CLIENT"
+#: src/dht/plugin_block_dht.c:131
+msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:869
-msgid "# Duplicate REPLIES to CLIENT request dropped"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:906
+#: src/dht/plugin_block_dht.c:140
 #, c-format
-msgid "Unsupported block type (%u) in request!\n"
+msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:928
-#, fuzzy
-msgid "# RESULTS queued for clients"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:979
-#: src/dht/gnunet-service-dht_clients.c:1022
-msgid "# REPLIES ignored for CLIENTS (no match)"
+#: src/dns/gnunet-dns-monitor.c:337
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
-#, fuzzy
-msgid "Could not pass reply to client, message too big!\n"
-msgstr "Kunde inte skicka meddelande till gnunetd\n"
-
-#: src/dht/gnunet-service-dht_nse.c:59
-#, fuzzy
-msgid "# Network size estimates received"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-dht-put.c:100
-msgid "PUT request sent!\n"
+#: src/dns/gnunet-dns-monitor.c:340
+msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
-msgid "Must provide KEY and DATA for DHT put!\n"
+#: src/dns/gnunet-dns-monitor.c:348
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:132
-#, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/dht/gnunet-dht-put.c:137
-#, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
-
-#: src/dht/gnunet-dht-put.c:152
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+#: src/dns/gnunet-dns-redirector.c:236
+msgid "set A records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:166
-msgid "the data to insert under the key"
+#: src/dns/gnunet-dns-redirector.c:239
+msgid "set AAAA records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:169
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/dns/gnunet-dns-redirector.c:247
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:175
-msgid "how many replicas to create"
-msgstr ""
+#: src/dns/gnunet-service-dns.c:480
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/dht/gnunet-dht-put.c:178
-msgid "the type to insert data as"
+#: src/dns/gnunet-service-dns.c:634
+msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:203
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+#: src/dns/gnunet-service-dns.c:818
+msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:211
-msgid "# Good REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1001
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Duplicate REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1046
+msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
-msgid "# Invalid REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1165
+msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:236
-msgid "# Unsupported REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1198
+msgid "Changing DNS reply according to client specifications\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:314
-#: src/dht/gnunet-service-dht_routing.c:368
-msgid "# Entries removed from routing table"
+#: src/dns/gnunet-service-dns.c:1279
+msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
-msgid "# Entries added to routing table"
+#: src/dns/gnunet-service-dns.c:1294
+msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:93
-#, fuzzy, c-format
-msgid "%s request received, but have no datacache!\n"
-msgstr "# byte mottagna av typen %d"
-
-#: src/dht/gnunet-service-dht_datacache.c:103
-msgid "# ITEMS stored in datacache"
+#: src/dns/gnunet-service-dns.c:1303
+#, c-format
+msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:209
-msgid "# Good RESULTS found in datacache"
+#: src/dns/gnunet-service-dns.c:1312
+msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:220
-msgid "# Duplicate RESULTS found in datacache"
-msgstr ""
+#: src/dns/gnunet-service-dns.c:1377
+#, fuzzy
+msgid "# DNS requests received via TUN interface"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_datacache.c:226
-msgid "# Invalid RESULTS found in datacache"
+#: src/dns/gnunet-service-dns.c:1461
+#, c-format
+msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
-msgid "# Unsupported RESULTS found in datacache"
+#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2671
+msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:241
-#, c-format
-msgid "Unsupported block type (%u) in local response!\n"
+#: src/dns/gnunet-service-dns.c:1567
+msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:271
+#: src/dv/dv_api.c:179
 #, fuzzy
-msgid "# GET requests given to datacache"
-msgstr "# byte mottogs via TCP"
+msgid "Failed to connect to the dv service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-service-dht_hello.c:82
-#, fuzzy
-msgid "# HELLOs obtained from peerinfo"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/arm/gnunet-arm.c:149
+#: src/dv/plugin_transport_dv.c:159
 #, fuzzy, c-format
-msgid "Service `%s' is unknown to ARM.\n"
-msgstr "\"%s\" är inte en fil.\n"
+msgid "%s Received message from %s of type %d, distance %u!\n"
+msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:154
-#, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "Tjänst borttagen.\n"
-
-#: src/arm/gnunet-arm.c:157
-#, fuzzy, c-format
-msgid "Service `%s' was already running.\n"
-msgstr "\"%s\" är inte en fil.\n"
-
-#: src/arm/gnunet-arm.c:162
-#, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "Tjänst borttagen.\n"
-
-#: src/arm/gnunet-arm.c:165
-#, fuzzy, c-format
-msgid "Service `%s' was already being stopped.\n"
-msgstr "Tjänst borttagen.\n"
-
-#: src/arm/gnunet-arm.c:169
-#, fuzzy, c-format
-msgid "Service `%s' was already not running.\n"
-msgstr "\"%s\" är inte en fil.\n"
-
-#: src/arm/gnunet-arm.c:173
-msgid "Request ignored as ARM is shutting down.\n"
+#: src/exit/gnunet-daemon-exit.c:508
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:177
+#: src/exit/gnunet-daemon-exit.c:563
 #, fuzzy
-msgid "Error communicating with ARM service.\n"
-msgstr "Skriv ut information om GNUnets motparter."
+msgid "# Bytes transmitted via mesh tunnels"
+msgstr "# byte skickade av typen %d"
 
-#: src/arm/gnunet-arm.c:181
-#, fuzzy
-msgid "Timeout communicating with ARM service.\n"
-msgstr "Skriv ut information om GNUnets motparter."
+#: src/exit/gnunet-daemon-exit.c:678 src/exit/gnunet-daemon-exit.c:2066
+#: src/exit/gnunet-daemon-exit.c:2316 src/vpn/gnunet-service-vpn.c:1388
+#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+msgid "# ICMPv4 packets dropped (type not allowed)"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:185
-#, fuzzy
-msgid "Operation failed.\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+#: src/exit/gnunet-daemon-exit.c:714 src/exit/gnunet-daemon-exit.c:2125
+#: src/exit/gnunet-daemon-exit.c:2375 src/vpn/gnunet-service-vpn.c:1444
+#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+msgid "# ICMPv6 packets dropped (type not allowed)"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:189
-msgid "Unknown response code from ARM.\n"
+#: src/exit/gnunet-daemon-exit.c:754
+msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
-#, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
+#: src/exit/gnunet-daemon-exit.c:761
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
-msgid "Fatal error initializing ARM API.\n"
+#: src/exit/gnunet-daemon-exit.c:838
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
-#, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+#: src/exit/gnunet-daemon-exit.c:913
+msgid "TCP Packet dropped, have no matching connection information\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:253
-#, fuzzy, c-format
-msgid "Failed to remove servicehome directory %s\n"
-msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+#: src/exit/gnunet-daemon-exit.c:966
+#, fuzzy
+msgid "# Packets received from TUN"
+msgstr "# byte mottagna via HTTP"
 
-#: src/arm/gnunet-arm.c:355
-msgid "stop all GNUnet services"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:980
+#, fuzzy
+msgid "# Bytes received from TUN"
+msgstr "# byte mottagna via HTTP"
 
-#: src/arm/gnunet-arm.c:357
-msgid "start a particular service"
+#: src/exit/gnunet-daemon-exit.c:1006
+msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
-msgid "stop a particular service"
+#: src/exit/gnunet-daemon-exit.c:1033
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
-msgid "start all GNUnet default services"
+#: src/exit/gnunet-daemon-exit.c:1079
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:364
-msgid "stop and start all GNUnet default services"
+#: src/exit/gnunet-daemon-exit.c:1087
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:367
-msgid "delete config file and directory on exit"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1468
+#, fuzzy
+msgid "# TCP packets sent via TUN"
+msgstr "# byte skickade via UDP"
 
-#: src/arm/gnunet-arm.c:369
-msgid "don't print status messages"
+#: src/exit/gnunet-daemon-exit.c:1568
+msgid "# TCP service creation requests received via mesh"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:372
-msgid "timeout for completing current operation"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1571 src/exit/gnunet-daemon-exit.c:1650
+#: src/exit/gnunet-daemon-exit.c:1760 src/exit/gnunet-daemon-exit.c:1990
+#: src/exit/gnunet-daemon-exit.c:2232 src/exit/gnunet-daemon-exit.c:2513
+#: src/exit/gnunet-daemon-exit.c:2613
+#, fuzzy
+msgid "# Bytes received from MESH"
+msgstr "# byte mottagna via HTTP"
 
-#: src/arm/gnunet-arm.c:383
-msgid "Control services and the Automated Restart Manager (ARM)"
+#: src/exit/gnunet-daemon-exit.c:1604 src/exit/gnunet-daemon-exit.c:2635
+#, c-format
+msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:959
+#: src/exit/gnunet-daemon-exit.c:1608
 #, fuzzy
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr "Misslyckades att starta samling.\n"
+msgid "# TCP requests dropped (no such service)"
+msgstr "# byte mottogs via TCP"
 
-#: src/arm/mockup-service.c:46
-msgid "Transmitting shutdown ACK.\n"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1653
+#, fuzzy
+msgid "# TCP IP-exit creation requests received via mesh"
+msgstr "# byte mottogs via TCP"
 
-#: src/arm/mockup-service.c:69
-msgid "Initiating shutdown as requested by client.\n"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1763
+#, fuzzy
+msgid "# TCP data requests received via mesh"
+msgstr "# byte mottogs via TCP"
 
-#: src/arm/gnunet-service-arm.c:320
-#, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "Misslyckades att starta samling.\n"
+#: src/exit/gnunet-daemon-exit.c:1777
+#, fuzzy
+msgid "# TCP DATA requests dropped (no session)"
+msgstr "# byte mottogs via TCP"
 
-#: src/arm/gnunet-service-arm.c:323
-#, fuzzy, c-format
-msgid "Starting service `%s'\n"
-msgstr "Startade samling \"%s\".\n"
+#: src/exit/gnunet-daemon-exit.c:1827
+#, fuzzy
+msgid "# ICMP packets sent via TUN"
+msgstr "# byte skickade via UDP"
 
-#: src/arm/gnunet-service-arm.c:349
+#: src/exit/gnunet-daemon-exit.c:1993
 #, fuzzy
-msgid "Could not send status result to client\n"
-msgstr "Kunde inte skicka begäran till gnunetd.\n"
+msgid "# ICMP IP-exit requests received via mesh"
+msgstr "# byte mottogs via TCP"
 
-#: src/arm/gnunet-service-arm.c:476
-#, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "Kunde inte skapa användarkonto:"
+#: src/exit/gnunet-daemon-exit.c:2235
+#, fuzzy
+msgid "# ICMP service requests received via mesh"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/arm/gnunet-service-arm.c:498
-#, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+#: src/exit/gnunet-daemon-exit.c:2301 src/vpn/gnunet-service-vpn.c:1378
+#: src/vpn/gnunet-service-vpn.c:1945
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:512
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:2360 src/vpn/gnunet-service-vpn.c:1414
+#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:620
-#, fuzzy, c-format
-msgid "Preparing to stop `%s'\n"
-msgstr "Startade samling \"%s\".\n"
+#: src/exit/gnunet-daemon-exit.c:2410
+#, fuzzy
+msgid "# UDP packets sent via TUN"
+msgstr "# byte skickade via UDP"
 
-#: src/arm/gnunet-service-arm.c:774
-#, fuzzy, c-format
-msgid "Restarting service `%s'.\n"
-msgstr "Startade samling \"%s\".\n"
+#: src/exit/gnunet-daemon-exit.c:2516
+#, fuzzy
+msgid "# UDP IP-exit requests received via mesh"
+msgstr "# byte mottogs via TCP"
 
-#: src/arm/gnunet-service-arm.c:869
-msgid "exit"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2616
+#, fuzzy
+msgid "# UDP service requests received via mesh"
+msgstr "# byte mottogs via TCP"
 
-#: src/arm/gnunet-service-arm.c:874
-msgid "signal"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:879
+#: src/exit/gnunet-daemon-exit.c:2639
 #, fuzzy
-msgid "unknown"
-msgstr "Okänt fel"
+msgid "# UDP requests dropped (no such service)"
+msgstr "# byte mottogs via TCP"
 
-#: src/arm/gnunet-service-arm.c:913
+#: src/exit/gnunet-daemon-exit.c:2879
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1052
-#, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not valid: %s\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/arm/gnunet-service-arm.c:1054
-msgid "option missing"
+#: src/exit/gnunet-daemon-exit.c:2893 src/exit/gnunet-daemon-exit.c:2905
+#, c-format
+msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1131
-#, fuzzy, c-format
-msgid "Starting default services `%s'\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/arm/gnunet-service-arm.c:1142
+#: src/exit/gnunet-daemon-exit.c:2916
 #, c-format
-msgid "Default service `%s' not configured correctly!\n"
+msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1156
+#: src/exit/gnunet-daemon-exit.c:3045
 msgid ""
-"No default services configured, GNUnet will not really start right now.\n"
+"This system does not support IPv4, will disable IPv4 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/arm/arm_api.c:187
-msgid "Failed to transmit shutdown request to client.\n"
+#: src/exit/gnunet-daemon-exit.c:3053
+msgid ""
+"This system does not support IPv6, will disable IPv6 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/arm/arm_api.c:378
-#, fuzzy, c-format
-msgid "Configuration failes to specify option `%s' in section `%s'!\n"
-msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
-
-#: src/arm/arm_api.c:392
-#, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/arm/arm_api.c:465
-#, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:3060
+msgid ""
+"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
+"ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/arm/arm_api.c:521
-#, c-format
-msgid "Requesting start of service `%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:3066
+msgid ""
+"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
+"ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/arm/arm_api.c:522
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:3072 src/pt/gnunet-daemon-pt.c:884
+msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:544
-#, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
+#: src/exit/gnunet-daemon-exit.c:3233
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/arm/arm_api.c:546
-#, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:579
-#, fuzzy, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
-msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
-
-#: src/arm/arm_api.c:652
-#, fuzzy, c-format
-msgid "Stopping service `%s' within %llu ms\n"
-msgstr "Inget svar mottaget inom %llums.\n"
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -1985,250 +1839,336 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/statistics/gnunet-service-statistics.c:207
+#: src/fs/fs_api.c:284
 #, fuzzy, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
-msgstr "Ladda ner filer från GNUnet."
+msgid "Could not open file `%s': %s"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/statistics/gnunet-service-statistics.c:263
+#: src/fs/fs_api.c:293
 #, fuzzy, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
-msgstr "Ladda ner filer från GNUnet."
+msgid "Could not read file `%s': %s"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/statistics/statistics_api.c:390
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/fs/fs_api.c:299
+#, c-format
+msgid "Short read reading from file `%s'!"
+msgstr ""
 
-#: src/statistics/gnunet-statistics.c:98
-#, fuzzy
-msgid "Failed to obtain statistics.\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
-
-#: src/statistics/gnunet-statistics.c:126 src/fs/gnunet-pseudonym.c:151
+#: src/fs/fs_api.c:877
 #, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
+msgid "Failed to resume publishing information `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/statistics/gnunet-statistics.c:164
-msgid "limit output to statistics for the given NAME"
+#: src/fs/fs_api.c:1334
+#, c-format
+msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:167
-msgid "make the value being set persistent"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:170
-msgid "limit output to the given SUBSYSTEM"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:173
-msgid "just print the statistics value"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:180
-msgid "Print statistics about GNUnet operations."
-msgstr "Skriv ut statistik om GNUnet-operationer."
-
-#: src/fs/gnunet-unindex.c:89
+#: src/fs/fs_api.c:1376
 #, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:96
+#: src/fs/fs_api.c:1392
 #, fuzzy, c-format
-msgid "Error unindexing: %s.\n"
-msgstr ""
-"\n"
-"Fel vid avindexering av fil: %s\n"
+msgid "Failed to resume publishing operation `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-unindex.c:101
-#, fuzzy
-msgid "Unindexing done.\n"
-msgstr "Avindexera filer."
-
-#: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
-#: src/fs/gnunet-publish.c:163 src/fs/gnunet-download.c:144
+#: src/fs/fs_api.c:2004
 #, c-format
-msgid "Unexpected status: %d\n"
+msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:131
+#: src/fs/fs_api.c:2014
 #, fuzzy, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
-msgstr "Du måste ange en och endast en fil att avindexera.\n"
+msgid "Failed to resume unindexing operation `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
-#: src/fs/gnunet-publish.c:417 src/fs/gnunet-download.c:203
+#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
 #, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+msgid "Failed to resume sub-download `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-unindex.c:148
-#, fuzzy
-msgid "Could not start unindex operation.\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+#: src/fs/fs_api.c:2156
+#, fuzzy, c-format
+msgid "Failed to resume sub-search `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-unindex.c:176
-msgid "Unindex a file that was previously indexed with gnunet-publish."
+#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#, c-format
+msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:165
-#, fuzzy, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
-
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
-#, fuzzy, c-format
-msgid "Option `%s' ignored\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:543
-msgid "set the desired LEVEL of sender-anonymity"
+#: src/fs/fs_api.c:2369
+#, c-format
+msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:272
-msgid "create or advertise namespace NAME"
+#: src/fs/fs_api.c:2615
+msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
-msgid "delete namespace NAME "
+#: src/fs/fs_api.c:2709
+#, c-format
+msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/fs_directory.c:210
+#, fuzzy
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: src/fs/fs_download.c:313
 msgid ""
-"add an additional keyword for the advertisment (this option can be specified "
-"multiple times)"
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:562
-msgid "set the meta-data for the given TYPE to the given VALUE"
+#: src/fs/fs_download.c:333
+msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
-msgid "print names of local namespaces"
-msgstr ""
+#: src/fs/fs_download.c:491 src/fs/fs_download.c:503
+#, fuzzy, c-format
+msgid "Failed to open file `%s' for writing"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-pseudonym.c:288
-msgid "use the given PRIORITY for the advertisments"
+#: src/fs/fs_download.c:877
+#, fuzzy, c-format
+msgid "Failed to create directory for recursive download of `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/fs/fs_download.c:963
+#, c-format
+msgid ""
+"Internal error or bogus download URI (expected %u bytes at depth %u and "
+"offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
-msgid "do not print names of remote namespaces"
+#: src/fs/fs_download.c:989
+msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:581
-msgid "set the desired replication LEVEL"
+#: src/fs/fs_download.c:1012
+#, fuzzy, c-format
+msgid "Download failed: could not open file `%s': %s\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/fs/fs_download.c:1024
+#, fuzzy, c-format
+msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/fs/fs_download.c:1033
+#, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/fs_download.c:1875
 #, fuzzy
-msgid "specify ID of the root of the namespace"
-msgstr "ange prioritet för innehållet"
+msgid "Invalid URI"
+msgstr "Ogiltiga argument: "
 
-#: src/fs/gnunet-pseudonym.c:300
-msgid "change rating of namespace ID by VALUE"
+#: src/fs/fs_getopt.c:191
+#, c-format
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:308
-msgid "Manage GNUnet pseudonyms."
-msgstr ""
+#: src/fs/fs_list_indexed.c:90
+#, fuzzy, c-format
+msgid "Failed to receive response for `%s' request from `%s' service.\n"
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/fs/fs_namespace.c:64 src/fs/fs_namespace.c:90
+#: src/fs/fs_list_indexed.c:113
 #, fuzzy, c-format
-msgid "Configuration fails to specify `%s' in section `%s'\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
+msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/fs/fs_namespace.c:119
+#: src/fs/fs_list_indexed.c:151
 #, fuzzy, c-format
-msgid "Failed to open `%s' for writing: %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "Failed to not connect to `%s' service.\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_namespace.c:141 src/fs/fs_namespace.c:229
+#: src/fs/fs_misc.c:126
 #, fuzzy, c-format
-msgid "Failed to write `%s': %s\n"
-msgstr "Fel vid %s:%d.\n"
+msgid "Did not find mime type `%s' in extension list.\n"
+msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/fs/fs_namespace.c:338
+#: src/fs/fs_namespace_advertise.c:150
 #, fuzzy
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: src/fs/fs_namespace.c:427 src/fs/fs_namespace.c:448
+#: src/fs/fs_namespace_advertise.c:238 src/fs/fs_namespace_advertise.c:259
 #, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_namespace.c:467
+#: src/fs/fs_namespace_advertise.c:278
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_namespace.c:510
+#: src/fs/fs_namespace.c:57 src/fs/fs_namespace.c:83
 #, fuzzy, c-format
+msgid "Configuration fails to specify `%s' in section `%s'\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/fs/fs_namespace.c:112
+#, fuzzy, c-format
+msgid "Failed to open `%s' for writing: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/fs/fs_namespace.c:134 src/fs/fs_namespace.c:222
+#, fuzzy, c-format
+msgid "Failed to write `%s': %s\n"
+msgstr "Fel vid %s:%d.\n"
+
+#: src/fs/fs_namespace.c:256
+#, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_namespace.c:612
+#: src/fs/fs_namespace.c:371
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:840 src/fs/fs_publish.c:1535
+#: src/fs/fs_namespace.c:588 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_namespace.c:884
+#: src/fs/fs_namespace.c:631
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/gnunet-search.c:111
-#, c-format
-msgid "Failed to write directory with search results to `%s'\n"
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:395
+#, fuzzy, c-format
+msgid "Publishing failed: %s"
 msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/gnunet-search.c:181
+#: src/fs/fs_publish.c:616 src/fs/fs_publish.c:633 src/fs/fs_publish.c:672
+#: src/fs/fs_publish.c:692 src/fs/fs_publish.c:717 src/fs/fs_publish.c:857
 #, fuzzy, c-format
-msgid "Error searching: %s.\n"
-msgstr "Fel vid lämning av DHT.\n"
+msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/fs/gnunet-search.c:231
+#: src/fs/fs_publish.c:618
+msgid "timeout on index-start request to `fs' service"
+msgstr ""
+
+#: src/fs/fs_publish.c:630
 #, fuzzy
-msgid "Could not create keyword URI from arguments.\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+msgid "unknown error"
+msgstr "Okänt fel"
 
-#: src/fs/gnunet-search.c:255
+#: src/fs/fs_publish.c:673
+msgid "failed to compute hash"
+msgstr ""
+
+#: src/fs/fs_publish.c:693
+msgid "filename too long"
+msgstr ""
+
+#: src/fs/fs_publish.c:718
 #, fuzzy
-msgid "Could not start searching.\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+msgid "could not connect to `fs' service"
+msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/gnunet-search.c:285 src/fs/gnunet-download.c:240
-msgid "set the desired LEVEL of receiver-anonymity"
+#: src/fs/fs_publish.c:741
+#, fuzzy, c-format
+msgid "Failed to get file identifiers for `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/fs/fs_publish.c:806
+#, fuzzy, c-format
+msgid "Recursive upload failed at `%s': %s"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/fs/fs_publish.c:812
+#, fuzzy, c-format
+msgid "Recursive upload failed: %s"
 msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/gnunet-search.c:288 src/fs/gnunet-download.c:246
-msgid "only search the local peer (no P2P network search)"
+#: src/fs/fs_publish.c:858
+msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/gnunet-search.c:291
-msgid "write search results to file starting with PREFIX"
+#: src/fs/fs_publish.c:1067
+#, c-format
+msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/gnunet-search.c:294
-msgid "automatically terminate search after VALUE ms"
+#: src/fs/fs_publish.c:1138
+#, c-format
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:301
-msgid "automatically terminate search after VALUE results are found"
+#: src/fs/fs_publish_ksk.c:258
+#, fuzzy
+msgid "Could not connect to datastore."
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/fs/fs_search.c:810
+#, c-format
+msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-search.c:308
-msgid "Search GNUnet for files that were published on GNUnet"
+#: src/fs/fs_test_lib.c:269
+#, fuzzy, c-format
+msgid "Failed to start daemon: %s\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/fs/fs_unindex.c:58
+msgid "Failed to find given position in file"
 msgstr ""
 
+#: src/fs/fs_unindex.c:63
+#, fuzzy
+msgid "Failed to read file"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/fs/fs_unindex.c:236
+msgid "Unexpected time for a response from `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:244
+msgid "Timeout waiting for `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:252
+#, fuzzy
+msgid "Invalid response from `fs' service."
+msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
+
+#: src/fs/fs_unindex.c:297
+#, fuzzy
+msgid "Failed to connect to FS service for unindexing."
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/fs/fs_unindex.c:332
+#, fuzzy
+msgid "Failed to connect to `datastore' service."
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/fs/fs_unindex.c:345
+#, fuzzy
+msgid "Failed to open file for unindexing."
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/fs/fs_unindex.c:379
+#, fuzzy
+msgid "Failed to compute hash of file."
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
 #: src/fs/fs_uri.c:220
 #, c-format
 msgid "`%' must be followed by HEX number"
@@ -2302,374 +2242,454 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:118
+#: src/fs/gnunet-directory.c:49
 #, c-format
-msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
+msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:126
+#: src/fs/gnunet-directory.c:94
 #, fuzzy, c-format
-msgid "Error publishing: %s.\n"
-msgstr "Fel vid nedladdning: %s\n"
+msgid "Directory `%s' meta data:\n"
+msgstr "==> Katalog \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:137
-#, c-format
-msgid "Publishing `%s' done.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:141
+#: src/fs/gnunet-directory.c:97
 #, fuzzy, c-format
-msgid "URI is `%s'.\n"
-msgstr "Jag är ändpunkt \"%s\".\n"
+msgid "Directory `%s' contents:\n"
+msgstr "==> Katalog \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:160
+#: src/fs/gnunet-directory.c:132
 #, fuzzy
-msgid "Cleanup after abort complete.\n"
-msgstr "\"%s\" uppstart klar.\n"
+msgid "You must specify a filename to inspect.\n"
+msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/fs/gnunet-publish.c:272
+#: src/fs/gnunet-directory.c:145
 #, fuzzy, c-format
-msgid "Meta data for file `%s' (%s)\n"
-msgstr "Uppdaterar data för modul \"%s\"\n"
+msgid "Failed to read directory `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:274
+#: src/fs/gnunet-directory.c:154
 #, fuzzy, c-format
-msgid "Keywords for file `%s' (%s)\n"
-msgstr "Nyckelord för fil \"%s\":\n"
+msgid "`%s' is not a GNUnet directory\n"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/gnunet-publish.c:325
+#: src/fs/gnunet-directory.c:179
+#, fuzzy
+msgid "Display contents of a GNUnet directory"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: src/fs/gnunet-download.c:100
 #, fuzzy, c-format
-msgid "Failed to create namespace `%s'\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+msgid "Starting download `%s'.\n"
+msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:367
+#: src/fs/gnunet-download.c:109
+#, fuzzy
+msgid "<unknown time>"
+msgstr "Okänt fel"
+
+#: src/fs/gnunet-download.c:118
 #, c-format
-msgid "Cannot extract metadata from a URI!\n"
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:374
+#: src/fs/gnunet-download.c:128
 #, fuzzy, c-format
-msgid "You must specify one and only one filename for insertion.\n"
-msgstr "Du måste ange en och endast en fil att avindexera.\n"
+msgid "Error downloading: %s.\n"
+msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-publish.c:380
+#: src/fs/gnunet-download.c:136
 #, fuzzy, c-format
-msgid "You must NOT specify an URI and a filename.\n"
-msgstr "Du måste ange en och endast en fil att avindexera.\n"
+msgid "Downloading `%s' done (%s/s).\n"
+msgstr "Uppladdning vägrades!"
 
-#: src/fs/gnunet-publish.c:388
-#, fuzzy, c-format
-msgid "Option `%s' is required when using option `%s'.\n"
-msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
-
-#: src/fs/gnunet-publish.c:398 src/fs/gnunet-publish.c:405
-#: src/transport/gnunet-transport.c:503
+#: src/fs/gnunet-download.c:151 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
+msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:427
-#, fuzzy, c-format
-msgid "Could not create namespace `%s'\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+#: src/fs/gnunet-download.c:176
+#, fuzzy
+msgid "You need to specify a URI argument.\n"
+msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:439 src/fs/gnunet-download.c:175
+#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/gnunet-publish.c:472
-#, fuzzy, c-format
-msgid "Could not access file: %s\n"
-msgstr "Kunde inte köra \"%s\": %s\n"
+#: src/fs/gnunet-download.c:189
+msgid "Only CHK or LOC URIs supported.\n"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-download.c:196
+msgid "Target filename must be specified.\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
-msgid "Could not publish `%s': %s\n"
-msgstr "Kunde inte köra \"%s\": %s\n"
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:520
-#, fuzzy
-msgid "Could not start publishing.\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+#: src/fs/gnunet-download.c:247 src/fs/gnunet-search.c:285
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:547
-msgid "disable adding the creation time to the metadata of the uploaded file"
+#: src/fs/gnunet-download.c:250
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:550
-msgid "do not use libextractor to add keywords or metadata"
+#: src/fs/gnunet-download.c:253 src/fs/gnunet-search.c:288
+msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:554
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
+#: src/fs/gnunet-download.c:256
+msgid "write the file to FILENAME"
+msgstr "skriv filen till FILNAMN"
+
+#: src/fs/gnunet-download.c:260
+msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:558
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
+#: src/fs/gnunet-download.c:264
+msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-download.c:267
+msgid "download a GNUnet directory recursively"
+msgstr "hämta en GNUnet-katalog rekursivt"
+
+#: src/fs/gnunet-download.c:277
 msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:570
-msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
+#: src/fs/gnunet-fs.c:117
+msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:574
-msgid "specify the priority of the content"
-msgstr "ange prioritet för innehållet"
+#: src/fs/gnunet-fs.c:124
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Visa alla alternativ"
 
-#: src/fs/gnunet-publish.c:578
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
+#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/fs/gnunet-pseudonym.c:165
+#, fuzzy, c-format
+msgid "Namespace `%s' unknown.\n"
+msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
+
+#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
+#: src/fs/gnunet-pseudonym.c:249
+#, fuzzy, c-format
+msgid "Option `%s' ignored\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:584
-msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
+#: src/fs/gnunet-pseudonym.c:272
+msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:588
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
+#: src/fs/gnunet-pseudonym.c:275
+msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-pseudonym.c:278
 msgid ""
-"URI to be published (can be used instead of passing a file to add keywords "
-"to the file with the respective URI)"
+"add an additional keyword for the advertisment (this option can be specified "
+"multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:605
-msgid "Publish a file or directory on GNUnet"
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/fs_search.c:810
-#, c-format
-msgid "Got result with unknown block type `%d', ignoring"
+#: src/fs/gnunet-pseudonym.c:285
+msgid "print names of local namespaces"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
-#: src/fs/gnunet-service-fs_lc.c:490
-#, fuzzy
-msgid "# client searches active"
-msgstr "# klartext PONG-meddelanden mottagna"
+#: src/fs/gnunet-pseudonym.c:288
+msgid "use the given PRIORITY for the advertisments"
+msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:254
-#, fuzzy
-msgid "# replies received for local clients"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
+#: src/fs/gnunet-pseudonym.c:291
+msgid "do not print names of remote namespaces"
+msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:319
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:297
 #, fuzzy
-msgid "# client searches received"
-msgstr "# klartext PONG-meddelanden mottagna"
+msgid "specify ID of the root of the namespace"
+msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-service-fs_lc.c:358
-msgid "# client searches updated (merged content seen list)"
+#: src/fs/gnunet-pseudonym.c:300
+msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
-#, fuzzy
-msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
-msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+#: src/fs/gnunet-pseudonym.c:308
+msgid "Manage GNUnet pseudonyms."
+msgstr ""
 
-#: src/fs/fs_misc.c:126
+#: src/fs/gnunet-publish.c:147
+#, c-format
+msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:155
 #, fuzzy, c-format
-msgid "Did not find mime type `%s' in extension list.\n"
-msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+msgid "Error publishing: %s.\n"
+msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-directory.c:49
+#: src/fs/gnunet-publish.c:165
 #, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
+#: src/fs/gnunet-publish.c:169
 #, fuzzy, c-format
-msgid "Directory `%s' meta data:\n"
-msgstr "==> Katalog \"%s\":\n"
+msgid "URI is `%s'.\n"
+msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/fs/gnunet-directory.c:97
+#: src/fs/gnunet-publish.c:187
+#, fuzzy
+msgid "Cleanup after abort complete.\n"
+msgstr "\"%s\" uppstart klar.\n"
+
+#: src/fs/gnunet-publish.c:299
 #, fuzzy, c-format
-msgid "Directory `%s' contents:\n"
-msgstr "==> Katalog \"%s\":\n"
+msgid "Meta data for file `%s' (%s)\n"
+msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-directory.c:132
-#, fuzzy
-msgid "You must specify a filename to inspect."
-msgstr "Du måste ange en lista av filer att lägga in.\n"
+#: src/fs/gnunet-publish.c:301
+#, fuzzy, c-format
+msgid "Keywords for file `%s' (%s)\n"
+msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-publish.c:352
 #, fuzzy, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Failed to create namespace `%s'\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-directory.c:176
+#: src/fs/gnunet-publish.c:427
 #, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+msgid "Could not publish\n"
+msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_pr.c:287
+#: src/fs/gnunet-publish.c:454
 #, fuzzy
-msgid "# Pending requests created"
-msgstr "# byte mottogs via TCP"
+msgid "Could not start publishing.\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:623
-msgid "# Pending requests active"
+#: src/fs/gnunet-publish.c:485
+#, fuzzy, c-format
+msgid "Scanning directory `%s'.\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/fs/gnunet-publish.c:487
+#, fuzzy, c-format
+msgid "Scanning file `%s'.\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/fs/gnunet-publish.c:492
+#, c-format
+msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:787
+#: src/fs/gnunet-publish.c:497
 #, fuzzy
-msgid "# replies received and matched"
-msgstr "# byte mottagna av typen %d"
+msgid "Preprocessing complete.\n"
+msgstr "Nedstängning klar.\n"
 
-#: src/fs/gnunet-service-fs_pr.c:814
-msgid "# duplicate replies discarded (bloomfilter)"
+#: src/fs/gnunet-publish.c:501
+#, fuzzy, c-format
+msgid "Extracting meta data from file `%s' complete.\n"
+msgstr "Uppdaterar data för modul \"%s\"\n"
+
+#: src/fs/gnunet-publish.c:505
+msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:830
+#: src/fs/gnunet-publish.c:512
+#, fuzzy
+msgid "Internal error scanning directory.\n"
+msgstr "=\tFel vid läsning av katalog.\n"
+
+#: src/fs/gnunet-publish.c:546
 #, c-format
-msgid "Unsupported block type %u\n"
+msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:845
-msgid "# results found locally"
-msgstr ""
+#: src/fs/gnunet-publish.c:553
+#, fuzzy, c-format
+msgid "You must specify one and only one filename for insertion.\n"
+msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-service-fs_pr.c:965
-msgid "# Datastore `PUT' failures"
+#: src/fs/gnunet-publish.c:559
+#, fuzzy, c-format
+msgid "You must NOT specify an URI and a filename.\n"
+msgstr "Du måste ange en och endast en fil att avindexera.\n"
+
+#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#, fuzzy, c-format
+msgid "Option `%s' is required when using option `%s'.\n"
+msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
+
+#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
+#: src/transport/gnunet-transport.c:530
+#, c-format
+msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:992
-#, fuzzy
-msgid "# storage requests dropped due to high load"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+#: src/fs/gnunet-publish.c:606
+#, fuzzy, c-format
+msgid "Could not create namespace `%s'\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1027
-#, fuzzy
-msgid "# Replies received from DHT"
-msgstr "# byte mottagna via HTTP"
+#: src/fs/gnunet-publish.c:639
+#, fuzzy, c-format
+msgid "Failed to access `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1120
-#, c-format
-msgid "Datastore lookup already took %llu ms!\n"
+#: src/fs/gnunet-publish.c:651
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1141
-#, c-format
-msgid "On-demand lookup already took %llu ms!\n"
+#: src/fs/gnunet-publish.c:676
+msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
-msgid "# Datastore lookups concluded (no results)"
+#: src/fs/gnunet-publish.c:679
+msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1202
-msgid "# Datastore lookups concluded (seen all)"
+#: src/fs/gnunet-publish.c:683
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
-msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
+#: src/fs/gnunet-publish.c:687
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1227
-msgid "# requested DBLOCK or IBLOCK not found"
+#: src/fs/gnunet-publish.c:694
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
-msgid "# on-demand blocks matched requests"
+#: src/fs/gnunet-publish.c:699
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1257
-msgid "# on-demand lookups performed successfully"
+#: src/fs/gnunet-publish.c:703
+msgid "specify the priority of the content"
+msgstr "ange prioritet för innehållet"
+
+#: src/fs/gnunet-publish.c:707
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
-msgid "# on-demand lookups failed"
+#: src/fs/gnunet-publish.c:713
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1289 src/fs/gnunet-service-fs_pr.c:1329
-#: src/fs/gnunet-service-fs_pr.c:1469
-msgid "# Datastore lookups concluded (error queueing)"
+#: src/fs/gnunet-publish.c:717
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1347
-msgid "# Datastore lookups concluded (found last result)"
+#: src/fs/gnunet-publish.c:721
+msgid ""
+"URI to be published (can be used instead of passing a file to add keywords "
+"to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1360
-msgid "# Datastore lookups concluded (load too high)"
+#: src/fs/gnunet-publish.c:736
+msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1446
-msgid "# Datastore lookups initiated"
+#: src/fs/gnunet-search.c:111
+#, c-format
+msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1530
-#, fuzzy
-msgid "# GAP PUT messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/fs/gnunet-service-fs_pr.c:1629 src/fs/gnunet-service-fs_pr.c:1638
+#: src/fs/gnunet-search.c:181
 #, fuzzy, c-format
-msgid "Configuration fails to specify `%s', assuming default value."
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
+msgid "Error searching: %s.\n"
+msgstr "Fel vid lämning av DHT.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:265
-msgid "# average retransmission delay (ms)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:394
+#: src/fs/gnunet-search.c:231
 #, fuzzy
-msgid "# transmission failed (core has no bandwidth)"
-msgstr "Ingen transport av typ %d är känd.\n"
+msgid "Could not create keyword URI from arguments.\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-service-fs_pe.c:425
+#: src/fs/gnunet-search.c:255
 #, fuzzy
-msgid "# query messages sent to other peers"
-msgstr "# byte skickade av typen %d"
+msgid "Could not start searching.\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-service-fs_pe.c:478
-msgid "# delay heap timeout"
+#: src/fs/gnunet-search.c:291
+msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:485
-msgid "# query plans executed"
+#: src/fs/gnunet-search.c:294
+msgid "automatically terminate search after VALUE ms"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:549
-#, fuzzy
-msgid "# requests merged"
-msgstr "# byte mottogs via TCP"
+#: src/fs/gnunet-search.c:301
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:555
-#, fuzzy
-msgid "# requests refreshed"
-msgstr "# byte mottogs via TCP"
+#: src/fs/gnunet-search.c:308
+msgid "Search GNUnet for files that were published on GNUnet"
+msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:608 src/fs/gnunet-service-fs_pe.c:694
-#: src/fs/gnunet-service-fs_pe.c:736
-msgid "# query plan entries"
+#: src/fs/gnunet-service-fs.c:240
+msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1544
-#: src/transport/gnunet-service-transport_neighbours.c:936
-#: src/transport/gnunet-service-transport_neighbours.c:1263
-#: src/transport/gnunet-service-transport_neighbours.c:1735
-#: src/transport/gnunet-service-transport_neighbours.c:2369
-#: src/transport/gnunet-service-transport_neighbours.c:2437
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
+msgid "# Loopback routes suppressed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:583 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/topology/gnunet-daemon-topology.c:1290
+#: src/topology/gnunet-daemon-topology.c:1297
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' service.\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1546
 #: src/topology/gnunet-daemon-topology.c:654
 #: src/topology/gnunet-daemon-topology.c:756
+#: src/transport/gnunet-service-transport_neighbours.c:960
+#: src/transport/gnunet-service-transport_neighbours.c:1289
+#: src/transport/gnunet-service-transport_neighbours.c:1841
+#: src/transport/gnunet-service-transport_neighbours.c:2499
+#: src/transport/gnunet-service-transport_neighbours.c:2566
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
@@ -2693,7 +2713,7 @@
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1334
+#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1336
 msgid "# P2P searches active"
 msgstr ""
 
@@ -2701,73 +2721,66 @@
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:909
+#: src/fs/gnunet-service-fs_cp.c:911
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:919
+#: src/fs/gnunet-service-fs_cp.c:921
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:933
+#: src/fs/gnunet-service-fs_cp.c:935
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:971
+#: src/fs/gnunet-service-fs_cp.c:973
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1038
+#: src/fs/gnunet-service-fs_cp.c:1040
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1064
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1072
+#: src/fs/gnunet-service-fs_cp.c:1074
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1151
+#: src/fs/gnunet-service-fs_cp.c:1153
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1185
+#: src/fs/gnunet-service-fs_cp.c:1187
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1209
+#: src/fs/gnunet-service-fs_cp.c:1211
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1275
+#: src/fs/gnunet-service-fs_cp.c:1277
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1303
+#: src/fs/gnunet-service-fs_cp.c:1305
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1332
+#: src/fs/gnunet-service-fs_cp.c:1334
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1699
+#: src/fs/gnunet-service-fs_cp.c:1701
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_push.c:653
-#, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
-msgstr ""
-
 #: src/fs/gnunet-service-fs_indexing.c:113
 #: src/fs/gnunet-service-fs_indexing.c:163
 #, fuzzy, c-format
@@ -2821,1067 +2834,1271 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/fs/fs_list_indexed.c:90
-#, fuzzy, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
+#: src/fs/gnunet-service-fs_lc.c:494
+#, fuzzy
+msgid "# client searches active"
+msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/fs_list_indexed.c:117
-#, fuzzy, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+#: src/fs/gnunet-service-fs_lc.c:256
+#, fuzzy
+msgid "# replies received for local clients"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/fs/fs_list_indexed.c:164
-#, fuzzy, c-format
-msgid "Failed to not connect to `%s' service.\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+#: src/fs/gnunet-service-fs_lc.c:323
+#, fuzzy
+msgid "# client searches received"
+msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/fs_unindex.c:58
-msgid "Failed to find given position in file"
+#: src/fs/gnunet-service-fs_lc.c:362
+msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/gnunet-service-fs_pe.c:265
+msgid "# average retransmission delay (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:394
 #, fuzzy
-msgid "Failed to read file"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "# transmission failed (core has no bandwidth)"
+msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/fs/fs_unindex.c:236
-msgid "Unexpected time for a response from `fs' service."
+#: src/fs/gnunet-service-fs_pe.c:425
+#, fuzzy
+msgid "# query messages sent to other peers"
+msgstr "# byte skickade av typen %d"
+
+#: src/fs/gnunet-service-fs_pe.c:478
+msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/fs_unindex.c:244
-msgid "Timeout waiting for `fs' service."
+#: src/fs/gnunet-service-fs_pe.c:485
+msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/fs_unindex.c:252
+#: src/fs/gnunet-service-fs_pe.c:549
 #, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
+msgid "# requests merged"
+msgstr "# byte mottogs via TCP"
 
-#: src/fs/fs_unindex.c:297
+#: src/fs/gnunet-service-fs_pe.c:555
 #, fuzzy
-msgid "Failed to connect to FS service for unindexing."
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "# requests refreshed"
+msgstr "# byte mottogs via TCP"
 
-#: src/fs/fs_unindex.c:332
-#, fuzzy
-msgid "Failed to connect to `datastore' service."
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+#: src/fs/gnunet-service-fs_pe.c:608 src/fs/gnunet-service-fs_pe.c:694
+#: src/fs/gnunet-service-fs_pe.c:761
+msgid "# query plan entries"
+msgstr ""
 
-#: src/fs/fs_unindex.c:345
+#: src/fs/gnunet-service-fs_pr.c:287
 #, fuzzy
-msgid "Failed to open file for unindexing."
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "# Pending requests created"
+msgstr "# byte mottogs via TCP"
 
-#: src/fs/fs_unindex.c:379
+#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:622
+msgid "# Pending requests active"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:787
 #, fuzzy
-msgid "Failed to compute hash of file."
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "# replies received and matched"
+msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-download.c:100
-#, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "Startade samling \"%s\".\n"
+#: src/fs/gnunet-service-fs_pr.c:816
+msgid "# duplicate replies discarded (bloomfilter)"
+msgstr ""
 
-#: src/fs/gnunet-download.c:112
+#: src/fs/gnunet-service-fs_pr.c:832
 #, c-format
-msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
+msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:121
-#, fuzzy, c-format
-msgid "Error downloading: %s.\n"
-msgstr "Fel vid nedladdning: %s\n"
+#: src/fs/gnunet-service-fs_pr.c:847
+msgid "# results found locally"
+msgstr ""
 
-#: src/fs/gnunet-download.c:129
-#, fuzzy, c-format
-msgid "Downloading `%s' done (%s/s).\n"
-msgstr "Uppladdning vägrades!"
+#: src/fs/gnunet-service-fs_pr.c:969
+msgid "# Datastore `PUT' failures"
+msgstr ""
 
-#: src/fs/gnunet-download.c:169
+#: src/fs/gnunet-service-fs_pr.c:996
 #, fuzzy
-msgid "You need to specify a URI argument.\n"
-msgstr "Du måste ange en och endast en fil att avindexera.\n"
+msgid "# storage requests dropped due to high load"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-download.c:182
-msgid "Only CHK or LOC URIs supported.\n"
+#: src/fs/gnunet-service-fs_pr.c:1031
+#, fuzzy
+msgid "# Replies received from DHT"
+msgstr "# byte mottagna via HTTP"
+
+#: src/fs/gnunet-service-fs_pr.c:1124
+#, c-format
+msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
-msgid "Target filename must be specified.\n"
+#: src/fs/gnunet-service-fs_pr.c:1145
+#, c-format
+msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:243
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
+#: src/fs/gnunet-service-fs_pr.c:1192
+msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:249
-msgid "write the file to FILENAME"
-msgstr "skriv filen till FILNAMN"
+#: src/fs/gnunet-service-fs_pr.c:1206
+msgid "# Datastore lookups concluded (seen all)"
+msgstr ""
 
-#: src/fs/gnunet-download.c:253
-msgid "set the maximum number of parallel downloads that is allowed"
+#: src/fs/gnunet-service-fs_pr.c:1215
+msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
-msgid "set the maximum number of parallel requests for blocks that is allowed"
+#: src/fs/gnunet-service-fs_pr.c:1231
+msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-download.c:260
-msgid "download a GNUnet directory recursively"
-msgstr "hämta en GNUnet-katalog rekursivt"
+#: src/fs/gnunet-service-fs_pr.c:1248
+msgid "# on-demand blocks matched requests"
+msgstr ""
 
-#: src/fs/gnunet-download.c:270
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+#: src/fs/gnunet-service-fs_pr.c:1261
+msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/fs_getopt.c:191
+#: src/fs/gnunet-service-fs_pr.c:1266
+msgid "# on-demand lookups failed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1293 src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1473
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1351
+msgid "# Datastore lookups concluded (found last result)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1364
+msgid "# Datastore lookups concluded (load too high)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1450
+msgid "# Datastore lookups initiated"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1534
+#, fuzzy
+msgid "# GAP PUT messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/fs/gnunet-service-fs_pr.c:1633 src/fs/gnunet-service-fs_pr.c:1642
+#, fuzzy, c-format
+msgid "Configuration fails to specify `%s', assuming default value."
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+"Invalid value specified for option `%s' in section `%s', content pushing "
+"disabled\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:150 src/fs/fs_publish.c:421
+#: src/fs/gnunet-unindex.c:89
+#, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:96
 #, fuzzy, c-format
-msgid "Publishing failed: %s"
+msgid "Error unindexing: %s.\n"
 msgstr ""
 "\n"
-"Fel vid uppladdning av fil: %s\n"
+"Fel vid avindexering av fil: %s\n"
 
-#: src/fs/fs_publish.c:658 src/fs/fs_publish.c:675 src/fs/fs_publish.c:714
-#: src/fs/fs_publish.c:734 src/fs/fs_publish.c:761 src/fs/fs_publish.c:909
+#: src/fs/gnunet-unindex.c:101
+#, fuzzy
+msgid "Unindexing done.\n"
+msgstr "Avindexera filer."
+
+#: src/fs/gnunet-unindex.c:131
 #, fuzzy, c-format
-msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
-msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
+msgid "You must specify one and only one filename for unindexing.\n"
+msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/fs_publish.c:660
-msgid "timeout on index-start request to `fs' service"
-msgstr ""
-
-#: src/fs/fs_publish.c:672
+#: src/fs/gnunet-unindex.c:148
 #, fuzzy
-msgid "unknown error"
-msgstr "Okänt fel"
+msgid "Could not start unindex operation.\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/fs/fs_publish.c:715
-msgid "failed to compute hash"
+#: src/fs/gnunet-unindex.c:176
+msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/fs_publish.c:735
-msgid "filename too long"
+#: src/fs/plugin_block_fs.c:131
+msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:762
+#: src/gns/gns_api.c:221
 #, fuzzy
-msgid "could not connect to `fs' service"
-msgstr "Kunde inte ansluta till gnunetd.\n"
+msgid "Failed to connect to the GNS service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:786
-#, fuzzy, c-format
-msgid "Failed to get file identifiers for `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/gns/gnunet-gns-lookup.c:216
+msgid "Issue a request to the GNUnet Naming System, prints results."
+msgstr ""
 
-#: src/fs/fs_publish.c:856
-#, fuzzy, c-format
-msgid "Recursive upload failed at `%s': %s"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+#: src/hostlist/gnunet-daemon-hostlist.c:264
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
+msgstr ""
 
-#: src/fs/fs_publish.c:862
-#, fuzzy, c-format
-msgid "Recursive upload failed: %s"
+#: src/hostlist/gnunet-daemon-hostlist.c:317
+msgid "advertise our hostlist to other peers"
 msgstr ""
-"\n"
-"Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:910
-msgid "needs to be an actual file"
+#: src/hostlist/gnunet-daemon-hostlist.c:322
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
 msgstr ""
 
-#: src/fs/fs_publish.c:1092
-#, c-format
-msgid "Insufficient space for publishing: %s"
+#: src/hostlist/gnunet-daemon-hostlist.c:325
+msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/fs/fs_publish.c:1163
-#, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
+#: src/hostlist/gnunet-daemon-hostlist.c:329
+msgid "provide a hostlist server"
 msgstr ""
 
-#: src/fs/fs_publish.c:1499
-#, fuzzy
-msgid "Could not connect to datastore."
-msgstr "Kunde inte ansluta till gnunetd.\n"
+#: src/hostlist/gnunet-daemon-hostlist.c:341
+msgid "GNUnet hostlist server and client"
+msgstr ""
 
-#: src/fs/fs_api.c:284
-#, fuzzy, c-format
-msgid "Could not open file `%s': %s"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+#: src/hostlist/hostlist-client.c:286
+msgid "# bytes downloaded from hostlist servers"
+msgstr ""
 
-#: src/fs/fs_api.c:293
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
+msgid "# invalid HELLOs downloaded from hostlist servers"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
 #, fuzzy, c-format
-msgid "Could not read file `%s': %s"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+msgid "Invalid `%s' message received from hostlist at `%s'\n"
+msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/fs/fs_api.c:299
+#: src/hostlist/hostlist-client.c:330
+msgid "# valid HELLOs downloaded from hostlist servers"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
 #, c-format
-msgid "Short read reading from file `%s'!"
+msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
+#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
+#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
+#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
+#: src/transport/plugin_transport_http_client.c:108
+#: src/transport/plugin_transport_http_client.c:123
 #, fuzzy, c-format
-msgid "Failed to resume publishing information `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_api.c:1323
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+msgid "# advertised hostlist URIs"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:622
 #, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
+msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/fs/fs_api.c:1365
+#: src/hostlist/hostlist-client.c:663
 #, c-format
-msgid "Failure while resuming publishing operation `%s': %s\n"
+msgid ""
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1381
+#: src/hostlist/hostlist-client.c:805
 #, fuzzy, c-format
-msgid "Failed to resume publishing operation `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "Timeout trying to download hostlist from `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_api.c:1993
+#: src/hostlist/hostlist-client.c:822
 #, c-format
-msgid "Failure while resuming unindexing operation `%s': %s\n"
+msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2003
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
-msgid "Failed to resume unindexing operation `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "%s failed for `%s' at %s:%d: `%s'\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_api.c:2129 src/fs/fs_api.c:2368
+#: src/hostlist/hostlist-client.c:848
 #, fuzzy, c-format
-msgid "Failed to resume sub-download `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "Download of hostlist `%s' completed.\n"
+msgstr ""
+"Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/fs/fs_api.c:2146
-#, fuzzy, c-format
-msgid "Failed to resume sub-search `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+#: src/hostlist/hostlist-client.c:856
+#, c-format
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
+msgstr ""
 
-#: src/fs/fs_api.c:2158 src/fs/fs_api.c:2177 src/fs/fs_api.c:2653
+#: src/hostlist/hostlist-client.c:909
 #, c-format
-msgid "Failure while resuming search operation `%s': %s\n"
+msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2359
+#: src/hostlist/hostlist-client.c:917
+msgid "# hostlist downloads initiated"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+msgid "# milliseconds between hostlist downloads"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1054
 #, c-format
-msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2605
-msgid "Could not resume running search, will resume as paused search\n"
+#: src/hostlist/hostlist-client.c:1092
+msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2691
+#: src/hostlist/hostlist-client.c:1096
 #, c-format
-msgid "Failure while resuming download operation `%s': %s\n"
+msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/fs/fs_download.c:309
-msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
+#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
+#, fuzzy
+msgid "# active connections"
+msgstr "Nätverksanslutning"
+
+#: src/hostlist/hostlist-client.c:1253
+#, c-format
+msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/fs/fs_download.c:329
-msgid "Directory too large for system address space\n"
+#: src/hostlist/hostlist-client.c:1284
+#, c-format
+msgid ""
+"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
+#: src/hostlist/hostlist-client.c:1290
 #, fuzzy, c-format
-msgid "Failed to open file `%s' for writing"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "Loading saved hostlist entries from file `%s' \n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_download.c:873
+#: src/hostlist/hostlist-client.c:1294
+#, c-format
+msgid "Hostlist file `%s' is not existing\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1305
 #, fuzzy, c-format
-msgid "Failed to create directory for recursive download of `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Could not open file `%s' for reading to load hostlists: %s\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_download.c:959
+#: src/hostlist/hostlist-client.c:1338
 #, c-format
-msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/fs/fs_download.c:986
-msgid "internal error decrypting content"
+#: src/hostlist/hostlist-client.c:1340
+msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/fs/fs_download.c:1009
+#: src/hostlist/hostlist-client.c:1373
+#, c-format
+msgid ""
+"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1387
 #, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
+msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_download.c:1021
+#: src/hostlist/hostlist-client.c:1392
 #, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "Writing %u hostlist URIs to `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_download.c:1030
+#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
 #, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
+msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1829
-#, fuzzy
-msgid "Invalid URI"
-msgstr "Ogiltiga argument: "
+#: src/hostlist/hostlist-client.c:1428
+msgid "# hostlist URIs written to file"
+msgstr ""
 
-#: src/fs/gnunet-service-fs.c:240
-msgid "# running average P2P latency (ms)"
+#: src/hostlist/hostlist-client.c:1480
+msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
-msgid "# Loopback routes suppressed"
+#: src/hostlist/hostlist-client.c:1483
+#, c-format
+msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
-#: src/topology/gnunet-daemon-topology.c:1297
-#: src/hostlist/gnunet-daemon-hostlist.c:297
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' service.\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+#: src/hostlist/hostlist-client.c:1492
+msgid "Learning is not enabled on this peer\n"
+msgstr ""
 
-# drive = hard drive ?
-#: src/fs/fs_file_information.c:356
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s': %s"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+#: src/hostlist/hostlist-client.c:1504
+#, c-format
+msgid ""
+"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:468
-msgid "# failed connection attempts due to timeout"
+#: src/hostlist/hostlist-client.c:1508
+#, c-format
+msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:859
+#: src/hostlist/hostlist-server.c:134
 #, fuzzy
-msgid "# peers disconnected due to external request"
-msgstr "# av anslutna parter"
+msgid "bytes in hostlist"
+msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:942
-#, fuzzy
-msgid "# fast reconnects failed"
-msgstr "# av anslutna parter"
+#: src/hostlist/hostlist-server.c:157
+msgid "expired addresses encountered"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:998
-#, fuzzy
-msgid "# peers disconnected due to timeout"
-msgstr "# av anslutna parter"
+#: src/hostlist/hostlist-server.c:184
+#: src/topology/gnunet-daemon-topology.c:875
+#, fuzzy, c-format
+msgid "Error in communication with PEERINFO service: %s\n"
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-service-transport_neighbours.c:1023
-#, fuzzy
-msgid "# keepalives sent"
-msgstr "# sessionsnycklar skickade"
+#: src/hostlist/hostlist-server.c:205
+msgid "HELLOs without addresses encountered (ignored)"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1065
-#, fuzzy
-msgid "# peers disconnected due to global disconnect"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+#: src/hostlist/hostlist-server.c:221
+msgid "bytes not included in hostlist (size limit)"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1781
-#: src/transport/gnunet-service-transport_neighbours.c:1802
-msgid "# messages not sent (no such peer or not connected)"
+#: src/hostlist/hostlist-server.c:269
+#, c-format
+msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1818
-msgid "# bytes in message queue for other peers"
+#: src/hostlist/hostlist-server.c:272
+msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1870
-#, fuzzy
-msgid "# messages discarded due to lack of neighbour record"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+#: src/hostlist/hostlist-server.c:280
+msgid "Sending 100 CONTINUE reply\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
-msgid "# bandwidth quota violations by other peers"
+#: src/hostlist/hostlist-server.c:287
+#, c-format
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1924
-msgid "# ms throttling suggested"
+#: src/hostlist/hostlist-server.c:291
+msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1953
-msgid "# KEEPALIVE messages discarded (not connected)"
+#: src/hostlist/hostlist-server.c:299
+msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2005
-#, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+#: src/hostlist/hostlist-server.c:302
+msgid "hostlist requests refused (not ready)"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2013
-#, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-
-#: src/transport/gnunet-service-transport_neighbours.c:2079
-msgid "# SET QUOTA messages ignored (no such peer)"
+#: src/hostlist/hostlist-server.c:306
+msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2097
-msgid "# disconnects due to quota of 0"
+#: src/hostlist/hostlist-server.c:307
+msgid "hostlist requests processed"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2215
-msgid "# disconnect messages ignored (old format)"
+#: src/hostlist/hostlist-server.c:350
+msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2228
-msgid "# disconnect messages ignored (timestamp)"
+#: src/hostlist/hostlist-server.c:397
+msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2305
-#, fuzzy
-msgid "# unexpected CONNECT_ACK messages (no peer)"
-msgstr "skicka ANTAL meddelanden"
+#: src/hostlist/hostlist-server.c:565
+#, fuzzy, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2322
-#, fuzzy
-msgid "# unexpected CONNECT_ACK messages"
-msgstr "skicka ANTAL meddelanden"
+#: src/hostlist/hostlist-server.c:574
+#, c-format
+msgid "Hostlist service starts on %s:%llu\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2415
-#, fuzzy
-msgid "# unexpected ACK messages"
-msgstr "# krypterade PONG-meddelanden skickade"
-
-#: src/transport/gnunet-service-transport_blacklist.c:247
+#: src/hostlist/hostlist-server.c:588
 #, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
+msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:254
+#: src/hostlist/hostlist-server.c:626
 #, c-format
-msgid "Blacklist file `%s' is empty.\n"
+msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
-#, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/mesh/gnunet-service-mesh.c:4595
+msgid "Wrong CORE service\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
+#: src/mesh/gnunet-service-mesh.c:4789
+#, fuzzy
+msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
+msgstr "GNUnet-konfiguration"
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/mesh/gnunet-service-mesh.c:4798
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#: src/nat/gnunet-nat-server.c:289
 #, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
+#: src/nat/gnunet-nat-server.c:328
+msgid "GNUnet NAT traversal test helper daemon"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/nat/nat.c:803
 #, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:756
-msgid "# disconnects due to blacklist"
-msgstr ""
+#: src/nat/nat.c:852
+#, fuzzy, c-format
+msgid "Failed to start %s\n"
+msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_http_server.c:191
+#: src/nat/nat.c:1121
+#, fuzzy, c-format
+msgid "Malformed %s `%s' given in configuration!\n"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/nat/nat.c:1187 src/nat/nat.c:1197
+#, c-format
 msgid ""
-"Could not create a new TLS certificate, program `gnunet-transport-"
-"certificate-creation' could not be started!\n"
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:215
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/nat/nat.c:1329
+msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:172
-msgid "# refreshed my HELLO"
+#: src/nat/nat.c:1341
+#, c-format
+msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1567
+#: src/nat/nat_test.c:348
 #, fuzzy
-msgid "# IPv4 broadcast HELLO beacons received via udp"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/plugin_transport_udp.c:1610
-#, fuzzy
-msgid "# IPv6 multicast HELLO beacons received via udp"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/transport/plugin_transport_udp.c:2106
-#: src/transport/plugin_transport_udp_new.c:1220
+#: src/nat/nat_test.c:418
 #, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2157
-#: src/transport/plugin_transport_udp_new.c:1270
-#, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
+#: src/nse/gnunet-nse-profiler.c:926
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "Kan inte tillgå tjänsten"
 
-#: src/transport/plugin_transport_udp.c:2301
+#: src/nse/gnunet-service-nse.c:936
 #, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2372
-#: src/transport/plugin_transport_udp_new.c:1398
+#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
+#: src/nse/gnunet-service-nse.c:1431
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+msgstr ""
+
+#: src/nse/gnunet-service-nse.c:1398
 #, fuzzy
-msgid "Failed to open UDP sockets\n"
-msgstr "Misslyckades att binda till UDP6-port %d.\n"
+msgid "Invalid work requirement for NSE service. Exiting.\n"
+msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/transport/plugin_transport_http_client.c:108
-#: src/transport/plugin_transport_http_client.c:123
-#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
-#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
-#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
+#: src/nse/gnunet-service-nse.c:1419
+#, fuzzy
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:133
 #, fuzzy, c-format
-msgid "%s failed at %s:%d: `%s'\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/transport/plugin_transport_http_client.c:620
+#: src/peerinfo/gnunet-service-peerinfo.c:195
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:239
 #, c-format
-msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:514
+#: src/peerinfo/gnunet-service-peerinfo.c:305
 #, c-format
-msgid "Unexpected address length: %u bytes\n"
+msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:601
-#: src/transport/plugin_transport_tcp.c:690
-#: src/transport/plugin_transport_tcp.c:742
-#: src/transport/plugin_transport_tcp.c:831
-#: src/transport/plugin_transport_tcp.c:1173
-#: src/transport/plugin_transport_tcp.c:1254
+#: src/peerinfo/peerinfo_api.c:279
+#, fuzzy, c-format
+msgid "Failed to transmit message to `%s' service.\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/peerinfo/peerinfo_api.c:435
 #, fuzzy
-msgid "# bytes currently in TCP buffers"
-msgstr "# byte skickades via TCP"
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/transport/plugin_transport_tcp.c:607
-#: src/transport/plugin_transport_tcp.c:857
-#: src/transport/plugin_transport_tcp.c:1828
+#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
 #, fuzzy
-msgid "# TCP sessions active"
-msgstr "# sessionsnycklar accepterade"
+msgid "Received invalid message from `PEERINFO' service.\n"
+msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
 
-#: src/transport/plugin_transport_tcp.c:694
+#: src/peerinfo/peerinfo_api.c:523
 #, fuzzy
-msgid "# bytes discarded by TCP (timeout)"
-msgstr "# byte kastade via TCP (utgående)"
+msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/plugin_transport_tcp.c:745
+#: src/peerinfo/peerinfo_api.c:557
+msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api_notify.c:258
+#, fuzzy, c-format
+msgid "Could not connect to `%s' service.\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#, fuzzy, c-format
+msgid "Could not find option `%s:%s' in configuration.\n"
+msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#, fuzzy, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#, c-format
+msgid "I am peer `%s'.\n"
+msgstr "Jag är ändpunkt \"%s\".\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:255
+msgid "output only the identity strings"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+msgid "output our own identity only"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
 #, fuzzy
-msgid "# bytes transmitted via TCP"
-msgstr "# byte skickade av typen %d"
+msgid "Print information about peers."
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/plugin_transport_tcp.c:835
+#: src/pt/gnunet-daemon-pt.c:264
 #, fuzzy
-msgid "# bytes discarded by TCP (disconnect)"
-msgstr "# byte kastade via TCP (utgående)"
+msgid "Failed to pack DNS request.  Dropping.\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/plugin_transport_tcp.c:956
+#: src/pt/gnunet-daemon-pt.c:270
 #, fuzzy
-msgid "# bytes TCP was asked to transmit"
-msgstr "# byte skickade av typen %d"
+msgid "# DNS requests mapped to VPN"
+msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:1007
-msgid "# bytes discarded by TCP (no address and no connection)"
+#: src/pt/gnunet-daemon-pt.c:323
+msgid "# DNS records modified"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1050
-#: src/transport/plugin_transport_tcp.c:1368
-#, c-format
-msgid "Address of unexpected length: %u\n"
+#: src/pt/gnunet-daemon-pt.c:500
+msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1067
-#: src/transport/plugin_transport_tcp.c:1404
-msgid "Found valid IPv4 NAT address (creating session)!\n"
-msgstr ""
+#: src/pt/gnunet-daemon-pt.c:506
+#, fuzzy
+msgid "Failed to parse DNS request.  Dropping.\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/plugin_transport_tcp.c:1118
+#: src/pt/gnunet-daemon-pt.c:602
 #, fuzzy
-msgid "# bytes discarded by TCP (failed to connect)"
-msgstr "# byte kastade via TCP (utgående)"
+msgid "# DNS requests dropped (timeout)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_tcp.c:1508
-msgid "# transport-service disconnect requests for TCP"
+#: src/pt/gnunet-daemon-pt.c:632
+#, fuzzy
+msgid "# DNS requests intercepted"
+msgstr "# byte mottogs via TCP"
+
+#: src/pt/gnunet-daemon-pt.c:637
+msgid "# DNS requests dropped (DNS mesh tunnel down)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1871
+#: src/pt/gnunet-daemon-pt.c:645
 #, fuzzy
-msgid "# TCP WELCOME messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "# DNS requests dropped (malformed)"
+msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2021
-msgid "# bytes received via TCP"
+#: src/pt/gnunet-daemon-pt.c:716
+#, fuzzy
+msgid "# DNS replies received"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2089
-msgid "# network-level TCP disconnect events"
+#: src/pt/gnunet-daemon-pt.c:730
+#, fuzzy
+msgid "# DNS replies dropped (too late?)"
+msgstr "# byte mottagna av typen %d"
+
+#: src/pt/gnunet-daemon-pt.c:748 src/pt/gnunet-daemon-pt.c:760
+msgid "# DNS requests aborted (tunnel down)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2242
-#, fuzzy
-msgid "Failed to start service.\n"
-msgstr "Misslyckades att starta samling.\n"
+#: src/pt/gnunet-daemon-pt.c:898 src/pt/gnunet-daemon-pt.c:907
+#: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
+#, fuzzy, c-format
+msgid "Failed to connect to %s service.  Exiting.\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/plugin_transport_tcp.c:2307
+#: src/pt/gnunet-daemon-pt.c:973
+msgid "Daemon to run to perform IP protocol translation to GNUnet"
+msgstr ""
+
+#: src/statistics/gnunet-service-statistics.c:209
 #, fuzzy, c-format
-msgid "Failed to find option %s in section %s!\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
+msgstr "Ladda ner filer från GNUnet."
+
+#: src/statistics/gnunet-service-statistics.c:267
+#, fuzzy, c-format
+msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgstr "Ladda ner filer från GNUnet."
+
+#: src/statistics/gnunet-statistics.c:98
+#, fuzzy
+msgid "Failed to obtain statistics.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2330
-#, c-format
-msgid "TCP transport listening on port %llu\n"
+#: src/statistics/gnunet-statistics.c:164
+msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2334
-msgid "TCP transport not listening on any port (client only)\n"
+#: src/statistics/gnunet-statistics.c:167
+msgid "make the value being set persistent"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2338
-#, c-format
-msgid "TCP transport advertises itself as being on port %llu\n"
+#: src/statistics/gnunet-statistics.c:170
+msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:984
-msgid "Disabling IPv6 since it is not supported on this system!\n"
+#: src/statistics/gnunet-statistics.c:173
+msgid "just print the statistics value"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1032
+#: src/statistics/gnunet-statistics.c:180
+msgid "Print statistics about GNUnet operations."
+msgstr "Skriv ut statistik om GNUnet-operationer."
+
+#: src/statistics/statistics_api.c:390
 #, fuzzy
-msgid "Require valid port number for service in configuration!\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
+msgid "Failed to connect to statistics service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:1179
+#: src/template/gnunet-template.c:68
+#, fuzzy
+msgid "help text"
+msgstr "hjälptext för -t"
+
+#: src/testing/gnunet-testing.c:157
+#, fuzzy
+msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/testing/gnunet-testing.c:159
 #, c-format
-msgid "Found %u addresses to report to NAT service\n"
+msgid "Specified hostkey file `%s' not found!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1192
-#, c-format
-msgid "FREEING %s\n"
+#: src/testing/gnunet-testing.c:273
+#, fuzzy
+msgid "create unique configuration files"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+
+#: src/testing/gnunet-testing.c:275
+msgid "create hostkey files from pre-computed hostkey list"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1267
-msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
+#: src/testing/gnunet-testing.c:277
+msgid "host key file"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1280
+#: src/testing/gnunet-testing.c:279
 #, fuzzy
-msgid "Port is required! Fix in configuration\n"
-msgstr " gconfig\tGTK-konfiguration\n"
+msgid "number of unique configuration files or hostkeys to create"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/transport/plugin_transport_http.c:1291
-msgid "Port 0, client only mode\n"
-msgstr ""
+#: src/testing/gnunet-testing.c:281
+#, fuzzy
+msgid "configuration template"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/plugin_transport_http.c:1311
-#, c-format
-msgid ""
-"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
+#: src/testing/gnunet-testing.c:287
+msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1341
-#, c-format
-msgid ""
-"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
+#: src/testing/helper.c:56
+#, fuzzy
+msgid "Peer is lacking HOSTKEY configuration setting.\n"
+msgstr "GNUnet-konfiguration"
+
+#: src/testing/helper.c:64
+#, fuzzy
+msgid "Could not access hostkey.\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/testing/testing.c:214
+msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1096
+#: src/testing/testing.c:228 src/testing/testing.c:849
 #, fuzzy
-msgid "Failed to open UNIX sockets\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "`scp' did not complete cleanly.\n"
+msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
 
-#: src/transport/plugin_transport_smtp.c:370
+#: src/testing/testing.c:251
+#, fuzzy
+msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/testing/testing.c:252
+#, fuzzy
+msgid "Failed to create pipe for `ssh' process.\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/testing/testing.c:308
 #, fuzzy, c-format
-msgid "Received malformed message via %s. Ignored.\n"
-msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
+msgid "Could not start `%s' process to create hostkey.\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
 
-# capped är inte ett bra ord IMHO
-#: src/transport/plugin_transport_smtp.c:457
+#: src/testing/testing.c:315
 #, fuzzy
-msgid "SMTP filter string to invalid, lacks ': '\n"
-msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
+msgid "Failed to start `gnunet-peerinfo' process.\n"
+msgstr "Misslyckades att starta samling.\n"
 
-# capped är inte ett bra ord IMHO
-#: src/transport/plugin_transport_smtp.c:466
+#: src/testing/testing.c:316 src/testing/testing.c:514
+#, fuzzy
+msgid "Failed to start `ssh' process.\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/testing/testing.c:378
 #, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
-msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
+msgid "Error reading from gnunet-peerinfo: %s\n"
+msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
-#, fuzzy, c-format
-msgid "SMTP: `%s' failed: %s.\n"
-msgstr "\"%s\" %s misslyckades: %s\n"
+#: src/testing/testing.c:382
+#, fuzzy
+msgid "Malformed output from gnunet-peerinfo!\n"
+msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_smtp.c:801
-msgid "No email-address specified, can not start SMTP transport.\n"
+#: src/testing/testing.c:392
+#, fuzzy
+msgid "Failed to get hostkey!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/testing/testing.c:426
+msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:813
-#, fuzzy
-msgid "# bytes received via SMTP"
-msgstr "# byte mottogs via TCP"
+#: src/testing/testing.c:506
+#, fuzzy, c-format
+msgid "Could not start `%s' process to start GNUnet.\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/transport/plugin_transport_smtp.c:814
+#: src/testing/testing.c:513
 #, fuzzy
-msgid "# bytes sent via SMTP"
-msgstr "# byte skickades via TCP"
+msgid "Failed to start `gnunet-arm' process.\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/plugin_transport_smtp.c:816
+#: src/testing/testing.c:537 src/testing/testing.c:647
+msgid "`gnunet-arm' does not seem to terminate.\n"
+msgstr ""
+
+#: src/testing/testing.c:538 src/testing/testing.c:648
+#: src/testing/testing.c:668
+msgid "`ssh' does not seem to terminate.\n"
+msgstr ""
+
+#: src/testing/testing.c:617
+msgid "Unable to get HELLO for peer!\n"
+msgstr ""
+
+#: src/testing/testing.c:667
+msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
+msgstr ""
+
+#: src/testing/testing.c:690 src/testing/testing.c:724
+msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
+msgstr ""
+
+#: src/testing/testing.c:705 src/testing/testing.c:762
 #, fuzzy
-msgid "# bytes dropped by SMTP (outgoing)"
-msgstr "# byte kastade via TCP (utgående)"
+msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
+msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:111
-msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+#: src/testing/testing.c:837
+msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:118
+#: src/testing/testing.c:1015
 #, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Testar transport(er) %s\n"
+msgid "Starting service %s for peer `%4s'\n"
+msgstr "Startade samling \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:122
+#: src/testing/testing.c:1299 src/testing/testing_group.c:6278
 #, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Testar transport(er) %s\n"
+msgid "Could not start `%s' process to copy configuration directory.\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:150
+#: src/testing/testing.c:1387 src/testing/testing.c:1470
+#: src/testing/testing.c:1608
 #, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+msgid "Terminating peer `%4s'\n"
+msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/plugin_transport_wlan.c:880
+#: src/testing/testing.c:1560
+#, fuzzy, c-format
+msgid "Setting d->dead on peer `%4s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/testing/testing.c:1698
+msgid "Peer not yet running, can not change configuration at this point."
+msgstr ""
+
+#: src/testing/testing.c:1706
 #, fuzzy
-msgid "# wlan session timeouts"
-msgstr "# sessionsnycklar accepterade"
+msgid "Failed to write new configuration to disk."
+msgstr "Kunde inte spara konfiguration!"
 
-#: src/transport/plugin_transport_wlan.c:904
+#: src/testing/testing.c:1737
+#, fuzzy, c-format
+msgid "Could not start `%s' process to copy configuration file.\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/testing/testing.c:1740
 #, fuzzy
-msgid "# wlan session created"
-msgstr "# sessionsnycklar accepterade"
+msgid "Failed to copy new configuration to remote machine."
+msgstr "Kunde inte spara konfiguration!"
 
-#: src/transport/plugin_transport_wlan.c:988
-#: src/transport/plugin_transport_wlan.c:1151
-#: src/transport/plugin_transport_wlan.c:1172
-#: src/transport/plugin_transport_wlan.c:1203
-#: src/transport/plugin_transport_wlan.c:2378
-#: src/transport/plugin_transport_wlan.c:3240
-msgid "# wlan pending sessions"
-msgstr ""
+#: src/testing/testing.c:1895
+#, fuzzy
+msgid "Peers failed to connect"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/plugin_transport_wlan.c:1246
-#: src/transport/plugin_transport_wlan.c:1933
+#: src/testing/testing.c:2035
 #, fuzzy
-msgid "# wlan pending fragments"
-msgstr "# byte mottogs via TCP"
+msgid "Failed to connect to core service of first peer!\n"
+msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_wlan.c:1407
+#: src/testing/testing.c:2274
+msgid "Peers are not fully running yet, can not connect!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:1910 src/testing/testing_group.c:1922
+#: src/testing/testing_group.c:2023 src/testing/testing_group.c:2082
+#: src/testing/testing_group.c:2171 src/testing/testing_group.c:2191
+#: src/testing/testing_group.c:2328 src/testing/testing_peergroup.c:940
+#, fuzzy, c-format
+msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
+
+#: src/testing/testing_group.c:1932
+#, fuzzy, c-format
+msgid "Target is %d connections per peer."
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/testing/testing_group.c:2179
 #, c-format
 msgid ""
-"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
+"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
+"greater than 0\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1774
-msgid "# wlan hello beacons send"
+#: src/testing/testing_group.c:2209 src/testing/testing_group.c:2402
+#, c-format
+msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1807
-#: src/transport/plugin_transport_wlan.c:2022
-#: src/transport/plugin_transport_wlan.c:2117
+#: src/testing/testing_group.c:2246
 #, c-format
-msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
+msgid "natural log of %d is %d, will run %d iterations\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2008
-msgid "# wlan acks send"
+#: src/testing/testing_group.c:2249
+#, c-format
+msgid "Total connections added thus far: %u!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2079
-#, fuzzy
-msgid "# wlan fragments send"
-msgstr "# byte mottogs via TCP"
+#: src/testing/testing_group.c:2290
+#, c-format
+msgid "Total connections added for small world: %d!\n"
+msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2245
+#: src/testing/testing_group.c:2342
 #, c-format
-msgid "Wlan Address len %d is wrong\n"
+msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2250
-#, fuzzy
-msgid "# wlan messages queued"
-msgstr "# krypterade PONG-meddelanden mottagna"
+#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#, c-format
+msgid ""
+"No `%s' specified in peer configuration in section `%s', cannot copy friends "
+"file!\n"
+msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2339
-#: src/transport/plugin_transport_wlan.c:2996
-#: src/transport/plugin_transport_wlan.c:3243
-msgid "# wlan mac endpoints"
+#: src/testing/testing_group.c:3020
+msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2567
-#, fuzzy
-msgid "# wlan whole messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+#: src/testing/testing_group.c:3133
+#, fuzzy, c-format
+msgid "Copying file with command cp %s %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/transport/plugin_transport_wlan.c:2770
-#, fuzzy
-msgid "# wlan hello messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+#: src/testing/testing_group.c:3156
+#, fuzzy, c-format
+msgid "Copying file with command scp %s %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/transport/plugin_transport_wlan.c:2807
-#, fuzzy
-msgid "# wlan fragments received"
-msgstr "# byte mottogs via TCP"
+#: src/testing/testing_group.c:3173
+#, c-format
+msgid "Checking copy status of file %d\n"
+msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2859
+#: src/testing/testing_group.c:3191
+#, c-format
+msgid "File %d copied\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3206
 #, fuzzy
-msgid "# wlan acks received"
-msgstr "# klartext PONG-meddelanden mottagna"
+msgid "Finished copying all blacklist files!\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/plugin_transport_wlan.c:2956
-msgid "# wlan mac endpoints timeouts"
+#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
+#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
+msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2980
-#, fuzzy
-msgid "# wlan mac endpoints created"
-msgstr "# byte mottogs via TCP"
+#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
+#: src/testing/testing_group.c:5035
+#, c-format
+msgid "Creating connection, outstanding_connections is %d\n"
+msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3038
-msgid "# wlan WLAN_HELPER_DATA received"
+#: src/testing/testing_group.c:3608
+#, c-format
+msgid "Offering HELLO of peer %s to peer %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3094
-#, fuzzy
-msgid "# wlan messages for this client received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+#: src/testing/testing_group.c:3734
+#, c-format
+msgid "Creating connection, outstanding_connections is %d (max %d)\n"
+msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3105
-#, fuzzy
-msgid "# wlan messages inside WLAN_HELPER_DATA received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+#: src/testing/testing_group.c:3988
+msgid "Creating clique topology\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:251
-msgid "No transport plugins configured, peer will never communicate\n"
+#: src/testing/testing_group.c:3993
+msgid "Creating small world (ring) topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:264
-#, c-format
-msgid "No port configured for plugin `%s', cannot test it\n"
+#: src/testing/testing_group.c:3998
+msgid "Creating small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:314
-#, c-format
-msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
+#: src/testing/testing_group.c:4002
+msgid "Creating ring topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:321
-#, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
+#: src/testing/testing_group.c:4006
+msgid "Creating 2d torus topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:354
-#, fuzzy, c-format
-msgid "Transmitting %u bytes to %s\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/testing/testing_group.c:4010
+msgid "Creating Erdos-Renyi topology\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:374
-#, fuzzy, c-format
-msgid "Connected to %s\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
+#: src/testing/testing_group.c:4014
+msgid "Creating InterNAT topology\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:405
-#, fuzzy, c-format
-msgid "Disconnected from %s\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
+#: src/testing/testing_group.c:4018
+msgid "Creating Scale Free topology\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:434
-#, c-format
-msgid "Received %u bytes from %s\n"
+#: src/testing/testing_group.c:4023
+msgid "Creating straight line topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:448
-#, fuzzy, c-format
-msgid "Peer `%s': %s %s\n"
-msgstr "Jag är ändpunkt \"%s\".\n"
+#: src/testing/testing_group.c:4027
+msgid "Creating topology from file!\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:512
-#, fuzzy, c-format
-msgid "Failed to parse peer identity `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/testing/testing_group.c:4043
+msgid "Creating no allowed topology (all peers can connect at core level)\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:549
-msgid "measure how fast we are receiving data (until CTRL-C)"
+#: src/testing/testing_group.c:4058
+msgid "Failed during friend file copying!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:552
-#, fuzzy
-msgid "try to connect to the given peer"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/testing/testing_group.c:4064
+msgid "Friend files created/copied successfully!\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:555
-#, fuzzy
-msgid "provide information about all current connections (once)"
-msgstr "Skriv ut information om GNUnets motparter."
+#: src/testing/testing_group.c:4081
+msgid "Blacklisting all but clique topology\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:559
-msgid "send data for benchmarking to the other peer (until CTRL-C)"
+#: src/testing/testing_group.c:4087
+msgid "Blacklisting all but small world (ring) topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:562
-msgid "test transport configuration (involves external server)"
+#: src/testing/testing_group.c:4093
+msgid "Blacklisting all but small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:565
-#, fuzzy
-msgid "do not resolve hostnames"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/testing/testing_group.c:4099
+msgid "Blacklisting all but ring topology\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:573
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/testing/testing_group.c:4105
+msgid "Blacklisting all but 2d torus topology\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:410
-msgid "# address records discarded"
+#: src/testing/testing_group.c:4111
+msgid "Blacklisting all but Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:459
-#, c-format
-msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+#: src/testing/testing_group.c:4117
+msgid "Blacklisting all but InterNAT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:496
-#, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# PING-meddelanden i klartext skickade"
+#: src/testing/testing_group.c:4152
+msgid "Blacklisting all but Scale Free topology\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:554
-msgid "# address revalidations started"
+#: src/testing/testing_group.c:4158
+msgid "Blacklisting all but straight line topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:775
+#: src/testing/testing_group.c:4173
 #, fuzzy
-msgid "# PING message for different peer received"
-msgstr "# PING-meddelanden skapade"
+msgid "Failed during blacklist file copying!\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_validation.c:810
-#, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+#: src/testing/testing_group.c:4179
+msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:878
-msgid "# PONGs unicast via reliable transport"
+#: src/testing/testing_group.c:5263
+msgid "Creating clique CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:887
-msgid "# PONGs multicast to all available addresses"
+#: src/testing/testing_group.c:5270
+msgid "Creating small world (ring) CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1009
-msgid "# PONGs dropped, no matching pending validation"
+#: src/testing/testing_group.c:5277
+msgid "Creating small world (2d-torus) CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1034
-msgid "# PONGs dropped, signature expired"
+#: src/testing/testing_group.c:5283
+msgid "Creating ring CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1093
-#, fuzzy, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
-msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+#: src/testing/testing_group.c:5290
+msgid "Creating 2d torus CONNECT topology\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:253
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+#: src/testing/testing_group.c:5297
+msgid "Creating Erdos-Renyi CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:258
-msgid "# messages dropped due to slow client"
+#: src/testing/testing_group.c:5304
+msgid "Creating InterNAT CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:405
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
+#: src/testing/testing_group.c:5311
+msgid "Creating Scale Free CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:523
-#, fuzzy
-msgid "# bytes payload received for other peers"
-msgstr "# byte mottagna av typen %d"
+#: src/testing/testing_group.c:5318
+msgid "Creating straight line CONNECT topology\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:540
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/testing/testing_group.c:5324
+msgid "Creating no CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:591
-#, fuzzy
-msgid "# REQUEST CONNECT messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+#: src/testing/testing_group.c:5330
+msgid "Unknown topology specification, can't connect peers!\n"
+msgstr ""
 
-#: src/transport/transport_api.c:588
-#, fuzzy, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
-msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
+#: src/testing/testing_group.c:5340
+#, c-format
+msgid "Connecting random subset (%'.2f percent) of possible peers\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport.c:158
-#, fuzzy
-msgid "# bytes payload discarded due to not connected peer "
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+#: src/testing/testing_group.c:5348
+#, c-format
+msgid "Connecting a minimum of %u peers each (if possible)\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport.c:555
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+#: src/testing/testing_group.c:5357
+#, c-format
+msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:564
-msgid "Transport service could not access hostkey.  Exiting.\n"
+#: src/testing/testing_group.c:5367
+#, c-format
+msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:159
+#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:648
+#, fuzzy
+msgid "Could not read hostkeys file!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/testing/testing_group.c:6131
 #, fuzzy, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
-msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
+msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/dv/dv_api.c:179
-#, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
 #: src/topology/gnunet-daemon-topology.c:244
 msgid "# peers blacklisted"
 msgstr ""
@@ -3897,12 +4114,6 @@
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:875
-#: src/hostlist/hostlist-server.c:184
-#, fuzzy, c-format
-msgid "Error in communication with PEERINFO service: %s\n"
-msgstr "Skriv ut information om GNUnets motparter."
-
 #: src/topology/gnunet-daemon-topology.c:950
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
@@ -3983,828 +4194,1644 @@
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/chat/chat.c:175
-#, fuzzy
-msgid "Could not transmit confirmation receipt\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+#: src/transport/gnunet-service-transport_blacklist.c:247
+#, fuzzy, c-format
+msgid "Could not read blacklist file `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/chat/chat.c:283
-msgid "The current user must be the the first one joined\n"
+#: src/transport/gnunet-service-transport_blacklist.c:254
+#, c-format
+msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/chat/chat.c:412
+#: src/transport/gnunet-service-transport_blacklist.c:266
 #, fuzzy, c-format
-msgid "Unknown message type: '%u'\n"
-msgstr "Okänd operation \"%s\"\n"
+msgid "Failed to read blacklist from `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/chat/chat.c:472
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
 #, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/chat/chat.c:480
-#, fuzzy, c-format
-msgid "Failed to access chat home directory `%s'\n"
-msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+#: src/transport/gnunet-service-transport_blacklist.c:298
+#: src/transport/gnunet-service-transport_blacklist.c:336
+#, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgstr ""
 
-#: src/chat/chat.c:498
+#: src/transport/gnunet-service-transport_blacklist.c:350
 #, fuzzy, c-format
-msgid "Failed to create/open key in file `%s'\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/chat/chat.c:559
+#: src/transport/gnunet-service-transport_blacklist.c:364
+#, c-format
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:523
+#: src/transport/gnunet-service-transport_blacklist.c:764
+msgid "# disconnects due to blacklist"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:158
 #, fuzzy
-msgid "Could not serialize metadata\n"
-msgstr "Kunde inte initiera libgnunetutil!\n"
+msgid "# bytes payload discarded due to not connected peer "
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/chat/chat.c:674
+#: src/transport/gnunet-service-transport.c:572
+msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:581
+msgid "Transport service could not access hostkey.  Exiting.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:353
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:358
+msgid "# messages dropped due to slow client"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:510
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:628
 #, fuzzy
-msgid "Failed to connect to the chat service\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "# bytes payload received for other peers"
+msgstr "# byte mottagna av typen %d"
 
-#: src/chat/chat.c:680
-msgid "Undefined mandatory parameter: joinCallback\n"
+#: src/transport/gnunet-service-transport_clients.c:645
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/chat/chat.c:686
-msgid "Undefined mandatory parameter: messageCallback\n"
+#: src/transport/gnunet-service-transport_clients.c:696
+#, fuzzy
+msgid "# REQUEST CONNECT messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/gnunet-service-transport_hello.c:172
+msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/chat/chat.c:692
-msgid "Undefined mandatory parameter: memberCallback\n"
+#: src/transport/gnunet-service-transport_neighbours.c:482
+msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:267
+#: src/transport/gnunet-service-transport_neighbours.c:883
 #, fuzzy
-msgid "Failed to queue a message notification\n"
-msgstr "Kunde inte spara konfiguration!"
+msgid "# peers disconnected due to external request"
+msgstr "# av anslutna parter"
 
-#: src/chat/gnunet-service-chat.c:546
+#: src/transport/gnunet-service-transport_neighbours.c:966
 #, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "Kunde inte spara konfiguration!"
+msgid "# fast reconnects failed"
+msgstr "# av anslutna parter"
 
-#: src/chat/gnunet-service-chat.c:729
+#: src/transport/gnunet-service-transport_neighbours.c:1022
 #, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "Kunde inte spara konfiguration!"
+msgid "# peers disconnected due to timeout"
+msgstr "# av anslutna parter"
 
-#: src/chat/gnunet-service-chat.c:907
+#: src/transport/gnunet-service-transport_neighbours.c:1047
 #, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "Kunde inte spara konfiguration!"
+msgid "# keepalives sent"
+msgstr "# sessionsnycklar skickade"
 
-#: src/chat/gnunet-chat.c:92
-msgid "Joined\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1088
+#, fuzzy
+msgid "# peers disconnected due to global disconnect"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1909
+msgid "# messages not sent (no such peer or not connected)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
-msgid "anonymous"
+#: src/transport/gnunet-service-transport_neighbours.c:1925
+msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:130
-#, fuzzy, c-format
-msgid "(%s) `%s' said: %s\n"
-msgstr "\"%s\" %s misslyckades: %s\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1977
+#, fuzzy
+msgid "# messages discarded due to lack of neighbour record"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/transport/gnunet-service-transport_neighbours.c:2013
+msgid "# bandwidth quota violations by other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2031
+msgid "# ms throttling suggested"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2060
+msgid "# KEEPALIVE messages discarded (not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2113
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2121
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2187
+msgid "# SET QUOTA messages ignored (no such peer)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2205
+msgid "# disconnects due to quota of 0"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2323
+msgid "# disconnect messages ignored (old format)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2336
+msgid "# disconnect messages ignored (timestamp)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2411
+#, fuzzy
+msgid "# unexpected CONNECT_ACK messages (no peer)"
+msgstr "skicka ANTAL meddelanden"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2453
+#, fuzzy
+msgid "# unexpected CONNECT_ACK messages"
+msgstr "skicka ANTAL meddelanden"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2544
+#, fuzzy
+msgid "# unexpected ACK messages"
+msgstr "# krypterade PONG-meddelanden skickade"
+
+#: src/transport/gnunet-service-transport_plugins.c:111
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:118
 #, fuzzy, c-format
-msgid "(%s) `%s' said to you: %s\n"
-msgstr "\"%s\" %s misslyckades: %s\n"
+msgid "Starting transport plugins `%s'\n"
+msgstr "Testar transport(er) %s\n"
 
-# drive = hard drive ?
-#: src/chat/gnunet-chat.c:139
+#: src/transport/gnunet-service-transport_plugins.c:122
 #, fuzzy, c-format
-msgid "(%s) `%s' said for sure: %s\n"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+msgid "Loading `%s' transport plugin\n"
+msgstr "Testar transport(er) %s\n"
 
-# drive = hard drive ?
-#: src/chat/gnunet-chat.c:142
+#: src/transport/gnunet-service-transport_plugins.c:150
 #, fuzzy, c-format
-msgid "(%s) `%s' said to you for sure: %s\n"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/chat/gnunet-chat.c:145
-#, c-format
-msgid "(%s) `%s' was confirmed that you received: %s\n"
+#: src/transport/gnunet-service-transport_validation.c:410
+msgid "# address records discarded"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:148
+#: src/transport/gnunet-service-transport_validation.c:459
 #, c-format
-msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
+msgid ""
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:151
-#, c-format
-msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
+#: src/transport/gnunet-service-transport_validation.c:508
+#, fuzzy
+msgid "# PING without HELLO messages sent"
+msgstr "# PING-meddelanden i klartext skickade"
+
+#: src/transport/gnunet-service-transport_validation.c:566
+msgid "# address revalidations started"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:156
+#: src/transport/gnunet-service-transport_validation.c:798
+#, fuzzy
+msgid "# PING message for different peer received"
+msgstr "# PING-meddelanden skapade"
+
+#: src/transport/gnunet-service-transport_validation.c:833
 #, c-format
 msgid ""
-"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:159
+#: src/transport/gnunet-service-transport_validation.c:919
+msgid "# PONGs unicast via reliable transport"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:928
+msgid "# PONGs multicast to all available addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1050
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1075
+msgid "# PONGs dropped, signature expired"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1134
 #, fuzzy, c-format
-msgid "(%s) `%s' said off the record: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+msgid "Adding `%s' without addresses for peer `%s'\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/chat/gnunet-chat.c:162
-#, c-format
-msgid "(%s) <%s> said using an unknown message type: %s\n"
+#: src/transport/gnunet-transport.c:256
+msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:193
+#: src/transport/gnunet-transport.c:269
 #, c-format
-msgid "'%s' acknowledged message #%d\n"
+msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/transport/gnunet-transport.c:319
 #, c-format
-msgid "`%s' entered the room\n"
+msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/transport/gnunet-transport.c:326
 #, c-format
-msgid "`%s' left the room\n"
+msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
-#, fuzzy
-msgid "Could not change username\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+#: src/transport/gnunet-transport.c:359
+#, fuzzy, c-format
+msgid "Transmitting %u bytes to %s\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/transport/gnunet-transport.c:379
 #, fuzzy, c-format
-msgid "Joining room `%s' as user `%s'...\n"
-msgstr "Ogiltigt svar till \"%s\" från motpart \"%s\".\n"
+msgid "Connected to %s\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/chat/gnunet-chat.c:320
+#: src/transport/gnunet-transport.c:410
 #, fuzzy, c-format
-msgid "Changed username to `%s'\n"
-msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
+msgid "Disconnected from %s\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/chat/gnunet-chat.c:333
+#: src/transport/gnunet-transport.c:439
 #, c-format
-msgid "Users in room `%s': "
+msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:371
-msgid "Syntax: /msg USERNAME MESSAGE"
-msgstr ""
+#: src/transport/gnunet-transport.c:453
+#, fuzzy, c-format
+msgid "Peer `%s': %s %s\n"
+msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/chat/gnunet-chat.c:379
+#: src/transport/gnunet-transport.c:483
 #, fuzzy, c-format
-msgid "Unknown user `%s'\n"
-msgstr "Okänd operation \"%s\"\n"
+msgid "Peer `%s' disconnected\n"
+msgstr "# av anslutna parter"
 
-#: src/chat/gnunet-chat.c:395
-#, c-format
-msgid "User `%s' is currently not in the room!\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:448
+#: src/transport/gnunet-transport.c:539
 #, fuzzy, c-format
-msgid "Unknown command `%s'\n"
-msgstr "Okänd operation \"%s\"\n"
+msgid "Failed to parse peer identity `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/chat/gnunet-chat.c:459
-msgid ""
-"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
-"leave the current room"
+#: src/transport/gnunet-transport.c:587
+msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:463
-msgid ""
-"Use `/nick nickname' to change your nickname.  This will cause you to leave "
-"the current room and immediately rejoin it with the new name."
+#: src/transport/gnunet-transport.c:590
+#, fuzzy
+msgid "try to connect to the given peer"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/transport/gnunet-transport.c:593
+#, fuzzy
+msgid "provide information about all current connections (once)"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/transport/gnunet-transport.c:596
+#, fuzzy
+msgid "provide information about all current connections (continuously)"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/transport/gnunet-transport.c:599
+#, fuzzy
+msgid "do not resolve hostnames"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/transport/gnunet-transport.c:603
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
-msgid ""
-"Use `/msg nickname message' to send a private message to the specified user"
+#: src/transport/gnunet-transport.c:606
+msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:470
-msgid "The `/notice' command is an alias for `/msg'"
+#: src/transport/gnunet-transport.c:614
+#, fuzzy
+msgid "Direct access to transport service."
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/transport/plugin_transport_http.c:981
+msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:472
-msgid "The `/query' command is an alias for `/msg'"
+#: src/transport/plugin_transport_http.c:1029
+#, fuzzy
+msgid "Require valid port number for service in configuration!\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#: src/transport/plugin_transport_http.c:1054 src/util/service.c:986
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/transport/plugin_transport_http.c:1071 src/util/service.c:1003
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
+
+#: src/transport/plugin_transport_http.c:1176
+#, c-format
+msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
-msgid "Use `/sig message' to send a signed public message"
+#: src/transport/plugin_transport_http.c:1189
+#, c-format
+msgid "FREEING %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
-msgid "Use `/ack message' to require signed acknowledgment of the message"
+#: src/transport/plugin_transport_http.c:1264
+msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
-msgid "Use `/anonymous message' to send a public anonymous message"
+#: src/transport/plugin_transport_http.c:1277
+#, fuzzy
+msgid "Port is required! Fix in configuration\n"
+msgstr " gconfig\tGTK-konfiguration\n"
+
+#: src/transport/plugin_transport_http.c:1288
+msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
-msgid "The `/anon' command is an alias for `/anonymous'"
+#: src/transport/plugin_transport_http.c:1308
+#, c-format
+msgid ""
+"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:484
-msgid "Use `/quit' to terminate gnunet-chat"
+#: src/transport/plugin_transport_http.c:1338
+#, c-format
+msgid ""
+"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
-msgid "The `/leave' command is an alias for `/quit'"
+#: src/transport/plugin_transport_http_client.c:621
+#, c-format
+msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
-msgid "Use `/names' to list all of the current members in the chat room"
+#: src/transport/plugin_transport_http_server.c:189
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
-msgid "Use `/help command' to get help for a specific command"
+#: src/transport/plugin_transport_http_server.c:213
+msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:606
+#: src/transport/plugin_transport_smtp.c:370
+#, fuzzy, c-format
+msgid "Received malformed message via %s. Ignored.\n"
+msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
+
+# capped är inte ett bra ord IMHO
+#: src/transport/plugin_transport_smtp.c:457
 #, fuzzy
-msgid "You must specify a nickname\n"
-msgstr "Du måste ange en mottagare!\n"
+msgid "SMTP filter string to invalid, lacks ': '\n"
+msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
 
-#: src/chat/gnunet-chat.c:622
+# capped är inte ett bra ord IMHO
+#: src/transport/plugin_transport_smtp.c:466
+#, c-format
+msgid "SMTP filter string to long, capped to `%s'\n"
+msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
+
+#: src/transport/plugin_transport_smtp.c:561
+#: src/transport/plugin_transport_smtp.c:571
+#: src/transport/plugin_transport_smtp.c:584
+#: src/transport/plugin_transport_smtp.c:603
+#: src/transport/plugin_transport_smtp.c:626
+#: src/transport/plugin_transport_smtp.c:634
+#: src/transport/plugin_transport_smtp.c:647
+#: src/transport/plugin_transport_smtp.c:658
 #, fuzzy, c-format
-msgid "Failed to join room `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "SMTP: `%s' failed: %s.\n"
+msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/chat/gnunet-chat.c:655
-msgid "set the nickname to use (required)"
+#: src/transport/plugin_transport_smtp.c:801
+msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:658
-msgid "set the chat room to join"
-msgstr ""
+#: src/transport/plugin_transport_smtp.c:813
+#, fuzzy
+msgid "# bytes received via SMTP"
+msgstr "# byte mottogs via TCP"
 
-#: src/chat/gnunet-chat.c:670
-msgid "Join a chat on GNUnet."
+#: src/transport/plugin_transport_smtp.c:814
+#, fuzzy
+msgid "# bytes sent via SMTP"
+msgstr "# byte skickades via TCP"
+
+#: src/transport/plugin_transport_smtp.c:816
+#, fuzzy
+msgid "# bytes dropped by SMTP (outgoing)"
+msgstr "# byte kastade via TCP (utgående)"
+
+#: src/transport/plugin_transport_tcp.c:512
+#, c-format
+msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:289
+#: src/transport/plugin_transport_tcp.c:616
+#: src/transport/plugin_transport_tcp.c:705
+#: src/transport/plugin_transport_tcp.c:757
+#: src/transport/plugin_transport_tcp.c:830
+#: src/transport/plugin_transport_tcp.c:909
+#, fuzzy
+msgid "# bytes currently in TCP buffers"
+msgstr "# byte skickades via TCP"
+
+#: src/transport/plugin_transport_tcp.c:622
+#: src/transport/plugin_transport_tcp.c:856
+#: src/transport/plugin_transport_tcp.c:1561
+#, fuzzy
+msgid "# TCP sessions active"
+msgstr "# sessionsnycklar accepterade"
+
+#: src/transport/plugin_transport_tcp.c:709
+#, fuzzy
+msgid "# bytes discarded by TCP (timeout)"
+msgstr "# byte kastade via TCP (utgående)"
+
+#: src/transport/plugin_transport_tcp.c:760
+#, fuzzy
+msgid "# bytes transmitted via TCP"
+msgstr "# byte skickade av typen %d"
+
+#: src/transport/plugin_transport_tcp.c:834
+#, fuzzy
+msgid "# bytes discarded by TCP (disconnect)"
+msgstr "# byte kastade via TCP (utgående)"
+
+#: src/transport/plugin_transport_tcp.c:1081
 #, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
+msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:328
-msgid "GNUnet NAT traversal test helper daemon"
+#: src/transport/plugin_transport_tcp.c:1116
+msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/nat/nat.c:803
+#: src/transport/plugin_transport_tcp.c:1186
+msgid "# transport-service disconnect requests for TCP"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1603
+#, fuzzy
+msgid "# TCP WELCOME messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_tcp.c:1756
+msgid "# bytes received via TCP"
+msgstr "# byte mottogs via TCP"
+
+#: src/transport/plugin_transport_tcp.c:1823
+msgid "# network-level TCP disconnect events"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/nat/nat.c:852
-#, fuzzy, c-format
-msgid "Failed to start %s\n"
+#: src/transport/plugin_transport_tcp.c:1976
+#, fuzzy
+msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1121
+#: src/transport/plugin_transport_tcp.c:2039
 #, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "Kunde inte spara konfiguration!"
+msgid "Failed to find option %s in section %s!\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/nat/nat.c:1187 src/nat/nat.c:1197
+#: src/transport/plugin_transport_tcp.c:2062
 #, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
+msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+#: src/transport/plugin_transport_tcp.c:2066
+msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/transport/plugin_transport_tcp.c:2070
 #, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
+msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/nat/nat_test.c:348
+#: src/transport/plugin_transport_udp_broadcasting.c:130
 #, fuzzy
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "# IPv6 multicast HELLO beacons received via udp"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/nat/nat_test.c:418
+#: src/transport/plugin_transport_udp_broadcasting.c:172
+#, fuzzy
+msgid "# IPv4 broadcast HELLO beacons received via udp"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:393
 #, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:124
+#: src/transport/plugin_transport_udp.c:1971
+#, fuzzy
+msgid "Failed to open UDP sockets\n"
+msgstr "Misslyckades att binda till UDP6-port %d.\n"
+
+#: src/transport/plugin_transport_udp.c:2054
+#, c-format
+msgid "Given `%s' option is out of range: %llu > %u\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2098
 #, fuzzy, c-format
-msgid "Block not of type %u\n"
-msgstr "Ingen transport av typ %d är känd.\n"
+msgid "Invalid IPv6 address: `%s'\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/dht/plugin_block_dht.c:131
-msgid "Size mismatch for block\n"
+#: src/transport/plugin_transport_unix.c:1051
+#, fuzzy
+msgid "Failed to open UNIX sockets\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/transport/plugin_transport_wlan.c:880
+#, fuzzy
+msgid "# wlan session timeouts"
+msgstr "# sessionsnycklar accepterade"
+
+#: src/transport/plugin_transport_wlan.c:904
+#, fuzzy
+msgid "# wlan session created"
+msgstr "# sessionsnycklar accepterade"
+
+#: src/transport/plugin_transport_wlan.c:988
+#: src/transport/plugin_transport_wlan.c:1151
+#: src/transport/plugin_transport_wlan.c:1172
+#: src/transport/plugin_transport_wlan.c:1203
+#: src/transport/plugin_transport_wlan.c:2398
+#: src/transport/plugin_transport_wlan.c:3260
+msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:140
+#: src/transport/plugin_transport_wlan.c:1246
+#: src/transport/plugin_transport_wlan.c:1933
+#, fuzzy
+msgid "# wlan pending fragments"
+msgstr "# byte mottogs via TCP"
+
+#: src/transport/plugin_transport_wlan.c:1407
 #, c-format
-msgid "Block of type %u is malformed\n"
+msgid ""
+"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
 msgstr ""
 
-#: src/fs/plugin_block_fs.c:131
-msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+#: src/transport/plugin_transport_wlan.c:1774
+msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/block/block.c:105
-#, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
-msgstr "Testar transport(er) %s\n"
+#: src/transport/plugin_transport_wlan.c:1807
+#: src/transport/plugin_transport_wlan.c:2022
+#: src/transport/plugin_transport_wlan.c:2117
+#, c-format
+msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
+msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4214
-msgid "MESH: Wrong CORE service\n"
+#: src/transport/plugin_transport_wlan.c:2008
+msgid "# wlan acks send"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4419
+#: src/transport/plugin_transport_wlan.c:2079
 #, fuzzy
-msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
-msgstr "GNUnet-konfiguration"
+msgid "# wlan fragments send"
+msgstr "# byte mottogs via TCP"
 
-#: src/mesh/gnunet-service-mesh.c:4428
+#: src/transport/plugin_transport_wlan.c:2223
+#, c-format
+msgid "Wlan Address len %d is wrong\n"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:2359
+#: src/transport/plugin_transport_wlan.c:3016
+#: src/transport/plugin_transport_wlan.c:3263
+msgid "# wlan mac endpoints"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:2587
 #, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+msgid "# wlan whole messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/hostlist/hostlist-client.c:286
-msgid "# bytes downloaded from hostlist servers"
+#: src/transport/plugin_transport_wlan.c:2790
+#, fuzzy
+msgid "# wlan hello messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_wlan.c:2827
+#, fuzzy
+msgid "# wlan fragments received"
+msgstr "# byte mottogs via TCP"
+
+#: src/transport/plugin_transport_wlan.c:2879
+#, fuzzy
+msgid "# wlan acks received"
+msgstr "# klartext PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_wlan.c:2976
+msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
-msgid "# invalid HELLOs downloaded from hostlist servers"
+#: src/transport/plugin_transport_wlan.c:3000
+#, fuzzy
+msgid "# wlan mac endpoints created"
+msgstr "# byte mottogs via TCP"
+
+#: src/transport/plugin_transport_wlan.c:3058
+msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/transport/plugin_transport_wlan.c:3114
+#, fuzzy
+msgid "# wlan messages for this client received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_wlan.c:3125
+#, fuzzy
+msgid "# wlan messages inside WLAN_HELPER_DATA received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/transport_api.c:588
 #, fuzzy, c-format
-msgid "Invalid `%s' message received from hostlist at `%s'\n"
-msgstr "Ogiltigt meddelande mottogs den %s:%d."
+msgid "Received unexpected message of type %u in %s:%u\n"
+msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/hostlist/hostlist-client.c:330
-msgid "# valid HELLOs downloaded from hostlist servers"
+#: src/util/bio.c:136 src/util/bio.c:142
+#, fuzzy, c-format
+msgid "Error reading `%s': %s"
+msgstr "Fel vid skapandet av användare"
+
+#: src/util/bio.c:143
+#, fuzzy
+msgid "End of file"
+msgstr "Läs in en konfigurationsfil"
+
+#: src/util/bio.c:195
+#, c-format
+msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#: src/util/bio.c:205
 #, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
+msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
-msgid "# advertised hostlist URIs"
+#: src/util/bio.c:250
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/util/bio.c:264
 #, c-format
-msgid "# advertised URI `%s' downloaded"
+msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:663
+#: src/util/client.c:304
 #, c-format
 msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
+"Could not determine valid hostname and port for service `%s' from "
+"configuration.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:805
-#, fuzzy, c-format
-msgid "Timeout trying to download hostlist from `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/util/client.c:312
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
+msgstr ""
 
-#: src/hostlist/hostlist-client.c:822
+#: src/util/client.c:657
+msgid "Failure to transmit TEST request.\n"
+msgstr ""
+
+#: src/util/client.c:717 src/util/service.c:919
 #, c-format
-msgid "Download limit of %u bytes exceeded, stopping download\n"
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/util/client.c:859
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+msgid "Could not connect to service `%s', must not be running.\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/hostlist/hostlist-client.c:848
+#: src/util/client.c:875
 #, fuzzy, c-format
-msgid "Download of hostlist `%s' completed.\n"
+msgid "Failure to transmit request to service `%s'\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#: src/util/client.c:1143
+msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
-"Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/hostlist-client.c:856
-#, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
+#: src/util/common_logging.c:239 src/util/common_logging.c:889
+msgid "DEBUG"
+msgstr "FELSÖKNING"
+
+#: src/util/common_logging.c:241 src/util/common_logging.c:887
+msgid "INFO"
+msgstr "INFO"
+
+#: src/util/common_logging.c:243 src/util/common_logging.c:885
+msgid "WARNING"
+msgstr "VARNING"
+
+#: src/util/common_logging.c:245 src/util/common_logging.c:883
+msgid "ERROR"
+msgstr "FEL"
+
+#: src/util/common_logging.c:247 src/util/common_logging.c:891
+msgid "NONE"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:909
+#: src/util/common_logging.c:609
+#, fuzzy, c-format
+msgid "Failed to create or access directory for log file `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/util/common_logging.c:724
 #, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
+msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
-msgid "# hostlist downloads initiated"
+#: src/util/common_logging.c:892
+msgid "INVALID"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
-msgid "# milliseconds between hostlist downloads"
+#: src/util/common_logging.c:991
+msgid "unknown address"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
-#, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+#: src/util/common_logging.c:1029
+msgid "invalid address"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
-msgid "Scheduled saving of hostlists\n"
-msgstr ""
+#: src/util/configuration.c:245
+#, fuzzy, c-format
+msgid "Syntax error in configuration file `%s' at line %u.\n"
+msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/util/configuration.c:817
 #, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
-#, fuzzy
-msgid "# active connections"
-msgstr "Nätverksanslutning"
+#: src/util/connection.c:461
+#, fuzzy, c-format
+msgid "Access denied to `%s'\n"
+msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/hostlist/hostlist-client.c:1253
+#: src/util/connection.c:476
 #, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1284
+#: src/util/connection.c:642
+#, fuzzy, c-format
+msgid ""
+"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/util/connection.c:852 src/util/connection.c:1025
+#, fuzzy, c-format
+msgid "Trying to connect to `%s' (%p)\n"
+msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+
+#: src/util/connection.c:862
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' (%p)\n"
+msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+
+#: src/util/connection.c:1015
+#, fuzzy, c-format
+msgid "Attempt to connect to `%s' failed\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/util/connection.c:1528
 #, c-format
 msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
+"Could not satisfy pending transmission request, socket closed or connect "
+"failed (%p).\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/util/connection.c:1564
 #, fuzzy, c-format
-msgid "Loading saved hostlist entries from file `%s' \n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Failed to send to `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/util/container_bloomfilter.c:507
 #, c-format
-msgid "Hostlist file `%s' is not existing\n"
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1305
+#: src/util/crypto_random.c:280
+#, c-format
+msgid "Starting `%s' process to generate entropy\n"
+msgstr ""
+
+#: src/util/crypto_random.c:308
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
+
+#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
 #, fuzzy, c-format
-msgid "Could not open file `%s' for reading to load hostlists: %s\n"
+msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1338
+#: src/util/crypto_rsa.c:623
+#, fuzzy
+msgid "Creating a new private key.  This may take a while.\n"
+msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
+
+#: src/util/crypto_rsa.c:641
 #, c-format
-msgid "%u hostlist URIs loaded from file\n"
+msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1340
-msgid "# hostlist URIs read from file"
+#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/util/crypto_rsa.c:700
 #, c-format
 msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+"When trying to read hostkey file `%s' I found %u bytes but I need at least "
+"%u.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1387
+#: src/util/crypto_rsa.c:720
 #, fuzzy, c-format
-msgid "Could not open file `%s' for writing to save hostlists: %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/hostlist/hostlist-client.c:1392
+#: src/util/crypto_rsa.c:738
 #, fuzzy, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "I am host `%s'.  Read private key from `%s'.\n"
+msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
 
-#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#: src/util/crypto_rsa.c:959
 #, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
+msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1428
-msgid "# hostlist URIs written to file"
+# drive = hard drive ?
+#: src/util/disk.c:479
+#, fuzzy, c-format
+msgid "`%s' failed for drive `%S': %u\n"
+msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+
+#: src/util/disk.c:1087
+#, fuzzy, c-format
+msgid "Expected `%s' to be a directory!\n"
+msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
+
+#: src/util/disk.c:1441 src/util/service.c:1580
+#, fuzzy, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
+
+#: src/util/disk.c:1759
+#, fuzzy, c-format
+msgid "No `%s' specified for service `%s' in configuration.\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#: src/util/getopt.c:672
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/util/getopt.c:696
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
+
+#: src/util/getopt.c:701
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s: flagga \"%c%s\" tillåter inte ett argument\n"
+
+#: src/util/getopt.c:718 src/util/getopt.c:886
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: flagga \"%s\" kräver ett argument\n"
+
+#: src/util/getopt.c:747
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: okänd flagga \"--%s\"\n"
+
+#: src/util/getopt.c:751
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: okänd flagga \"%c%s\"\n"
+
+#: src/util/getopt.c:776
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: otillåten flagga -- %c\n"
+
+#: src/util/getopt.c:778
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ogiltig flagga -- %c\n"
+
+#: src/util/getopt.c:806 src/util/getopt.c:934
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flagga kräver ett argument -- %c\n"
+
+#: src/util/getopt.c:854
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: flagga \"-W %s\" är tvetydig\n"
+
+#: src/util/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
+
+#: src/util/getopt.c:1038
+#, fuzzy, c-format
+msgid "Use %s to get a list of options.\n"
+msgstr "Använd --help för att få en lista på flaggor.\n"
+
+#: src/util/getopt_helpers.c:84
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
+"Argument som är obligatoriska för långa flaggor är också obligatoriska för "
+"korta flaggor.\n"
 
-#: src/hostlist/hostlist-client.c:1480
-msgid "Learning is enabled on this peer\n"
+#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+
+#: src/util/gnunet-resolver.c:148
+msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/util/gnunet-resolver.c:154
+msgid "Use build-in GNUnet stub resolver"
+msgstr ""
+
+#: src/util/gnunet-service-resolver.c:288
+#, fuzzy, c-format
+msgid "Could not resolve `%s' (%s): %s\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/util/gnunet-service-resolver.c:358
+#: src/util/gnunet-service-resolver.c:399
 #, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
+msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
-msgid "Learning is not enabled on this peer\n"
+#: src/util/gnunet-service-resolver.c:494
+#, c-format
+msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1504
+#: src/util/gnunet-service-resolver.c:529
 #, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1508
+#: src/util/helper.c:239
+#, fuzzy, c-format
+msgid "Error reading from `%s': %s\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/util/helper.c:254
 #, c-format
-msgid "Hostlist file `%s' could not be removed\n"
+msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:264
-msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
+#: src/util/helper.c:264
+#, c-format
+msgid "Got %u bytes from helper `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:317
-msgid "advertise our hostlist to other peers"
+#: src/util/helper.c:273
+#, fuzzy, c-format
+msgid "Failed to parse inbound message from helper `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/util/helper.c:431
+#, fuzzy, c-format
+msgid "Error writing to `%s': %s\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/util/network.c:1204
+#, c-format
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:322
+#: src/util/os_installation.c:299
+#, c-format
 msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
-msgid "enable learning about hostlist servers from other peers"
+#: src/util/os_installation.c:486
+#, fuzzy, c-format
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+
+#: src/util/os_installation.c:492
+#, fuzzy, c-format
+msgid "access (%s, X_OK) failed: %s\n"
+msgstr "\"%s\" %s misslyckades: %s\n"
+
+#: src/util/os_installation.c:507
+#, fuzzy, c-format
+msgid "stat (%s) failed: %s\n"
+msgstr "\"%s\" %s misslyckades: %s\n"
+
+#: src/util/os_priority.c:117
+#, c-format
+msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
-msgid "provide a hostlist server"
+#: src/util/plugin.c:89
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
+
+#: src/util/plugin.c:146
+#, fuzzy, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
+
+#: src/util/plugin.c:219
+#, fuzzy, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/util/plugin.c:349
+#, fuzzy
+msgid "Could not determine plugin installation path.\n"
+msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
+
+#: src/util/pseudonym.c:273
+#, fuzzy, c-format
+msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/util/pseudonym.c:338
+#, fuzzy
+msgid "no-name"
+msgstr "Visa namn"
+
+#: src/util/resolver_api.c:202
+#, fuzzy, c-format
+msgid "Must specify `%s' for `%s' in configuration!\n"
+msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
+
+#: src/util/resolver_api.c:221
+#, fuzzy, c-format
+msgid ""
+"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
+"Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
+"\".\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
-msgid "GNUnet hostlist server and client"
+#: src/util/resolver_api.c:351
+#, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:134
-#, fuzzy
-msgid "bytes in hostlist"
-msgstr "# byte krypterade"
+#: src/util/resolver_api.c:355
+#, fuzzy, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-server.c:157
-msgid "expired addresses encountered"
+#: src/util/resolver_api.c:426
+#, c-format
+msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:205
-msgid "HELLOs without addresses encountered (ignored)"
+#: src/util/resolver_api.c:807
+#, c-format
+msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:221
-msgid "bytes not included in hostlist (size limit)"
+#: src/util/resolver_api.c:901
+#, c-format
+msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:269
+#: src/util/resolver_api.c:906
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN : %s\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/util/resolver_api.c:938
 #, c-format
-msgid "Refusing `%s' request to hostlist server\n"
+msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
-msgid "hostlist requests refused (not HTTP GET)"
+#: src/util/scheduler.c:870
+msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:280
-msgid "Sending 100 CONTINUE reply\n"
+#: src/util/scheduler.c:1000
+#, c-format
+msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:287
+# drive = hard drive ?
+#: src/util/server.c:397
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+
+#: src/util/server.c:406
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
+
+#: src/util/server.c:411
+#, fuzzy, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
+
+#: src/util/server.c:640
 #, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\n"
+msgid ""
+"Processing code for message of type %u did not call "
+"GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:291
-msgid "hostlist requests refused (upload data)"
+#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
+#: src/util/service.c:207 src/util/service.c:214
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#: src/util/service.c:170
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
+
+#: src/util/service.c:263
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
+
+#: src/util/service.c:296
+#, fuzzy, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Fel format \"%s\" för nätmask: %s\n"
+
+#: src/util/service.c:326
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Fel format \"%s\" för nätverk: %s\n"
+
+#: src/util/service.c:668
+#, c-format
+msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
-msgid "Could not handle hostlist request since I do not have a response yet\n"
+#: src/util/service.c:673
+#, fuzzy, c-format
+msgid "Unknown address family %d\n"
+msgstr "Okänd operation \"%s\"\n"
+
+#: src/util/service.c:680
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
-msgid "hostlist requests refused (not ready)"
+#: src/util/service.c:724
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:306
-msgid "Received request for our hostlist\n"
+#: src/util/service.c:752
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:307
-msgid "hostlist requests processed"
+#: src/util/service.c:869
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:350
-msgid "# hostlist advertisements send"
+#: src/util/service.c:939
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:397
-msgid "Advertisement message could not be queued by core\n"
+#: src/util/service.c:956
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
-#, fuzzy, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
-msgstr "Ogiltiga argument. Avslutar.\n"
+#: src/util/service.c:1191
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
 
-#: src/hostlist/hostlist-server.c:574
+#: src/util/service.c:1242 src/util/service.c:1260
 #, c-format
-msgid "Hostlist service starts on %s:%llu\n"
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
-#, fuzzy, c-format
-msgid "Address to obtain hostlist: `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/hostlist/hostlist-server.c:626
+#: src/util/service.c:1287
 #, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/util/service.c:1442
 #, fuzzy, c-format
-msgid "Could not find option `%s:%s' in configuration.\n"
-msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "Fel vid %s:%d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/util/service.c:1475
 #, fuzzy, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
+msgid "Service `%s' runs at %s\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
-#, c-format
-msgid "I am peer `%s'.\n"
-msgstr "Jag är ändpunkt \"%s\".\n"
+#: src/util/service.c:1521
+msgid "Service process failed to initialize\n"
+msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
-msgid "output only the identity strings"
+#: src/util/service.c:1525
+msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
-msgid "output our own identity only"
+#: src/util/service.c:1529
+msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
-#, fuzzy
-msgid "Print information about peers."
-msgstr "Skriv ut information om GNUnets motparter."
+#: src/util/service.c:1581
+msgid "No such user"
+msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:144
-msgid "print this help"
-msgstr "skriv ut denna hjälp"
+#: src/util/service.c:1594
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/include/gnunet_getopt_lib.h:154
-msgid "print the version number"
-msgstr "skriv ut versionsnummer"
+#: src/util/service.c:1657
+msgid "do daemonize (detach from terminal)"
+msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:163
-msgid "configure logging to write logs to LOGFILE"
+#: src/util/signal.c:80
+#, fuzzy, c-format
+msgid "signal (%d, %p) returned %d.\n"
+msgstr "Anrop till \"%s\" returnerade %d.\n"
+
+#: src/util/strings.c:143
+msgid "b"
+msgstr "b"
+
+#: src/util/strings.c:354
+#, c-format
+msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:172
-msgid "configure logging to use LOGLEVEL"
+#: src/util/strings.c:462
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:181
-msgid "be verbose"
-msgstr "var informativ"
+#: src/util/strings.c:554
+msgid "ms"
+msgstr "ms"
 
-#: src/include/gnunet_getopt_lib.h:190
-msgid "use configuration file FILENAME"
-msgstr "använd konfigurationsfil FILNAMN"
+#: src/util/strings.c:559
+msgid "eternity"
+msgstr ""
 
-#: src/include/gnunet_common.h:430 src/include/gnunet_common.h:435
-#: src/include/gnunet_common.h:441
-#, fuzzy, c-format
-msgid "Assertion failed at %s:%d.\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+#: src/util/strings.c:563
+msgid "s"
+msgstr "s"
 
-#: src/include/gnunet_common.h:451
-#, c-format
-msgid "External protocol violation detected at %s:%d.\n"
+#: src/util/strings.c:567
+msgid "m"
+msgstr "m"
+
+#: src/util/strings.c:571
+msgid "h"
+msgstr "h"
+
+#: src/util/strings.c:575
+msgid " days"
+msgstr " dagar"
+
+#: src/util/strings.c:599
+msgid "end of time"
 msgstr ""
 
-#: src/include/gnunet_common.h:472 src/include/gnunet_common.h:479
-#, c-format
-msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
-msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+#, fuzzy
+msgid "# Active tunnels"
+msgstr "Nätverksanslutning"
 
+#: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
 #, fuzzy
-#~ msgid "Failed to stop service `%s'!\n"
-#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "# Peers connected to mesh tunnels"
+msgstr "# av anslutna parter"
 
+#: src/vpn/gnunet-service-vpn.c:699
 #, fuzzy
-#~ msgid "Failed to start service `%s'!\n"
-#~ msgstr "Misslyckades att starta samling.\n"
+msgid "# Bytes given to mesh for transmission"
+msgstr "# PING-meddelanden skapade"
 
+#: src/vpn/gnunet-service-vpn.c:737
 #, fuzzy
-#~ msgid "Service `%s' stopped\n"
-#~ msgstr "Tjänst borttagen.\n"
+msgid "# Bytes dropped in mesh queue (overflow)"
+msgstr "# byte kastade via UDP (utgående)"
 
+#: src/vpn/gnunet-service-vpn.c:772
 #, fuzzy
-#~ msgid "Unable to start service `%s': %s\n"
-#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+msgid "# Mesh tunnels created"
+msgstr "# PING-meddelanden skapade"
 
+#: src/vpn/gnunet-service-vpn.c:795
 #, fuzzy
-#~ msgid "Unable to accept connection for service `%s': %s\n"
-#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+msgid "Failed to setup mesh tunnel!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
 
+#: src/vpn/gnunet-service-vpn.c:967
+#, c-format
+msgid "Protocol %u not supported, dropping\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1285
+msgid "# ICMPv4 packets dropped (not allowed)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1306
+msgid "# ICMPv6 packets dropped (not allowed)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1511
 #, fuzzy
-#~ msgid "Service `%s' started\n"
-#~ msgstr "Tjänst borttagen.\n"
+msgid "# Packets received from TUN interface"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
+#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#, c-format
+msgid "Packet received for unmapped destination `%s' (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1600
+msgid "Received IPv4 packet with options (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1614
+#, c-format
+msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1697
 #, fuzzy
-#~ msgid "Peer `%s' plugin: `%s' address `%s'\n"
-#~ msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+msgid "# ICMP packets received from mesh"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
+#: src/vpn/gnunet-service-vpn.c:2038
 #, fuzzy
-#~ msgid "Failed to create IPv4 broadcast socket on port %d\n"
-#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "# UDP packets received from mesh"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
+#: src/vpn/gnunet-service-vpn.c:2196
 #, fuzzy
-#~ msgid "Failed to load block plugin `%s'\n"
-#~ msgstr "Kunde inte slå upp \"%s\": %s\n"
+msgid "# TCP packets received from mesh"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
+#: src/vpn/gnunet-service-vpn.c:2347
+msgid "Failed to find unallocated IPv4 address in VPN's range\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2402
+msgid "Failed to find unallocated IPv6 address in VPN's range\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
 #, fuzzy
-#~ msgid "Target is %d connections per peer."
-#~ msgstr "Misslyckades att starta samling.\n"
+msgid "# Active destinations"
+msgstr "Nätverksanslutning"
 
+#: src/vpn/gnunet-service-vpn.c:2726
+msgid "Failed to allocate IP address for new destination\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3133
+msgid "IPv6 support disabled as this system does not support IPv6\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3165
+msgid "IPv4 support disabled as this system does not support IPv4\n"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:151
 #, fuzzy
-#~ msgid "Copying file with command cp %s %s\n"
-#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+msgid "Error creating tunnel\n"
+msgstr "Klar med skapandet av värdnyckel.\n"
 
+#: src/vpn/gnunet-vpn.c:195 src/vpn/gnunet-vpn.c:226
+#, fuzzy, c-format
+msgid "Option `%s' makes no sense with option `%s'.\n"
+msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
+
+#: src/vpn/gnunet-vpn.c:208
+#, fuzzy, c-format
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/vpn/gnunet-vpn.c:220
+#, fuzzy, c-format
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
+msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
+
+#: src/vpn/gnunet-vpn.c:238
+#, fuzzy, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "\"%s\" är inte en vanlig fil.\n"
+
+#: src/vpn/gnunet-vpn.c:260
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/vpn/gnunet-vpn.c:296
+msgid "request that result should be an IPv4 address"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:299
+msgid "request that result should be an IPv6 address"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:302
+msgid "print IP address only after mesh tunnel has been created"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:305
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:308
+msgid "destination IP for the tunnel"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:311
+msgid "peer offering the service we would like to access"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:314
+msgid "name of the service we would like to access"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:317
 #, fuzzy
-#~ msgid "Could not read hostkeys file!\n"
-#~ msgstr "Kunde inte skapa värdnyckel!\n"
+msgid "service is offered via TCP"
+msgstr "# byte mottogs via TCP"
 
+#: src/vpn/gnunet-vpn.c:320
 #, fuzzy
-#~ msgid "`scp' did not complete cleanly.\n"
-#~ msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
+msgid "service is offered via UDP"
+msgstr "# byte mottagna via UDP"
 
+#: src/vpn/gnunet-vpn.c:329
+msgid "Setup tunnels via VPN."
+msgstr ""
+
+#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
+#: src/include/gnunet_common.h:490
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d.\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/include/gnunet_common.h:500
+#, c-format
+msgid "External protocol violation detected at %s:%d.\n"
+msgstr ""
+
+#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
+#, c-format
+msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
+msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
+
 #, fuzzy
-#~ msgid "Failed to create pipe for `ssh' process.\n"
-#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#~ msgid "Could not access file: %s\n"
+#~ msgstr "Kunde inte köra \"%s\": %s\n"
 
+# drive = hard drive ?
 #, fuzzy
-#~ msgid "Could not start `%s' process to create hostkey.\n"
-#~ msgstr "Kunde inte skapa värdnyckel!\n"
+#~ msgid "`%s' failed on file `%s': %s"
+#~ msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
 #, fuzzy
-#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
-#~ msgstr "Misslyckades att starta samling.\n"
+#~ msgid "# bytes TCP was asked to transmit"
+#~ msgstr "# byte skickade av typen %d"
 
 #, fuzzy
-#~ msgid "Failed to start `ssh' process.\n"
-#~ msgstr "Misslyckades att starta samling.\n"
+#~ msgid "# bytes discarded by TCP (failed to connect)"
+#~ msgstr "# byte kastade via TCP (utgående)"
 
 #, fuzzy
-#~ msgid "`Failed to get hostkey!\n"
-#~ msgstr "Kunde inte skapa värdnyckel!\n"
+#~ msgid "# wlan messages queued"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
 
+#~ msgid "print this help"
+#~ msgstr "skriv ut denna hjälp"
+
+#~ msgid "print the version number"
+#~ msgstr "skriv ut versionsnummer"
+
+#~ msgid "be verbose"
+#~ msgstr "var informativ"
+
+#~ msgid "use configuration file FILENAME"
+#~ msgstr "använd konfigurationsfil FILNAMN"
+
 #, fuzzy
-#~ msgid "Failed to start `gnunet-arm' process.\n"
-#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+#~ msgid "Failed to stop service `%s'!\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
 #, fuzzy
-#~ msgid "Starting service %s for peer `%4s'\n"
-#~ msgstr "Startade samling \"%s\".\n"
+#~ msgid "Failed to start service `%s'!\n"
+#~ msgstr "Misslyckades att starta samling.\n"
 
 #, fuzzy
-#~ msgid "Terminating peer `%4s'\n"
-#~ msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
+#~ msgid "Service `%s' stopped\n"
+#~ msgstr "Tjänst borttagen.\n"
 
 #, fuzzy
-#~ msgid "Setting d->dead on peer `%4s'\n"
-#~ msgstr "Startade samling \"%s\".\n"
+#~ msgid "Unable to start service `%s': %s\n"
+#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
 #, fuzzy
-#~ msgid "Failed to write new configuration to disk."
-#~ msgstr "Kunde inte spara konfiguration!"
+#~ msgid "Unable to accept connection for service `%s': %s\n"
+#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
 #, fuzzy
-#~ msgid "Failed to copy new configuration to remote machine."
-#~ msgstr "Kunde inte spara konfiguration!"
+#~ msgid "Service `%s' started\n"
+#~ msgstr "Tjänst borttagen.\n"
 
 #, fuzzy
-#~ msgid "Peers failed to connect"
-#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+#~ msgid "Peer `%s' plugin: `%s' address `%s'\n"
+#~ msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
 #, fuzzy
-#~ msgid "Failed to connect to core service of first peer!\n"
-#~ msgstr "Misslyckades att starta samling.\n"
+#~ msgid "Failed to create IPv4 broadcast socket on port %d\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
 #, fuzzy
-#~ msgid "Could not resolve our FQDN : %s %u\n"
+#~ msgid "Failed to load block plugin `%s'\n"
 #~ msgstr "Kunde inte slå upp \"%s\": %s\n"
 
 #, fuzzy
-#~ msgid "Failed to start daemon: %s\n"
-#~ msgstr "Misslyckades att starta samling.\n"
+#~ msgid "Could not resolve our FQDN : %s %u\n"
+#~ msgstr "Kunde inte slå upp \"%s\": %s\n"
 
 #, fuzzy
 #~ msgid "Failed to load dhtlog plugin for `%s'\n"
@@ -5034,10 +6061,6 @@
 #~ msgstr "Fel: kan inte ta bort tjänst: %s\n"
 
 #, fuzzy
-#~ msgid "Configuration saved."
-#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#, fuzzy
 #~ msgid "Configuration changed. Save?"
 #~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
@@ -5053,17 +6076,10 @@
 #~ msgid "Do you want to save the new configuration?"
 #~ msgstr "Vill du spara dina inställningar?"
 
-#~ msgid "print a value from the configuration file to stdout"
-#~ msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-
 #~ msgid "Tool to setup GNUnet."
 #~ msgstr "Verktyg för att ställa in GNUnet."
 
 #, fuzzy
-#~ msgid "update a value in the configuration file"
-#~ msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-
-#, fuzzy
 #~ msgid "Too many arguments.\n"
 #~ msgstr "Ogiltiga kommandoradsargument.\n"
 
@@ -5076,10 +6092,6 @@
 #~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
 #, fuzzy
-#~ msgid "`%s' is not available.\n"
-#~ msgstr "\"%s\" är inte tillgänglig."
-
-#, fuzzy
 #~ msgid "Unknown operation '%s'.\n"
 #~ msgstr "Okänd operation \"%s\"\n"
 
@@ -5280,10 +6292,6 @@
 #~ msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
 #, fuzzy
-#~ msgid "Done creating key.\n"
-#~ msgstr "Klar med skapandet av värdnyckel.\n"
-
-#, fuzzy
 #~ msgid "allow TIME ms to process a GET command"
 #~ msgstr "tillåt TID ms för behandling av varje kommando"
 
@@ -5385,9 +6393,6 @@
 #~ msgstr ""
 #~ "Du måste ange ett namn för PID-filen i sektion \"%s\" under \"%s\".\n"
 
-#~ msgid "=\tError reading directory.\n"
-#~ msgstr "=\tFel vid läsning av katalog.\n"
-
 #~ msgid "%d files found in directory.\n"
 #~ msgstr "%d filer hittades i katalog.\n"
 
@@ -5721,12 +6726,6 @@
 #~ msgid "# HTTP connect calls"
 #~ msgstr "# av anslutna parter"
 
-#~ msgid "# bytes received via UDP"
-#~ msgstr "# byte mottagna via UDP"
-
-#~ msgid "# bytes sent via UDP"
-#~ msgstr "# byte skickade via UDP"
-
 #~ msgid "specify host on which gnunetd is running"
 #~ msgstr "ange värd på vilken gnunetd körs"
 
@@ -5787,10 +6786,6 @@
 #~ msgstr "Visa alla alternativ"
 
 #, fuzzy
-#~ msgid "File-Sharing options"
-#~ msgstr "Visa alla alternativ"
-
-#, fuzzy
 #~ msgid "Options related to gnunet-gtk"
 #~ msgstr "Ej ansluten till gnunetd."
 
@@ -6216,9 +7211,6 @@
 #~ msgid "Cron stopped\n"
 #~ msgstr "Cron stoppad\n"
 
-#~ msgid "Shutdown complete.\n"
-#~ msgstr "Nedstängning klar.\n"
-
 #~ msgid "Caught signal %d.\n"
 #~ msgstr "Fångade signal %d.\n"
 
@@ -6256,9 +7248,6 @@
 #~ "Konfigurationsfil måste ange en katalog för GNUnet att lagra motpartsdata "
 #~ "under %s\\%s.\n"
 
-#~ msgid "`%s' is not a regular file.\n"
-#~ msgstr "\"%s\" är inte en vanlig fil.\n"
-
 #~ msgid "g"
 #~ msgstr "g"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2012-02-24 15:12:56 UTC (rev 20010)
+++ gnunet/po/vi.po     2012-02-24 15:14:18 UTC (rev 20011)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-01-07 20:53+0100\n"
+"POT-Creation-Date: 2012-02-24 16:13+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -19,402 +19,545 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:61
-#: src/datastore/plugin_datastore_mysql.c:139
-#: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:613
-#: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685
-#: src/datastore/plugin_datastore_mysql.c:1362
-#: src/datastore/plugin_datastore_mysql.c:1376 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/datacache/plugin_datacache_sqlite.c:71
-#: src/datacache/plugin_datacache_sqlite.c:74
-#: src/datacache/plugin_datacache_mysql.c:103
-#: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:517
-#: src/datacache/plugin_datacache_mysql.c:526
-#: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:458
-#: src/include/gnunet_common.h:465
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
+#: src/arm/arm_api.c:187
+msgid "Failed to transmit shutdown request to client.\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/arm/arm_api.c:378
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%u with error: %s"
-msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
+msgid "Configuration failes to specify option `%s' in section `%s'!\n"
+msgstr ""
+"Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:239
+#: src/arm/arm_api.c:392
+#, fuzzy, c-format
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr ""
+"Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
+
+#: src/arm/arm_api.c:465
 #, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
+msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:266
+#: src/arm/arm_api.c:521
 #, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "Không thể sơ khởi SQLite: %s.\n"
+msgid "Requesting start of service `%s'.\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:414
-#: src/datacache/plugin_datacache_sqlite.c:457
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+#: src/arm/arm_api.c:522
+#, c-format
+msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:671
-#, fuzzy
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "Dữ liệu sai trong %s. Đang thử sửa chữa (bằng cách xoá).\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:1161
-msgid "sqlite version to old to determine size, assuming zero\n"
+#: src/arm/arm_api.c:544
+#, c-format
+msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1180
+#: src/arm/arm_api.c:546
 #, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1220
-#, fuzzy
-msgid "Sqlite database running\n"
-msgstr "kho dữ liệu sqlite"
+#: src/arm/arm_api.c:579
+#, fuzzy, c-format
+msgid "Asked to start service `%s' within %llu ms\n"
+msgstr "« %s »: Chưa nhận thông báo sau %llu miligiây.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:316
-#: src/datacache/plugin_datacache_mysql.c:224
+#: src/arm/arm_api.c:652
 #, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
+msgid "Stopping service `%s' within %llu ms\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:322
-#: src/datacache/plugin_datacache_mysql.c:230
+#: src/arm/gnunet-arm.c:149
 #, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "Không thể truy cập đến « %s »: %s\n"
+msgid "Service `%s' is unknown to ARM.\n"
+msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#: src/datastore/plugin_datastore_mysql.c:1336
+#: src/arm/gnunet-arm.c:154
 #, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+msgid "Service `%s' has been stopped.\n"
+msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#: src/datastore/plugin_datastore_mysql.c:1346
+#: src/arm/gnunet-arm.c:157
 #, fuzzy, c-format
-msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
-msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
+msgid "Service `%s' was already running.\n"
+msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1581
-msgid "Mysql database running\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:162
+#, fuzzy, c-format
+msgid "Service `%s' has been started.\n"
+msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:93
-#: src/datacache/plugin_datacache_postgres.c:79
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
+msgid "Service `%s' was already being stopped.\n"
+msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:173
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
+msgid "Service `%s' was already not running.\n"
+msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1017
-msgid "Postgres database running\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:173
+#, fuzzy
+msgid "Request ignored as ARM is shutting down.\n"
+msgstr "« %s » đang tắt.\n"
 
-#: src/datastore/datastore_api.c:289
-msgid "Failed to transmit request to drop database.\n"
+#: src/arm/gnunet-arm.c:177
+#, fuzzy
+msgid "Error communicating with ARM service.\n"
+msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
+#: src/arm/gnunet-arm.c:181
+#, fuzzy
+msgid "Timeout communicating with ARM service.\n"
+msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
+#: src/arm/gnunet-arm.c:185
+#, fuzzy
+msgid "Operation failed.\n"
+msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
+
+#: src/arm/gnunet-arm.c:189
+msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:372
-msgid "# queue entry timeouts"
+#: src/arm/gnunet-arm.c:216
+#, c-format
+msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:418
-msgid "# queue overflows"
+#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:445
-#, fuzzy
-msgid "# queue entries created"
-msgstr "# các truy vấn lỗ hổng được định tuyến"
+#: src/arm/gnunet-arm.c:247
+#, fuzzy, c-format
+msgid "Failed to remove configuration file %s\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/datastore/datastore_api.c:465
-#, fuzzy
-msgid "# Requests dropped from datastore queue"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+#: src/arm/gnunet-arm.c:253
+#, fuzzy, c-format
+msgid "Failed to remove servicehome directory %s\n"
+msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/datastore/datastore_api.c:513
+#: src/arm/gnunet-arm.c:355
 #, fuzzy
-msgid "# datastore connections (re)created"
-msgstr "# các kết nối dht"
+msgid "stop all GNUnet services"
+msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/datastore/datastore_api.c:540
-msgid "# reconnected to DATASTORE"
+#: src/arm/gnunet-arm.c:357
+msgid "start a particular service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
+#: src/arm/gnunet-arm.c:359
+msgid "stop a particular service"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:361
 #, fuzzy
-msgid "# transmission request failures"
-msgstr "# các sự truyền PONG bị lỗi"
+msgid "start all GNUnet default services"
+msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/datastore/datastore_api.c:631
+#: src/arm/gnunet-arm.c:364
 #, fuzzy
-msgid "# bytes sent to datastore"
-msgstr "# các byte trong kho dữ liệu"
+msgid "stop and start all GNUnet default services"
+msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/datastore/datastore_api.c:772
-#, fuzzy
-msgid "Failed to receive status response from database."
+#: src/arm/gnunet-arm.c:367
+msgid "delete config file and directory on exit"
 msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/datastore_api.c:786
-msgid "Error reading response from datastore service"
+#: src/arm/gnunet-arm.c:369
+msgid "don't print status messages"
 msgstr ""
 
-#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+#: src/arm/gnunet-arm.c:372
 #, fuzzy
-msgid "Invalid error message received from datastore service"
-msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
+msgid "timeout for completing current operation"
+msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
 
-#: src/datastore/datastore_api.c:810
-#, fuzzy
-msgid "# status messages received"
-msgstr "# các thông báo phát hiện dht được nhận"
+#: src/arm/gnunet-arm.c:383
+msgid "Control services and the Automated Restart Manager (ARM)"
+msgstr ""
 
-#: src/datastore/datastore_api.c:883
-#, fuzzy
-msgid "# PUT requests executed"
-msgstr "# các yêu cầu dht được định tuyến"
+#: src/arm/gnunet-service-arm.c:321
+#, fuzzy, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/datastore/datastore_api.c:954
-#, fuzzy
-msgid "# RESERVE requests executed"
-msgstr "# các yêu cầu dht được định tuyến"
+#: src/arm/gnunet-service-arm.c:324
+#, fuzzy, c-format
+msgid "Starting service `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/datastore/datastore_api.c:1019
-msgid "# RELEASE RESERVE requests executed"
+#: src/arm/gnunet-service-arm.c:350
+msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1080
-#, fuzzy
-msgid "# UPDATE requests executed"
-msgstr "# các yêu cầu dht được định tuyến"
+#: src/arm/gnunet-service-arm.c:477
+#, fuzzy, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/datastore/datastore_api.c:1148
-#, fuzzy
-msgid "# REMOVE requests executed"
-msgstr "# các yêu cầu dht được định tuyến"
+#: src/arm/gnunet-service-arm.c:499
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgstr ""
 
-#: src/datastore/datastore_api.c:1193
-#, fuzzy
-msgid "Failed to receive response from database.\n"
+#: src/arm/gnunet-service-arm.c:513
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1253
-#, fuzzy
-msgid "# Results received"
-msgstr "# các kết quả dht được nhận"
+#: src/arm/gnunet-service-arm.c:621
+#, fuzzy, c-format
+msgid "Preparing to stop `%s'\n"
+msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/datastore/datastore_api.c:1324
-msgid "# GET REPLICATION requests executed"
+#: src/arm/gnunet-service-arm.c:775
+#, fuzzy, c-format
+msgid "Restarting service `%s'.\n"
+msgstr "Đang nạp và khởi động dùng « %s ».\n"
+
+#: src/arm/gnunet-service-arm.c:870
+msgid "exit"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1391
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/arm/gnunet-service-arm.c:875
+msgid "signal"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1455
+#: src/arm/gnunet-service-arm.c:880
 #, fuzzy
-msgid "# GET requests executed"
-msgstr "# các yêu cầu dht được định tuyến"
+msgid "unknown"
+msgstr "Lỗi không rõ"
 
-#: src/datastore/plugin_datastore_template.c:241
-msgid "Template database running\n"
+#: src/arm/gnunet-service-arm.c:914
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/arm/gnunet-service-arm.c:960 src/arm/mockup-service.c:41
 #, fuzzy
-msgid "# bytes expired"
-msgstr "# các byte được nhận"
+msgid "Failed to transmit shutdown ACK.\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/datastore/gnunet-service-datastore.c:426
-msgid "# bytes purged (low-priority)"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:1060
+#, fuzzy, c-format
+msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/datastore/gnunet-service-datastore.c:486
-msgid "Transmission to client failed!\n"
+#: src/arm/gnunet-service-arm.c:1062
+msgid "option missing"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:640
-msgid "# results found"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:1139
+#, fuzzy, c-format
+msgid "Starting default services `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:685
+#: src/arm/gnunet-service-arm.c:1150
 #, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
-"%llu bytes\n"
+msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
-#, c-format
+#: src/arm/gnunet-service-arm.c:1164
 msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+"No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:700
-msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+#: src/arm/mockup-service.c:46
+msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:706
-msgid "Insufficient space to satisfy request"
+#: src/arm/mockup-service.c:69
+msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
-#: src/datastore/gnunet-service-datastore.c:765
-#: src/datastore/gnunet-service-datastore.c:986
-#: src/datastore/gnunet-service-datastore.c:1465
-msgid "# reserved"
-msgstr ""
+#: src/block/block.c:105
+#, fuzzy, c-format
+msgid "Loading block plugin `%s'\n"
+msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:780
-msgid "Could not find matching reservation"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:854 src/datacache/datacache.c:118
-#: src/datacache/datacache.c:255
+#: src/chat/chat.c:175
 #, fuzzy
-msgid "# bytes stored"
-msgstr "# các byte trong kho dữ liệu"
+msgid "Could not transmit confirmation receipt\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/datastore/gnunet-service-datastore.c:868
-#, c-format
-msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
+#: src/chat/chat.c:283
+msgid "The current user must be the the first one joined\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1034
-#, fuzzy
-msgid "# GET requests received"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
+#: src/chat/chat.c:412
+#, fuzzy, c-format
+msgid "Unknown message type: '%u'\n"
+msgstr "\tKhông rõ miền tên « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:1048
-#, fuzzy
-msgid "# requests filtered by bloomfilter"
-msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
+#: src/chat/chat.c:472
+#, fuzzy, c-format
+msgid "Configuration option `%s' in section `%s' missing\n"
+msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/datastore/gnunet-service-datastore.c:1076
-#, fuzzy
-msgid "# UPDATE requests received"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
+#: src/chat/chat.c:480
+#, fuzzy, c-format
+msgid "Failed to access chat home directory `%s'\n"
+msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:1110
+#: src/chat/chat.c:498
+#, fuzzy, c-format
+msgid "Failed to create/open key in file `%s'\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/chat/chat.c:559
 #, fuzzy
-msgid "# GET REPLICATION requests received"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
+msgid "Could not serialize metadata\n"
+msgstr "Không thể tạo miền tên.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1145
+#: src/chat/chat.c:674
 #, fuzzy
-msgid "# GET ZERO ANONYMITY requests received"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
+msgid "Failed to connect to the chat service\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1172
-msgid "Content not found"
+#: src/chat/chat.c:680
+msgid "Undefined mandatory parameter: joinCallback\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1182
-msgid "# bytes removed (explicit request)"
+#: src/chat/chat.c:686
+msgid "Undefined mandatory parameter: messageCallback\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1216
-#, fuzzy
-msgid "# REMOVE requests received"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
+#: src/chat/chat.c:692
+msgid "Undefined mandatory parameter: memberCallback\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1260
-#, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+#: src/chat/gnunet-chat.c:92
+msgid "Joined\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1323
+#: src/chat/gnunet-chat.c:124
+msgid "anonymous"
+msgstr "nặc danh"
+
+#: src/chat/gnunet-chat.c:130
+#, fuzzy, c-format
+msgid "(%s) `%s' said: %s\n"
+msgstr "« %s » nói: %s\n"
+
+#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#, fuzzy, c-format
+msgid "(%s) `%s' said to you: %s\n"
+msgstr "« %s » nói cho bạn: %s\n"
+
+#: src/chat/gnunet-chat.c:139
+#, fuzzy, c-format
+msgid "(%s) `%s' said for sure: %s\n"
+msgstr "« %s » nói thật: %s\n"
+
+#: src/chat/gnunet-chat.c:142
+#, fuzzy, c-format
+msgid "(%s) `%s' said to you for sure: %s\n"
+msgstr "« %s » nói thật cho bạn: %s\n"
+
+#: src/chat/gnunet-chat.c:145
+#, fuzzy, c-format
+msgid "(%s) `%s' was confirmed that you received: %s\n"
+msgstr "« %s » xác nhận bạn đã nhận được: %s\n"
+
+#: src/chat/gnunet-chat.c:148
+#, fuzzy, c-format
+msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
+msgstr "« %s » xác nhận mà chỉ bạn đã nhận được: %s\n"
+
+#: src/chat/gnunet-chat.c:151
+#, fuzzy, c-format
+msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
+msgstr "« %s » xác nhận mà bạn đã nhận được từ họ : %s\n"
+
+#: src/chat/gnunet-chat.c:156
+#, fuzzy, c-format
+msgid ""
+"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
+msgstr "« %s » xác nhận mà chỉ bạn đa nhận được từ họ : %s\n"
+
+#: src/chat/gnunet-chat.c:159
+#, fuzzy, c-format
+msgid "(%s) `%s' said off the record: %s\n"
+msgstr "« %s » nói không chính thức: %s\n"
+
+#: src/chat/gnunet-chat.c:162
+#, fuzzy, c-format
+msgid "(%s) <%s> said using an unknown message type: %s\n"
+msgstr "<%s> đã nói bằng một kiểu tin nhẳn không rõ : %s\n"
+
+#: src/chat/gnunet-chat.c:193
 #, c-format
-msgid "Loading `%s' datastore plugin\n"
+msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1332
+#: src/chat/gnunet-chat.c:224
+#, c-format
+msgid "`%s' entered the room\n"
+msgstr "« %s » vào phòng\n"
+
+#: src/chat/gnunet-chat.c:224
+#, c-format
+msgid "`%s' left the room\n"
+msgstr "« %s » rời phòng\n"
+
+#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#, fuzzy
+msgid "Could not change username\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
 #, fuzzy, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
-msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+msgid "Joining room `%s' as user `%s'...\n"
+msgstr "Đã vào phòng « %s » là người dùng « %s ».\n"
 
-#: src/datastore/gnunet-service-datastore.c:1531
-#: src/datastore/gnunet-service-datastore.c:1542 src/datacache/datacache.c:144
-#: src/datacache/datacache.c:151
+#: src/chat/gnunet-chat.c:320
+#, fuzzy, c-format
+msgid "Changed username to `%s'\n"
+msgstr "Đã thay đổi tên người dùng thành « %s ».\n"
+
+#: src/chat/gnunet-chat.c:333
 #, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr ""
+msgid "Users in room `%s': "
+msgstr "Người dùng trong phòng « %s »:"
 
-#: src/datastore/gnunet-service-datastore.c:1536
+#: src/chat/gnunet-chat.c:371
+msgid "Syntax: /msg USERNAME MESSAGE"
+msgstr "Cú pháp: /msg TÊN_NGƯỜI_DÙNG TIN_NHẲN"
+
+#: src/chat/gnunet-chat.c:379
+#, c-format
+msgid "Unknown user `%s'\n"
+msgstr "Không rõ người dùng « %s »\n"
+
+#: src/chat/gnunet-chat.c:395
+#, c-format
+msgid "User `%s' is currently not in the room!\n"
+msgstr "Người dùng « %s » hiện thời không có trong phòng này.\n"
+
+#: src/chat/gnunet-chat.c:448
 #, fuzzy, c-format
-msgid "# bytes used in file-sharing datastore `%s'"
-msgstr "# các byte được phép trong kho dữ liệu"
+msgid "Unknown command `%s'\n"
+msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/datastore/gnunet-service-datastore.c:1547
-msgid "# quota"
+#: src/chat/gnunet-chat.c:459
+msgid ""
+"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
+"leave the current room"
 msgstr ""
+"Gõ chuỗi « /join #tên_phòng » để vào một phòng trò chuyện nào đó (việc này "
+"cũng gây ra bạn ra khỏi phòng hiện tại)"
 
-#: src/datastore/gnunet-service-datastore.c:1549
-msgid "# cache size"
+#: src/chat/gnunet-chat.c:463
+msgid ""
+"Use `/nick nickname' to change your nickname.  This will cause you to leave "
+"the current room and immediately rejoin it with the new name."
 msgstr ""
+"Gõ chuỗi « /nick tên_hiệu » để thay đổi tên hiệu của mình (việc này cũng gây "
+"ra bạn ra khỏi phòng hiện tại, sau đó vào lại ngay với tên mới)"
 
-#: src/datastore/gnunet-service-datastore.c:1562
-#, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+#: src/chat/gnunet-chat.c:467
+msgid ""
+"Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
+"Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người dùng "
+"có tên đó"
 
-#: src/datastore/gnunet-service-datastore.c:1580
-#: src/datastore/gnunet-service-datastore.c:1596
-#, fuzzy, c-format
-msgid "Failed to remove bogus bloomfilter file `%s'\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
+#: src/chat/gnunet-chat.c:470
+msgid "The `/notice' command is an alias for `/msg'"
+msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
 
-#: src/datastore/gnunet-service-datastore.c:1626
+#: src/chat/gnunet-chat.c:472
+msgid "The `/query' command is an alias for `/msg'"
+msgstr "Lệnh « /query » là một biệt hiệu cho « /msg »"
+
+#: src/chat/gnunet-chat.c:474
 #, fuzzy
-msgid "Failed to initialize bloomfilter.\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-
-#: src/datastore/gnunet-service-datastore.c:1655
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgid "Use `/sig message' to send a signed public message"
 msgstr ""
+"Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người dùng "
+"có tên đó"
 
-#: src/datastore/gnunet-service-datastore.c:1660
-msgid "Plugin does not support get_keys function. Please fix!\n"
+#: src/chat/gnunet-chat.c:477
+msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1663
-msgid "Bloomfilter construction complete.\n"
+#: src/chat/gnunet-chat.c:480
+msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
+#: src/chat/gnunet-chat.c:482
+#, fuzzy
+msgid "The `/anon' command is an alias for `/anonymous'"
+msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
+
+#: src/chat/gnunet-chat.c:484
+msgid "Use `/quit' to terminate gnunet-chat"
+msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
+
+#: src/chat/gnunet-chat.c:486
+msgid "The `/leave' command is an alias for `/quit'"
+msgstr "Lệnh « /leave » là một biệt hiệu cho « /quit »"
+
+#: src/chat/gnunet-chat.c:489
+msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
+"Gõ chuỗi « /names » để liệt kê tất cả các thành viên hiện thời trong phòng "
+"trò chuyện đó"
 
-#: src/core/gnunet-service-core_sessions.c:238
+#: src/chat/gnunet-chat.c:491
+msgid "Use `/help command' to get help for a specific command"
+msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
+
+#: src/chat/gnunet-chat.c:606
+msgid "You must specify a nickname\n"
+msgstr "Phải ghi rõ tên hiệu\n"
+
+#: src/chat/gnunet-chat.c:622
+#, c-format
+msgid "Failed to join room `%s'\n"
+msgstr "Lỗi vào phòng « %s »\n"
+
+#: src/chat/gnunet-chat.c:655
+msgid "set the nickname to use (required)"
+msgstr "đặt tên hiệu cần dùng (cần thiết)"
+
+#: src/chat/gnunet-chat.c:658
+msgid "set the chat room to join"
+msgstr "đặt phòng trò chuyện cần vào"
+
+#: src/chat/gnunet-chat.c:670
+msgid "Join a chat on GNUnet."
+msgstr "Vào phòng trò chuyện trên GNUnet."
+
+#: src/chat/gnunet-service-chat.c:267
 #, fuzzy
-msgid "# type map refreshes sent"
-msgstr "# tổng số yêu cầu lỗ hổng được gửi"
+msgid "Failed to queue a message notification\n"
+msgstr "Lỗi lưu cấu hình."
 
-#: src/core/gnunet-service-core_sessions.c:414
-msgid "# messages discarded (expired prior to transmission)"
+#: src/chat/gnunet-service-chat.c:546
+#, fuzzy
+msgid "Failed to queue a join notification\n"
+msgstr "Lỗi lưu cấu hình."
+
+#: src/chat/gnunet-service-chat.c:729
+#, fuzzy
+msgid "Failed to queue a confirmation receipt\n"
+msgstr "Lỗi lưu cấu hình."
+
+#: src/chat/gnunet-service-chat.c:907
+#, fuzzy
+msgid "Failed to queue a leave notification\n"
+msgstr "Lỗi lưu cấu hình."
+
+#: src/core/core_api.c:798
+msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
 #: src/core/gnunet-core-list-connections.c:77
@@ -439,6 +582,11 @@
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
+#: src/core/gnunet-service-core.c:99
+#, c-format
+msgid "Core service of `%4s' ready.\n"
+msgstr ""
+
 #: src/core/gnunet-service-core_clients.c:360
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
@@ -454,40 +602,6 @@
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core.c:99
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
-#, fuzzy
-msgid "# type maps received"
-msgstr "# các thông báo phát hiện dht được nhận"
-
-#: src/core/gnunet-service-core_typemap.c:151
-msgid "# updates to my type map"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:163
-#, fuzzy
-msgid "# sessions terminated by transport disconnect"
-msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
-
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:343
-msgid "# neighbour entries allocated"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:252
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:431
-#, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
-msgstr ""
-
 #: src/core/gnunet-service-core_kx.c:493
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
@@ -530,7 +644,7 @@
 msgstr "# các thông báo được chắp liền"
 
 #: src/core/gnunet-service-core_kx.c:880
-#: src/transport/gnunet-service-transport_validation.c:780
+#: src/transport/gnunet-service-transport_validation.c:803
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
@@ -558,7 +672,7 @@
 msgstr "# các thông báo PING nhập thô được gửi"
 
 #: src/core/gnunet-service-core_kx.c:1092
-#: src/transport/gnunet-service-transport_validation.c:985
+#: src/transport/gnunet-service-transport_validation.c:1026
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -617,802 +731,656 @@
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1541
-#: src/transport/gnunet-service-transport.c:578
-#: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/core/gnunet-service-core_kx.c:1541 src/hostlist/hostlist-server.c:555
+#: src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/transport/gnunet-service-transport.c:595
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/core/core_api.c:798
-msgid "Client was disconnected from core service, trying to reconnect.\n"
-msgstr ""
+#: src/core/gnunet-service-core_neighbours.c:163
+#, fuzzy
+msgid "# sessions terminated by transport disconnect"
+msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/vpn/gnunet-daemon-exit.c:1496
-msgid "Daemon to run to provide an IP exit node for the VPN"
+#: src/core/gnunet-service-core_neighbours.c:180
+#: src/core/gnunet-service-core_neighbours.c:342
+msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1804
-msgid "help text"
+#: src/core/gnunet-service-core_neighbours.c:251
+msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/util/getopt_helpers.c:84
+#: src/core/gnunet-service-core_neighbours.c:430
 #, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
+msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
-"Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
-"ngắn.\n"
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
-
-#: src/util/common_logging.c:239 src/util/common_logging.c:890
-msgid "DEBUG"
-msgstr "GỠ LỖI"
-
-#: src/util/common_logging.c:241 src/util/common_logging.c:888
-msgid "INFO"
-msgstr "TIN"
-
-#: src/util/common_logging.c:243 src/util/common_logging.c:886
-msgid "WARNING"
-msgstr "CẢNH BÁO"
-
-#: src/util/common_logging.c:245 src/util/common_logging.c:884
-msgid "ERROR"
-msgstr "LỖI"
-
-#: src/util/common_logging.c:247 src/util/common_logging.c:892
-msgid "NONE"
+#: src/core/gnunet-service-core_sessions.c:208
+#: src/core/gnunet-service-core_sessions.c:273
+msgid "# entries in session map"
 msgstr ""
 
-#: src/util/common_logging.c:610
-#, fuzzy, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+#: src/core/gnunet-service-core_sessions.c:238
+#, fuzzy
+msgid "# type map refreshes sent"
+msgstr "# tổng số yêu cầu lỗ hổng được gửi"
 
-#: src/util/common_logging.c:725
-#, fuzzy, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
-msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
-
-#: src/util/common_logging.c:893
-msgid "INVALID"
+#: src/core/gnunet-service-core_sessions.c:414
+msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/util/common_logging.c:975
-msgid "unknown address"
-msgstr ""
+#: src/core/gnunet-service-core_typemap.c:110
+#: src/core/gnunet-service-core_typemap.c:121
+#, fuzzy
+msgid "# type maps received"
+msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/util/common_logging.c:1013
-msgid "invalid address"
+#: src/core/gnunet-service-core_typemap.c:151
+msgid "# updates to my type map"
 msgstr ""
 
-#: src/util/plugin.c:89
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
-
-#: src/util/plugin.c:146
-#, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
-msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n"
-
-#: src/util/plugin.c:219
-#, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
-msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n"
-
-#: src/util/plugin.c:349
+#: src/datacache/datacache.c:118 src/datacache/datacache.c:255
+#: src/datastore/gnunet-service-datastore.c:854
 #, fuzzy
-msgid "Could not determine plugin installation path.\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+msgid "# bytes stored"
+msgstr "# các byte trong kho dữ liệu"
 
-#: src/util/configuration.c:245
-#, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
-msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
-
-#: src/util/configuration.c:817
+#: src/datacache/datacache.c:144 src/datacache/datacache.c:151
+#: src/datastore/gnunet-service-datastore.c:1531
+#: src/datastore/gnunet-service-datastore.c:1542
 #, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
+msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
-"Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
-"tập hợp các sự chọn được phép\n"
 
-#: src/util/getopt.c:672
+#: src/datacache/datacache.c:183
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: tùy chọn « %s » là mơ hồ\n"
+msgid "Loading `%s' datacache plugin\n"
+msgstr ""
 
-#: src/util/getopt.c:696
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
+#: src/datacache/datacache.c:191
+#, fuzzy, c-format
+msgid "Failed to load datacache plugin for `%s'\n"
+msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/util/getopt.c:701
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
+#: src/datacache/datacache.c:281
+#, fuzzy
+msgid "# requests received"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/util/getopt.c:718 src/util/getopt.c:886
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: tùy chọn « %s » cần thiết đối số\n"
+#: src/datacache/datacache.c:291
+msgid "# requests filtered by bloom filter"
+msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/util/getopt.c:747
+#: src/datacache/plugin_datacache_mysql.c:103
+#: src/datacache/plugin_datacache_mysql.c:110
+#: src/datacache/plugin_datacache_mysql.c:517
+#: src/datacache/plugin_datacache_mysql.c:526
+#: src/datacache/plugin_datacache_mysql.c:598
+#: src/datacache/plugin_datacache_mysql.c:614
+#: src/datacache/plugin_datacache_sqlite.c:71
+#: src/datacache/plugin_datacache_sqlite.c:74
+#: src/datastore/plugin_datastore_mysql.c:139
+#: src/datastore/plugin_datastore_mysql.c:146
+#: src/datastore/plugin_datastore_mysql.c:613
+#: src/datastore/plugin_datastore_mysql.c:673
+#: src/datastore/plugin_datastore_mysql.c:685
+#: src/datastore/plugin_datastore_mysql.c:1362
+#: src/datastore/plugin_datastore_mysql.c:1376
+#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
+#: src/include/gnunet_common.h:514
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: không nhận ra tùy chọn « --%s »\n"
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/util/getopt.c:751
+#: src/datacache/plugin_datacache_mysql.c:224
+#: src/datastore/plugin_datastore_mysql.c:316
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/util/getopt.c:776
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: tùy chọn không được phép -- %c\n"
+#: src/datacache/plugin_datacache_mysql.c:230
+#: src/datastore/plugin_datastore_mysql.c:322
+#, fuzzy, c-format
+msgid "Could not access file `%s': %s\n"
+msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/util/getopt.c:778
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: tùy chọn không hợp lệ -- %c\n"
+#: src/datacache/plugin_datacache_mysql.c:979
+msgid "MySQL datacache running\n"
+msgstr ""
 
-#: src/util/getopt.c:806 src/util/getopt.c:934
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: tùy chọn cần thiết đối số -- %c\n"
+#: src/datacache/plugin_datacache_postgres.c:79
+#: src/datastore/plugin_datastore_postgres.c:93
+#, fuzzy, c-format
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 
-#: src/util/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
-
-#: src/util/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
-
-#: src/util/getopt.c:1038
+#: src/datacache/plugin_datacache_postgres.c:149
 #, fuzzy, c-format
-msgid "Use %s to get a list of options.\n"
-msgstr ""
-"Hãy sử dụng câu lệnh trợ giúp « --help » để xem danh sách các tùy chọn.\n"
+msgid "Unable to initialize Postgres: %s"
+msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/util/scheduler.c:870
-msgid "Looks like we're busy waiting...\n"
+#: src/datacache/plugin_datacache_postgres.c:499
+msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/util/scheduler.c:1000
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
+#: src/datacache/plugin_datacache_sqlite.c:424
+msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/util/connection.c:461
-#, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "Không đủ quyền cho « %s ».\n"
-
-#: src/util/connection.c:476
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
+#: src/datacache/plugin_datacache_sqlite.c:457
+#: src/datastore/plugin_datastore_sqlite.c:414
+#: src/namestore/plugin_namestore_sqlite.c:381
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/util/connection.c:642
-#, fuzzy, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
-msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
-
-#: src/util/connection.c:852 src/util/connection.c:1025
-#, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/util/connection.c:862
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/util/connection.c:1015
-#, fuzzy, c-format
-msgid "Attempt to connect to `%s' failed\n"
-msgstr " Lỗi kết nối\n"
-
-#: src/util/connection.c:1528
-#, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
+#: src/datacache/plugin_datacache_template.c:121
+msgid "Template datacache running\n"
 msgstr ""
 
-#: src/util/connection.c:1564
-#, fuzzy, c-format
-msgid "Failed to send to `%s': %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/util/signal.c:80
-#, c-format
-msgid "signal (%d, %p) returned %d.\n"
+#: src/datastore/datastore_api.c:289
+msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/util/network.c:1204
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+#: src/datastore/datastore_api.c:372
+msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/util/os_installation.c:299
-#, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+#: src/datastore/datastore_api.c:418
+msgid "# queue overflows"
 msgstr ""
 
-#: src/util/os_installation.c:486
-#, fuzzy, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+#: src/datastore/datastore_api.c:445
+#, fuzzy
+msgid "# queue entries created"
+msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/util/os_installation.c:492
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "SMTP: « %s » bị lỗi: %s\n"
+#: src/datastore/datastore_api.c:465
+#, fuzzy
+msgid "# Requests dropped from datastore queue"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/util/strings.c:143
-msgid "b"
-msgstr "b"
+#: src/datastore/datastore_api.c:513
+#, fuzzy
+msgid "# datastore connections (re)created"
+msgstr "# các kết nối dht"
 
-#: src/util/strings.c:354
-#, c-format
-msgid "Character sets requested were `%s'->`%s'\n"
+#: src/datastore/datastore_api.c:540
+msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/util/strings.c:462
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr ""
-"Lỗi mở rộng biến môi trường « $HOME »: chưa đặt biến môi trường « HOME »"
+#: src/datastore/datastore_api.c:608
+#, fuzzy
+msgid "# transmission request failures"
+msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/util/strings.c:554
-msgid "ms"
-msgstr "mg"
+#: src/datastore/datastore_api.c:631
+#, fuzzy
+msgid "# bytes sent to datastore"
+msgstr "# các byte trong kho dữ liệu"
 
-#: src/util/strings.c:559
-msgid "eternity"
+#: src/datastore/datastore_api.c:772
+#, fuzzy
+msgid "Failed to receive status response from database."
 msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/util/strings.c:563
-msgid "s"
-msgstr "g"
-
-#: src/util/strings.c:567
-msgid "m"
-msgstr "p"
-
-#: src/util/strings.c:571
-msgid "h"
-msgstr "g"
-
-#: src/util/strings.c:575
-msgid " days"
-msgstr " ngày"
-
-#: src/util/strings.c:599
-msgid "end of time"
+#: src/datastore/datastore_api.c:786
+msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/util/server.c:388
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
+#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+#, fuzzy
+msgid "Invalid error message received from datastore service"
+msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/util/server.c:397
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
+#: src/datastore/datastore_api.c:810
+#, fuzzy
+msgid "# status messages received"
+msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/util/server.c:402
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
+#: src/datastore/datastore_api.c:883
+#, fuzzy
+msgid "# PUT requests executed"
+msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/util/server.c:617
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
-msgstr ""
+#: src/datastore/datastore_api.c:954
+#, fuzzy
+msgid "# RESERVE requests executed"
+msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/util/crypto_random.c:280
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
+#: src/datastore/datastore_api.c:1019
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/util/crypto_random.c:308
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
+#: src/datastore/datastore_api.c:1080
+#, fuzzy
+msgid "# UPDATE requests executed"
+msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/util/disk.c:479
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%S': %u\n"
-msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
+#: src/datastore/datastore_api.c:1148
+#, fuzzy
+msgid "# REMOVE requests executed"
+msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/util/disk.c:883
-#, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "Mong đợi « %s » là một thư mục.\n"
+#: src/datastore/datastore_api.c:1193
+#, fuzzy
+msgid "Failed to receive response from database.\n"
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/util/disk.c:1235 src/util/service.c:1541
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
+#: src/datastore/datastore_api.c:1253
+#, fuzzy
+msgid "# Results received"
+msgstr "# các kết quả dht được nhận"
 
-#: src/util/disk.c:1553
-#, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
+#: src/datastore/datastore_api.c:1324
+msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
-#: src/util/service.c:207 src/util/service.c:214
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Địa chỉ IP định dạng sai: %s\n"
+#: src/datastore/datastore_api.c:1391
+msgid "# GET ZERO ANONYMITY requests executed"
+msgstr ""
 
-#: src/util/service.c:170
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
+#: src/datastore/datastore_api.c:1455
+#, fuzzy
+msgid "# GET requests executed"
+msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/util/service.c:263
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
+#: src/datastore/gnunet-service-datastore.c:351
+#, fuzzy
+msgid "# bytes expired"
+msgstr "# các byte được nhận"
 
-#: src/util/service.c:296
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
+#: src/datastore/gnunet-service-datastore.c:426
+msgid "# bytes purged (low-priority)"
+msgstr ""
 
-#: src/util/service.c:326
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Mạng có định dạng sai « %s »: %s\n"
-
-#: src/util/service.c:629
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
+#: src/datastore/gnunet-service-datastore.c:486
+msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/util/service.c:634
-#, fuzzy, c-format
-msgid "Unknown address family %d\n"
-msgstr "\tKhông rõ miền tên « %s »\n"
-
-#: src/util/service.c:641
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
+#: src/datastore/gnunet-service-datastore.c:640
+msgid "# results found"
 msgstr ""
 
-#: src/util/service.c:685
+#: src/datastore/gnunet-service-datastore.c:685
 #, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgid ""
+"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/util/service.c:713
+#: src/datastore/gnunet-service-datastore.c:696
 #, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/util/service.c:830
-#, c-format
+#: src/datastore/gnunet-service-datastore.c:700
 msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:2228
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+#: src/datastore/gnunet-service-datastore.c:706
+msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/util/service.c:880 src/util/client.c:707
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:765
+#: src/datastore/gnunet-service-datastore.c:986
+#: src/datastore/gnunet-service-datastore.c:1465
+msgid "# reserved"
 msgstr ""
 
-#: src/util/service.c:900
-#, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+#: src/datastore/gnunet-service-datastore.c:780
+msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/util/service.c:917
+#: src/datastore/gnunet-service-datastore.c:868
 #, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/util/service.c:947 src/transport/plugin_transport_http.c:1057
-#, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+#: src/datastore/gnunet-service-datastore.c:1034
+#, fuzzy
+msgid "# GET requests received"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/util/service.c:964 src/transport/plugin_transport_http.c:1074
-#, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "Lỗi đóng kết đến cổng %s %d.\n"
+#: src/datastore/gnunet-service-datastore.c:1048
+#, fuzzy
+msgid "# requests filtered by bloomfilter"
+msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/util/service.c:1152
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
+#: src/datastore/gnunet-service-datastore.c:1076
+#, fuzzy
+msgid "# UPDATE requests received"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/datastore/gnunet-service-datastore.c:1110
+#, fuzzy
+msgid "# GET REPLICATION requests received"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/datastore/gnunet-service-datastore.c:1145
+#, fuzzy
+msgid "# GET ZERO ANONYMITY requests received"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/datastore/gnunet-service-datastore.c:1172
+msgid "Content not found"
 msgstr ""
 
-#: src/util/service.c:1203 src/util/service.c:1221
+#: src/datastore/gnunet-service-datastore.c:1182
+msgid "# bytes removed (explicit request)"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1216
+#, fuzzy
+msgid "# REMOVE requests received"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/datastore/gnunet-service-datastore.c:1260
 #, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/util/service.c:1248
+#: src/datastore/gnunet-service-datastore.c:1323
 #, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/util/service.c:1403
+#: src/datastore/gnunet-service-datastore.c:1332
 #, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "Lỗi chạy %s: %s %d\n"
+msgid "Failed to load datastore plugin for `%s'\n"
+msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/util/service.c:1436
+#: src/datastore/gnunet-service-datastore.c:1536
 #, fuzzy, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
+msgid "# bytes used in file-sharing datastore `%s'"
+msgstr "# các byte được phép trong kho dữ liệu"
 
-#: src/util/service.c:1482
-msgid "Service process failed to initialize\n"
+#: src/datastore/gnunet-service-datastore.c:1547
+msgid "# quota"
 msgstr ""
 
-#: src/util/service.c:1486
-msgid "Service process could not initialize server function\n"
+#: src/datastore/gnunet-service-datastore.c:1549
+msgid "# cache size"
 msgstr ""
 
-#: src/util/service.c:1490
-msgid "Service process failed to report status\n"
+#: src/datastore/gnunet-service-datastore.c:1562
+#, c-format
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/util/service.c:1542
-msgid "No such user"
-msgstr "Không có người dùng như vậy"
+#: src/datastore/gnunet-service-datastore.c:1580
+#: src/datastore/gnunet-service-datastore.c:1596
+#, fuzzy, c-format
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/service.c:1555
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
+#: src/datastore/gnunet-service-datastore.c:1626
+#, fuzzy
+msgid "Failed to initialize bloomfilter.\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/util/service.c:1618
-msgid "do daemonize (detach from terminal)"
+#: src/datastore/gnunet-service-datastore.c:1655
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:76
-msgid "Test GNUnet DNS resolver code."
+#: src/datastore/gnunet-service-datastore.c:1660
+msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:507
-#, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
+#: src/datastore/gnunet-service-datastore.c:1663
+msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/util/os_priority.c:117
-#, c-format
-msgid "Not installing a handler because $%s=%s\n"
-msgstr ""
+#: src/datastore/plugin_datastore_mysql.c:529
+#: src/datastore/plugin_datastore_mysql.c:1336
+#, fuzzy, c-format
+msgid "Failed to prepare statement `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/resolver_api.c:202
+#: src/datastore/plugin_datastore_mysql.c:622
+#: src/datastore/plugin_datastore_mysql.c:1346
 #, fuzzy, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
-msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
+msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
+msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/util/resolver_api.c:221
-#, c-format
-msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+#: src/datastore/plugin_datastore_mysql.c:1581
+msgid "Mysql database running\n"
 msgstr ""
 
-#: src/util/resolver_api.c:358
+#: src/datastore/plugin_datastore_postgres.c:173
 #, fuzzy, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
+msgid "Unable to initialize Postgres with configuration `%s': %s"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/resolver_api.c:362
-#, fuzzy, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr "không quyết định các tên máy"
-
-#: src/util/resolver_api.c:430
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
+#: src/datastore/plugin_datastore_postgres.c:1017
+msgid "Postgres database running\n"
 msgstr ""
 
-#: src/util/resolver_api.c:791
-#, c-format
-msgid "Resolver returns `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:875
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
-msgstr ""
-
-#: src/util/resolver_api.c:880
+#: src/datastore/plugin_datastore_sqlite.c:61
 #, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s\n"
-msgstr "Không thể giải quyết « %s » (%s): %s\n"
+msgid "`%s' failed at %s:%u with error: %s"
+msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 
-#: src/util/resolver_api.c:912
+#: src/datastore/plugin_datastore_sqlite.c:239
+#: src/namestore/plugin_namestore_sqlite.c:223
 #, c-format
-msgid "Resolving our hostname `%s'\n"
+msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 
-#: src/util/pseudonym.c:273
-#, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "Lỗi phân tích dữ liệu giao diện từ « %s ».\n"
-
-#: src/util/pseudonym.c:337
-msgid "no-name"
-msgstr "không-tên"
-
-#: src/util/gnunet-service-resolver.c:261
+#: src/datastore/plugin_datastore_sqlite.c:266
+#: src/namestore/plugin_namestore_sqlite.c:248
 #, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "Không thể giải quyết « %s » (%s): %s\n"
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/util/gnunet-service-resolver.c:317
-#: src/util/gnunet-service-resolver.c:362
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
+#: src/datastore/plugin_datastore_sqlite.c:669
+#, fuzzy
+msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+msgstr "Dữ liệu sai trong %s. Đang thử sửa chữa (bằng cách xoá).\n"
 
-#: src/util/gnunet-service-resolver.c:460
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
+#: src/datastore/plugin_datastore_sqlite.c:1159
+msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:508
+#: src/datastore/plugin_datastore_sqlite.c:1178
 #, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/util/bio.c:136 src/util/bio.c:142
-#, fuzzy, c-format
-msgid "Error reading `%s': %s"
-msgstr "Gặp lỗi khi tạo người dùng"
+#: src/datastore/plugin_datastore_sqlite.c:1218
+#: src/namestore/plugin_namestore_sqlite.c:779
+#, fuzzy
+msgid "Sqlite database running\n"
+msgstr "kho dữ liệu sqlite"
 
-#: src/util/bio.c:143
-msgid "End of file"
+#: src/datastore/plugin_datastore_template.c:241
+msgid "Template database running\n"
 msgstr ""
 
-#: src/util/bio.c:195
-#, c-format
-msgid "Error reading length of string `%s'"
-msgstr ""
+#: src/dht/dht_api.c:280
+#, fuzzy
+msgid "Failed to connect to the DHT service!\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/util/bio.c:205
-#, c-format
-msgid "String `%s' longer than allowed (%u > %u)"
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
+#: src/gns/gnunet-gns-lookup.c:185
+msgid "the query key"
 msgstr ""
 
-#: src/util/bio.c:250
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:188
+msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/util/bio.c:264
-#, c-format
-msgid "Metadata `%s' failed to deserialize"
+#: src/dht/gnunet-dht-get.c:207 src/gns/gnunet-gns-lookup.c:191
+msgid "the type of data to look for"
 msgstr ""
 
-#: src/util/client.c:301
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
+#: src/gns/gnunet-gns-lookup.c:194
+msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/util/client.c:309
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
+#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
+#: src/gns/gnunet-gns-lookup.c:197 src/nse/gnunet-nse-profiler.c:908
+msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/util/client.c:647
-msgid "Failure to transmit TEST request.\n"
+#: src/dht/gnunet-dht-get.c:232
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/util/client.c:849
-#, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
+#: src/dht/gnunet-dht-put.c:100
+#, fuzzy
+msgid "PUT request sent!\n"
+msgstr "# độ tin cậy được tiêu phí"
+
+#: src/dht/gnunet-dht-put.c:124
+msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/util/client.c:865
+#: src/dht/gnunet-dht-put.c:132
 #, fuzzy, c-format
-msgid "Failure to transmit request to service `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+msgid "Could not connect to %s service!\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/util/client.c:1133
-msgid "Could not submit request, not expecting to receive a response.\n"
-msgstr ""
-
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/dht/gnunet-dht-put.c:137
 #, fuzzy, c-format
-msgid "Could not aquire lock on file `%s': %s...\n"
-msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
+msgid "Connected to %s service!\n"
+msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/util/crypto_rsa.c:623
-#, fuzzy
-msgid "Creating a new private key.  This may take a while.\n"
-msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
-
-#: src/util/crypto_rsa.c:641
+#: src/dht/gnunet-dht-put.c:152
 #, c-format
-msgid "I am host `%s'.  Stored new private key in `%s'.\n"
+msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
-msgid "This may be ok if someone is currently generating a hostkey.\n"
+#: src/dht/gnunet-dht-put.c:166
+msgid "the data to insert under the key"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
-#, c-format
-msgid ""
-"When trying to read hostkey file `%s' I found %u bytes but I need at least "
-"%u.\n"
+#: src/dht/gnunet-dht-put.c:169
+msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
-#, fuzzy, c-format
-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
-msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
+#: src/dht/gnunet-dht-put.c:175
+msgid "how many replicas to create"
+msgstr ""
 
-#: src/util/crypto_rsa.c:738
-#, c-format
-msgid "I am host `%s'.  Read private key from `%s'.\n"
+#: src/dht/gnunet-dht-put.c:178
+msgid "the type to insert data as"
 msgstr ""
 
-#: src/util/crypto_rsa.c:959
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
-
-#: src/nse/gnunet-nse-profiler.c:882 src/dht/gnunet-dht-get.c:213
-#: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:596
-#: src/fs/gnunet-download.c:263
-msgid "be verbose (print progress information)"
+#: src/dht/gnunet-dht-put.c:203
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:900
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:588
+#: src/testing/testing.c:2087 src/testing/testing.c:2121
 #, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "Không thể truy cập đến dịch vụ"
+msgid "Failed to connect to transport service!\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/nse/gnunet-service-nse.c:938
-#, c-format
-msgid "Proof of work invalid: %llu!\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_clients.c:371
+#, fuzzy
+msgid "# GET requests from clients injected"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/nse/gnunet-service-nse.c:1393 src/nse/gnunet-service-nse.c:1412
-#: src/nse/gnunet-service-nse.c:1433
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_clients.c:462
+#, fuzzy
+msgid "# PUT requests received from clients"
+msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/nse/gnunet-service-nse.c:1400
-msgid "Invalid work requirement for NSE service. Exiting.\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_clients.c:529
+#, fuzzy
+msgid "# GET requests received from clients"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/nse/gnunet-service-nse.c:1421
+#: src/dht/gnunet-service-dht_clients.c:624
 #, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+msgid "# GET STOP requests received from clients"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
-#, fuzzy, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Đã nạp truyền tải « %s »\n"
+#: src/dht/gnunet-service-dht_clients.c:854
+msgid "# Key match, type mismatches in REPLY to CLIENT"
+msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
-msgid "# peers known"
+#: src/dht/gnunet-service-dht_clients.c:869
+msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/dht/gnunet-service-dht_clients.c:906
 #, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgid "Unsupported block type (%u) in request!\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:305
-#, 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/dht/gnunet-service-dht_clients.c:928
+msgid "# RESULTS queued for clients"
+msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:258
-#, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
+#: src/dht/gnunet-service-dht_clients.c:979
+#: src/dht/gnunet-service-dht_clients.c:1022
+msgid "# REPLIES ignored for CLIENTS (no match)"
+msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:279
+#: src/dht/gnunet-service-dht_clients.c:989
+msgid "Could not pass reply to client, message too big!\n"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:93
 #, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+msgid "%s request received, but have no datacache!\n"
+msgstr "# các byte kiểu %d được nhận"
 
-#: src/peerinfo/peerinfo_api.c:435
-#, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
+#: src/dht/gnunet-service-dht_datacache.c:103
+msgid "# ITEMS stored in datacache"
 msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
-msgid "Received invalid message from `PEERINFO' service.\n"
+#: src/dht/gnunet-service-dht_datacache.c:209
+msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:523
-#, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+#: src/dht/gnunet-service-dht_datacache.c:220
+msgid "# Duplicate RESULTS found in datacache"
+msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:557
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+#: src/dht/gnunet-service-dht_datacache.c:226
+msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:424
-msgid "Sqlite datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:238
+msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/datacache.c:183
+#: src/dht/gnunet-service-dht_datacache.c:241
 #, c-format
-msgid "Loading `%s' datacache plugin\n"
+msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/datacache/datacache.c:191
-#, fuzzy, c-format
-msgid "Failed to load datacache plugin for `%s'\n"
-msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
-
-#: src/datacache/datacache.c:281
+#: src/dht/gnunet-service-dht_datacache.c:271
 #, fuzzy
-msgid "# requests received"
+msgid "# GET requests given to datacache"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datacache/datacache.c:291
-msgid "# requests filtered by bloom filter"
-msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
+#: src/dht/gnunet-service-dht_hello.c:82
+#, fuzzy
+msgid "# HELLOs obtained from peerinfo"
+msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "Không thể sơ khởi SQLite: %s.\n"
-
-#: src/datacache/plugin_datacache_postgres.c:500
-msgid "Postgres datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_template.c:121
-msgid "Template datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_mysql.c:979
-msgid "MySQL datacache running\n"
-msgstr ""
-
 #: src/dht/gnunet-service-dht_neighbours.c:481
 msgid "# Preference updates given to core"
 msgstr ""
@@ -1513,454 +1481,351 @@
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/dht/dht_api.c:282
+#: src/dht/gnunet-service-dht_nse.c:59
 #, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+msgid "# Network size estimates received"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht.c:163
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+#: src/dht/gnunet-service-dht_routing.c:211
+msgid "# Good REPLIES matched against routing table"
+msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
-msgid "the query key"
+#: src/dht/gnunet-service-dht_routing.c:220
+msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204
-msgid "how many parallel requests (replicas) to create"
+#: src/dht/gnunet-service-dht_routing.c:226
+msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207
-msgid "the type of data to look for"
+#: src/dht/gnunet-service-dht_routing.c:236
+msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
-msgid "how long to execute this query before giving up?"
+#: src/dht/gnunet-service-dht_routing.c:314
+#: src/dht/gnunet-service-dht_routing.c:368
+msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:232
-msgid "Issue a GET request to the GNUnet DHT, prints results."
+#: src/dht/gnunet-service-dht_routing.c:324
+msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:371
-#, fuzzy
-msgid "# GET requests from clients injected"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
+#: src/dht/plugin_block_dht.c:124
+#, fuzzy, c-format
+msgid "Block not of type %u\n"
+msgstr "Không biết truyền tải nào kiểu %d.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:462
-#, fuzzy
-msgid "# PUT requests received from clients"
-msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
+#: src/dht/plugin_block_dht.c:131
+msgid "Size mismatch for block\n"
+msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:529
-#, fuzzy
-msgid "# GET requests received from clients"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/dht/gnunet-service-dht_clients.c:624
-#, fuzzy
-msgid "# GET STOP requests received from clients"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/dht/gnunet-service-dht_clients.c:854
-msgid "# Key match, type mismatches in REPLY to CLIENT"
+#: src/dht/plugin_block_dht.c:140
+#, c-format
+msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:869
-msgid "# Duplicate REPLIES to CLIENT request dropped"
+#: src/dns/gnunet-dns-monitor.c:337
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:906
-#, c-format
-msgid "Unsupported block type (%u) in request!\n"
+#: src/dns/gnunet-dns-monitor.c:340
+msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:928
-msgid "# RESULTS queued for clients"
+#: src/dns/gnunet-dns-monitor.c:348
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:979
-#: src/dht/gnunet-service-dht_clients.c:1022
-msgid "# REPLIES ignored for CLIENTS (no match)"
+#: src/dns/gnunet-dns-redirector.c:236
+msgid "set A records"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
-msgid "Could not pass reply to client, message too big!\n"
+#: src/dns/gnunet-dns-redirector.c:239
+msgid "set AAAA records"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_nse.c:59
-#, fuzzy
-msgid "# Network size estimates received"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/dht/gnunet-dht-put.c:100
-#, fuzzy
-msgid "PUT request sent!\n"
-msgstr "# độ tin cậy được tiêu phí"
-
-#: src/dht/gnunet-dht-put.c:124
-msgid "Must provide KEY and DATA for DHT put!\n"
+#: src/dns/gnunet-dns-redirector.c:247
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:132
+#: src/dns/gnunet-service-dns.c:480
 #, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
+msgid "Could not bind to any port: %s\n"
+msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/dht/gnunet-dht-put.c:137
-#, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "« %s » được kết nối tới « %s ».\n"
+#: src/dns/gnunet-service-dns.c:634
+msgid "# DNS requests answered via TUN interface"
+msgstr ""
 
-#: src/dht/gnunet-dht-put.c:152
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+#: src/dns/gnunet-service-dns.c:818
+msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:166
-msgid "the data to insert under the key"
+#: src/dns/gnunet-service-dns.c:1001
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:169
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/dns/gnunet-service-dns.c:1046
+msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:175
-msgid "how many replicas to create"
+#: src/dns/gnunet-service-dns.c:1165
+msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:178
-msgid "the type to insert data as"
+#: src/dns/gnunet-service-dns.c:1198
+msgid "Changing DNS reply according to client specifications\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:203
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+#: src/dns/gnunet-service-dns.c:1279
+msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:211
-msgid "# Good REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1294
+msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Duplicate REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1303
+#, c-format
+msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
-msgid "# Invalid REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1312
+msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:236
-msgid "# Unsupported REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1377
+#, fuzzy
+msgid "# DNS requests received via TUN interface"
+msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
+
+#: src/dns/gnunet-service-dns.c:1461
+#, c-format
+msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:314
-#: src/dht/gnunet-service-dht_routing.c:368
-msgid "# Entries removed from routing table"
+#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2671
+msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
-msgid "# Entries added to routing table"
+#: src/dns/gnunet-service-dns.c:1567
+msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:93
+#: src/dv/dv_api.c:179
+#, fuzzy
+msgid "Failed to connect to the dv service!\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/dv/plugin_transport_dv.c:159
 #, fuzzy, c-format
-msgid "%s request received, but have no datacache!\n"
-msgstr "# các byte kiểu %d được nhận"
+msgid "%s Received message from %s of type %d, distance %u!\n"
+msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
 
-#: src/dht/gnunet-service-dht_datacache.c:103
-msgid "# ITEMS stored in datacache"
+#: src/exit/gnunet-daemon-exit.c:508
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:209
-msgid "# Good RESULTS found in datacache"
+#: src/exit/gnunet-daemon-exit.c:563
+#, fuzzy
+msgid "# Bytes transmitted via mesh tunnels"
+msgstr "# các byte được gửi"
+
+#: src/exit/gnunet-daemon-exit.c:678 src/exit/gnunet-daemon-exit.c:2066
+#: src/exit/gnunet-daemon-exit.c:2316 src/vpn/gnunet-service-vpn.c:1388
+#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:220
-msgid "# Duplicate RESULTS found in datacache"
+#: src/exit/gnunet-daemon-exit.c:714 src/exit/gnunet-daemon-exit.c:2125
+#: src/exit/gnunet-daemon-exit.c:2375 src/vpn/gnunet-service-vpn.c:1444
+#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:226
-msgid "# Invalid RESULTS found in datacache"
+#: src/exit/gnunet-daemon-exit.c:754
+msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
-msgid "# Unsupported RESULTS found in datacache"
+#: src/exit/gnunet-daemon-exit.c:761
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:241
-#, c-format
-msgid "Unsupported block type (%u) in local response!\n"
+#: src/exit/gnunet-daemon-exit.c:838
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:271
-#, fuzzy
-msgid "# GET requests given to datacache"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
+#: src/exit/gnunet-daemon-exit.c:913
+msgid "TCP Packet dropped, have no matching connection information\n"
+msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:82
+#: src/exit/gnunet-daemon-exit.c:966
 #, fuzzy
-msgid "# HELLOs obtained from peerinfo"
-msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
+msgid "# Packets received from TUN"
+msgstr "# các byte đã nhận qua HTTP"
 
-#: src/arm/gnunet-arm.c:149
-#, fuzzy, c-format
-msgid "Service `%s' is unknown to ARM.\n"
-msgstr "Không gian tên « %s » có đánh giá %d.\n"
-
-#: src/arm/gnunet-arm.c:154
-#, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "Dịch vụ đã bị xoá.\n"
-
-#: src/arm/gnunet-arm.c:157
-#, fuzzy, c-format
-msgid "Service `%s' was already running.\n"
-msgstr "Không gian tên « %s » có đánh giá %d.\n"
-
-#: src/arm/gnunet-arm.c:162
-#, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "Dịch vụ đã bị xoá.\n"
-
-#: src/arm/gnunet-arm.c:165
-#, fuzzy, c-format
-msgid "Service `%s' was already being stopped.\n"
-msgstr "Dịch vụ đã bị xoá.\n"
-
-#: src/arm/gnunet-arm.c:169
-#, fuzzy, c-format
-msgid "Service `%s' was already not running.\n"
-msgstr "« %s » không phải là một tập tin.\n"
-
-#: src/arm/gnunet-arm.c:173
+#: src/exit/gnunet-daemon-exit.c:980
 #, fuzzy
-msgid "Request ignored as ARM is shutting down.\n"
-msgstr "« %s » đang tắt.\n"
+msgid "# Bytes received from TUN"
+msgstr "# các byte đã nhận qua HTTP"
 
-#: src/arm/gnunet-arm.c:177
-#, fuzzy
-msgid "Error communicating with ARM service.\n"
-msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+#: src/exit/gnunet-daemon-exit.c:1006
+msgid "IPv4 packet options received.  Ignored.\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:181
-#, fuzzy
-msgid "Timeout communicating with ARM service.\n"
-msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
-
-#: src/arm/gnunet-arm.c:185
-#, fuzzy
-msgid "Operation failed.\n"
-msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
-
-#: src/arm/gnunet-arm.c:189
-msgid "Unknown response code from ARM.\n"
+#: src/exit/gnunet-daemon-exit.c:1033
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/exit/gnunet-daemon-exit.c:1079
 #, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
-msgid "Fatal error initializing ARM API.\n"
+#: src/exit/gnunet-daemon-exit.c:1087
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
-#, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
+#: src/exit/gnunet-daemon-exit.c:1468
+#, fuzzy
+msgid "# TCP packets sent via TUN"
+msgstr "# các byte đã gửi qua UDP"
 
-#: src/arm/gnunet-arm.c:253
-#, fuzzy, c-format
-msgid "Failed to remove servicehome directory %s\n"
-msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
+#: src/exit/gnunet-daemon-exit.c:1568
+#, fuzzy
+msgid "# TCP service creation requests received via mesh"
+msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/arm/gnunet-arm.c:355
+#: src/exit/gnunet-daemon-exit.c:1571 src/exit/gnunet-daemon-exit.c:1650
+#: src/exit/gnunet-daemon-exit.c:1760 src/exit/gnunet-daemon-exit.c:1990
+#: src/exit/gnunet-daemon-exit.c:2232 src/exit/gnunet-daemon-exit.c:2513
+#: src/exit/gnunet-daemon-exit.c:2613
 #, fuzzy
-msgid "stop all GNUnet services"
-msgstr "hủy cài đặt dịch vụ GNUnet"
+msgid "# Bytes received from MESH"
+msgstr "# các byte đã nhận qua HTTP"
 
-#: src/arm/gnunet-arm.c:357
-msgid "start a particular service"
+#: src/exit/gnunet-daemon-exit.c:1604 src/exit/gnunet-daemon-exit.c:2635
+#, c-format
+msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
-msgid "stop a particular service"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1608
+#, fuzzy
+msgid "# TCP requests dropped (no such service)"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/arm/gnunet-arm.c:361
+#: src/exit/gnunet-daemon-exit.c:1653
 #, fuzzy
-msgid "start all GNUnet default services"
-msgstr "hủy cài đặt dịch vụ GNUnet"
+msgid "# TCP IP-exit creation requests received via mesh"
+msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/arm/gnunet-arm.c:364
+#: src/exit/gnunet-daemon-exit.c:1763
 #, fuzzy
-msgid "stop and start all GNUnet default services"
-msgstr "hủy cài đặt dịch vụ GNUnet"
+msgid "# TCP data requests received via mesh"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/arm/gnunet-arm.c:367
-msgid "delete config file and directory on exit"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1777
+#, fuzzy
+msgid "# TCP DATA requests dropped (no session)"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/arm/gnunet-arm.c:369
-msgid "don't print status messages"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1827
+#, fuzzy
+msgid "# ICMP packets sent via TUN"
+msgstr "# các byte đã gửi qua UDP"
 
-#: src/arm/gnunet-arm.c:372
+#: src/exit/gnunet-daemon-exit.c:1993
 #, fuzzy
-msgid "timeout for completing current operation"
-msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
+msgid "# ICMP IP-exit requests received via mesh"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/arm/gnunet-arm.c:383
-msgid "Control services and the Automated Restart Manager (ARM)"
-msgstr ""
-
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:959
+#: src/exit/gnunet-daemon-exit.c:2235
 #, fuzzy
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
+msgid "# ICMP service requests received via mesh"
+msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/arm/mockup-service.c:46
-msgid "Transmitting shutdown ACK.\n"
+#: src/exit/gnunet-daemon-exit.c:2301 src/vpn/gnunet-service-vpn.c:1378
+#: src/vpn/gnunet-service-vpn.c:1945
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/arm/mockup-service.c:69
-msgid "Initiating shutdown as requested by client.\n"
+#: src/exit/gnunet-daemon-exit.c:2360 src/vpn/gnunet-service-vpn.c:1414
+#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:320
-#, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
+#: src/exit/gnunet-daemon-exit.c:2410
+#, fuzzy
+msgid "# UDP packets sent via TUN"
+msgstr "# các byte đã gửi qua UDP"
 
-#: src/arm/gnunet-service-arm.c:323
-#, fuzzy, c-format
-msgid "Starting service `%s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
+#: src/exit/gnunet-daemon-exit.c:2516
+#, fuzzy
+msgid "# UDP IP-exit requests received via mesh"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/arm/gnunet-service-arm.c:349
-msgid "Could not send status result to client\n"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2616
+#, fuzzy
+msgid "# UDP service requests received via mesh"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/arm/gnunet-service-arm.c:476
-#, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "Không thể tạo tài khoản người dùng:"
+#: src/exit/gnunet-daemon-exit.c:2639
+#, fuzzy
+msgid "# UDP requests dropped (no such service)"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/arm/gnunet-service-arm.c:498
+#: src/exit/gnunet-daemon-exit.c:2879
 #, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:512
+#: src/exit/gnunet-daemon-exit.c:2893 src/exit/gnunet-daemon-exit.c:2905
 #, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:620
-#, fuzzy, c-format
-msgid "Preparing to stop `%s'\n"
-msgstr "Đang bắt đầu tài lên « %s ».\n"
-
-#: src/arm/gnunet-service-arm.c:774
-#, fuzzy, c-format
-msgid "Restarting service `%s'.\n"
-msgstr "Đang nạp và khởi động dùng « %s ».\n"
-
-#: src/arm/gnunet-service-arm.c:869
-msgid "exit"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:874
-msgid "signal"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:879
-#, fuzzy
-msgid "unknown"
-msgstr "Lỗi không rõ"
-
-#: src/arm/gnunet-service-arm.c:913
+#: src/exit/gnunet-daemon-exit.c:2916
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1052
-#, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not valid: %s\n"
-msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
-
-#: src/arm/gnunet-service-arm.c:1054
-msgid "option missing"
+#: src/exit/gnunet-daemon-exit.c:3045
+msgid ""
+"This system does not support IPv4, will disable IPv4 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1131
-#, fuzzy, c-format
-msgid "Starting default services `%s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
-#: src/arm/gnunet-service-arm.c:1142
-#, c-format
-msgid "Default service `%s' not configured correctly!\n"
+#: src/exit/gnunet-daemon-exit.c:3053
+msgid ""
+"This system does not support IPv6, will disable IPv6 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1156
+#: src/exit/gnunet-daemon-exit.c:3060
 msgid ""
-"No default services configured, GNUnet will not really start right now.\n"
+"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
+"ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/arm/arm_api.c:187
-msgid "Failed to transmit shutdown request to client.\n"
+#: src/exit/gnunet-daemon-exit.c:3066
+msgid ""
+"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
+"ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/arm/arm_api.c:378
-#, fuzzy, c-format
-msgid "Configuration failes to specify option `%s' in section `%s'!\n"
+#: src/exit/gnunet-daemon-exit.c:3072 src/pt/gnunet-daemon-pt.c:884
+msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
-"Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/arm/arm_api.c:392
-#, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+#: src/exit/gnunet-daemon-exit.c:3233
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
-"Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/arm/arm_api.c:465
-#, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
-msgstr ""
-
-#: src/arm/arm_api.c:521
-#, c-format
-msgid "Requesting start of service `%s'.\n"
-msgstr ""
-
-#: src/arm/arm_api.c:522
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
-msgstr ""
-
-#: src/arm/arm_api.c:544
-#, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:546
-#, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:579
-#, fuzzy, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
-msgstr "« %s »: Chưa nhận thông báo sau %llu miligiây.\n"
-
-#: src/arm/arm_api.c:652
-#, c-format
-msgid "Stopping service `%s' within %llu ms\n"
-msgstr ""
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -2011,257 +1876,334 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/statistics/gnunet-service-statistics.c:207
+#: src/fs/fs_api.c:284
 #, fuzzy, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
-msgstr "Đã tải %llu byte xuống « %s ».\n"
+msgid "Could not open file `%s': %s"
+msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/statistics/gnunet-service-statistics.c:263
+#: src/fs/fs_api.c:293
 #, fuzzy, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
-msgstr "Đã tải %llu byte xuống « %s ».\n"
+msgid "Could not read file `%s': %s"
+msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/statistics/statistics_api.c:390
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+#: src/fs/fs_api.c:299
+#, c-format
+msgid "Short read reading from file `%s'!"
+msgstr ""
 
-#: src/statistics/gnunet-statistics.c:98
-#, fuzzy
-msgid "Failed to obtain statistics.\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/statistics/gnunet-statistics.c:126 src/fs/gnunet-pseudonym.c:151
+#: src/fs/fs_api.c:877
 #, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
+msgid "Failed to resume publishing information `%s': %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/statistics/gnunet-statistics.c:164
-msgid "limit output to statistics for the given NAME"
+#: src/fs/fs_api.c:1334
+#, c-format
+msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:167
-msgid "make the value being set persistent"
+#: src/fs/fs_api.c:1376
+#, c-format
+msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:170
-msgid "limit output to the given SUBSYSTEM"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:173
-msgid "just print the statistics value"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:180
-msgid "Print statistics about GNUnet operations."
-msgstr "In ra thống kê về các thao tác GNUnet."
-
-#: src/fs/gnunet-unindex.c:89
+#: src/fs/fs_api.c:1392
 #, fuzzy, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
-msgstr "Lỗi bỏ chỉ mục (không đưa ra lý do)."
+msgid "Failed to resume publishing operation `%s': %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-unindex.c:96
-#, fuzzy, c-format
-msgid "Error unindexing: %s.\n"
+#: src/fs/fs_api.c:2004
+#, c-format
+msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
-"\n"
-"Gặp lỗi khi bỏ chỉ mục tập tin: %s\n"
 
-#: src/fs/gnunet-unindex.c:101
-#, fuzzy
-msgid "Unindexing done.\n"
-msgstr "Bỏ chỉ mục tập tin."
-
-#: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
-#: src/fs/gnunet-publish.c:163 src/fs/gnunet-download.c:144
+#: src/fs/fs_api.c:2014
 #, fuzzy, c-format
-msgid "Unexpected status: %d\n"
-msgstr "Gặp sự kiện bất thường: %d\n"
+msgid "Failed to resume unindexing operation `%s': %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-unindex.c:131
+#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
 #, fuzzy, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
-msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
+msgid "Failed to resume sub-download `%s': %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
-#: src/fs/gnunet-publish.c:417 src/fs/gnunet-download.c:203
+#: src/fs/fs_api.c:2156
 #, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+msgid "Failed to resume sub-search `%s': %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-unindex.c:148
-#, fuzzy
-msgid "Could not start unindex operation.\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#, c-format
+msgid "Failure while resuming search operation `%s': %s\n"
+msgstr ""
 
-#: src/fs/gnunet-unindex.c:176
-msgid "Unindex a file that was previously indexed with gnunet-publish."
+#: src/fs/fs_api.c:2369
+#, c-format
+msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:165
-#, fuzzy, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr "Không gian tên « %s » có đánh giá %d.\n"
-
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
-#, fuzzy, c-format
-msgid "Option `%s' ignored\n"
-msgstr "%s: tùy chọn « %s » là mơ hồ\n"
-
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:543
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
-
-#: src/fs/gnunet-pseudonym.c:272
-msgid "create or advertise namespace NAME"
+#: src/fs/fs_api.c:2615
+msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
-msgid "delete namespace NAME "
+#: src/fs/fs_api.c:2709
+#, c-format
+msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/fs_directory.c:210
 #, fuzzy
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
+msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
+
+#: src/fs/fs_download.c:313
 msgid ""
-"add an additional keyword for the advertisment (this option can be specified "
-"multiple times)"
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
 msgstr ""
-"thêm một từ khóa bổ sung cho tất cả tập tin và thư mục (có thể chỉ ra tùy "
-"chọn này nhiều lần)"
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:562
-msgid "set the meta-data for the given TYPE to the given VALUE"
-msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
+#: src/fs/fs_download.c:333
+msgid "Directory too large for system address space\n"
+msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
-#, fuzzy
-msgid "print names of local namespaces"
-msgstr "đặt đánh giá của một không gian tên"
+#: src/fs/fs_download.c:491 src/fs/fs_download.c:503
+#, fuzzy, c-format
+msgid "Failed to open file `%s' for writing"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-pseudonym.c:288
-msgid "use the given PRIORITY for the advertisments"
+#: src/fs/fs_download.c:877
+#, fuzzy, c-format
+msgid "Failed to create directory for recursive download of `%s'\n"
+msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+
+#: src/fs/fs_download.c:963
+#, c-format
+msgid ""
+"Internal error or bogus download URI (expected %u bytes at depth %u and "
+"offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
-msgid "do not print names of remote namespaces"
+#: src/fs/fs_download.c:989
+msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:581
-msgid "set the desired replication LEVEL"
+#: src/fs/fs_download.c:1012
+#, fuzzy, c-format
+msgid "Download failed: could not open file `%s': %s\n"
+msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
+
+#: src/fs/fs_download.c:1024
+#, fuzzy, c-format
+msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/fs/fs_download.c:1033
+#, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/fs_download.c:1875
 #, fuzzy
-msgid "specify ID of the root of the namespace"
-msgstr "đặt đánh giá của một không gian tên"
+msgid "Invalid URI"
+msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/fs/gnunet-pseudonym.c:300
-#, fuzzy
-msgid "change rating of namespace ID by VALUE"
-msgstr "đặt đánh giá của một không gian tên"
-
-#: src/fs/gnunet-pseudonym.c:308
-msgid "Manage GNUnet pseudonyms."
+#: src/fs/fs_getopt.c:191
+#, c-format
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
+"Không rõ kiểu siêu dữ liệu trong tùy chọn siêu dữ liệu « %s ». Đang ùng kiểu "
+"siêu dữ liệu « không rõ » (unknown) để thay thế.\n"
 
-#: src/fs/fs_namespace.c:64 src/fs/fs_namespace.c:90
+#: src/fs/fs_list_indexed.c:90
 #, fuzzy, c-format
-msgid "Configuration fails to specify `%s' in section `%s'\n"
-msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
+msgid "Failed to receive response for `%s' request from `%s' service.\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_namespace.c:119
+#: src/fs/fs_list_indexed.c:113
 #, fuzzy, c-format
-msgid "Failed to open `%s' for writing: %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_namespace.c:141 src/fs/fs_namespace.c:229
+#: src/fs/fs_list_indexed.c:151
 #, fuzzy, c-format
-msgid "Failed to write `%s': %s\n"
-msgstr "Lỗi chạy %s: %s %d\n"
+msgid "Failed to not connect to `%s' service.\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_namespace.c:338
+#: src/fs/fs_misc.c:126
+#, c-format
+msgid "Did not find mime type `%s' in extension list.\n"
+msgstr ""
+
+#: src/fs/fs_namespace_advertise.c:150
 #, fuzzy
 msgid "Unknown error"
 msgstr "Lỗi không rõ.\n"
 
-#: src/fs/fs_namespace.c:427 src/fs/fs_namespace.c:448
+#: src/fs/fs_namespace_advertise.c:238 src/fs/fs_namespace_advertise.c:259
 #, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/fs/fs_namespace.c:467
+#: src/fs/fs_namespace_advertise.c:278
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_namespace.c:510
+#: src/fs/fs_namespace.c:57 src/fs/fs_namespace.c:83
 #, fuzzy, c-format
+msgid "Configuration fails to specify `%s' in section `%s'\n"
+msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
+
+#: src/fs/fs_namespace.c:112
+#, fuzzy, c-format
+msgid "Failed to open `%s' for writing: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/fs/fs_namespace.c:134 src/fs/fs_namespace.c:222
+#, fuzzy, c-format
+msgid "Failed to write `%s': %s\n"
+msgstr "Lỗi chạy %s: %s %d\n"
+
+#: src/fs/fs_namespace.c:256
+#, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_namespace.c:612
+#: src/fs/fs_namespace.c:371
 #, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr "Lỗi thêm mục nhập vào không gian tên « %s » (có chưa ?)\n"
 
-#: src/fs/fs_namespace.c:840 src/fs/fs_publish.c:1535
+#: src/fs/fs_namespace.c:588 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_namespace.c:884
+#: src/fs/fs_namespace.c:631
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/gnunet-search.c:111
-#, c-format
-msgid "Failed to write directory with search results to `%s'\n"
-msgstr ""
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:395
+#, fuzzy, c-format
+msgid "Publishing failed: %s"
+msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/gnunet-search.c:181
+#: src/fs/fs_publish.c:616 src/fs/fs_publish.c:633 src/fs/fs_publish.c:672
+#: src/fs/fs_publish.c:692 src/fs/fs_publish.c:717 src/fs/fs_publish.c:857
 #, fuzzy, c-format
-msgid "Error searching: %s.\n"
-msgstr "Gặp lỗi khi tải xuống: %s\n"
+msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n"
 
-#: src/fs/gnunet-search.c:231
+#: src/fs/fs_publish.c:618
+msgid "timeout on index-start request to `fs' service"
+msgstr ""
+
+#: src/fs/fs_publish.c:630
 #, fuzzy
-msgid "Could not create keyword URI from arguments.\n"
-msgstr "Không thể tạo miền tên.\n"
+msgid "unknown error"
+msgstr "Lỗi không rõ"
 
-#: src/fs/gnunet-search.c:255
+#: src/fs/fs_publish.c:673
+msgid "failed to compute hash"
+msgstr ""
+
+#: src/fs/fs_publish.c:693
 #, fuzzy
-msgid "Could not start searching.\n"
-msgstr "Không thể tạo miền tên.\n"
+msgid "filename too long"
+msgstr "tên tập tin"
 
-#: src/fs/gnunet-search.c:285 src/fs/gnunet-download.c:240
+#: src/fs/fs_publish.c:718
+msgid "could not connect to `fs' service"
+msgstr ""
+
+#: src/fs/fs_publish.c:741
+#, fuzzy, c-format
+msgid "Failed to get file identifiers for `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/fs/fs_publish.c:806
+#, fuzzy, c-format
+msgid "Recursive upload failed at `%s': %s"
+msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+
+#: src/fs/fs_publish.c:812
+#, fuzzy, c-format
+msgid "Recursive upload failed: %s"
+msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+
+#: src/fs/fs_publish.c:858
+msgid "needs to be an actual file"
+msgstr ""
+
+#: src/fs/fs_publish.c:1067
+#, fuzzy, c-format
+msgid "Insufficient space for publishing: %s"
+msgstr "Không đủ quyền truy cập cho « %s »: %s\n"
+
+#: src/fs/fs_publish.c:1138
+#, c-format
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
+msgstr ""
+
+#: src/fs/fs_publish_ksk.c:258
 #, fuzzy
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
+msgid "Could not connect to datastore."
+msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/fs/gnunet-search.c:288 src/fs/gnunet-download.c:246
-msgid "only search the local peer (no P2P network search)"
+#: src/fs/fs_search.c:810
+#, c-format
+msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-search.c:291
-msgid "write search results to file starting with PREFIX"
+#: src/fs/fs_test_lib.c:269
+#, fuzzy, c-format
+msgid "Failed to start daemon: %s\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/fs/fs_unindex.c:58
+msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/gnunet-search.c:294
-msgid "automatically terminate search after VALUE ms"
+#: src/fs/fs_unindex.c:63
+#, fuzzy
+msgid "Failed to read file"
+msgstr "Lỗi gửi tin nhẳn.\n"
+
+#: src/fs/fs_unindex.c:236
+msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/gnunet-search.c:301
-msgid "automatically terminate search after VALUE results are found"
+#: src/fs/fs_unindex.c:244
+msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/gnunet-search.c:308
+#: src/fs/fs_unindex.c:252
 #, fuzzy
-msgid "Search GNUnet for files that were published on GNUnet"
-msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chúng ta tải lên"
+msgid "Invalid response from `fs' service."
+msgstr "Đối số không hợp lệ cho « %s ».\n"
 
+#: src/fs/fs_unindex.c:297
+#, fuzzy
+msgid "Failed to connect to FS service for unindexing."
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/fs/fs_unindex.c:332
+#, fuzzy
+msgid "Failed to connect to `datastore' service."
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/fs/fs_unindex.c:345
+#, fuzzy
+msgid "Failed to open file for unindexing."
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/fs/fs_unindex.c:379
+#, fuzzy
+msgid "Failed to compute hash of file."
+msgstr "Không kết nối được đến trình nền gnunetd."
+
 #: src/fs/fs_uri.c:220
 #, c-format
 msgid "`%' must be followed by HEX number"
@@ -2334,106 +2276,350 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
-#: src/fs/gnunet-publish.c:118
+#: src/fs/gnunet-directory.c:49
 #, c-format
+msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgstr ""
+
+#: src/fs/gnunet-directory.c:94
+#, fuzzy, c-format
+msgid "Directory `%s' meta data:\n"
+msgstr "==> Thư mục « %s »:\n"
+
+#: src/fs/gnunet-directory.c:97
+#, fuzzy, c-format
+msgid "Directory `%s' contents:\n"
+msgstr "==> Thư mục « %s »:\n"
+
+#: src/fs/gnunet-directory.c:132
+#, fuzzy
+msgid "You must specify a filename to inspect.\n"
+msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
+
+#: src/fs/gnunet-directory.c:145
+#, fuzzy, c-format
+msgid "Failed to read directory `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/fs/gnunet-directory.c:154
+#, fuzzy, c-format
+msgid "`%s' is not a GNUnet directory\n"
+msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
+
+#: src/fs/gnunet-directory.c:179
+#, fuzzy
+msgid "Display contents of a GNUnet directory"
+msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
+
+#: src/fs/gnunet-download.c:100
+#, fuzzy, c-format
+msgid "Starting download `%s'.\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/fs/gnunet-download.c:109
+#, fuzzy
+msgid "<unknown time>"
+msgstr "Lỗi không rõ"
+
+#: src/fs/gnunet-download.c:118
+#, c-format
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:128
+#, fuzzy, c-format
+msgid "Error downloading: %s.\n"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#: src/fs/gnunet-download.c:136
+#, fuzzy, c-format
+msgid "Downloading `%s' done (%s/s).\n"
+msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
+
+#: src/fs/gnunet-download.c:151 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
+#, fuzzy, c-format
+msgid "Unexpected status: %d\n"
+msgstr "Gặp sự kiện bất thường: %d\n"
+
+#: src/fs/gnunet-download.c:176
+#, fuzzy
+msgid "You need to specify a URI argument.\n"
+msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
+
+#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#, fuzzy, c-format
+msgid "Failed to parse URI: %s\n"
+msgstr "Tập tin « %s » có URI: %s\n"
+
+#: src/fs/gnunet-download.c:189
+msgid "Only CHK or LOC URIs supported.\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:196
+msgid "Target filename must be specified.\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
+#, fuzzy, c-format
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/fs/gnunet-download.c:247 src/fs/gnunet-search.c:285
+#, fuzzy
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
+
+#: src/fs/gnunet-download.c:250
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
+msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
+
+#: src/fs/gnunet-download.c:253 src/fs/gnunet-search.c:288
+msgid "only search the local peer (no P2P network search)"
+msgstr ""
+
+#: src/fs/gnunet-download.c:256
+msgid "write the file to FILENAME"
+msgstr "ghi tập tin vào TÊN_TẬP_TIN"
+
+#: src/fs/gnunet-download.c:260
+#, fuzzy
+msgid "set the maximum number of parallel downloads that is allowed"
+msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
+
+#: src/fs/gnunet-download.c:264
+#, fuzzy
+msgid "set the maximum number of parallel requests for blocks that is allowed"
+msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
+
+#: src/fs/gnunet-download.c:267
+msgid "download a GNUnet directory recursively"
+msgstr "tải xuống đệ quy một thư mục GNUnet"
+
+#: src/fs/gnunet-download.c:277
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:117
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:124
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Tùy chọn chia sẻ tập tin"
+
+#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/fs/gnunet-pseudonym.c:165
+#, fuzzy, c-format
+msgid "Namespace `%s' unknown.\n"
+msgstr "Không gian tên « %s » có đánh giá %d.\n"
+
+#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
+#: src/fs/gnunet-pseudonym.c:249
+#, fuzzy, c-format
+msgid "Option `%s' ignored\n"
+msgstr "%s: tùy chọn « %s » là mơ hồ\n"
+
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
+
+#: src/fs/gnunet-pseudonym.c:272
+msgid "create or advertise namespace NAME"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:275
+msgid "delete namespace NAME "
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:278
+#, fuzzy
+msgid ""
+"add an additional keyword for the advertisment (this option can be specified "
+"multiple times)"
+msgstr ""
+"thêm một từ khóa bổ sung cho tất cả tập tin và thư mục (có thể chỉ ra tùy "
+"chọn này nhiều lần)"
+
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+msgid "set the meta-data for the given TYPE to the given VALUE"
+msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
+
+#: src/fs/gnunet-pseudonym.c:285
+#, fuzzy
+msgid "print names of local namespaces"
+msgstr "đặt đánh giá của một không gian tên"
+
+#: src/fs/gnunet-pseudonym.c:288
+msgid "use the given PRIORITY for the advertisments"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:291
+msgid "do not print names of remote namespaces"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:297
+#, fuzzy
+msgid "specify ID of the root of the namespace"
+msgstr "đặt đánh giá của một không gian tên"
+
+#: src/fs/gnunet-pseudonym.c:300
+#, fuzzy
+msgid "change rating of namespace ID by VALUE"
+msgstr "đặt đánh giá của một không gian tên"
+
+#: src/fs/gnunet-pseudonym.c:308
+msgid "Manage GNUnet pseudonyms."
+msgstr ""
+
+#: src/fs/gnunet-publish.c:147
+#, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:126
+#: src/fs/gnunet-publish.c:155
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-publish.c:137
+#: src/fs/gnunet-publish.c:165
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:141
+#: src/fs/gnunet-publish.c:169
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/fs/gnunet-publish.c:160
+#: src/fs/gnunet-publish.c:187
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:272
+#: src/fs/gnunet-publish.c:299
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:274
+#: src/fs/gnunet-publish.c:301
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/fs/gnunet-publish.c:325
+#: src/fs/gnunet-publish.c:352
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-publish.c:367
+#: src/fs/gnunet-publish.c:427
+#, fuzzy
+msgid "Could not publish\n"
+msgstr "Không thể truy cập đến « %s »: %s\n"
+
+#: src/fs/gnunet-publish.c:454
+#, fuzzy
+msgid "Could not start publishing.\n"
+msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+
+#: src/fs/gnunet-publish.c:485
+#, fuzzy, c-format
+msgid "Scanning directory `%s'.\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/fs/gnunet-publish.c:487
+#, fuzzy, c-format
+msgid "Scanning file `%s'.\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/fs/gnunet-publish.c:492
 #, c-format
+msgid "There was trouble processing file `%s', skipping it.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:497
+msgid "Preprocessing complete.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:501
+#, fuzzy, c-format
+msgid "Extracting meta data from file `%s' complete.\n"
+msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
+
+#: src/fs/gnunet-publish.c:505
+msgid "Meta data extraction has finished.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:512
+#, fuzzy
+msgid "Internal error scanning directory.\n"
+msgstr "=\tLỗi đọc thư mục.\n"
+
+#: src/fs/gnunet-publish.c:546
+#, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "Không thể trích siêu dữ liệu ra một địa chỉ URI.\n"
 
-#: src/fs/gnunet-publish.c:374
+#: src/fs/gnunet-publish.c:553
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-publish.c:380
+#: src/fs/gnunet-publish.c:559
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-publish.c:388
+#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:398 src/fs/gnunet-publish.c:405
-#: src/transport/gnunet-transport.c:503
+#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
+#: src/transport/gnunet-transport.c:530
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:606
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-publish.c:439 src/fs/gnunet-download.c:175
+#: src/fs/gnunet-publish.c:639
 #, fuzzy, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "Tập tin « %s » có URI: %s\n"
+msgid "Failed to access `%s': %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:472
-#, fuzzy, c-format
-msgid "Could not access file: %s\n"
-msgstr "Không thể truy cập đến « %s »: %s\n"
+#: src/fs/gnunet-publish.c:651
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:497
-#, fuzzy, c-format
-msgid "Could not publish `%s': %s\n"
-msgstr "Không thể truy cập đến « %s »: %s\n"
-
-#: src/fs/gnunet-publish.c:520
-#, fuzzy
-msgid "Could not start publishing.\n"
-msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
-
-#: src/fs/gnunet-publish.c:547
+#: src/fs/gnunet-publish.c:676
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
 
-#: src/fs/gnunet-publish.c:550
+#: src/fs/gnunet-publish.c:679
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:554
+#: src/fs/gnunet-publish.c:683
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2441,7 +2627,7 @@
 "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện "
 "tải lên"
 
-#: src/fs/gnunet-publish.c:558
+#: src/fs/gnunet-publish.c:687
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2449,7 +2635,7 @@
 "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra "
 "tùy chọn này nhiều lần)"
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:694
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2457,7 +2643,7 @@
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/fs/gnunet-publish.c:570
+#: src/fs/gnunet-publish.c:699
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2465,16 +2651,16 @@
 "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ "
 "cho sự chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:574
+#: src/fs/gnunet-publish.c:703
 msgid "specify the priority of the content"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/fs/gnunet-publish.c:578
+#: src/fs/gnunet-publish.c:707
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)"
 
-#: src/fs/gnunet-publish.c:584
+#: src/fs/gnunet-publish.c:713
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -2482,13 +2668,13 @@
 msgstr ""
 "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
 
-#: src/fs/gnunet-publish.c:588
+#: src/fs/gnunet-publish.c:717
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "đặt mã số của phiên bản này của sự công bố (chỉ cho chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-publish.c:721
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -2496,81 +2682,286 @@
 "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm "
 "từ khoá vào tập tin có địa chỉ URI tương ứng)"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:736
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_search.c:810
+#: src/fs/gnunet-search.c:111
 #, c-format
-msgid "Got result with unknown block type `%d', ignoring"
+msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
-#: src/fs/gnunet-service-fs_lc.c:490
+#: src/fs/gnunet-search.c:181
+#, fuzzy, c-format
+msgid "Error searching: %s.\n"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#: src/fs/gnunet-search.c:231
 #, fuzzy
+msgid "Could not create keyword URI from arguments.\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/fs/gnunet-search.c:255
+#, fuzzy
+msgid "Could not start searching.\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/fs/gnunet-search.c:291
+msgid "write search results to file starting with PREFIX"
+msgstr ""
+
+#: src/fs/gnunet-search.c:294
+msgid "automatically terminate search after VALUE ms"
+msgstr ""
+
+#: src/fs/gnunet-search.c:301
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
+
+#: src/fs/gnunet-search.c:308
+#, fuzzy
+msgid "Search GNUnet for files that were published on GNUnet"
+msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chúng ta tải lên"
+
+#: src/fs/gnunet-service-fs.c:240
+msgid "# running average P2P latency (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
+#, fuzzy
+msgid "# Loopback routes suppressed"
+msgstr "# tổng số định tuyến lỗ hổng thành công"
+
+#: src/fs/gnunet-service-fs.c:583 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/topology/gnunet-daemon-topology.c:1290
+#: src/topology/gnunet-daemon-topology.c:1297
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' service.\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1546
+#: src/topology/gnunet-daemon-topology.c:654
+#: src/topology/gnunet-daemon-topology.c:756
+#: src/transport/gnunet-service-transport_neighbours.c:960
+#: src/transport/gnunet-service-transport_neighbours.c:1289
+#: src/transport/gnunet-service-transport_neighbours.c:1841
+#: src/transport/gnunet-service-transport_neighbours.c:2499
+#: src/transport/gnunet-service-transport_neighbours.c:2566
+#, fuzzy
+msgid "# peers connected"
+msgstr "# của các đồng đẳng đã kết nối"
+
+#: src/fs/gnunet-service-fs_cp.c:696
+#, fuzzy
+msgid "# migration stop messages received"
+msgstr "# các thông báo phát hiện dht được nhận"
+
+#: src/fs/gnunet-service-fs_cp.c:700
+#, c-format
+msgid "Migration of content to peer `%s' blocked for %llu ms\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:735
+#, fuzzy
+msgid "# replies transmitted to other peers"
+msgstr "# các byte kiểu %d được gửi "
+
+#: src/fs/gnunet-service-fs_cp.c:741
+#, fuzzy
+msgid "# replies dropped"
+msgstr "# các đáp ứng dht được định tuyến"
+
+#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1336
+msgid "# P2P searches active"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:858
+msgid "# artificial delays introduced (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:911
+#, fuzzy
+msgid "# replies dropped due to type mismatch"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/fs/gnunet-service-fs_cp.c:921
+#, fuzzy
+msgid "# replies received for other peers"
+msgstr "# các byte kiểu %d được nhận"
+
+#: src/fs/gnunet-service-fs_cp.c:935
+msgid "# replies dropped due to insufficient cover traffic"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:973
+msgid "# P2P searches destroyed due to ultimate reply"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1040
+#, fuzzy
+msgid "# requests done for free (low load)"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/fs/gnunet-service-fs_cp.c:1064
+msgid "# request dropped, priority insufficient"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1074
+#, fuzzy
+msgid "# requests done for a price (normal load)"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/fs/gnunet-service-fs_cp.c:1153
+msgid "# GET requests received (from other peers)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1187
+#, fuzzy
+msgid "# requests dropped due to initiator not being connected"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/fs/gnunet-service-fs_cp.c:1211
+#, fuzzy
+msgid "# requests dropped due to missing reverse route"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/fs/gnunet-service-fs_cp.c:1277
+#, fuzzy
+msgid "# requests dropped due TTL underflow"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/fs/gnunet-service-fs_cp.c:1305
+#, fuzzy
+msgid "# requests dropped due to higher-TTL request"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/fs/gnunet-service-fs_cp.c:1334
+#, fuzzy
+msgid "# P2P query messages received and processed"
+msgstr "# các thông báo phát hiện dht được nhận"
+
+#: src/fs/gnunet-service-fs_cp.c:1701
+#, fuzzy
+msgid "# migration stop messages sent"
+msgstr "# các thông báo phát hiện dht được nhận"
+
+#: src/fs/gnunet-service-fs_indexing.c:113
+#: src/fs/gnunet-service-fs_indexing.c:163
+#, fuzzy, c-format
+msgid "Configuration option `%s' in section `%s' missing.\n"
+msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#: src/fs/gnunet-service-fs_indexing.c:121
+#: src/fs/gnunet-service-fs_indexing.c:177
+#, fuzzy, c-format
+msgid "Could not open `%s'.\n"
+msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
+
+#: src/fs/gnunet-service-fs_indexing.c:137
+#, fuzzy, c-format
+msgid "Error writing `%s'.\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/fs/gnunet-service-fs_indexing.c:228
+#, c-format
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:266
+#, c-format
+msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:490
+#, fuzzy, c-format
+msgid "Failed to delete bogus block: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/fs/gnunet-service-fs_indexing.c:548
+msgid "# index blocks removed: original file inaccessible"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:563
+#, fuzzy, c-format
+msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
+msgstr "Không thể giải quyết « %s » (%s): %s\n"
+
+#: src/fs/gnunet-service-fs_indexing.c:565
+msgid "not indexed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:580
+#, fuzzy, c-format
+msgid "Indexed file `%s' changed at offset %llu\n"
+msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
+
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
+#: src/fs/gnunet-service-fs_lc.c:494
+#, fuzzy
 msgid "# client searches active"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/fs/gnunet-service-fs_lc.c:254
+#: src/fs/gnunet-service-fs_lc.c:256
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/fs/gnunet-service-fs_lc.c:319
+#: src/fs/gnunet-service-fs_lc.c:323
 #, fuzzy
 msgid "# client searches received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/fs/gnunet-service-fs_lc.c:358
+#: src/fs/gnunet-service-fs_lc.c:362
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
+#: src/fs/gnunet-service-fs_pe.c:265
 #, fuzzy
-msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
-msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
+msgid "# average retransmission delay (ms)"
+msgstr "# thời gian trung bình còn kết nối (theo miligiây)"
 
-#: src/fs/fs_misc.c:126
-#, c-format
-msgid "Did not find mime type `%s' in extension list.\n"
-msgstr ""
+#: src/fs/gnunet-service-fs_pe.c:394
+#, fuzzy
+msgid "# transmission failed (core has no bandwidth)"
+msgstr "Lỗi thử gửi, kiểu truyền tải %d không được hỗ trợ\n"
 
-#: src/fs/gnunet-directory.c:49
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
+#: src/fs/gnunet-service-fs_pe.c:425
+#, fuzzy
+msgid "# query messages sent to other peers"
+msgstr "# các byte thông báo gửi đi bị loại bỏ"
+
+#: src/fs/gnunet-service-fs_pe.c:478
+msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
-#, fuzzy, c-format
-msgid "Directory `%s' meta data:\n"
-msgstr "==> Thư mục « %s »:\n"
+#: src/fs/gnunet-service-fs_pe.c:485
+#, fuzzy
+msgid "# query plans executed"
+msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/fs/gnunet-directory.c:97
-#, fuzzy, c-format
-msgid "Directory `%s' contents:\n"
-msgstr "==> Thư mục « %s »:\n"
+#: src/fs/gnunet-service-fs_pe.c:549
+#, fuzzy
+msgid "# requests merged"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-directory.c:132
+#: src/fs/gnunet-service-fs_pe.c:555
 #, fuzzy
-msgid "You must specify a filename to inspect."
-msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
+msgid "# requests refreshed"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-directory.c:145
-#, fuzzy, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+#: src/fs/gnunet-service-fs_pe.c:608 src/fs/gnunet-service-fs_pe.c:694
+#: src/fs/gnunet-service-fs_pe.c:761
+msgid "# query plan entries"
+msgstr ""
 
-#: src/fs/gnunet-directory.c:176
-#, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
-
 #: src/fs/gnunet-service-fs_pr.c:287
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:623
+#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:622
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -2580,1004 +2971,1749 @@
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:816
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:830
+#: src/fs/gnunet-service-fs_pr.c:832
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:845
+#: src/fs/gnunet-service-fs_pr.c:847
 #, fuzzy
 msgid "# results found locally"
 msgstr "# nội dung lỗ hổng được tìm cục bộ"
 
-#: src/fs/gnunet-service-fs_pr.c:965
+#: src/fs/gnunet-service-fs_pr.c:969
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:992
+#: src/fs/gnunet-service-fs_pr.c:996
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_pr.c:1027
+#: src/fs/gnunet-service-fs_pr.c:1031
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1120
+#: src/fs/gnunet-service-fs_pr.c:1124
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1141
+#: src/fs/gnunet-service-fs_pr.c:1145
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
+#: src/fs/gnunet-service-fs_pr.c:1192
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1202
+#: src/fs/gnunet-service-fs_pr.c:1206
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1215
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1227
+#: src/fs/gnunet-service-fs_pr.c:1231
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1248
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1257
+#: src/fs/gnunet-service-fs_pr.c:1261
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1266
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1289 src/fs/gnunet-service-fs_pr.c:1329
-#: src/fs/gnunet-service-fs_pr.c:1469
+#: src/fs/gnunet-service-fs_pr.c:1293 src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1473
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1347
+#: src/fs/gnunet-service-fs_pr.c:1351
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1360
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1446
+#: src/fs/gnunet-service-fs_pr.c:1450
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1530
+#: src/fs/gnunet-service-fs_pr.c:1534
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:1629 src/fs/gnunet-service-fs_pr.c:1638
+#: src/fs/gnunet-service-fs_pr.c:1633 src/fs/gnunet-service-fs_pr.c:1642
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:265
+#: src/fs/gnunet-service-fs_push.c:653
+#, c-format
+msgid ""
+"Invalid value specified for option `%s' in section `%s', content pushing "
+"disabled\n"
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:89
+#, fuzzy, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgstr "Lỗi bỏ chỉ mục (không đưa ra lý do)."
+
+#: src/fs/gnunet-unindex.c:96
+#, fuzzy, c-format
+msgid "Error unindexing: %s.\n"
+msgstr ""
+"\n"
+"Gặp lỗi khi bỏ chỉ mục tập tin: %s\n"
+
+#: src/fs/gnunet-unindex.c:101
 #, fuzzy
-msgid "# average retransmission delay (ms)"
-msgstr "# thời gian trung bình còn kết nối (theo miligiây)"
+msgid "Unindexing done.\n"
+msgstr "Bỏ chỉ mục tập tin."
 
-#: src/fs/gnunet-service-fs_pe.c:394
+#: src/fs/gnunet-unindex.c:131
+#, fuzzy, c-format
+msgid "You must specify one and only one filename for unindexing.\n"
+msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
+
+#: src/fs/gnunet-unindex.c:148
 #, fuzzy
-msgid "# transmission failed (core has no bandwidth)"
-msgstr "Lỗi thử gửi, kiểu truyền tải %d không được hỗ trợ\n"
+msgid "Could not start unindex operation.\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:425
+#: src/fs/gnunet-unindex.c:176
+msgid "Unindex a file that was previously indexed with gnunet-publish."
+msgstr ""
+
+#: src/fs/plugin_block_fs.c:131
+msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+msgstr ""
+
+#: src/gns/gns_api.c:221
 #, fuzzy
-msgid "# query messages sent to other peers"
-msgstr "# các byte thông báo gửi đi bị loại bỏ"
+msgid "Failed to connect to the GNS service!\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:478
-msgid "# delay heap timeout"
+#: src/gns/gnunet-gns-lookup.c:216
+msgid "Issue a request to the GNUnet Naming System, prints results."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:485
+#: src/hostlist/gnunet-daemon-hostlist.c:264
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:317
 #, fuzzy
-msgid "# query plans executed"
-msgstr "# các yêu cầu dht được định tuyến"
+msgid "advertise our hostlist to other peers"
+msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/fs/gnunet-service-fs_pe.c:549
+#: src/hostlist/gnunet-daemon-hostlist.c:322
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:325
 #, fuzzy
-msgid "# requests merged"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
+msgid "enable learning about hostlist servers from other peers"
+msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/fs/gnunet-service-fs_pe.c:555
+#: src/hostlist/gnunet-daemon-hostlist.c:329
 #, fuzzy
-msgid "# requests refreshed"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
+msgid "provide a hostlist server"
+msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/fs/gnunet-service-fs_pe.c:608 src/fs/gnunet-service-fs_pe.c:694
-#: src/fs/gnunet-service-fs_pe.c:736
-msgid "# query plan entries"
+#: src/hostlist/gnunet-daemon-hostlist.c:341
+msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1544
-#: src/transport/gnunet-service-transport_neighbours.c:936
-#: src/transport/gnunet-service-transport_neighbours.c:1263
-#: src/transport/gnunet-service-transport_neighbours.c:1735
-#: src/transport/gnunet-service-transport_neighbours.c:2369
-#: src/transport/gnunet-service-transport_neighbours.c:2437
-#: src/topology/gnunet-daemon-topology.c:654
-#: src/topology/gnunet-daemon-topology.c:756
+#: src/hostlist/hostlist-client.c:286
 #, fuzzy
-msgid "# peers connected"
-msgstr "# của các đồng đẳng đã kết nối"
+msgid "# bytes downloaded from hostlist servers"
+msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/fs/gnunet-service-fs_cp.c:696
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
 #, fuzzy
-msgid "# migration stop messages received"
-msgstr "# các thông báo phát hiện dht được nhận"
+msgid "# invalid HELLOs downloaded from hostlist servers"
+msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/fs/gnunet-service-fs_cp.c:700
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#, fuzzy, c-format
+msgid "Invalid `%s' message received from hostlist at `%s'\n"
+msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
+
+#: src/hostlist/hostlist-client.c:330
+#, fuzzy
+msgid "# valid HELLOs downloaded from hostlist servers"
+msgstr "# các HELLO tải xuống qua HTTP"
+
+#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#, fuzzy, c-format
+msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
+msgstr ""
+"Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
+
+#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
+#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
+#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
+#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
+#: src/transport/plugin_transport_http_client.c:108
+#: src/transport/plugin_transport_http_client.c:123
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %llu ms\n"
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:735
+#: src/hostlist/hostlist-client.c:622
+#, c-format
+msgid "# advertised URI `%s' downloaded"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:663
+#, c-format
+msgid ""
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:805
+#, fuzzy, c-format
+msgid "Timeout trying to download hostlist from `%s'\n"
+msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
+
+#: src/hostlist/hostlist-client.c:822
+#, c-format
+msgid "Download limit of %u bytes exceeded, stopping download\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:842
+#, fuzzy, c-format
+msgid "%s failed for `%s' at %s:%d: `%s'\n"
+msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+
+#: src/hostlist/hostlist-client.c:848
+#, fuzzy, c-format
+msgid "Download of hostlist `%s' completed.\n"
+msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
+
+#: src/hostlist/hostlist-client.c:856
+#, c-format
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:909
+#, fuzzy, c-format
+msgid "Bootstrapping using hostlist at `%s'.\n"
+msgstr "Đang nạp và khởi động dùng « %s ».\n"
+
+#: src/hostlist/hostlist-client.c:917
+msgid "# hostlist downloads initiated"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+msgid "# milliseconds between hostlist downloads"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1054
+#, c-format
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1092
+msgid "Scheduled saving of hostlists\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1096
+#, c-format
+msgid "Hostlists will be saved to file again in %llums\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
 #, fuzzy
-msgid "# replies transmitted to other peers"
-msgstr "# các byte kiểu %d được gửi "
+msgid "# active connections"
+msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_cp.c:741
+#: src/hostlist/hostlist-client.c:1253
+#, c-format
+msgid "Initial time between hostlist downloads is %llums\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1284
+#, fuzzy, c-format
+msgid ""
+"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
+msgstr ""
+"Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
+
+#: src/hostlist/hostlist-client.c:1290
+#, fuzzy, c-format
+msgid "Loading saved hostlist entries from file `%s' \n"
+msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
+
+#: src/hostlist/hostlist-client.c:1294
+#, c-format
+msgid "Hostlist file `%s' is not existing\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1305
+#, fuzzy, c-format
+msgid "Could not open file `%s' for reading to load hostlists: %s\n"
+msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
+
+#: src/hostlist/hostlist-client.c:1338
+#, c-format
+msgid "%u hostlist URIs loaded from file\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1340
 #, fuzzy
-msgid "# replies dropped"
-msgstr "# các đáp ứng dht được định tuyến"
+msgid "# hostlist URIs read from file"
+msgstr "# các byte danh sách máy được trả về"
 
-#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1334
-msgid "# P2P searches active"
+#: src/hostlist/hostlist-client.c:1373
+#, fuzzy, c-format
+msgid ""
+"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
+"Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:858
-msgid "# artificial delays introduced (ms)"
+#: src/hostlist/hostlist-client.c:1387
+#, fuzzy, c-format
+msgid "Could not open file `%s' for writing to save hostlists: %s\n"
+msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
+
+#: src/hostlist/hostlist-client.c:1392
+#, fuzzy, c-format
+msgid "Writing %u hostlist URIs to `%s'\n"
+msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
+
+#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#, c-format
+msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:909
+#: src/hostlist/hostlist-client.c:1428
 #, fuzzy
-msgid "# replies dropped due to type mismatch"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+msgid "# hostlist URIs written to file"
+msgstr "# các byte danh sách máy được trả về"
 
-#: src/fs/gnunet-service-fs_cp.c:919
+#: src/hostlist/hostlist-client.c:1480
+msgid "Learning is enabled on this peer\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1483
+#, c-format
+msgid "Hostlists will be saved to file again in  %llums\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1492
+msgid "Learning is not enabled on this peer\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1504
+#, c-format
+msgid ""
+"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1508
+#, fuzzy, c-format
+msgid "Hostlist file `%s' could not be removed\n"
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#: src/hostlist/hostlist-server.c:134
 #, fuzzy
-msgid "# replies received for other peers"
-msgstr "# các byte kiểu %d được nhận"
+msgid "bytes in hostlist"
+msgstr "# các byte trong kho dữ liệu"
 
-#: src/fs/gnunet-service-fs_cp.c:933
-msgid "# replies dropped due to insufficient cover traffic"
+#: src/hostlist/hostlist-server.c:157
+msgid "expired addresses encountered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:971
-msgid "# P2P searches destroyed due to ultimate reply"
+#: src/hostlist/hostlist-server.c:184
+#: src/topology/gnunet-daemon-topology.c:875
+#, fuzzy, c-format
+msgid "Error in communication with PEERINFO service: %s\n"
+msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
+#: src/hostlist/hostlist-server.c:205
+msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1038
+#: src/hostlist/hostlist-server.c:221
+msgid "bytes not included in hostlist (size limit)"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:269
+#, fuzzy, c-format
+msgid "Refusing `%s' request to hostlist server\n"
+msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
+
+#: src/hostlist/hostlist-server.c:272
 #, fuzzy
-msgid "# requests done for free (low load)"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+msgid "hostlist requests refused (not HTTP GET)"
+msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1062
-msgid "# request dropped, priority insufficient"
+#: src/hostlist/hostlist-server.c:280
+msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1072
+#: src/hostlist/hostlist-server.c:287
+#, c-format
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:291
 #, fuzzy
-msgid "# requests done for a price (normal load)"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+msgid "hostlist requests refused (upload data)"
+msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1151
-msgid "# GET requests received (from other peers)"
+#: src/hostlist/hostlist-server.c:299
+msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1185
+#: src/hostlist/hostlist-server.c:302
 #, fuzzy
-msgid "# requests dropped due to initiator not being connected"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+msgid "hostlist requests refused (not ready)"
+msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1209
+#: src/hostlist/hostlist-server.c:306
 #, fuzzy
-msgid "# requests dropped due to missing reverse route"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+msgid "Received request for our hostlist\n"
+msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1275
+#: src/hostlist/hostlist-server.c:307
 #, fuzzy
-msgid "# requests dropped due TTL underflow"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+msgid "hostlist requests processed"
+msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1303
+#: src/hostlist/hostlist-server.c:350
 #, fuzzy
-msgid "# requests dropped due to higher-TTL request"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+msgid "# hostlist advertisements send"
+msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
-#: src/fs/gnunet-service-fs_cp.c:1332
+#: src/hostlist/hostlist-server.c:397
+msgid "Advertisement message could not be queued by core\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:565
+#, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:574
+#, c-format
+msgid "Hostlist service starts on %s:%llu\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:588
+#, fuzzy, c-format
+msgid "Address to obtain hostlist: `%s'\n"
+msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
+
+#: src/hostlist/hostlist-server.c:626
+#, fuzzy, c-format
+msgid "Could not start hostlist HTTP server on port %u\n"
+msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
+
+#: src/mesh/gnunet-service-mesh.c:4595
+msgid "Wrong CORE service\n"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:4789
 #, fuzzy
-msgid "# P2P query messages received and processed"
-msgstr "# các thông báo phát hiện dht được nhận"
+msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
+msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/fs/gnunet-service-fs_cp.c:1699
+#: src/mesh/gnunet-service-mesh.c:4798
 #, fuzzy
-msgid "# migration stop messages sent"
-msgstr "# các thông báo phát hiện dht được nhận"
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/fs/gnunet-service-fs_push.c:653
+#: src/nat/gnunet-nat-server.c:289
 #, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
+msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:113
-#: src/fs/gnunet-service-fs_indexing.c:163
-#, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing.\n"
-msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+#: src/nat/gnunet-nat-server.c:328
+msgid "GNUnet NAT traversal test helper daemon"
+msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:121
-#: src/fs/gnunet-service-fs_indexing.c:177
+#: src/nat/nat.c:803
+#, c-format
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgstr ""
+
+#: src/nat/nat.c:852
 #, fuzzy, c-format
-msgid "Could not open `%s'.\n"
-msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
+msgid "Failed to start %s\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:137
+#: src/nat/nat.c:1121
 #, fuzzy, c-format
-msgid "Error writing `%s'.\n"
-msgstr "Gặp lỗi khi tạo người dùng"
+msgid "Malformed %s `%s' given in configuration!\n"
+msgstr "Lỗi lưu cấu hình."
 
-#: src/fs/gnunet-service-fs_indexing.c:228
+#: src/nat/nat.c:1187 src/nat/nat.c:1197
 #, c-format
 msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:266
+#: src/nat/nat.c:1329
+msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+msgstr ""
+
+#: src/nat/nat.c:1341
 #, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
+msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:490
-#, fuzzy, c-format
-msgid "Failed to delete bogus block: %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+#: src/nat/nat_test.c:348
+#, fuzzy
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:548
-msgid "# index blocks removed: original file inaccessible"
+#: src/nat/nat_test.c:418
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:563
-#, fuzzy, c-format
-msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
-msgstr "Không thể giải quyết « %s » (%s): %s\n"
+#: src/nse/gnunet-nse-profiler.c:926
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/fs/gnunet-service-fs_indexing.c:565
-msgid "not indexed"
+#: src/nse/gnunet-service-nse.c:936
+#, c-format
+msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:580
+#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
+#: src/nse/gnunet-service-nse.c:1431
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+msgstr ""
+
+#: src/nse/gnunet-service-nse.c:1398
+msgid "Invalid work requirement for NSE service. Exiting.\n"
+msgstr ""
+
+#: src/nse/gnunet-service-nse.c:1419
+#, fuzzy
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:133
 #, fuzzy, c-format
-msgid "Indexed file `%s' changed at offset %llu\n"
-msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/fs/fs_list_indexed.c:90
+#: src/peerinfo/gnunet-service-peerinfo.c:195
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:239
+#, 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:305
+#, 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/peerinfo_api.c:279
 #, fuzzy, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+msgid "Failed to transmit message to `%s' service.\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_list_indexed.c:117
+#: src/peerinfo/peerinfo_api.c:435
+#, fuzzy
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
+
+#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
+msgid "Received invalid message from `PEERINFO' service.\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:523
+#, fuzzy
+msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/peerinfo/peerinfo_api.c:557
+msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api_notify.c:258
 #, fuzzy, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+msgid "Could not connect to `%s' service.\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/fs/fs_list_indexed.c:164
+#: src/peerinfo-tool/gnunet-peerinfo.c:216
 #, fuzzy, c-format
-msgid "Failed to not connect to `%s' service.\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+msgid "Could not find option `%s:%s' in configuration.\n"
+msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
 
-#: src/fs/fs_unindex.c:58
-msgid "Failed to find given position in file"
+#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#, c-format
+msgid "I am peer `%s'.\n"
+msgstr "Tôi là đồng đẳng « %s ».\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:255
+msgid "output only the identity strings"
+msgstr "chỉ xuất những chuỗi nhận diện"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+msgid "output our own identity only"
+msgstr "chỉ xuất nhận diện mình"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
 #, fuzzy
-msgid "Failed to read file"
-msgstr "Lỗi gửi tin nhẳn.\n"
+msgid "Print information about peers."
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/fs/fs_unindex.c:236
-msgid "Unexpected time for a response from `fs' service."
+#: src/pt/gnunet-daemon-pt.c:264
+msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:244
-msgid "Timeout waiting for `fs' service."
+#: src/pt/gnunet-daemon-pt.c:270
+#, fuzzy
+msgid "# DNS requests mapped to VPN"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/pt/gnunet-daemon-pt.c:323
+msgid "# DNS records modified"
 msgstr ""
 
-#: src/fs/fs_unindex.c:252
+#: src/pt/gnunet-daemon-pt.c:500
 #, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "Đối số không hợp lệ cho « %s ».\n"
+msgid "# DNS replies intercepted"
+msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/fs_unindex.c:297
+#: src/pt/gnunet-daemon-pt.c:506
+msgid "Failed to parse DNS request.  Dropping.\n"
+msgstr ""
+
+#: src/pt/gnunet-daemon-pt.c:602
 #, fuzzy
-msgid "Failed to connect to FS service for unindexing."
-msgstr "Không kết nối được đến trình nền gnunetd."
+msgid "# DNS requests dropped (timeout)"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/fs_unindex.c:332
+#: src/pt/gnunet-daemon-pt.c:632
 #, fuzzy
-msgid "Failed to connect to `datastore' service."
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+msgid "# DNS requests intercepted"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/fs_unindex.c:345
+#: src/pt/gnunet-daemon-pt.c:637
 #, fuzzy
-msgid "Failed to open file for unindexing."
-msgstr "Không kết nối được đến trình nền gnunetd."
+msgid "# DNS requests dropped (DNS mesh tunnel down)"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/fs_unindex.c:379
+#: src/pt/gnunet-daemon-pt.c:645
 #, fuzzy
-msgid "Failed to compute hash of file."
-msgstr "Không kết nối được đến trình nền gnunetd."
+msgid "# DNS requests dropped (malformed)"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-download.c:100
+#: src/pt/gnunet-daemon-pt.c:716
+#, fuzzy
+msgid "# DNS replies received"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/pt/gnunet-daemon-pt.c:730
+#, fuzzy
+msgid "# DNS replies dropped (too late?)"
+msgstr "# các đáp ứng dht được định tuyến"
+
+#: src/pt/gnunet-daemon-pt.c:748 src/pt/gnunet-daemon-pt.c:760
+msgid "# DNS requests aborted (tunnel down)"
+msgstr ""
+
+#: src/pt/gnunet-daemon-pt.c:898 src/pt/gnunet-daemon-pt.c:907
+#: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
 #, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
+msgid "Failed to connect to %s service.  Exiting.\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-download.c:112
-#, c-format
-msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
+#: src/pt/gnunet-daemon-pt.c:973
+msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-download.c:121
+#: src/statistics/gnunet-service-statistics.c:209
 #, fuzzy, c-format
-msgid "Error downloading: %s.\n"
-msgstr "Gặp lỗi khi tải xuống: %s\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
+msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/fs/gnunet-download.c:129
+#: src/statistics/gnunet-service-statistics.c:267
 #, fuzzy, c-format
-msgid "Downloading `%s' done (%s/s).\n"
-msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/fs/gnunet-download.c:169
+#: src/statistics/gnunet-statistics.c:98
 #, fuzzy
-msgid "You need to specify a URI argument.\n"
-msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
+msgid "Failed to obtain statistics.\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/fs/gnunet-download.c:182
-msgid "Only CHK or LOC URIs supported.\n"
+#: src/statistics/gnunet-statistics.c:164
+msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
-msgid "Target filename must be specified.\n"
+#: src/statistics/gnunet-statistics.c:167
+msgid "make the value being set persistent"
 msgstr ""
 
-#: src/fs/gnunet-download.c:243
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
-msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
+#: src/statistics/gnunet-statistics.c:170
+msgid "limit output to the given SUBSYSTEM"
+msgstr ""
 
-#: src/fs/gnunet-download.c:249
-msgid "write the file to FILENAME"
-msgstr "ghi tập tin vào TÊN_TẬP_TIN"
+#: src/statistics/gnunet-statistics.c:173
+msgid "just print the statistics value"
+msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/statistics/gnunet-statistics.c:180
+msgid "Print statistics about GNUnet operations."
+msgstr "In ra thống kê về các thao tác GNUnet."
+
+#: src/statistics/statistics_api.c:390
 #, fuzzy
-msgid "set the maximum number of parallel downloads that is allowed"
-msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
+msgid "Failed to connect to statistics service!\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/fs/gnunet-download.c:257
+#: src/template/gnunet-template.c:68
+msgid "help text"
+msgstr ""
+
+#: src/testing/gnunet-testing.c:157
 #, fuzzy
-msgid "set the maximum number of parallel requests for blocks that is allowed"
-msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
+msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/fs/gnunet-download.c:260
-msgid "download a GNUnet directory recursively"
-msgstr "tải xuống đệ quy một thư mục GNUnet"
+#: src/testing/gnunet-testing.c:159
+#, c-format
+msgid "Specified hostkey file `%s' not found!\n"
+msgstr ""
 
-#: src/fs/gnunet-download.c:270
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+#: src/testing/gnunet-testing.c:273
+#, fuzzy
+msgid "create unique configuration files"
+msgstr "cập nhật một giá trị trong tập tin cấu hình"
+
+#: src/testing/gnunet-testing.c:275
+msgid "create hostkey files from pre-computed hostkey list"
 msgstr ""
 
-#: src/fs/fs_getopt.c:191
-#, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+#: src/testing/gnunet-testing.c:277
+msgid "host key file"
 msgstr ""
-"Không rõ kiểu siêu dữ liệu trong tùy chọn siêu dữ liệu « %s ». Đang ùng kiểu "
-"siêu dữ liệu « không rõ » (unknown) để thay thế.\n"
 
-#: src/fs/fs_publish.c:150 src/fs/fs_publish.c:421
+#: src/testing/gnunet-testing.c:279
+#, fuzzy
+msgid "number of unique configuration files or hostkeys to create"
+msgstr "in ra đầu ra tiêu chuẩn một giá trị từ tập tin cấu hình"
+
+#: src/testing/gnunet-testing.c:281
+#, fuzzy
+msgid "configuration template"
+msgstr "Cấu hình đã được lưu."
+
+#: src/testing/gnunet-testing.c:287
+msgid "Command line tool to access the testing library"
+msgstr ""
+
+#: src/testing/helper.c:56
+#, fuzzy
+msgid "Peer is lacking HOSTKEY configuration setting.\n"
+msgstr "Lưu cấu hình ngay bây giờ không?"
+
+#: src/testing/helper.c:64
+#, fuzzy
+msgid "Could not access hostkey.\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/testing/testing.c:214
+msgid "`scp' does not seem to terminate (timeout copying config).\n"
+msgstr ""
+
+#: src/testing/testing.c:228 src/testing/testing.c:849
+#, fuzzy
+msgid "`scp' did not complete cleanly.\n"
+msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
+
+#: src/testing/testing.c:251
+#, fuzzy
+msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/testing/testing.c:252
+#, fuzzy
+msgid "Failed to create pipe for `ssh' process.\n"
+msgstr "Lỗi tạo thư mục tạm thời."
+
+#: src/testing/testing.c:308
 #, fuzzy, c-format
-msgid "Publishing failed: %s"
-msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+msgid "Could not start `%s' process to create hostkey.\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/fs/fs_publish.c:658 src/fs/fs_publish.c:675 src/fs/fs_publish.c:714
-#: src/fs/fs_publish.c:734 src/fs/fs_publish.c:761 src/fs/fs_publish.c:909
+#: src/testing/testing.c:315
+#, fuzzy
+msgid "Failed to start `gnunet-peerinfo' process.\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/testing/testing.c:316 src/testing/testing.c:514
+#, fuzzy
+msgid "Failed to start `ssh' process.\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/testing/testing.c:378
 #, fuzzy, c-format
-msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
-msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n"
+msgid "Error reading from gnunet-peerinfo: %s\n"
+msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
 
-#: src/fs/fs_publish.c:660
-msgid "timeout on index-start request to `fs' service"
+#: src/testing/testing.c:382
+#, fuzzy
+msgid "Malformed output from gnunet-peerinfo!\n"
+msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
+
+#: src/testing/testing.c:392
+#, fuzzy
+msgid "Failed to get hostkey!\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/testing/testing.c:426
+msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:672
+#: src/testing/testing.c:506
+#, fuzzy, c-format
+msgid "Could not start `%s' process to start GNUnet.\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/testing/testing.c:513
 #, fuzzy
-msgid "unknown error"
-msgstr "Lỗi không rõ"
+msgid "Failed to start `gnunet-arm' process.\n"
+msgstr "Lỗi dừng chạy gnunet-auto-share.\n"
 
-#: src/fs/fs_publish.c:715
-msgid "failed to compute hash"
+#: src/testing/testing.c:537 src/testing/testing.c:647
+msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:735
+#: src/testing/testing.c:538 src/testing/testing.c:648
+#: src/testing/testing.c:668
+msgid "`ssh' does not seem to terminate.\n"
+msgstr ""
+
+#: src/testing/testing.c:617
+msgid "Unable to get HELLO for peer!\n"
+msgstr ""
+
+#: src/testing/testing.c:667
+msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
+msgstr ""
+
+#: src/testing/testing.c:690 src/testing/testing.c:724
+msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
+msgstr ""
+
+#: src/testing/testing.c:705 src/testing/testing.c:762
 #, fuzzy
-msgid "filename too long"
-msgstr "tên tập tin"
+msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
+msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
 
-#: src/fs/fs_publish.c:762
-msgid "could not connect to `fs' service"
+#: src/testing/testing.c:837
+msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:786
+#: src/testing/testing.c:1015
 #, fuzzy, c-format
-msgid "Failed to get file identifiers for `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+msgid "Starting service %s for peer `%4s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/fs_publish.c:856
+#: src/testing/testing.c:1299 src/testing/testing_group.c:6278
 #, fuzzy, c-format
-msgid "Recursive upload failed at `%s': %s"
-msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+msgid "Could not start `%s' process to copy configuration directory.\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/fs/fs_publish.c:862
+#: src/testing/testing.c:1387 src/testing/testing.c:1470
+#: src/testing/testing.c:1608
 #, fuzzy, c-format
-msgid "Recursive upload failed: %s"
-msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+msgid "Terminating peer `%4s'\n"
+msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/fs/fs_publish.c:910
-msgid "needs to be an actual file"
+#: src/testing/testing.c:1560
+#, fuzzy, c-format
+msgid "Setting d->dead on peer `%4s'\n"
+msgstr "Đang bắt đầu tài lên « %s ».\n"
+
+#: src/testing/testing.c:1698
+msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/fs/fs_publish.c:1092
+#: src/testing/testing.c:1706
+#, fuzzy
+msgid "Failed to write new configuration to disk."
+msgstr "Lỗi lưu cấu hình."
+
+#: src/testing/testing.c:1737
 #, fuzzy, c-format
-msgid "Insufficient space for publishing: %s"
-msgstr "Không đủ quyền truy cập cho « %s »: %s\n"
+msgid "Could not start `%s' process to copy configuration file.\n"
+msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
 
-#: src/fs/fs_publish.c:1163
-#, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
-msgstr ""
+#: src/testing/testing.c:1740
+#, fuzzy
+msgid "Failed to copy new configuration to remote machine."
+msgstr "Lỗi lưu cấu hình."
 
-#: src/fs/fs_publish.c:1499
+#: src/testing/testing.c:1895
 #, fuzzy
-msgid "Could not connect to datastore."
-msgstr "« %s »: Không thể kết nối.\n"
+msgid "Peers failed to connect"
+msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_api.c:284
+#: src/testing/testing.c:2035
+#, fuzzy
+msgid "Failed to connect to core service of first peer!\n"
+msgstr "Lỗi nạp dịch vụ sqstore. Hãy kiểm tra lại cấu hình.\n"
+
+#: src/testing/testing.c:2274
+msgid "Peers are not fully running yet, can not connect!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:1910 src/testing/testing_group.c:1922
+#: src/testing/testing_group.c:2023 src/testing/testing_group.c:2082
+#: src/testing/testing_group.c:2171 src/testing/testing_group.c:2191
+#: src/testing/testing_group.c:2328 src/testing/testing_peergroup.c:940
 #, fuzzy, c-format
-msgid "Could not open file `%s': %s"
-msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
+msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/fs/fs_api.c:293
+#: src/testing/testing_group.c:1932
 #, fuzzy, c-format
-msgid "Could not read file `%s': %s"
-msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
+msgid "Target is %d connections per peer."
+msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
 
-#: src/fs/fs_api.c:299
+#: src/testing/testing_group.c:2179
+#, fuzzy, c-format
+msgid ""
+"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
+"greater than 0\n"
+msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#: src/testing/testing_group.c:2209 src/testing/testing_group.c:2402
 #, c-format
-msgid "Short read reading from file `%s'!"
+msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
+"Đang kết nối các điểm nút theo địa hình học hình xuyến hai chiều: %u hàng, "
+"%u cột\n"
 
-#: src/fs/fs_api.c:877
-#, fuzzy, c-format
-msgid "Failed to resume publishing information `%s': %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+#: src/testing/testing_group.c:2246
+#, c-format
+msgid "natural log of %d is %d, will run %d iterations\n"
+msgstr ""
 
-#: src/fs/fs_api.c:1323
+#: src/testing/testing_group.c:2249
 #, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
+msgid "Total connections added thus far: %u!\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1365
+#: src/testing/testing_group.c:2290
 #, c-format
-msgid "Failure while resuming publishing operation `%s': %s\n"
+msgid "Total connections added for small world: %d!\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1381
+#: src/testing/testing_group.c:2342
+#, c-format
+msgid "rand is %f probability is %f\n"
+msgstr ""
+
+#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
 #, fuzzy, c-format
-msgid "Failed to resume publishing operation `%s': %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+msgid ""
+"No `%s' specified in peer configuration in section `%s', cannot copy friends "
+"file!\n"
+msgstr ""
+"Đặc tả mạng dạng sai trong cấu hình phần « %s » cho mục nhập « %s »: %s\n"
 
-#: src/fs/fs_api.c:1993
-#, c-format
-msgid "Failure while resuming unindexing operation `%s': %s\n"
+#: src/testing/testing_group.c:3020
+msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2003
+#: src/testing/testing_group.c:3133
 #, fuzzy, c-format
-msgid "Failed to resume unindexing operation `%s': %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+msgid "Copying file with command cp %s %s\n"
+msgstr "« %s » thất bại với mã lỗi %s: %s\n"
 
-#: src/fs/fs_api.c:2129 src/fs/fs_api.c:2368
+#: src/testing/testing_group.c:3156
 #, fuzzy, c-format
-msgid "Failed to resume sub-download `%s': %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+msgid "Copying file with command scp %s %s\n"
+msgstr "« %s » thất bại với mã lỗi %s: %s\n"
 
-#: src/fs/fs_api.c:2146
+#: src/testing/testing_group.c:3173
+#, c-format
+msgid "Checking copy status of file %d\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3191
+#, c-format
+msgid "File %d copied\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3206
+#, fuzzy
+msgid "Finished copying all blacklist files!\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
+#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
+msgid "Delaying connect, we have too many outstanding connections!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
+#: src/testing/testing_group.c:5035
+#, c-format
+msgid "Creating connection, outstanding_connections is %d\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3608
 #, fuzzy, c-format
-msgid "Failed to resume sub-search `%s': %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+msgid "Offering HELLO of peer %s to peer %s\n"
+msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
 
-#: src/fs/fs_api.c:2158 src/fs/fs_api.c:2177 src/fs/fs_api.c:2653
+#: src/testing/testing_group.c:3734
 #, c-format
-msgid "Failure while resuming search operation `%s': %s\n"
+msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2359
+#: src/testing/testing_group.c:3988
+msgid "Creating clique topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3993
+msgid "Creating small world (ring) topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:3998
+msgid "Creating small world (2d-torus) topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4002
+msgid "Creating ring topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4006
+msgid "Creating 2d torus topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4010
+msgid "Creating Erdos-Renyi topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4014
+msgid "Creating InterNAT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4018
+msgid "Creating Scale Free topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4023
+msgid "Creating straight line topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4027
+msgid "Creating topology from file!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4043
+msgid "Creating no allowed topology (all peers can connect at core level)\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4058
+msgid "Failed during friend file copying!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4064
+msgid "Friend files created/copied successfully!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4081
+msgid "Blacklisting all but clique topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4087
+msgid "Blacklisting all but small world (ring) topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4093
+msgid "Blacklisting all but small world (2d-torus) topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4099
+msgid "Blacklisting all but ring topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4105
+msgid "Blacklisting all but 2d torus topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4111
+msgid "Blacklisting all but Erdos-Renyi topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4117
+msgid "Blacklisting all but InterNAT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4152
+msgid "Blacklisting all but Scale Free topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4158
+msgid "Blacklisting all but straight line topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:4173
+#, fuzzy
+msgid "Failed during blacklist file copying!\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/testing/testing_group.c:4179
+msgid "Blacklist files created/copied successfully!\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5263
+msgid "Creating clique CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5270
+msgid "Creating small world (ring) CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5277
+msgid "Creating small world (2d-torus) CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5283
+msgid "Creating ring CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5290
+msgid "Creating 2d torus CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5297
+msgid "Creating Erdos-Renyi CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5304
+msgid "Creating InterNAT CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5311
+msgid "Creating Scale Free CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5318
+msgid "Creating straight line CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5324
+msgid "Creating no CONNECT topology\n"
+msgstr ""
+
+#: src/testing/testing_group.c:5330
+#, fuzzy
+msgid "Unknown topology specification, can't connect peers!\n"
+msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
+
+#: src/testing/testing_group.c:5340
 #, c-format
-msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
+msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2605
-msgid "Could not resume running search, will resume as paused search\n"
+#: src/testing/testing_group.c:5348
+#, c-format
+msgid "Connecting a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2691
+#: src/testing/testing_group.c:5357
 #, c-format
-msgid "Failure while resuming download operation `%s': %s\n"
+msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:309
-msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
+#: src/testing/testing_group.c:5367
+#, c-format
+msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:329
-msgid "Directory too large for system address space\n"
+#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:648
+#, fuzzy
+msgid "Could not read hostkeys file!\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/testing/testing_group.c:6131
+#, fuzzy, c-format
+msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#: src/topology/gnunet-daemon-topology.c:244
+msgid "# peers blacklisted"
 msgstr ""
 
-#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
+#: src/topology/gnunet-daemon-topology.c:380
+#, fuzzy
+msgid "# connect requests issued to transport"
+msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
+
+#: src/topology/gnunet-daemon-topology.c:675
+#: src/topology/gnunet-daemon-topology.c:761
+#, fuzzy
+msgid "# friends connected"
+msgstr "# của các đồng đẳng đã kết nối"
+
+#: src/topology/gnunet-daemon-topology.c:950
+msgid "Failed to connect to core service, can not manage topology!\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:982
 #, fuzzy, c-format
-msgid "Failed to open file `%s' for writing"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+msgid "Option `%s' in section `%s' not specified!\n"
+msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/fs/fs_download.c:873
+#: src/topology/gnunet-daemon-topology.c:994
+#, c-format
+msgid "Could not read friends list `%s'\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/topology/gnunet-daemon-topology.c:1000
 #, fuzzy, c-format
-msgid "Failed to create directory for recursive download of `%s'\n"
-msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+msgid "Friends file `%s' is empty.\n"
+msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
 
-#: src/fs/fs_download.c:959
+#: src/topology/gnunet-daemon-topology.c:1009
+#, fuzzy, c-format
+msgid "Failed to read friends list from `%s': out of memory\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/topology/gnunet-daemon-topology.c:1017
 #, c-format
+msgid "Failed to read friends list from `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/topology/gnunet-daemon-topology.c:1037
+#, fuzzy, c-format
 msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+"Syntax error in topology specification at offset %llu, skipping bytes.\n"
+msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
+
+#: src/topology/gnunet-daemon-topology.c:1050
+#, fuzzy, c-format
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
+"Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/fs/fs_download.c:986
-msgid "internal error decrypting content"
+#: src/topology/gnunet-daemon-topology.c:1060
+#, fuzzy, c-format
+msgid "Found friend `%s' in configuration\n"
 msgstr ""
+"\n"
+"Kết thúc cấu hình.\n"
 
-#: src/fs/fs_download.c:1009
+#: src/topology/gnunet-daemon-topology.c:1066
+#, c-format
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:1076
+#, fuzzy
+msgid "# friends in configuration"
+msgstr ""
+"\n"
+"Kết thúc cấu hình.\n"
+
+#: src/topology/gnunet-daemon-topology.c:1082
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
+msgstr ""
+"Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n"
+
+#: src/topology/gnunet-daemon-topology.c:1089
+msgid ""
+"More friendly connections required than target total number of connections.\n"
+msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n"
+
+#: src/topology/gnunet-daemon-topology.c:1126
+#, fuzzy
+msgid "# HELLO messages received"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/topology/gnunet-daemon-topology.c:1183
+#, fuzzy
+msgid "# HELLO messages gossipped"
+msgstr "# các thông báo gửi đi bị loại bỏ"
+
+#: src/topology/gnunet-daemon-topology.c:1323
+msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:247
 #, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
-msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
+msgid "Could not read blacklist file `%s'\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/fs/fs_download.c:1021
+#: src/transport/gnunet-service-transport_blacklist.c:254
+#, c-format
+msgid "Blacklist file `%s' is empty.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:266
 #, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+msgid "Failed to read blacklist from `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_download.c:1030
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:298
+#: src/transport/gnunet-service-transport_blacklist.c:336
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:350
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr ""
+"Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:364
 #, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1829
+#: src/transport/gnunet-service-transport_blacklist.c:523
+#: src/transport/gnunet-service-transport_blacklist.c:764
+msgid "# disconnects due to blacklist"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:158
 #, fuzzy
-msgid "Invalid URI"
-msgstr "Dữ liệu nhập không hợp lệ.\n"
+msgid "# bytes payload discarded due to not connected peer "
+msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/fs/gnunet-service-fs.c:240
-msgid "# running average P2P latency (ms)"
+#: src/transport/gnunet-service-transport.c:572
+msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
+#: src/transport/gnunet-service-transport.c:581
+msgid "Transport service could not access hostkey.  Exiting.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:353
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:358
 #, fuzzy
-msgid "# Loopback routes suppressed"
-msgstr "# tổng số định tuyến lỗ hổng thành công"
+msgid "# messages dropped due to slow client"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
-#: src/topology/gnunet-daemon-topology.c:1297
-#: src/hostlist/gnunet-daemon-hostlist.c:297
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' service.\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+#: src/transport/gnunet-service-transport_clients.c:510
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
 
-#: src/fs/fs_file_information.c:356
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s': %s"
-msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
+#: src/transport/gnunet-service-transport_clients.c:628
+#, fuzzy
+msgid "# bytes payload received for other peers"
+msgstr "# các byte kiểu %d được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:468
+#: src/transport/gnunet-service-transport_clients.c:645
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:696
+#, fuzzy
+msgid "# REQUEST CONNECT messages received"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/gnunet-service-transport_hello.c:172
+msgid "# refreshed my HELLO"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:482
 msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:859
+#: src/transport/gnunet-service-transport_neighbours.c:883
 #, fuzzy
 msgid "# peers disconnected due to external request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_neighbours.c:942
+#: src/transport/gnunet-service-transport_neighbours.c:966
 #, fuzzy
 msgid "# fast reconnects failed"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/gnunet-service-transport_neighbours.c:998
+#: src/transport/gnunet-service-transport_neighbours.c:1022
 #, fuzzy
 msgid "# peers disconnected due to timeout"
 msgstr "# các kết nối bị đóng (vấn đề truyền tải)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1023
+#: src/transport/gnunet-service-transport_neighbours.c:1047
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1065
+#: src/transport/gnunet-service-transport_neighbours.c:1088
 #, fuzzy
 msgid "# peers disconnected due to global disconnect"
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1781
-#: src/transport/gnunet-service-transport_neighbours.c:1802
+#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1909
 #, fuzzy
 msgid "# messages not sent (no such peer or not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1818
+#: src/transport/gnunet-service-transport_neighbours.c:1925
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1870
+#: src/transport/gnunet-service-transport_neighbours.c:1977
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
+#: src/transport/gnunet-service-transport_neighbours.c:2013
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "theo dõi gnunetd sử dụng dải thông"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1924
+#: src/transport/gnunet-service-transport_neighbours.c:2031
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1953
+#: src/transport/gnunet-service-transport_neighbours.c:2060
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2005
+#: src/transport/gnunet-service-transport_neighbours.c:2113
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2013
+#: src/transport/gnunet-service-transport_neighbours.c:2121
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2079
+#: src/transport/gnunet-service-transport_neighbours.c:2187
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2097
+#: src/transport/gnunet-service-transport_neighbours.c:2205
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2215
+#: src/transport/gnunet-service-transport_neighbours.c:2323
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2228
+#: src/transport/gnunet-service-transport_neighbours.c:2336
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2305
+#: src/transport/gnunet-service-transport_neighbours.c:2411
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2322
+#: src/transport/gnunet-service-transport_neighbours.c:2453
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2415
+#: src/transport/gnunet-service-transport_neighbours.c:2544
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# các thông báo PONG đã mật mã được gửi"
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
-#, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:254
-#, c-format
-msgid "Blacklist file `%s' is empty.\n"
+#: src/transport/gnunet-service-transport_plugins.c:111
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/transport/gnunet-service-transport_plugins.c:118
 #, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+msgid "Starting transport plugins `%s'\n"
+msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
+#: src/transport/gnunet-service-transport_plugins.c:122
 #, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
+msgid "Loading `%s' transport plugin\n"
+msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/transport/gnunet-service-transport_plugins.c:150
 #, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
-msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+#: src/transport/gnunet-service-transport_validation.c:410
+msgid "# address records discarded"
 msgstr ""
-"Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/transport/gnunet-service-transport_validation.c:459
 #, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgid ""
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:756
-msgid "# disconnects due to blacklist"
+#: src/transport/gnunet-service-transport_validation.c:508
+#, fuzzy
+msgid "# PING without HELLO messages sent"
+msgstr "# các thông báo PONG nhập thô được gửi"
+
+#: src/transport/gnunet-service-transport_validation.c:566
+msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:191
+#: src/transport/gnunet-service-transport_validation.c:798
+#, fuzzy
+msgid "# PING message for different peer received"
+msgstr "# các thông báo PING được tạo"
+
+#: src/transport/gnunet-service-transport_validation.c:833
+#, c-format
 msgid ""
-"Could not create a new TLS certificate, program `gnunet-transport-"
-"certificate-creation' could not be started!\n"
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:215
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/transport/gnunet-service-transport_validation.c:919
+msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:172
-msgid "# refreshed my HELLO"
+#: src/transport/gnunet-service-transport_validation.c:928
+msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1567
-#, fuzzy
-msgid "# IPv4 broadcast HELLO beacons received via udp"
-msgstr "# các thông báo PONG đã mật mã được nhận"
+#: src/transport/gnunet-service-transport_validation.c:1050
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1610
-#, fuzzy
-msgid "# IPv6 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.c:2106
-#: src/transport/plugin_transport_udp_new.c:1220
-#, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+#: src/transport/gnunet-service-transport_validation.c:1075
+msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2157
-#: src/transport/plugin_transport_udp_new.c:1270
+#: src/transport/gnunet-service-transport_validation.c:1134
 #, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
+msgid "Adding `%s' without addresses for peer `%s'\n"
+msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/transport/plugin_transport_udp.c:2301
+#: src/transport/gnunet-transport.c:256
+msgid "No transport plugins configured, peer will never communicate\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:269
 #, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2372
-#: src/transport/plugin_transport_udp_new.c:1398
-#, fuzzy
-msgid "Failed to open UDP sockets\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/transport/plugin_transport_http_client.c:108
-#: src/transport/plugin_transport_http_client.c:123
-#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
-#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
-#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
+#: src/transport/gnunet-transport.c:319
 #, c-format
-msgid "%s failed at %s:%d: `%s'\n"
-msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
+msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:620
+#: src/transport/gnunet-transport.c:326
 #, c-format
-msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
+msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:514
+#: src/transport/gnunet-transport.c:359
 #, fuzzy, c-format
-msgid "Unexpected address length: %u bytes\n"
-msgstr "Gặp sự kiện bất thường: %d\n"
+msgid "Transmitting %u bytes to %s\n"
+msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/plugin_transport_tcp.c:601
-#: src/transport/plugin_transport_tcp.c:690
-#: src/transport/plugin_transport_tcp.c:742
-#: src/transport/plugin_transport_tcp.c:831
-#: src/transport/plugin_transport_tcp.c:1173
-#: src/transport/plugin_transport_tcp.c:1254
-#, fuzzy
-msgid "# bytes currently in TCP buffers"
-msgstr "# các byte đã gừi qua TCP"
+#: src/transport/gnunet-transport.c:379
+#, fuzzy, c-format
+msgid "Connected to %s\n"
+msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/plugin_transport_tcp.c:607
-#: src/transport/plugin_transport_tcp.c:857
-#: src/transport/plugin_transport_tcp.c:1828
-#, fuzzy
-msgid "# TCP sessions active"
-msgstr "# các khoá phiên chạy được chấp nhận"
+#: src/transport/gnunet-transport.c:410
+#, fuzzy, c-format
+msgid "Disconnected from %s\n"
+msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/plugin_transport_tcp.c:694
-#, fuzzy
-msgid "# bytes discarded by TCP (timeout)"
-msgstr "# các byte loại đi bởi TCP (đi ra)"
+#: src/transport/gnunet-transport.c:439
+#, fuzzy, c-format
+msgid "Received %u bytes from %s\n"
+msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/plugin_transport_tcp.c:745
-#, fuzzy
-msgid "# bytes transmitted via TCP"
-msgstr "# các byte được gửi"
+#: src/transport/gnunet-transport.c:453
+#, fuzzy, c-format
+msgid "Peer `%s': %s %s\n"
+msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/plugin_transport_tcp.c:835
-#, fuzzy
-msgid "# bytes discarded by TCP (disconnect)"
-msgstr "# các byte loại đi bởi TCP (đi ra)"
+#: src/transport/gnunet-transport.c:483
+#, fuzzy, c-format
+msgid "Peer `%s' disconnected\n"
+msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/plugin_transport_tcp.c:956
-#, fuzzy
-msgid "# bytes TCP was asked to transmit"
-msgstr "# các byte được gửi"
-
-#: src/transport/plugin_transport_tcp.c:1007
-msgid "# bytes discarded by TCP (no address and no connection)"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1050
-#: src/transport/plugin_transport_tcp.c:1368
+#: src/transport/gnunet-transport.c:539
 #, fuzzy, c-format
-msgid "Address of unexpected length: %u\n"
-msgstr "Gặp sự kiện bất thường: %d\n"
+msgid "Failed to parse peer identity `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/transport/plugin_transport_tcp.c:1067
-#: src/transport/plugin_transport_tcp.c:1404
-msgid "Found valid IPv4 NAT address (creating session)!\n"
+#: src/transport/gnunet-transport.c:587
+msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1118
+#: src/transport/gnunet-transport.c:590
 #, fuzzy
-msgid "# bytes discarded by TCP (failed to connect)"
-msgstr "# các byte loại đi bởi TCP (đi ra)"
+msgid "try to connect to the given peer"
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/plugin_transport_tcp.c:1508
-msgid "# transport-service disconnect requests for TCP"
-msgstr ""
+#: src/transport/gnunet-transport.c:593
+#, fuzzy
+msgid "provide information about all current connections (once)"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/plugin_transport_tcp.c:1871
+#: src/transport/gnunet-transport.c:596
 #, fuzzy
-msgid "# TCP WELCOME messages received"
-msgstr "# các thông báo PONG đã mật mã được nhận"
+msgid "provide information about all current connections (continuously)"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/plugin_transport_tcp.c:2021
-msgid "# bytes received via TCP"
-msgstr "# các byte đã nhận qua TCP"
-
-#: src/transport/plugin_transport_tcp.c:2089
-msgid "# network-level TCP disconnect events"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2242
+#: src/transport/gnunet-transport.c:599
 #, fuzzy
-msgid "Failed to start service.\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
+msgid "do not resolve hostnames"
+msgstr "không quyết định các tên máy"
 
-#: src/transport/plugin_transport_tcp.c:2307
-#, fuzzy, c-format
-msgid "Failed to find option %s in section %s!\n"
-msgstr "Lỗi đóng kết đến cổng %s %d.\n"
-
-#: src/transport/plugin_transport_tcp.c:2330
-#, c-format
-msgid "TCP transport listening on port %llu\n"
+#: src/transport/gnunet-transport.c:603
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2334
-msgid "TCP transport not listening on any port (client only)\n"
+#: src/transport/gnunet-transport.c:606
+msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2338
-#, c-format
-msgid "TCP transport advertises itself as being on port %llu\n"
-msgstr ""
+#: src/transport/gnunet-transport.c:614
+#, fuzzy
+msgid "Direct access to transport service."
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:984
+#: src/transport/plugin_transport_http.c:981
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1032
+#: src/transport/plugin_transport_http.c:1029
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/transport/plugin_transport_http.c:1179
+#: src/transport/plugin_transport_http.c:1054 src/util/service.c:986
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/transport/plugin_transport_http.c:1071 src/util/service.c:1003
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "Lỗi đóng kết đến cổng %s %d.\n"
+
+#: src/transport/plugin_transport_http.c:1176
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1192
+#: src/transport/plugin_transport_http.c:1189
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1267
+#: src/transport/plugin_transport_http.c:1264
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1280
+#: src/transport/plugin_transport_http.c:1277
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/transport/plugin_transport_http.c:1291
+#: src/transport/plugin_transport_http.c:1288
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1311
+#: src/transport/plugin_transport_http.c:1308
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1341
+#: src/transport/plugin_transport_http.c:1338
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1096
-#, fuzzy
-msgid "Failed to open UNIX sockets\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+#: src/transport/plugin_transport_http_client.c:621
+#, c-format
+msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
+msgstr ""
 
+#: src/transport/plugin_transport_http_server.c:189
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:213
+msgid "No usable TLS certificate found and creating one failed!\n"
+msgstr ""
+
 #: src/transport/plugin_transport_smtp.c:370
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -3620,25 +4756,132 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/gnunet-service-transport_plugins.c:111
-msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
-msgstr ""
+#: src/transport/plugin_transport_tcp.c:512
+#, fuzzy, c-format
+msgid "Unexpected address length: %u bytes\n"
+msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:118
+#: src/transport/plugin_transport_tcp.c:616
+#: src/transport/plugin_transport_tcp.c:705
+#: src/transport/plugin_transport_tcp.c:757
+#: src/transport/plugin_transport_tcp.c:830
+#: src/transport/plugin_transport_tcp.c:909
+#, fuzzy
+msgid "# bytes currently in TCP buffers"
+msgstr "# các byte đã gừi qua TCP"
+
+#: src/transport/plugin_transport_tcp.c:622
+#: src/transport/plugin_transport_tcp.c:856
+#: src/transport/plugin_transport_tcp.c:1561
+#, fuzzy
+msgid "# TCP sessions active"
+msgstr "# các khoá phiên chạy được chấp nhận"
+
+#: src/transport/plugin_transport_tcp.c:709
+#, fuzzy
+msgid "# bytes discarded by TCP (timeout)"
+msgstr "# các byte loại đi bởi TCP (đi ra)"
+
+#: src/transport/plugin_transport_tcp.c:760
+#, fuzzy
+msgid "# bytes transmitted via TCP"
+msgstr "# các byte được gửi"
+
+#: src/transport/plugin_transport_tcp.c:834
+#, fuzzy
+msgid "# bytes discarded by TCP (disconnect)"
+msgstr "# các byte loại đi bởi TCP (đi ra)"
+
+#: src/transport/plugin_transport_tcp.c:1081
 #, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Đang nạp các truyền tải « %s »\n"
+msgid "Address of unexpected length: %u\n"
+msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:122
+#: src/transport/plugin_transport_tcp.c:1116
+msgid "Found valid IPv4 NAT address (creating session)!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1186
+msgid "# transport-service disconnect requests for TCP"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1603
+#, fuzzy
+msgid "# TCP WELCOME messages received"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/plugin_transport_tcp.c:1756
+msgid "# bytes received via TCP"
+msgstr "# các byte đã nhận qua TCP"
+
+#: src/transport/plugin_transport_tcp.c:1823
+msgid "# network-level TCP disconnect events"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1976
+#, fuzzy
+msgid "Failed to start service.\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/transport/plugin_transport_tcp.c:2039
 #, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Đang nạp các truyền tải « %s »\n"
+msgid "Failed to find option %s in section %s!\n"
+msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:150
+#: src/transport/plugin_transport_tcp.c:2062
+#, c-format
+msgid "TCP transport listening on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2066
+msgid "TCP transport not listening on any port (client only)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2070
+#, c-format
+msgid "TCP transport advertises itself as being on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:130
+#, fuzzy
+msgid "# IPv6 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:172
+#, fuzzy
+msgid "# IPv4 broadcast 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:393
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:1971
+#, fuzzy
+msgid "Failed to open UDP sockets\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/transport/plugin_transport_udp.c:2054
+#, c-format
+msgid "Given `%s' option is out of range: %llu > %u\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2098
 #, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+msgid "Invalid IPv6 address: `%s'\n"
+msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
+#: src/transport/plugin_transport_unix.c:1051
+#, fuzzy
+msgid "Failed to open UNIX sockets\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
 #: src/transport/plugin_transport_wlan.c:880
 #, fuzzy
 msgid "# wlan session timeouts"
@@ -3653,8 +4896,8 @@
 #: src/transport/plugin_transport_wlan.c:1151
 #: src/transport/plugin_transport_wlan.c:1172
 #: src/transport/plugin_transport_wlan.c:1203
-#: src/transport/plugin_transport_wlan.c:2378
-#: src/transport/plugin_transport_wlan.c:3240
+#: src/transport/plugin_transport_wlan.c:2398
+#: src/transport/plugin_transport_wlan.c:3260
 msgid "# wlan pending sessions"
 msgstr ""
 
@@ -3690,1102 +4933,968 @@
 msgid "# wlan fragments send"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:2245
+#: src/transport/plugin_transport_wlan.c:2223
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2250
-#, fuzzy
-msgid "# wlan messages queued"
-msgstr "# các thông báo phát hiện dht được nhận"
-
-#: src/transport/plugin_transport_wlan.c:2339
-#: src/transport/plugin_transport_wlan.c:2996
-#: src/transport/plugin_transport_wlan.c:3243
+#: src/transport/plugin_transport_wlan.c:2359
+#: src/transport/plugin_transport_wlan.c:3016
+#: src/transport/plugin_transport_wlan.c:3263
 msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2567
+#: src/transport/plugin_transport_wlan.c:2587
 #, fuzzy
 msgid "# wlan whole messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2770
+#: src/transport/plugin_transport_wlan.c:2790
 #, fuzzy
 msgid "# wlan hello messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2807
+#: src/transport/plugin_transport_wlan.c:2827
 #, fuzzy
 msgid "# wlan fragments received"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:2859
+#: src/transport/plugin_transport_wlan.c:2879
 #, fuzzy
 msgid "# wlan acks received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2956
+#: src/transport/plugin_transport_wlan.c:2976
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2980
+#: src/transport/plugin_transport_wlan.c:3000
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:3038
+#: src/transport/plugin_transport_wlan.c:3058
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3094
+#: src/transport/plugin_transport_wlan.c:3114
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:3105
+#: src/transport/plugin_transport_wlan.c:3125
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/transport/gnunet-transport.c:251
-msgid "No transport plugins configured, peer will never communicate\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:264
-#, c-format
-msgid "No port configured for plugin `%s', cannot test it\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:314
-#, c-format
-msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:321
-#, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:354
+#: src/transport/transport_api.c:588
 #, fuzzy, c-format
-msgid "Transmitting %u bytes to %s\n"
-msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
+msgid "Received unexpected message of type %u in %s:%u\n"
+msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:374
+#: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
-msgid "Connected to %s\n"
-msgstr "« %s » được kết nối tới « %s ».\n"
+msgid "Error reading `%s': %s"
+msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/transport/gnunet-transport.c:405
-#, fuzzy, c-format
-msgid "Disconnected from %s\n"
-msgstr "« %.*s » được kết nối tới « %.*s ».\n"
-
-#: src/transport/gnunet-transport.c:434
-#, fuzzy, c-format
-msgid "Received %u bytes from %s\n"
-msgstr "Nhận yêu cầu định tuyến\n"
-
-#: src/transport/gnunet-transport.c:448
-#, fuzzy, c-format
-msgid "Peer `%s': %s %s\n"
-msgstr "Tôi là đồng đẳng « %s ».\n"
-
-#: src/transport/gnunet-transport.c:512
-#, fuzzy, c-format
-msgid "Failed to parse peer identity `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/transport/gnunet-transport.c:549
-msgid "measure how fast we are receiving data (until CTRL-C)"
+#: src/util/bio.c:143
+msgid "End of file"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:552
-#, fuzzy
-msgid "try to connect to the given peer"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/transport/gnunet-transport.c:555
-#, fuzzy
-msgid "provide information about all current connections (once)"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
-
-#: src/transport/gnunet-transport.c:559
-msgid "send data for benchmarking to the other peer (until CTRL-C)"
+#: src/util/bio.c:195
+#, c-format
+msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:562
-msgid "test transport configuration (involves external server)"
+#: src/util/bio.c:205
+#, c-format
+msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:565
-#, fuzzy
-msgid "do not resolve hostnames"
-msgstr "không quyết định các tên máy"
-
-#: src/transport/gnunet-transport.c:573
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/transport/gnunet-service-transport_validation.c:410
-msgid "# address records discarded"
+#: src/util/bio.c:250
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:459
+#: src/util/bio.c:264
 #, c-format
-msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:496
-#, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# các thông báo PONG nhập thô được gửi"
-
-#: src/transport/gnunet-service-transport_validation.c:554
-msgid "# address revalidations started"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:775
-#, fuzzy
-msgid "# PING message for different peer received"
-msgstr "# các thông báo PING được tạo"
-
-#: src/transport/gnunet-service-transport_validation.c:810
+#: src/util/client.c:304
 #, c-format
 msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+"Could not determine valid hostname and port for service `%s' from "
+"configuration.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:878
-msgid "# PONGs unicast via reliable transport"
+#: src/util/client.c:312
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:887
-msgid "# PONGs multicast to all available addresses"
+#: src/util/client.c:657
+msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1009
-msgid "# PONGs dropped, no matching pending validation"
+#: src/util/client.c:717 src/util/service.c:919
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1034
-msgid "# PONGs dropped, signature expired"
+#: src/util/client.c:859
+#, c-format
+msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1093
+#: src/util/client.c:875
 #, fuzzy, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
-msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
+msgid "Failure to transmit request to service `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/transport/gnunet-service-transport_clients.c:253
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+#: src/util/client.c:1143
+msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:258
-#, fuzzy
-msgid "# messages dropped due to slow client"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+#: src/util/common_logging.c:239 src/util/common_logging.c:889
+msgid "DEBUG"
+msgstr "GỠ LỖI"
 
-#: src/transport/gnunet-service-transport_clients.c:405
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
-msgstr ""
+#: src/util/common_logging.c:241 src/util/common_logging.c:887
+msgid "INFO"
+msgstr "TIN"
 
-#: src/transport/gnunet-service-transport_clients.c:523
-#, fuzzy
-msgid "# bytes payload received for other peers"
-msgstr "# các byte kiểu %d được nhận"
+#: src/util/common_logging.c:243 src/util/common_logging.c:885
+msgid "WARNING"
+msgstr "CẢNH BÁO"
 
-#: src/transport/gnunet-service-transport_clients.c:540
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/util/common_logging.c:245 src/util/common_logging.c:883
+msgid "ERROR"
+msgstr "LỖI"
+
+#: src/util/common_logging.c:247 src/util/common_logging.c:891
+msgid "NONE"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:591
-#, fuzzy
-msgid "# REQUEST CONNECT messages received"
-msgstr "# các thông báo PONG đã mật mã được nhận"
+#: src/util/common_logging.c:609
+#, fuzzy, c-format
+msgid "Failed to create or access directory for log file `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/transport/transport_api.c:588
+#: src/util/common_logging.c:724
 #, fuzzy, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
-msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
+msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
 
-#: src/transport/gnunet-service-transport.c:158
-#, fuzzy
-msgid "# bytes payload discarded due to not connected peer "
-msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
+#: src/util/common_logging.c:892
+msgid "INVALID"
+msgstr ""
 
-#: src/transport/gnunet-service-transport.c:555
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+#: src/util/common_logging.c:991
+msgid "unknown address"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:564
-msgid "Transport service could not access hostkey.  Exiting.\n"
+#: src/util/common_logging.c:1029
+msgid "invalid address"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:159
+#: src/util/configuration.c:245
 #, fuzzy, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
-msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
+msgid "Syntax error in configuration file `%s' at line %u.\n"
+msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/dv/dv_api.c:179
-#, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/topology/gnunet-daemon-topology.c:244
-msgid "# peers blacklisted"
+#: src/util/configuration.c:817
+#, c-format
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
+"Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
+"tập hợp các sự chọn được phép\n"
 
-#: src/topology/gnunet-daemon-topology.c:380
-#, fuzzy
-msgid "# connect requests issued to transport"
-msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
-
-#: src/topology/gnunet-daemon-topology.c:675
-#: src/topology/gnunet-daemon-topology.c:761
-#, fuzzy
-msgid "# friends connected"
-msgstr "# của các đồng đẳng đã kết nối"
-
-#: src/topology/gnunet-daemon-topology.c:875
-#: src/hostlist/hostlist-server.c:184
+#: src/util/connection.c:461
 #, fuzzy, c-format
-msgid "Error in communication with PEERINFO service: %s\n"
-msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+msgid "Access denied to `%s'\n"
+msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/topology/gnunet-daemon-topology.c:950
-msgid "Failed to connect to core service, can not manage topology!\n"
+#: src/util/connection.c:476
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:982
+#: src/util/connection.c:642
 #, fuzzy, c-format
-msgid "Option `%s' in section `%s' not specified!\n"
-msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
+msgid ""
+"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
+msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
 
-#: src/topology/gnunet-daemon-topology.c:994
-#, c-format
-msgid "Could not read friends list `%s'\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+#: src/util/connection.c:852 src/util/connection.c:1025
+#, fuzzy, c-format
+msgid "Trying to connect to `%s' (%p)\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/topology/gnunet-daemon-topology.c:1000
+#: src/util/connection.c:862
 #, fuzzy, c-format
-msgid "Friends file `%s' is empty.\n"
-msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
+msgid "Failed to connect to `%s' (%p)\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/util/connection.c:1015
 #, fuzzy, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+msgid "Attempt to connect to `%s' failed\n"
+msgstr " Lỗi kết nối\n"
 
-#: src/topology/gnunet-daemon-topology.c:1017
+#: src/util/connection.c:1528
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/topology/gnunet-daemon-topology.c:1037
-#, fuzzy, c-format
 msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
-msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
-
-#: src/topology/gnunet-daemon-topology.c:1050
-#, fuzzy, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
+"Could not satisfy pending transmission request, socket closed or connect "
+"failed (%p).\n"
 msgstr ""
-"Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/topology/gnunet-daemon-topology.c:1060
+#: src/util/connection.c:1564
 #, fuzzy, c-format
-msgid "Found friend `%s' in configuration\n"
-msgstr ""
-"\n"
-"Kết thúc cấu hình.\n"
+msgid "Failed to send to `%s': %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/topology/gnunet-daemon-topology.c:1066
+#: src/util/container_bloomfilter.c:507
 #, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1076
-#, fuzzy
-msgid "# friends in configuration"
+#: src/util/crypto_random.c:280
+#, c-format
+msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
-"\n"
-"Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1082
-msgid ""
-"Fewer friends specified than required by minimum friend count. Will only "
-"connect to friends.\n"
-msgstr ""
-"Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n"
+#: src/util/crypto_random.c:308
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/topology/gnunet-daemon-topology.c:1089
-msgid ""
-"More friendly connections required than target total number of connections.\n"
-msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n"
+#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#, fuzzy, c-format
+msgid "Could not aquire lock on file `%s': %s...\n"
+msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/util/crypto_rsa.c:623
 #, fuzzy
-msgid "# HELLO messages received"
-msgstr "# các thông báo PONG đã mật mã được nhận"
+msgid "Creating a new private key.  This may take a while.\n"
+msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
 
-#: src/topology/gnunet-daemon-topology.c:1183
-#, fuzzy
-msgid "# HELLO messages gossipped"
-msgstr "# các thông báo gửi đi bị loại bỏ"
+#: src/util/crypto_rsa.c:641
+#, c-format
+msgid "I am host `%s'.  Stored new private key in `%s'.\n"
+msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1323
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/chat/chat.c:175
-#, fuzzy
-msgid "Could not transmit confirmation receipt\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-
-#: src/chat/chat.c:283
-msgid "The current user must be the the first one joined\n"
+#: src/util/crypto_rsa.c:700
+#, c-format
+msgid ""
+"When trying to read hostkey file `%s' I found %u bytes but I need at least "
+"%u.\n"
 msgstr ""
 
-#: src/chat/chat.c:412
+#: src/util/crypto_rsa.c:720
 #, fuzzy, c-format
-msgid "Unknown message type: '%u'\n"
-msgstr "\tKhông rõ miền tên « %s »\n"
+msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
-#: src/chat/chat.c:472
-#, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing\n"
-msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+#: src/util/crypto_rsa.c:738
+#, c-format
+msgid "I am host `%s'.  Read private key from `%s'.\n"
+msgstr ""
 
-#: src/chat/chat.c:480
-#, fuzzy, c-format
-msgid "Failed to access chat home directory `%s'\n"
-msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
+#: src/util/crypto_rsa.c:959
+#, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
+msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/chat/chat.c:498
+#: src/util/disk.c:479
 #, fuzzy, c-format
-msgid "Failed to create/open key in file `%s'\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+msgid "`%s' failed for drive `%S': %u\n"
+msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/chat/chat.c:559
-#, fuzzy
-msgid "Could not serialize metadata\n"
-msgstr "Không thể tạo miền tên.\n"
+#: src/util/disk.c:1087
+#, c-format
+msgid "Expected `%s' to be a directory!\n"
+msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/chat/chat.c:674
-#, fuzzy
-msgid "Failed to connect to the chat service\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+#: src/util/disk.c:1441 src/util/service.c:1580
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
 
-#: src/chat/chat.c:680
-msgid "Undefined mandatory parameter: joinCallback\n"
+#: src/util/disk.c:1759
+#, c-format
+msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/chat/chat.c:686
-msgid "Undefined mandatory parameter: messageCallback\n"
-msgstr ""
+#: src/util/getopt.c:672
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/chat/chat.c:692
-msgid "Undefined mandatory parameter: memberCallback\n"
-msgstr ""
+#: src/util/getopt.c:696
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
 
-#: src/chat/gnunet-service-chat.c:267
-#, fuzzy
-msgid "Failed to queue a message notification\n"
-msgstr "Lỗi lưu cấu hình."
+#: src/util/getopt.c:701
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
 
-#: src/chat/gnunet-service-chat.c:546
-#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "Lỗi lưu cấu hình."
+#: src/util/getopt.c:718 src/util/getopt.c:886
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: tùy chọn « %s » cần thiết đối số\n"
 
-#: src/chat/gnunet-service-chat.c:729
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "Lỗi lưu cấu hình."
+#: src/util/getopt.c:747
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: không nhận ra tùy chọn « --%s »\n"
 
-#: src/chat/gnunet-service-chat.c:907
-#, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "Lỗi lưu cấu hình."
+#: src/util/getopt.c:751
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
 
-#: src/chat/gnunet-chat.c:92
-msgid "Joined\n"
-msgstr ""
+#: src/util/getopt.c:776
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: tùy chọn không được phép -- %c\n"
 
-#: src/chat/gnunet-chat.c:124
-msgid "anonymous"
-msgstr "nặc danh"
+#: src/util/getopt.c:778
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: tùy chọn không hợp lệ -- %c\n"
 
-#: src/chat/gnunet-chat.c:130
-#, fuzzy, c-format
-msgid "(%s) `%s' said: %s\n"
-msgstr "« %s » nói: %s\n"
+#: src/util/getopt.c:806 src/util/getopt.c:934
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: tùy chọn cần thiết đối số -- %c\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
-#, fuzzy, c-format
-msgid "(%s) `%s' said to you: %s\n"
-msgstr "« %s » nói cho bạn: %s\n"
+#: src/util/getopt.c:854
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
 
-#: src/chat/gnunet-chat.c:139
-#, fuzzy, c-format
-msgid "(%s) `%s' said for sure: %s\n"
-msgstr "« %s » nói thật: %s\n"
+#: src/util/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
 
-#: src/chat/gnunet-chat.c:142
+#: src/util/getopt.c:1038
 #, fuzzy, c-format
-msgid "(%s) `%s' said to you for sure: %s\n"
-msgstr "« %s » nói thật cho bạn: %s\n"
+msgid "Use %s to get a list of options.\n"
+msgstr ""
+"Hãy sử dụng câu lệnh trợ giúp « --help » để xem danh sách các tùy chọn.\n"
 
-#: src/chat/gnunet-chat.c:145
-#, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you received: %s\n"
-msgstr "« %s » xác nhận bạn đã nhận được: %s\n"
-
-#: src/chat/gnunet-chat.c:148
-#, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
-msgstr "« %s » xác nhận mà chỉ bạn đã nhận được: %s\n"
-
-#: src/chat/gnunet-chat.c:151
-#, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
-msgstr "« %s » xác nhận mà bạn đã nhận được từ họ : %s\n"
-
-#: src/chat/gnunet-chat.c:156
-#, fuzzy, c-format
+#: src/util/getopt_helpers.c:84
+#, c-format
 msgid ""
-"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
-msgstr "« %s » xác nhận mà chỉ bạn đa nhận được từ họ : %s\n"
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
+"ngắn.\n"
 
-#: src/chat/gnunet-chat.c:159
-#, fuzzy, c-format
-msgid "(%s) `%s' said off the record: %s\n"
-msgstr "« %s » nói không chính thức: %s\n"
+#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/chat/gnunet-chat.c:162
-#, fuzzy, c-format
-msgid "(%s) <%s> said using an unknown message type: %s\n"
-msgstr "<%s> đã nói bằng một kiểu tin nhẳn không rõ : %s\n"
+#: src/util/gnunet-resolver.c:148
+msgid "perform a reverse lookup"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:193
-#, c-format
-msgid "'%s' acknowledged message #%d\n"
+#: src/util/gnunet-resolver.c:154
+msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/util/gnunet-service-resolver.c:288
 #, c-format
-msgid "`%s' entered the room\n"
-msgstr "« %s » vào phòng\n"
+msgid "Could not resolve `%s' (%s): %s\n"
+msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/chat/gnunet-chat.c:224
+#: src/util/gnunet-service-resolver.c:358
+#: src/util/gnunet-service-resolver.c:399
 #, c-format
-msgid "`%s' left the room\n"
-msgstr "« %s » rời phòng\n"
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
-#, fuzzy
-msgid "Could not change username\n"
-msgstr "Không thể tạo miền tên.\n"
+#: src/util/gnunet-service-resolver.c:494
+#, c-format
+msgid "Resolver asked to look up `%s'.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
-#, fuzzy, c-format
-msgid "Joining room `%s' as user `%s'...\n"
-msgstr "Đã vào phòng « %s » là người dùng « %s ».\n"
+#: src/util/gnunet-service-resolver.c:529
+#, c-format
+msgid "Resolver asked to look up IP address `%s'.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:320
+#: src/util/helper.c:239
 #, fuzzy, c-format
-msgid "Changed username to `%s'\n"
-msgstr "Đã thay đổi tên người dùng thành « %s ».\n"
+msgid "Error reading from `%s': %s\n"
+msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/chat/gnunet-chat.c:333
+#: src/util/helper.c:254
 #, c-format
-msgid "Users in room `%s': "
-msgstr "Người dùng trong phòng « %s »:"
+msgid "Got 0 bytes from helper `%s' (EOF)\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:371
-msgid "Syntax: /msg USERNAME MESSAGE"
-msgstr "Cú pháp: /msg TÊN_NGƯỜI_DÙNG TIN_NHẲN"
+#: src/util/helper.c:264
+#, fuzzy, c-format
+msgid "Got %u bytes from helper `%s'\n"
+msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/chat/gnunet-chat.c:379
-#, c-format
-msgid "Unknown user `%s'\n"
-msgstr "Không rõ người dùng « %s »\n"
+#: src/util/helper.c:273
+#, fuzzy, c-format
+msgid "Failed to parse inbound message from helper `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/chat/gnunet-chat.c:395
-#, c-format
-msgid "User `%s' is currently not in the room!\n"
-msgstr "Người dùng « %s » hiện thời không có trong phòng này.\n"
-
-#: src/chat/gnunet-chat.c:448
+#: src/util/helper.c:431
 #, fuzzy, c-format
-msgid "Unknown command `%s'\n"
-msgstr "Không rõ câu lệnh « %s ».\n"
+msgid "Error writing to `%s': %s\n"
+msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/chat/gnunet-chat.c:459
+#: src/util/network.c:1204
+#, c-format
 msgid ""
-"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
-"leave the current room"
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
-"Gõ chuỗi « /join #tên_phòng » để vào một phòng trò chuyện nào đó (việc này "
-"cũng gây ra bạn ra khỏi phòng hiện tại)"
 
-#: src/chat/gnunet-chat.c:463
+#: src/util/os_installation.c:299
+#, c-format
 msgid ""
-"Use `/nick nickname' to change your nickname.  This will cause you to leave "
-"the current room and immediately rejoin it with the new name."
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
 msgstr ""
-"Gõ chuỗi « /nick tên_hiệu » để thay đổi tên hiệu của mình (việc này cũng gây "
-"ra bạn ra khỏi phòng hiện tại, sau đó vào lại ngay với tên mới)"
 
-#: src/chat/gnunet-chat.c:467
-msgid ""
-"Use `/msg nickname message' to send a private message to the specified user"
-msgstr ""
-"Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người dùng "
-"có tên đó"
+#: src/util/os_installation.c:486
+#, fuzzy, c-format
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/chat/gnunet-chat.c:470
-msgid "The `/notice' command is an alias for `/msg'"
-msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
+#: src/util/os_installation.c:492
+#, fuzzy, c-format
+msgid "access (%s, X_OK) failed: %s\n"
+msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/chat/gnunet-chat.c:472
-msgid "The `/query' command is an alias for `/msg'"
-msgstr "Lệnh « /query » là một biệt hiệu cho « /msg »"
+#: src/util/os_installation.c:507
+#, fuzzy, c-format
+msgid "stat (%s) failed: %s\n"
+msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/chat/gnunet-chat.c:474
-#, fuzzy
-msgid "Use `/sig message' to send a signed public message"
+#: src/util/os_priority.c:117
+#, c-format
+msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
-"Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người dùng "
-"có tên đó"
 
-#: src/chat/gnunet-chat.c:477
-msgid "Use `/ack message' to require signed acknowledgment of the message"
-msgstr ""
+#: src/util/plugin.c:89
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
 
-#: src/chat/gnunet-chat.c:480
-msgid "Use `/anonymous message' to send a public anonymous message"
-msgstr ""
+#: src/util/plugin.c:146
+#, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n"
 
-#: src/chat/gnunet-chat.c:482
-#, fuzzy
-msgid "The `/anon' command is an alias for `/anonymous'"
-msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
-
-#: src/chat/gnunet-chat.c:484
-msgid "Use `/quit' to terminate gnunet-chat"
-msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
-
-#: src/chat/gnunet-chat.c:486
-msgid "The `/leave' command is an alias for `/quit'"
-msgstr "Lệnh « /leave » là một biệt hiệu cho « /quit »"
-
-#: src/chat/gnunet-chat.c:489
-msgid "Use `/names' to list all of the current members in the chat room"
-msgstr ""
-"Gõ chuỗi « /names » để liệt kê tất cả các thành viên hiện thời trong phòng "
-"trò chuyện đó"
-
-#: src/chat/gnunet-chat.c:491
-msgid "Use `/help command' to get help for a specific command"
-msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
-
-#: src/chat/gnunet-chat.c:606
-msgid "You must specify a nickname\n"
-msgstr "Phải ghi rõ tên hiệu\n"
-
-#: src/chat/gnunet-chat.c:622
+#: src/util/plugin.c:219
 #, c-format
-msgid "Failed to join room `%s'\n"
-msgstr "Lỗi vào phòng « %s »\n"
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n"
 
-#: src/chat/gnunet-chat.c:655
-msgid "set the nickname to use (required)"
-msgstr "đặt tên hiệu cần dùng (cần thiết)"
+#: src/util/plugin.c:349
+#, fuzzy
+msgid "Could not determine plugin installation path.\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/chat/gnunet-chat.c:658
-msgid "set the chat room to join"
-msgstr "đặt phòng trò chuyện cần vào"
+#: src/util/pseudonym.c:273
+#, fuzzy, c-format
+msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgstr "Lỗi phân tích dữ liệu giao diện từ « %s ».\n"
 
-#: src/chat/gnunet-chat.c:670
-msgid "Join a chat on GNUnet."
-msgstr "Vào phòng trò chuyện trên GNUnet."
+#: src/util/pseudonym.c:338
+msgid "no-name"
+msgstr "không-tên"
 
-#: src/nat/gnunet-nat-server.c:289
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
-msgstr ""
+#: src/util/resolver_api.c:202
+#, fuzzy, c-format
+msgid "Must specify `%s' for `%s' in configuration!\n"
+msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/nat/gnunet-nat-server.c:328
-msgid "GNUnet NAT traversal test helper daemon"
-msgstr ""
-
-#: src/nat/nat.c:803
+#: src/util/resolver_api.c:221
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgid ""
+"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/nat/nat.c:852
+#: src/util/resolver_api.c:351
 #, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/nat/nat.c:1121
+#: src/util/resolver_api.c:355
 #, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "Lỗi lưu cấu hình."
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr "không quyết định các tên máy"
 
-#: src/nat/nat.c:1187 src/nat/nat.c:1197
+#: src/util/resolver_api.c:426
 #, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
+msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+#: src/util/resolver_api.c:807
+#, c-format
+msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/util/resolver_api.c:901
 #, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
+msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/nat/nat_test.c:348
-#, fuzzy
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+#: src/util/resolver_api.c:906
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN : %s\n"
+msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/nat/nat_test.c:418
+#: src/util/resolver_api.c:938
 #, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:124
-#, fuzzy, c-format
-msgid "Block not of type %u\n"
-msgstr "Không biết truyền tải nào kiểu %d.\n"
-
-#: src/dht/plugin_block_dht.c:131
-msgid "Size mismatch for block\n"
+#: src/util/scheduler.c:870
+msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:140
+#: src/util/scheduler.c:1000
 #, c-format
-msgid "Block of type %u is malformed\n"
+msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/fs/plugin_block_fs.c:131
-msgid "Reply mismatched in terms of namespace.  Discarded.\n"
-msgstr ""
-
-#: src/block/block.c:105
+#: src/util/server.c:397
 #, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
-msgstr "Đang nạp các truyền tải « %s »\n"
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/mesh/gnunet-service-mesh.c:4214
-msgid "MESH: Wrong CORE service\n"
-msgstr ""
-
-#: src/mesh/gnunet-service-mesh.c:4419
-#, fuzzy
-msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
-msgstr "Lưu cấu hình ngay bây giờ không?"
-
-#: src/mesh/gnunet-service-mesh.c:4428
-#, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-
-#: src/hostlist/hostlist-client.c:286
-#, fuzzy
-msgid "# bytes downloaded from hostlist servers"
-msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
-
-#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
-#, fuzzy
-msgid "# invalid HELLOs downloaded from hostlist servers"
-msgstr "# các HELLO tải xuống qua HTTP"
-
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/util/server.c:406
 #, fuzzy, c-format
-msgid "Invalid `%s' message received from hostlist at `%s'\n"
-msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/hostlist/hostlist-client.c:330
-#, fuzzy
-msgid "# valid HELLOs downloaded from hostlist servers"
-msgstr "# các HELLO tải xuống qua HTTP"
-
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#: src/util/server.c:411
 #, fuzzy, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
-msgstr ""
-"Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
-msgid "# advertised hostlist URIs"
+#: src/util/server.c:640
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
+#: src/util/service.c:207 src/util/service.c:214
 #, c-format
-msgid "# advertised URI `%s' downloaded"
-msgstr ""
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/hostlist/hostlist-client.c:663
+#: src/util/service.c:170
 #, c-format
-msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
-msgstr ""
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
 
-#: src/hostlist/hostlist-client.c:805
-#, fuzzy, c-format
-msgid "Timeout trying to download hostlist from `%s'\n"
-msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
-
-#: src/hostlist/hostlist-client.c:822
+#: src/util/service.c:263
 #, c-format
-msgid "Download limit of %u bytes exceeded, stopping download\n"
-msgstr ""
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/util/service.c:296
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:848
+#: src/util/service.c:326
 #, fuzzy, c-format
-msgid "Download of hostlist `%s' completed.\n"
-msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
+msgid "Wrong format `%s' for network\n"
+msgstr "Mạng có định dạng sai « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:856
+#: src/util/service.c:668
 #, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
+msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:909
+#: src/util/service.c:673
 #, fuzzy, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
-msgstr "Đang nạp và khởi động dùng « %s ».\n"
+msgid "Unknown address family %d\n"
+msgstr "\tKhông rõ miền tên « %s »\n"
 
-#: src/hostlist/hostlist-client.c:917
-msgid "# hostlist downloads initiated"
+#: src/util/service.c:680
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
-msgid "# milliseconds between hostlist downloads"
+#: src/util/service.c:724
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/util/service.c:752
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
-msgid "Scheduled saving of hostlists\n"
+#: src/util/service.c:869
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/util/service.c:939
 #, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
-#, fuzzy
-msgid "# active connections"
-msgstr "# các kết nối dht"
-
-#: src/hostlist/hostlist-client.c:1253
+#: src/util/service.c:956
 #, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1284
-#, fuzzy, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
+#: src/util/service.c:1191
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
-"Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
 
-#: src/hostlist/hostlist-client.c:1290
-#, fuzzy, c-format
-msgid "Loading saved hostlist entries from file `%s' \n"
-msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
+#: src/util/service.c:1242 src/util/service.c:1260
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/util/service.c:1287
 #, c-format
-msgid "Hostlist file `%s' is not existing\n"
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1305
+#: src/util/service.c:1442
 #, fuzzy, c-format
-msgid "Could not open file `%s' for reading to load hostlists: %s\n"
-msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/hostlist/hostlist-client.c:1338
-#, c-format
-msgid "%u hostlist URIs loaded from file\n"
+#: src/util/service.c:1475
+#, fuzzy, c-format
+msgid "Service `%s' runs at %s\n"
+msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
+
+#: src/util/service.c:1521
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1340
-#, fuzzy
-msgid "# hostlist URIs read from file"
-msgstr "# các byte danh sách máy được trả về"
+#: src/util/service.c:1525
+msgid "Service process could not initialize server function\n"
+msgstr ""
 
-#: src/hostlist/hostlist-client.c:1373
-#, fuzzy, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+#: src/util/service.c:1529
+msgid "Service process failed to report status\n"
 msgstr ""
-"Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
 
-#: src/hostlist/hostlist-client.c:1387
-#, fuzzy, c-format
-msgid "Could not open file `%s' for writing to save hostlists: %s\n"
-msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
+#: src/util/service.c:1581
+msgid "No such user"
+msgstr "Không có người dùng như vậy"
 
-#: src/hostlist/hostlist-client.c:1392
-#, fuzzy, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
-msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
+#: src/util/service.c:1594
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#: src/util/service.c:1657
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+
+#: src/util/signal.c:80
 #, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
+msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1428
-#, fuzzy
-msgid "# hostlist URIs written to file"
-msgstr "# các byte danh sách máy được trả về"
+#: src/util/strings.c:143
+msgid "b"
+msgstr "b"
 
-#: src/hostlist/hostlist-client.c:1480
-msgid "Learning is enabled on this peer\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1483
+#: src/util/strings.c:354
 #, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
+msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
-msgid "Learning is not enabled on this peer\n"
+#: src/util/strings.c:462
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
+"Lỗi mở rộng biến môi trường « $HOME »: chưa đặt biến môi trường « HOME »"
 
-#: src/hostlist/hostlist-client.c:1504
-#, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+#: src/util/strings.c:554
+msgid "ms"
+msgstr "mg"
+
+#: src/util/strings.c:559
+msgid "eternity"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1508
-#, fuzzy, c-format
-msgid "Hostlist file `%s' could not be removed\n"
-msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+#: src/util/strings.c:563
+msgid "s"
+msgstr "g"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:264
-msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
+#: src/util/strings.c:567
+msgid "m"
+msgstr "p"
+
+#: src/util/strings.c:571
+msgid "h"
+msgstr "g"
+
+#: src/util/strings.c:575
+msgid " days"
+msgstr " ngày"
+
+#: src/util/strings.c:599
+msgid "end of time"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:317
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
 #, fuzzy
-msgid "advertise our hostlist to other peers"
-msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
+msgid "# Active tunnels"
+msgstr "# các kết nối dht"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:322
-msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
-msgstr ""
+#: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
+#, fuzzy
+msgid "# Peers connected to mesh tunnels"
+msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/vpn/gnunet-service-vpn.c:699
 #, fuzzy
-msgid "enable learning about hostlist servers from other peers"
-msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
+msgid "# Bytes given to mesh for transmission"
+msgstr "# các thông báo PING được tạo"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
+#: src/vpn/gnunet-service-vpn.c:737
 #, fuzzy
-msgid "provide a hostlist server"
-msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
+msgid "# Bytes dropped in mesh queue (overflow)"
+msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
-msgid "GNUnet hostlist server and client"
-msgstr ""
+#: src/vpn/gnunet-service-vpn.c:772
+#, fuzzy
+msgid "# Mesh tunnels created"
+msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/hostlist/hostlist-server.c:134
+#: src/vpn/gnunet-service-vpn.c:795
 #, fuzzy
-msgid "bytes in hostlist"
-msgstr "# các byte trong kho dữ liệu"
+msgid "Failed to setup mesh tunnel!\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/hostlist/hostlist-server.c:157
-msgid "expired addresses encountered"
+#: src/vpn/gnunet-service-vpn.c:967
+#, c-format
+msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:205
-msgid "HELLOs without addresses encountered (ignored)"
+#: src/vpn/gnunet-service-vpn.c:1285
+msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:221
-msgid "bytes not included in hostlist (size limit)"
+#: src/vpn/gnunet-service-vpn.c:1306
+msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:269
-#, fuzzy, c-format
-msgid "Refusing `%s' request to hostlist server\n"
-msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
-
-#: src/hostlist/hostlist-server.c:272
+#: src/vpn/gnunet-service-vpn.c:1511
 #, fuzzy
-msgid "hostlist requests refused (not HTTP GET)"
-msgstr "# các yêu cầu danh sách máy được nhận"
+msgid "# Packets received from TUN interface"
+msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/hostlist/hostlist-server.c:280
-msgid "Sending 100 CONTINUE reply\n"
+#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#, c-format
+msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:287
-#, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\n"
+#: src/vpn/gnunet-service-vpn.c:1600
+msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:291
-#, fuzzy
-msgid "hostlist requests refused (upload data)"
-msgstr "# các yêu cầu danh sách máy được nhận"
-
-#: src/hostlist/hostlist-server.c:299
-msgid "Could not handle hostlist request since I do not have a response yet\n"
+#: src/vpn/gnunet-service-vpn.c:1614
+#, c-format
+msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
+#: src/vpn/gnunet-service-vpn.c:1697
 #, fuzzy
-msgid "hostlist requests refused (not ready)"
-msgstr "# các yêu cầu danh sách máy được nhận"
+msgid "# ICMP packets received from mesh"
+msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/hostlist/hostlist-server.c:306
+#: src/vpn/gnunet-service-vpn.c:2038
 #, fuzzy
-msgid "Received request for our hostlist\n"
-msgstr "Nhận yêu cầu định tuyến\n"
+msgid "# UDP packets received from mesh"
+msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/hostlist/hostlist-server.c:307
+#: src/vpn/gnunet-service-vpn.c:2196
 #, fuzzy
-msgid "hostlist requests processed"
-msgstr "# các yêu cầu danh sách máy được nhận"
+msgid "# TCP packets received from mesh"
+msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/hostlist/hostlist-server.c:350
+#: src/vpn/gnunet-service-vpn.c:2347
+msgid "Failed to find unallocated IPv4 address in VPN's range\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2402
+msgid "Failed to find unallocated IPv6 address in VPN's range\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
 #, fuzzy
-msgid "# hostlist advertisements send"
-msgstr "# Các quảng cáo ngoại được chuyển tiếp"
+msgid "# Active destinations"
+msgstr "# các kết nối dht"
 
-#: src/hostlist/hostlist-server.c:397
-msgid "Advertisement message could not be queued by core\n"
+#: src/vpn/gnunet-service-vpn.c:2726
+msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
-#, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+#: src/vpn/gnunet-service-vpn.c:3133
+msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:574
-#, c-format
-msgid "Hostlist service starts on %s:%llu\n"
+#: src/vpn/gnunet-service-vpn.c:3165
+msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/vpn/gnunet-vpn.c:151
+#, fuzzy
+msgid "Error creating tunnel\n"
+msgstr "Hoàn thành tạo khoá.\n"
+
+#: src/vpn/gnunet-vpn.c:195 src/vpn/gnunet-vpn.c:226
 #, fuzzy, c-format
-msgid "Address to obtain hostlist: `%s'\n"
-msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
+msgid "Option `%s' makes no sense with option `%s'.\n"
+msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/hostlist/hostlist-server.c:626
+#: src/vpn/gnunet-vpn.c:208
 #, fuzzy, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
-msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/vpn/gnunet-vpn.c:220
 #, fuzzy, c-format
-msgid "Could not find option `%s:%s' in configuration.\n"
-msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
+msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
-#, c-format
-msgid "Loading hostkey from `%s' failed.\n"
+#: src/vpn/gnunet-vpn.c:238
+#, fuzzy, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/vpn/gnunet-vpn.c:260
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/vpn/gnunet-vpn.c:296
+msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
-#, c-format
-msgid "I am peer `%s'.\n"
-msgstr "Tôi là đồng đẳng « %s ».\n"
+#: src/vpn/gnunet-vpn.c:299
+msgid "request that result should be an IPv6 address"
+msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
-msgid "output only the identity strings"
-msgstr "chỉ xuất những chuỗi nhận diện"
+#: src/vpn/gnunet-vpn.c:302
+msgid "print IP address only after mesh tunnel has been created"
+msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
-msgid "output our own identity only"
-msgstr "chỉ xuất nhận diện mình"
+#: src/vpn/gnunet-vpn.c:305
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
-#, fuzzy
-msgid "Print information about peers."
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
+#: src/vpn/gnunet-vpn.c:308
+msgid "destination IP for the tunnel"
+msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:144
-msgid "print this help"
-msgstr "hiển thị trợ giúp này"
+#: src/vpn/gnunet-vpn.c:311
+msgid "peer offering the service we would like to access"
+msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:154
-msgid "print the version number"
-msgstr "hiển thị số thứ tự phiên bản"
+#: src/vpn/gnunet-vpn.c:314
+msgid "name of the service we would like to access"
+msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:163
+#: src/vpn/gnunet-vpn.c:317
 #, fuzzy
-msgid "configure logging to write logs to LOGFILE"
-msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
+msgid "service is offered via TCP"
+msgstr "# các byte đã nhận qua TCP"
 
-#: src/include/gnunet_getopt_lib.h:172
-msgid "configure logging to use LOGLEVEL"
-msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
+#: src/vpn/gnunet-vpn.c:320
+#, fuzzy
+msgid "service is offered via UDP"
+msgstr "# các byte đã nhận qua UDP"
 
-#: src/include/gnunet_getopt_lib.h:181
-msgid "be verbose"
-msgstr "xuất chi tiết"
+#: src/vpn/gnunet-vpn.c:329
+msgid "Setup tunnels via VPN."
+msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:190
-msgid "use configuration file FILENAME"
-msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
-
-#: src/include/gnunet_common.h:430 src/include/gnunet_common.h:435
-#: src/include/gnunet_common.h:441
+#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
+#: src/include/gnunet_common.h:490
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:451
+#: src/include/gnunet_common.h:500
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:472 src/include/gnunet_common.h:479
+#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid "Could not access file: %s\n"
+#~ msgstr "Không thể truy cập đến « %s »: %s\n"
+
+#, fuzzy
+#~ msgid "`%s' failed on file `%s': %s"
+#~ msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
+
+#, fuzzy
+#~ msgid "# bytes TCP was asked to transmit"
+#~ msgstr "# các byte được gửi"
+
+#, fuzzy
+#~ msgid "# bytes discarded by TCP (failed to connect)"
+#~ msgstr "# các byte loại đi bởi TCP (đi ra)"
+
+#, fuzzy
+#~ msgid "# wlan messages queued"
+#~ msgstr "# các thông báo phát hiện dht được nhận"
+
+#~ msgid "print this help"
+#~ msgstr "hiển thị trợ giúp này"
+
+#~ msgid "print the version number"
+#~ msgstr "hiển thị số thứ tự phiên bản"
+
+#, fuzzy
+#~ msgid "configure logging to write logs to LOGFILE"
+#~ msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
+
+#~ msgid "configure logging to use LOGLEVEL"
+#~ msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
+
+#~ msgid "be verbose"
+#~ msgstr "xuất chi tiết"
+
+#~ msgid "use configuration file FILENAME"
+#~ msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
+
+#, fuzzy
 #~ msgid "Failed to stop service `%s'!\n"
 #~ msgstr "Lỗi vào phòng « %s »\n"
 
@@ -4838,107 +5947,10 @@
 #~ msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
 #, fuzzy
-#~ msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
-#~ msgstr ""
-#~ "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
-#, fuzzy
-#~ msgid "Target is %d connections per peer."
-#~ msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
-
-#~ msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
-#~ msgstr ""
-#~ "Đang kết nối các điểm nút theo địa hình học hình xuyến hai chiều: %u "
-#~ "hàng, %u cột\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "No `%s' specified in peer configuration in section `%s', cannot copy "
-#~ "friends file!\n"
-#~ msgstr ""
-#~ "Đặc tả mạng dạng sai trong cấu hình phần « %s » cho mục nhập « %s »: %s\n"
-
-#, fuzzy
-#~ msgid "Copying file with command cp %s %s\n"
-#~ msgstr "« %s » thất bại với mã lỗi %s: %s\n"
-
-#, fuzzy
-#~ msgid "Offering Hello of peer %s to peer %s\n"
-#~ msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
-
-#, fuzzy
-#~ msgid "Unknown topology specification, can't connect peers!\n"
-#~ msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
-
-#, fuzzy
-#~ msgid "Could not read hostkeys file!\n"
-#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-
-#, fuzzy
-#~ msgid "`scp' did not complete cleanly.\n"
-#~ msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
-
-#, fuzzy
-#~ msgid "Failed to create pipe for `ssh' process.\n"
-#~ msgstr "Lỗi tạo thư mục tạm thời."
-
-#, fuzzy
-#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
-#~ msgstr "Lỗi bắt đầu thu thập.\n"
-
-#, fuzzy
-#~ msgid "Failed to start `ssh' process.\n"
-#~ msgstr "Lỗi bắt đầu thu thập.\n"
-
-#, fuzzy
-#~ msgid "Error reading from gnunet-peerinfo: %s\n"
-#~ msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
-
-#, fuzzy
-#~ msgid "`Failed to get hostkey!\n"
-#~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#, fuzzy
-#~ msgid "Failed to start `gnunet-arm' process.\n"
-#~ msgstr "Lỗi dừng chạy gnunet-auto-share.\n"
-
-#, fuzzy
-#~ msgid "Starting service %s for peer `%4s'\n"
-#~ msgstr "Đang bắt đầu tài về « %s »\n"
-
-#, fuzzy
-#~ msgid "Terminating peer `%4s'\n"
-#~ msgstr "Không đủ quyền cho « %s ».\n"
-
-#, fuzzy
-#~ msgid "Setting d->dead on peer `%4s'\n"
-#~ msgstr "Đang bắt đầu tài lên « %s ».\n"
-
-#, fuzzy
-#~ msgid "Failed to write new configuration to disk."
-#~ msgstr "Lỗi lưu cấu hình."
-
-#, fuzzy
-#~ msgid "Failed to copy new configuration to remote machine."
-#~ msgstr "Lỗi lưu cấu hình."
-
-#, fuzzy
-#~ msgid "Peers failed to connect"
-#~ msgstr "Không kết nối được đến trình nền gnunetd."
-
-#, fuzzy
-#~ msgid "Failed to connect to core service of first peer!\n"
-#~ msgstr "Lỗi nạp dịch vụ sqstore. Hãy kiểm tra lại cấu hình.\n"
-
-#, fuzzy
 #~ msgid "Could not resolve our FQDN : %s %u\n"
 #~ msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
 #, fuzzy
-#~ msgid "Failed to start daemon: %s\n"
-#~ msgstr "Lỗi bắt đầu thu thập.\n"
-
-#, fuzzy
 #~ msgid "Failed to load dhtlog plugin for `%s'\n"
 #~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
@@ -5015,10 +6027,6 @@
 #~ msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
 #, fuzzy
-#~ msgid "# connection requests received"
-#~ msgstr "# các yêu cầu danh sách máy được nhận"
-
-#, fuzzy
 #~ msgid "# PING messages decrypted"
 #~ msgstr "# các thông báo PING được tạo"
 
@@ -5354,9 +6362,6 @@
 #~ msgid "Error: can't delete service: %s\n"
 #~ msgstr "Lỗi: không thể xoá dịch vụ : %s\n"
 
-#~ msgid "Configuration saved."
-#~ msgstr "Cấu hình đã được lưu."
-
 #~ msgid "Configuration changed. Save?"
 #~ msgstr "Cấu hình bị thay đổi. Lưu ?"
 
@@ -5404,15 +6409,9 @@
 #~ msgid "generate configuration for gnunetd, the GNUnet daemon"
 #~ msgstr "tạo ra cấu hình cho gnunetd, trình nền GNUnet"
 
-#~ msgid "print a value from the configuration file to stdout"
-#~ msgstr "in ra đầu ra tiêu chuẩn một giá trị từ tập tin cấu hình"
-
 #~ msgid "Tool to setup GNUnet."
 #~ msgstr "Công cụ để thiết lập GNUnet."
 
-#~ msgid "update a value in the configuration file"
-#~ msgstr "cập nhật một giá trị trong tập tin cấu hình"
-
 #~ msgid "Too many arguments.\n"
 #~ msgstr "Quá nhiều đối số.\n"
 
@@ -5422,9 +6421,6 @@
 #~ msgid "Undefined option.\n"
 #~ msgstr "Tùy chọn không xác định.\n"
 
-#~ msgid "`%s' is not available.\n"
-#~ msgstr "« %s » không sẵn sàng.\n"
-
 #~ msgid "Unknown operation '%s'.\n"
 #~ msgstr "Không rõ thao tác « %s ».\n"
 
@@ -5914,9 +6910,6 @@
 #~ msgid "Creating new key for this nickname (this may take a while).\n"
 #~ msgstr "Đang tạo khoá mới cho tên hiệu này (có thể hơi lâu).\n"
 
-#~ msgid "Done creating key.\n"
-#~ msgstr "Hoàn thành tạo khoá.\n"
-
 #~ msgid "# max bytes allowed in dstore"
 #~ msgstr "# các byte được phép trong kho dữ liệu dstore"
 
@@ -6145,9 +7138,6 @@
 #~ msgid "You must specify a name for the collection (`%s' option).\n"
 #~ msgstr "Bạn phải ghi rõ một tên cho thu thập (tùy chọn « %s »).\n"
 
-#~ msgid "=\tError reading directory.\n"
-#~ msgstr "=\tLỗi đọc thư mục.\n"
-
 #~ msgid "%d files found in directory.\n"
 #~ msgstr "Tìm thấy %d tập tin trong thư mục.\n"
 
@@ -7028,12 +8018,6 @@
 #~ msgid "MTU %llu for `%s' is probably too low!\n"
 #~ msgstr "MTU %llu cho « %s » rất có thể quá thấp.\n"
 
-#~ msgid "# bytes received via UDP"
-#~ msgstr "# các byte đã nhận qua UDP"
-
-#~ msgid "# bytes sent via UDP"
-#~ msgstr "# các byte đã gửi qua UDP"
-
 #~ msgid "# UDP connections (right now)"
 #~ msgstr "# các kết nối UDP (lúc này)"
 
@@ -8220,9 +9204,6 @@
 #~ msgid "Location of the log file for gnunet-auto-share"
 #~ msgstr "Vị trí của tập tin theo dõi cho gnunet-auto-share"
 
-#~ msgid "File-Sharing options"
-#~ msgstr "Tùy chọn chia sẻ tập tin"
-
 #~ msgid "Which plugins should be loaded by gnunet-gtk?"
 #~ msgstr "gnunet-gtk nên nạp những phần bổ sung nào?"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2012-02-24 15:12:56 UTC (rev 20010)
+++ gnunet/po/zh_CN.po  2012-02-24 15:14:18 UTC (rev 20011)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-01-07 20:53+0100\n"
+"POT-Creation-Date: 2012-02-24 16:13+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -16,376 +16,526 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:61
-#: src/datastore/plugin_datastore_mysql.c:139
-#: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:613
-#: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685
-#: src/datastore/plugin_datastore_mysql.c:1362
-#: src/datastore/plugin_datastore_mysql.c:1376 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/datacache/plugin_datacache_sqlite.c:71
-#: src/datacache/plugin_datacache_sqlite.c:74
-#: src/datacache/plugin_datacache_mysql.c:103
-#: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:517
-#: src/datacache/plugin_datacache_mysql.c:526
-#: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:458
-#: src/include/gnunet_common.h:465
+#: src/arm/arm_api.c:187
+msgid "Failed to transmit shutdown request to client.\n"
+msgstr ""
+
+#: src/arm/arm_api.c:378
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
+msgid "Configuration failes to specify option `%s' in section `%s'!\n"
+msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/arm/arm_api.c:392
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%u with error: %s"
-msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:239
+#: src/arm/arm_api.c:465
 #, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
+msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:266
+#: src/arm/arm_api.c:521
 #, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "无法初始化 SQLite:%s。\n"
+msgid "Requesting start of service `%s'.\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:414
-#: src/datacache/plugin_datacache_sqlite.c:457
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+#: src/arm/arm_api.c:522
+#, c-format
+msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:671
-#, fuzzy
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
+#: src/arm/arm_api.c:544
+#, c-format
+msgid "Error while trying to transmit request to start `%s' to ARM\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1161
-msgid "sqlite version to old to determine size, assuming zero\n"
+#: src/arm/arm_api.c:546
+#, c-format
+msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1180
+#: src/arm/arm_api.c:579
 #, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+msgid "Asked to start service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1220
-#, fuzzy
-msgid "Sqlite database running\n"
-msgstr "sqlite 数据仓库"
-
-#: src/datastore/plugin_datastore_mysql.c:316
-#: src/datacache/plugin_datacache_mysql.c:224
+#: src/arm/arm_api.c:652
 #, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:322
-#: src/datacache/plugin_datacache_mysql.c:230
+#: src/arm/gnunet-arm.c:149
 #, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "无法解析“%s”(%s):%s\n"
+msgid "Service `%s' is unknown to ARM.\n"
+msgstr "服务已删除。\n"
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#: src/datastore/plugin_datastore_mysql.c:1336
+#: src/arm/gnunet-arm.c:154
 #, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "Service `%s' has been stopped.\n"
+msgstr "服务已删除。\n"
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#: src/datastore/plugin_datastore_mysql.c:1346
+#: src/arm/gnunet-arm.c:157
 #, fuzzy, c-format
-msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
-msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
+msgid "Service `%s' was already running.\n"
+msgstr "服务已删除。\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1581
-msgid "Mysql database running\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:162
+#, fuzzy, c-format
+msgid "Service `%s' has been started.\n"
+msgstr "服务已删除。\n"
 
-#: src/datastore/plugin_datastore_postgres.c:93
-#: src/datacache/plugin_datacache_postgres.c:79
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
+msgid "Service `%s' was already being stopped.\n"
+msgstr "服务已删除。\n"
 
-#: src/datastore/plugin_datastore_postgres.c:173
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "无法保存配置文件“%s”:"
+msgid "Service `%s' was already not running.\n"
+msgstr "服务已删除。\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1017
-msgid "Postgres database running\n"
+#: src/arm/gnunet-arm.c:173
+msgid "Request ignored as ARM is shutting down.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:289
-msgid "Failed to transmit request to drop database.\n"
+#: src/arm/gnunet-arm.c:177
+msgid "Error communicating with ARM service.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:372
-msgid "# queue entry timeouts"
+#: src/arm/gnunet-arm.c:181
+msgid "Timeout communicating with ARM service.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:418
-msgid "# queue overflows"
+#: src/arm/gnunet-arm.c:185
+msgid "Operation failed.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:445
-msgid "# queue entries created"
+#: src/arm/gnunet-arm.c:189
+msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:465
-msgid "# Requests dropped from datastore queue"
+#: src/arm/gnunet-arm.c:216
+#, c-format
+msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:513
-msgid "# datastore connections (re)created"
+#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:540
-msgid "# reconnected to DATASTORE"
-msgstr ""
+#: src/arm/gnunet-arm.c:247
+#, fuzzy, c-format
+msgid "Failed to remove configuration file %s\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/datastore_api.c:608
-msgid "# transmission request failures"
+#: src/arm/gnunet-arm.c:253
+#, c-format
+msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:631
-msgid "# bytes sent to datastore"
-msgstr ""
+#: src/arm/gnunet-arm.c:355
+#, fuzzy
+msgid "stop all GNUnet services"
+msgstr "卸载 GNUnet 服务"
 
-#: src/datastore/datastore_api.c:772
-msgid "Failed to receive status response from database."
+#: src/arm/gnunet-arm.c:357
+msgid "start a particular service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:786
-msgid "Error reading response from datastore service"
+#: src/arm/gnunet-arm.c:359
+msgid "stop a particular service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
-msgid "Invalid error message received from datastore service"
-msgstr ""
+#: src/arm/gnunet-arm.c:361
+#, fuzzy
+msgid "start all GNUnet default services"
+msgstr "卸载 GNUnet 服务"
 
-#: src/datastore/datastore_api.c:810
-msgid "# status messages received"
-msgstr ""
+#: src/arm/gnunet-arm.c:364
+#, fuzzy
+msgid "stop and start all GNUnet default services"
+msgstr "卸载 GNUnet 服务"
 
-#: src/datastore/datastore_api.c:883
-msgid "# PUT requests executed"
+#: src/arm/gnunet-arm.c:367
+msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/datastore/datastore_api.c:954
-msgid "# RESERVE requests executed"
+#: src/arm/gnunet-arm.c:369
+msgid "don't print status messages"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1019
-msgid "# RELEASE RESERVE requests executed"
-msgstr ""
+#: src/arm/gnunet-arm.c:372
+#, fuzzy
+msgid "timeout for completing current operation"
+msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/datastore/datastore_api.c:1080
-msgid "# UPDATE requests executed"
+#: src/arm/gnunet-arm.c:383
+msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1148
-msgid "# REMOVE requests executed"
+#: src/arm/gnunet-service-arm.c:321
+#, fuzzy, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/arm/gnunet-service-arm.c:324
+#, c-format
+msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1193
-msgid "Failed to receive response from database.\n"
+#: src/arm/gnunet-service-arm.c:350
+msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1253
-msgid "# Results received"
+#: src/arm/gnunet-service-arm.c:477
+#, fuzzy, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "无法创建用户账户:"
+
+#: src/arm/gnunet-service-arm.c:499
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1324
-msgid "# GET REPLICATION requests executed"
+#: src/arm/gnunet-service-arm.c:513
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1391
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/arm/gnunet-service-arm.c:621
+#, c-format
+msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1455
-msgid "# GET requests executed"
+#: src/arm/gnunet-service-arm.c:775
+#, c-format
+msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:241
-msgid "Template database running\n"
+#: src/arm/gnunet-service-arm.c:870
+msgid "exit"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:351
-msgid "# bytes expired"
+#: src/arm/gnunet-service-arm.c:875
+msgid "signal"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:426
-msgid "# bytes purged (low-priority)"
+#: src/arm/gnunet-service-arm.c:880
+#, fuzzy
+msgid "unknown"
+msgstr "未知错误"
+
+#: src/arm/gnunet-service-arm.c:914
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:486
-msgid "Transmission to client failed!\n"
+#: src/arm/gnunet-service-arm.c:960 src/arm/mockup-service.c:41
+msgid "Failed to transmit shutdown ACK.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:640
-msgid "# results found"
+#: src/arm/gnunet-service-arm.c:1060
+#, fuzzy, c-format
+msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/arm/gnunet-service-arm.c:1062
+msgid "option missing"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:685
+#: src/arm/gnunet-service-arm.c:1139
+#, fuzzy, c-format
+msgid "Starting default services `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/arm/gnunet-service-arm.c:1150
 #, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
-"%llu bytes\n"
+msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
-#, c-format
+#: src/arm/gnunet-service-arm.c:1164
 msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+"No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:700
-msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+#: src/arm/mockup-service.c:46
+msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:706
-msgid "Insufficient space to satisfy request"
+#: src/arm/mockup-service.c:69
+msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
-#: src/datastore/gnunet-service-datastore.c:765
-#: src/datastore/gnunet-service-datastore.c:986
-#: src/datastore/gnunet-service-datastore.c:1465
-msgid "# reserved"
+#: src/block/block.c:105
+#, fuzzy, c-format
+msgid "Loading block plugin `%s'\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/chat/chat.c:175
+msgid "Could not transmit confirmation receipt\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:780
-msgid "Could not find matching reservation"
+#: src/chat/chat.c:283
+msgid "The current user must be the the first one joined\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:854 src/datacache/datacache.c:118
-#: src/datacache/datacache.c:255
-msgid "# bytes stored"
+#: src/chat/chat.c:412
+#, fuzzy, c-format
+msgid "Unknown message type: '%u'\n"
+msgstr "未知操作“%s”。\n"
+
+#: src/chat/chat.c:472
+#, fuzzy, c-format
+msgid "Configuration option `%s' in section `%s' missing\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/chat/chat.c:480
+#, fuzzy, c-format
+msgid "Failed to access chat home directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/chat/chat.c:498
+#, fuzzy, c-format
+msgid "Failed to create/open key in file `%s'\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/chat/chat.c:559
+msgid "Could not serialize metadata\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:868
-#, c-format
-msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
+#: src/chat/chat.c:674
+#, fuzzy
+msgid "Failed to connect to the chat service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/chat/chat.c:680
+msgid "Undefined mandatory parameter: joinCallback\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1034
-msgid "# GET requests received"
+#: src/chat/chat.c:686
+msgid "Undefined mandatory parameter: messageCallback\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1048
-msgid "# requests filtered by bloomfilter"
+#: src/chat/chat.c:692
+msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1076
-msgid "# UPDATE requests received"
+#: src/chat/gnunet-chat.c:92
+msgid "Joined\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1110
-msgid "# GET REPLICATION requests received"
+#: src/chat/gnunet-chat.c:124
+msgid "anonymous"
+msgstr "匿名"
+
+#: src/chat/gnunet-chat.c:130
+#, fuzzy, c-format
+msgid "(%s) `%s' said: %s\n"
+msgstr "“%s”说:%s\n"
+
+#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#, fuzzy, c-format
+msgid "(%s) `%s' said to you: %s\n"
+msgstr "“%s”对您说:%s\n"
+
+#: src/chat/gnunet-chat.c:139
+#, fuzzy, c-format
+msgid "(%s) `%s' said for sure: %s\n"
+msgstr "“%s”对您说:%s\n"
+
+#: src/chat/gnunet-chat.c:142
+#, fuzzy, c-format
+msgid "(%s) `%s' said to you for sure: %s\n"
+msgstr "“%s”对您说:%s\n"
+
+#: src/chat/gnunet-chat.c:145
+#, c-format
+msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1145
-msgid "# GET ZERO ANONYMITY requests received"
+#: src/chat/gnunet-chat.c:148
+#, c-format
+msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1172
-msgid "Content not found"
+#: src/chat/gnunet-chat.c:151
+#, c-format
+msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1182
-msgid "# bytes removed (explicit request)"
+#: src/chat/gnunet-chat.c:156
+#, c-format
+msgid ""
+"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1216
-msgid "# REMOVE requests received"
+#: src/chat/gnunet-chat.c:159
+#, fuzzy, c-format
+msgid "(%s) `%s' said off the record: %s\n"
+msgstr "“%s”对您说:%s\n"
+
+#: src/chat/gnunet-chat.c:162
+#, c-format
+msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1260
+#: src/chat/gnunet-chat.c:193
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1323
+#: src/chat/gnunet-chat.c:224
 #, c-format
-msgid "Loading `%s' datastore plugin\n"
+msgid "`%s' entered the room\n"
+msgstr "“%s”进入了房间\n"
+
+#: src/chat/gnunet-chat.c:224
+#, c-format
+msgid "`%s' left the room\n"
+msgstr "“%s”离开了房间\n"
+
+#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#, fuzzy
+msgid "Could not change username\n"
+msgstr "已将用户名改为“%s”。\n"
+
+#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#, c-format
+msgid "Joining room `%s' as user `%s'...\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1332
+#: src/chat/gnunet-chat.c:320
 #, fuzzy, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "Changed username to `%s'\n"
+msgstr "已将用户名改为“%s”。\n"
 
-#: src/datastore/gnunet-service-datastore.c:1531
-#: src/datastore/gnunet-service-datastore.c:1542 src/datacache/datacache.c:144
-#: src/datacache/datacache.c:151
+#: src/chat/gnunet-chat.c:333
 #, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr ""
+msgid "Users in room `%s': "
+msgstr "房间“%s”中的用户:"
 
-#: src/datastore/gnunet-service-datastore.c:1536
+#: src/chat/gnunet-chat.c:371
+msgid "Syntax: /msg USERNAME MESSAGE"
+msgstr "语法:/msg 用户名 消息"
+
+#: src/chat/gnunet-chat.c:379
 #, c-format
-msgid "# bytes used in file-sharing datastore `%s'"
+msgid "Unknown user `%s'\n"
+msgstr "未知的用户“%s”\n"
+
+#: src/chat/gnunet-chat.c:395
+#, c-format
+msgid "User `%s' is currently not in the room!\n"
+msgstr "用户“%s”当前不在房间里!\n"
+
+#: src/chat/gnunet-chat.c:448
+#, fuzzy, c-format
+msgid "Unknown command `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/chat/gnunet-chat.c:459
+msgid ""
+"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
+"leave the current room"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1547
-msgid "# quota"
+#: src/chat/gnunet-chat.c:463
+msgid ""
+"Use `/nick nickname' to change your nickname.  This will cause you to leave "
+"the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1549
-msgid "# cache size"
+#: src/chat/gnunet-chat.c:467
+msgid ""
+"Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1562
-#, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+#: src/chat/gnunet-chat.c:470
+msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1580
-#: src/datastore/gnunet-service-datastore.c:1596
-#, fuzzy, c-format
-msgid "Failed to remove bogus bloomfilter file `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/chat/gnunet-chat.c:472
+msgid "The `/query' command is an alias for `/msg'"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1626
-#, fuzzy
-msgid "Failed to initialize bloomfilter.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/chat/gnunet-chat.c:474
+msgid "Use `/sig message' to send a signed public message"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1655
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
+#: src/chat/gnunet-chat.c:477
+msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1660
-msgid "Plugin does not support get_keys function. Please fix!\n"
+#: src/chat/gnunet-chat.c:480
+msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1663
-msgid "Bloomfilter construction complete.\n"
+#: src/chat/gnunet-chat.c:482
+msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
+#: src/chat/gnunet-chat.c:484
+msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:238
-msgid "# type map refreshes sent"
+#: src/chat/gnunet-chat.c:486
+msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:414
-msgid "# messages discarded (expired prior to transmission)"
+#: src/chat/gnunet-chat.c:489
+msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
+#: src/chat/gnunet-chat.c:491
+msgid "Use `/help command' to get help for a specific command"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:606
+msgid "You must specify a nickname\n"
+msgstr "您必须指定一个昵称\n"
+
+#: src/chat/gnunet-chat.c:622
+#, c-format
+msgid "Failed to join room `%s'\n"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:655
+msgid "set the nickname to use (required)"
+msgstr "设置要使用的昵称(必须)"
+
+#: src/chat/gnunet-chat.c:658
+msgid "set the chat room to join"
+msgstr "设置要加入的聊天室"
+
+#: src/chat/gnunet-chat.c:670
+msgid "Join a chat on GNUnet."
+msgstr ""
+
+#: src/chat/gnunet-service-chat.c:267
+#, fuzzy
+msgid "Failed to queue a message notification\n"
+msgstr "保存配置失败。"
+
+#: src/chat/gnunet-service-chat.c:546
+#, fuzzy
+msgid "Failed to queue a join notification\n"
+msgstr "保存配置失败。"
+
+#: src/chat/gnunet-service-chat.c:729
+#, fuzzy
+msgid "Failed to queue a confirmation receipt\n"
+msgstr "保存配置失败。"
+
+#: src/chat/gnunet-service-chat.c:907
+#, fuzzy
+msgid "Failed to queue a leave notification\n"
+msgstr "保存配置失败。"
+
+#: src/core/core_api.c:798
+msgid "Client was disconnected from core service, trying to reconnect.\n"
+msgstr ""
+
 #: src/core/gnunet-core-list-connections.c:77
 #: src/peerinfo-tool/gnunet-peerinfo.c:60
 #, c-format
@@ -407,6 +557,11 @@
 msgid "Print information about connected peers."
 msgstr ""
 
+#: src/core/gnunet-service-core.c:99
+#, c-format
+msgid "Core service of `%4s' ready.\n"
+msgstr ""
+
 #: src/core/gnunet-service-core_clients.c:360
 msgid "# send requests dropped (disconnected)"
 msgstr ""
@@ -420,38 +575,6 @@
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:99
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
-msgid "# type maps received"
-msgstr ""
-
-#: src/core/gnunet-service-core_typemap.c:151
-msgid "# updates to my type map"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:163
-msgid "# sessions terminated by transport disconnect"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:343
-msgid "# neighbour entries allocated"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:252
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:431
-#, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
-msgstr ""
-
 #: src/core/gnunet-service-core_kx.c:493
 msgid "# bytes encrypted"
 msgstr ""
@@ -491,7 +614,7 @@
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:880
-#: src/transport/gnunet-service-transport_validation.c:780
+#: src/transport/gnunet-service-transport_validation.c:803
 msgid "# PING messages received"
 msgstr ""
 
@@ -515,7 +638,7 @@
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1092
-#: src/transport/gnunet-service-transport_validation.c:985
+#: src/transport/gnunet-service-transport_validation.c:1026
 msgid "# PONG messages received"
 msgstr ""
 
@@ -566,787 +689,615 @@
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1541
-#: src/transport/gnunet-service-transport.c:578
-#: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/core/gnunet-service-core_kx.c:1541 src/hostlist/hostlist-server.c:555
+#: src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/transport/gnunet-service-transport.c:595
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/core/core_api.c:798
-msgid "Client was disconnected from core service, trying to reconnect.\n"
+#: src/core/gnunet-service-core_neighbours.c:163
+msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-exit.c:1496
-msgid "Daemon to run to provide an IP exit node for the VPN"
+#: src/core/gnunet-service-core_neighbours.c:180
+#: src/core/gnunet-service-core_neighbours.c:342
+msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1804
-msgid "help text"
+#: src/core/gnunet-service-core_neighbours.c:251
+msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/util/getopt_helpers.c:84
+#: src/core/gnunet-service-core_neighbours.c:430
 #, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr "长选项的必选参数对短选项也是必选的。\n"
+msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
+msgstr ""
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "您必须向“%s”选项传递一个数字。\n"
+#: src/core/gnunet-service-core_sessions.c:208
+#: src/core/gnunet-service-core_sessions.c:273
+msgid "# entries in session map"
+msgstr ""
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:890
-msgid "DEBUG"
-msgstr "调试"
+#: src/core/gnunet-service-core_sessions.c:238
+msgid "# type map refreshes sent"
+msgstr ""
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:888
-msgid "INFO"
-msgstr "信息"
-
-#: src/util/common_logging.c:243 src/util/common_logging.c:886
-msgid "WARNING"
-msgstr "警告"
-
-#: src/util/common_logging.c:245 src/util/common_logging.c:884
-msgid "ERROR"
-msgstr "错误"
-
-#: src/util/common_logging.c:247 src/util/common_logging.c:892
-msgid "NONE"
+#: src/core/gnunet-service-core_sessions.c:414
+msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/util/common_logging.c:610
-#, fuzzy, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/common_logging.c:725
-#, fuzzy, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
-msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
-
-#: src/util/common_logging.c:893
-msgid "INVALID"
+#: src/core/gnunet-service-core_typemap.c:110
+#: src/core/gnunet-service-core_typemap.c:121
+msgid "# type maps received"
 msgstr ""
 
-#: src/util/common_logging.c:975
-msgid "unknown address"
+#: src/core/gnunet-service-core_typemap.c:151
+msgid "# updates to my type map"
 msgstr ""
 
-#: src/util/common_logging.c:1013
-msgid "invalid address"
+#: src/datacache/datacache.c:118 src/datacache/datacache.c:255
+#: src/datastore/gnunet-service-datastore.c:854
+msgid "# bytes stored"
 msgstr ""
 
-#: src/util/plugin.c:89
+#: src/datacache/datacache.c:144 src/datacache/datacache.c:151
+#: src/datastore/gnunet-service-datastore.c:1531
+#: src/datastore/gnunet-service-datastore.c:1542
 #, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "插件机构初始化失败:%s!\n"
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr ""
 
-#: src/util/plugin.c:146
+#: src/datacache/datacache.c:183
 #, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/util/plugin.c:219
+#: src/datacache/datacache.c:191
 #, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
+msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/util/plugin.c:349
-#, fuzzy
-msgid "Could not determine plugin installation path.\n"
-msgstr "无法确定用户界面定义文件。"
+#: src/datacache/datacache.c:281
+msgid "# requests received"
+msgstr ""
 
-#: src/util/configuration.c:245
-#, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
-msgstr "配置文件“%s”第 %d 行有语法错误。\n"
-
-#: src/util/configuration.c:817
-#, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
+#: src/datacache/datacache.c:291
+msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/util/getopt.c:672
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s:选项“%s”有歧义\n"
-
-#: src/util/getopt.c:696
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s:选项“--%s”不允许有参数\n"
-
-#: src/util/getopt.c:701
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s:选项“%c%s”不允许有参数\n"
-
-#: src/util/getopt.c:718 src/util/getopt.c:886
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s:选项“%s”要求有一个参数\n"
-
-#: src/util/getopt.c:747
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s:无法识别的选项“--%s”\n"
-
-#: src/util/getopt.c:751
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s:无法识别的选项“%c%s”\n"
-
-#: src/util/getopt.c:776
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s:非法选项 -- %c\n"
-
-#: src/util/getopt.c:778
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s:无效选项 -- %c\n"
-
-#: src/util/getopt.c:806 src/util/getopt.c:934
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s:选项要求有一个参数 -- %c\n"
-
-#: src/util/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s:选项“-W %s”有歧义\n"
-
-#: src/util/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s:选项“-W %s” 不允许有参数\n"
-
-#: src/util/getopt.c:1038
+#: src/datacache/plugin_datacache_mysql.c:103
+#: src/datacache/plugin_datacache_mysql.c:110
+#: src/datacache/plugin_datacache_mysql.c:517
+#: src/datacache/plugin_datacache_mysql.c:526
+#: src/datacache/plugin_datacache_mysql.c:598
+#: src/datacache/plugin_datacache_mysql.c:614
+#: src/datacache/plugin_datacache_sqlite.c:71
+#: src/datacache/plugin_datacache_sqlite.c:74
+#: src/datastore/plugin_datastore_mysql.c:139
+#: src/datastore/plugin_datastore_mysql.c:146
+#: src/datastore/plugin_datastore_mysql.c:613
+#: src/datastore/plugin_datastore_mysql.c:673
+#: src/datastore/plugin_datastore_mysql.c:685
+#: src/datastore/plugin_datastore_mysql.c:1362
+#: src/datastore/plugin_datastore_mysql.c:1376
+#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
+#: src/include/gnunet_common.h:514
 #, fuzzy, c-format
-msgid "Use %s to get a list of options.\n"
-msgstr "请使用 --help 获取选项列表。\n"
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/util/scheduler.c:870
-msgid "Looks like we're busy waiting...\n"
-msgstr ""
-
-#: src/util/scheduler.c:1000
+#: src/datacache/plugin_datacache_mysql.c:224
+#: src/datastore/plugin_datastore_mysql.c:316
 #, c-format
-msgid "Attempt to cancel dead task %llu!\n"
+msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/util/connection.c:461
+#: src/datacache/plugin_datacache_mysql.c:230
+#: src/datastore/plugin_datastore_mysql.c:322
 #, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "“%s”已连接到“%s”。\n"
+msgid "Could not access file `%s': %s\n"
+msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/connection.c:476
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
+#: src/datacache/plugin_datacache_mysql.c:979
+msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/util/connection.c:642
-#, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
-msgstr ""
-
-#: src/util/connection.c:852 src/util/connection.c:1025
+#: src/datacache/plugin_datacache_postgres.c:79
+#: src/datastore/plugin_datastore_postgres.c:93
 #, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "无法连接到 %s:%u:%s\n"
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/util/connection.c:862
+#: src/datacache/plugin_datacache_postgres.c:149
 #, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "无法连接到 %s:%u:%s\n"
+msgid "Unable to initialize Postgres: %s"
+msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/util/connection.c:1015
-#, c-format
-msgid "Attempt to connect to `%s' failed\n"
+#: src/datacache/plugin_datacache_postgres.c:499
+msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/util/connection.c:1528
-#, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
+#: src/datacache/plugin_datacache_sqlite.c:424
+msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/util/connection.c:1564
-#, fuzzy, c-format
-msgid "Failed to send to `%s': %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+#: src/datacache/plugin_datacache_sqlite.c:457
+#: src/datastore/plugin_datastore_sqlite.c:414
+#: src/namestore/plugin_namestore_sqlite.c:381
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+msgstr ""
 
-#: src/util/signal.c:80
-#, c-format
-msgid "signal (%d, %p) returned %d.\n"
+#: src/datacache/plugin_datacache_template.c:121
+msgid "Template datacache running\n"
 msgstr ""
 
-#: src/util/network.c:1204
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+#: src/datastore/datastore_api.c:289
+msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/util/os_installation.c:299
-#, fuzzy, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
-msgstr "无法确定安装路径。请尝试设置“%s”\n"
+#: src/datastore/datastore_api.c:372
+msgid "# queue entry timeouts"
+msgstr ""
 
-#: src/util/os_installation.c:486
-#, fuzzy, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "找不到主机“%s”的 IP:%s\n"
+#: src/datastore/datastore_api.c:418
+msgid "# queue overflows"
+msgstr ""
 
-#: src/util/os_installation.c:492
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "“%s”说:%s\n"
+#: src/datastore/datastore_api.c:445
+msgid "# queue entries created"
+msgstr ""
 
-#: src/util/strings.c:143
-msgid "b"
-msgstr "b"
+#: src/datastore/datastore_api.c:465
+msgid "# Requests dropped from datastore queue"
+msgstr ""
 
-#: src/util/strings.c:354
-#, c-format
-msgid "Character sets requested were `%s'->`%s'\n"
+#: src/datastore/datastore_api.c:513
+msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/util/strings.c:462
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr "扩展“$HOME”失败:没有设置环境变量“HOME”"
+#: src/datastore/datastore_api.c:540
+msgid "# reconnected to DATASTORE"
+msgstr ""
 
-#: src/util/strings.c:554
-msgid "ms"
-msgstr "毫秒"
+#: src/datastore/datastore_api.c:608
+msgid "# transmission request failures"
+msgstr ""
 
-#: src/util/strings.c:559
-msgid "eternity"
+#: src/datastore/datastore_api.c:631
+msgid "# bytes sent to datastore"
 msgstr ""
 
-#: src/util/strings.c:563
-msgid "s"
-msgstr "秒"
+#: src/datastore/datastore_api.c:772
+msgid "Failed to receive status response from database."
+msgstr ""
 
-#: src/util/strings.c:567
-msgid "m"
-msgstr "分"
+#: src/datastore/datastore_api.c:786
+msgid "Error reading response from datastore service"
+msgstr ""
 
-#: src/util/strings.c:571
-msgid "h"
-msgstr "时"
+#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+msgid "Invalid error message received from datastore service"
+msgstr ""
 
-#: src/util/strings.c:575
-msgid " days"
-msgstr " 天"
+#: src/datastore/datastore_api.c:810
+msgid "# status messages received"
+msgstr ""
 
-#: src/util/strings.c:599
-msgid "end of time"
+#: src/datastore/datastore_api.c:883
+msgid "# PUT requests executed"
 msgstr ""
 
-#: src/util/server.c:388
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+#: src/datastore/datastore_api.c:954
+msgid "# RESERVE requests executed"
+msgstr ""
 
-#: src/util/server.c:397
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
+#: src/datastore/datastore_api.c:1019
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/util/server.c:402
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+#: src/datastore/datastore_api.c:1080
+msgid "# UPDATE requests executed"
+msgstr ""
 
-#: src/util/server.c:617
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+#: src/datastore/datastore_api.c:1148
+msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/util/crypto_random.c:280
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
+#: src/datastore/datastore_api.c:1193
+msgid "Failed to receive response from database.\n"
 msgstr ""
 
-#: src/util/crypto_random.c:308
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
+#: src/datastore/datastore_api.c:1253
+msgid "# Results received"
+msgstr ""
 
-#: src/util/disk.c:479
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%S': %u\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+#: src/datastore/datastore_api.c:1324
+msgid "# GET REPLICATION requests executed"
+msgstr ""
 
-#: src/util/disk.c:883
-#, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "“%s”应为目录!\n"
+#: src/datastore/datastore_api.c:1391
+msgid "# GET ZERO ANONYMITY requests executed"
+msgstr ""
 
-#: src/util/disk.c:1235 src/util/service.c:1541
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "无法获取有关用户“%s”的信息:%s\n"
+#: src/datastore/datastore_api.c:1455
+msgid "# GET requests executed"
+msgstr ""
 
-#: src/util/disk.c:1553
-#, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
+#: src/datastore/gnunet-service-datastore.c:351
+msgid "# bytes expired"
 msgstr ""
 
-#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
-#: src/util/service.c:207 src/util/service.c:214
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "IP 格式无效:“%s”\n"
-
-#: src/util/service.c:170
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
-
-#: src/util/service.c:263
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "无效的网络表示法(没有以“;”结尾:“%s”)\n"
-
-#: src/util/service.c:296
-#, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "网络掩码的格式“%s”错误\n"
-
-#: src/util/service.c:326
-#, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "网络的格式“%s”错误\n"
-
-#: src/util/service.c:629
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
+#: src/datastore/gnunet-service-datastore.c:426
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/util/service.c:634
-#, c-format
-msgid "Unknown address family %d\n"
+#: src/datastore/gnunet-service-datastore.c:486
+msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/util/service.c:641
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
+#: src/datastore/gnunet-service-datastore.c:640
+msgid "# results found"
 msgstr ""
 
-#: src/util/service.c:685
+#: src/datastore/gnunet-service-datastore.c:685
 #, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgid ""
+"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/util/service.c:713
+#: src/datastore/gnunet-service-datastore.c:696
 #, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/util/service.c:830
-#, c-format
+#: src/datastore/gnunet-service-datastore.c:700
 msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:2228
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+#: src/datastore/gnunet-service-datastore.c:706
+msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/util/service.c:880 src/util/client.c:707
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:765
+#: src/datastore/gnunet-service-datastore.c:986
+#: src/datastore/gnunet-service-datastore.c:1465
+msgid "# reserved"
 msgstr ""
 
-#: src/util/service.c:900
-#, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+#: src/datastore/gnunet-service-datastore.c:780
+msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/util/service.c:917
+#: src/datastore/gnunet-service-datastore.c:868
 #, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/util/service.c:947 src/transport/plugin_transport_http.c:1057
-#, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+#: src/datastore/gnunet-service-datastore.c:1034
+msgid "# GET requests received"
+msgstr ""
 
-#: src/util/service.c:964 src/transport/plugin_transport_http.c:1074
-#, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/util/service.c:1152
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
+#: src/datastore/gnunet-service-datastore.c:1048
+msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/util/service.c:1203 src/util/service.c:1221
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
+#: src/datastore/gnunet-service-datastore.c:1076
+msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/util/service.c:1248
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+#: src/datastore/gnunet-service-datastore.c:1110
+msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/util/service.c:1403
-#, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/util/service.c:1436
-#, c-format
-msgid "Service `%s' runs at %s\n"
+#: src/datastore/gnunet-service-datastore.c:1145
+msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/util/service.c:1482
-msgid "Service process failed to initialize\n"
+#: src/datastore/gnunet-service-datastore.c:1172
+msgid "Content not found"
 msgstr ""
 
-#: src/util/service.c:1486
-msgid "Service process could not initialize server function\n"
+#: src/datastore/gnunet-service-datastore.c:1182
+msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/util/service.c:1490
-msgid "Service process failed to report status\n"
+#: src/datastore/gnunet-service-datastore.c:1216
+msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/util/service.c:1542
-msgid "No such user"
-msgstr "无此用户"
-
-#: src/util/service.c:1555
+#: src/datastore/gnunet-service-datastore.c:1260
 #, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "无法更改用户/组为“%s”:%s\n"
-
-#: src/util/service.c:1618
-msgid "do daemonize (detach from terminal)"
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:76
-msgid "Test GNUnet DNS resolver code."
+#: src/datastore/gnunet-service-datastore.c:1323
+#, c-format
+msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:507
+#: src/datastore/gnunet-service-datastore.c:1332
+#, fuzzy, c-format
+msgid "Failed to load datastore plugin for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/datastore/gnunet-service-datastore.c:1536
 #, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
+msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/util/os_priority.c:117
-#, c-format
-msgid "Not installing a handler because $%s=%s\n"
+#: src/datastore/gnunet-service-datastore.c:1547
+msgid "# quota"
 msgstr ""
 
-#: src/util/resolver_api.c:202
-#, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
+#: src/datastore/gnunet-service-datastore.c:1549
+msgid "# cache size"
 msgstr ""
 
-#: src/util/resolver_api.c:221
+#: src/datastore/gnunet-service-datastore.c:1562
 #, c-format
-msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:358
+#: src/datastore/gnunet-service-datastore.c:1580
+#: src/datastore/gnunet-service-datastore.c:1596
 #, fuzzy, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr "GNUnet 现在使用 IP 地址 %s。\n"
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/resolver_api.c:362
-#, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1626
+#, fuzzy
+msgid "Failed to initialize bloomfilter.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/util/resolver_api.c:430
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
+#: src/datastore/gnunet-service-datastore.c:1655
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:791
-#, c-format
-msgid "Resolver returns `%s'.\n"
+#: src/datastore/gnunet-service-datastore.c:1660
+msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:875
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
+#: src/datastore/gnunet-service-datastore.c:1663
+msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:880
+#: src/datastore/plugin_datastore_mysql.c:529
+#: src/datastore/plugin_datastore_mysql.c:1336
 #, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s\n"
-msgstr "无法解析“%s”(%s):%s\n"
+msgid "Failed to prepare statement `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/resolver_api.c:912
-#, c-format
-msgid "Resolving our hostname `%s'\n"
+#: src/datastore/plugin_datastore_mysql.c:622
+#: src/datastore/plugin_datastore_mysql.c:1346
+#, fuzzy, c-format
+msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
+msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
+
+#: src/datastore/plugin_datastore_mysql.c:1581
+msgid "Mysql database running\n"
 msgstr ""
 
-#: src/util/pseudonym.c:273
+#: src/datastore/plugin_datastore_postgres.c:173
 #, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+msgid "Unable to initialize Postgres with configuration `%s': %s"
+msgstr "无法保存配置文件“%s”:"
 
-#: src/util/pseudonym.c:337
-msgid "no-name"
-msgstr "无名称"
+#: src/datastore/plugin_datastore_postgres.c:1017
+msgid "Postgres database running\n"
+msgstr ""
 
-#: src/util/gnunet-service-resolver.c:261
-#, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "无法解析“%s”(%s):%s\n"
+#: src/datastore/plugin_datastore_sqlite.c:61
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%u with error: %s"
+msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/util/gnunet-service-resolver.c:317
-#: src/util/gnunet-service-resolver.c:362
+#: src/datastore/plugin_datastore_sqlite.c:239
+#: src/namestore/plugin_namestore_sqlite.c:223
 #, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr "找不到主机“%s”的 IP:%s\n"
-
-#: src/util/gnunet-service-resolver.c:460
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
+msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:508
+#: src/datastore/plugin_datastore_sqlite.c:266
+#: src/namestore/plugin_namestore_sqlite.c:248
 #, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
-msgstr ""
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/util/bio.c:136 src/util/bio.c:142
-#, fuzzy, c-format
-msgid "Error reading `%s': %s"
-msgstr "创建用户出错"
+#: src/datastore/plugin_datastore_sqlite.c:669
+#, fuzzy
+msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
-#: src/util/bio.c:143
-msgid "End of file"
+#: src/datastore/plugin_datastore_sqlite.c:1159
+msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/util/bio.c:195
+#: src/datastore/plugin_datastore_sqlite.c:1178
 #, c-format
-msgid "Error reading length of string `%s'"
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/util/bio.c:205
-#, c-format
-msgid "String `%s' longer than allowed (%u > %u)"
+#: src/datastore/plugin_datastore_sqlite.c:1218
+#: src/namestore/plugin_namestore_sqlite.c:779
+#, fuzzy
+msgid "Sqlite database running\n"
+msgstr "sqlite 数据仓库"
+
+#: src/datastore/plugin_datastore_template.c:241
+msgid "Template database running\n"
 msgstr ""
 
-#: src/util/bio.c:250
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+#: src/dht/dht_api.c:280
+#, fuzzy
+msgid "Failed to connect to the DHT service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
+#: src/gns/gnunet-gns-lookup.c:185
+msgid "the query key"
 msgstr ""
 
-#: src/util/bio.c:264
-#, c-format
-msgid "Metadata `%s' failed to deserialize"
+#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:188
+msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/util/client.c:301
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
+#: src/dht/gnunet-dht-get.c:207 src/gns/gnunet-gns-lookup.c:191
+msgid "the type of data to look for"
 msgstr ""
 
-#: src/util/client.c:309
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
+#: src/gns/gnunet-gns-lookup.c:194
+msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/util/client.c:647
-msgid "Failure to transmit TEST request.\n"
+#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
+#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
+#: src/gns/gnunet-gns-lookup.c:197 src/nse/gnunet-nse-profiler.c:908
+msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/util/client.c:849
-#, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
+#: src/dht/gnunet-dht-get.c:232
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/util/client.c:865
-#, c-format
-msgid "Failure to transmit request to service `%s'\n"
+#: src/dht/gnunet-dht-put.c:100
+msgid "PUT request sent!\n"
 msgstr ""
 
-#: src/util/client.c:1133
-msgid "Could not submit request, not expecting to receive a response.\n"
+#: src/dht/gnunet-dht-put.c:124
+msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/dht/gnunet-dht-put.c:132
 #, fuzzy, c-format
-msgid "Could not aquire lock on file `%s': %s...\n"
-msgstr "无法解析“%s”(%s):%s\n"
+msgid "Could not connect to %s service!\n"
+msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/util/crypto_rsa.c:623
-#, fuzzy
-msgid "Creating a new private key.  This may take a while.\n"
-msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
+#: src/dht/gnunet-dht-put.c:137
+#, fuzzy, c-format
+msgid "Connected to %s service!\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/util/crypto_rsa.c:641
+#: src/dht/gnunet-dht-put.c:152
 #, c-format
-msgid "I am host `%s'.  Stored new private key in `%s'.\n"
+msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
-msgid "This may be ok if someone is currently generating a hostkey.\n"
+#: src/dht/gnunet-dht-put.c:166
+msgid "the data to insert under the key"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
-#, c-format
-msgid ""
-"When trying to read hostkey file `%s' I found %u bytes but I need at least "
-"%u.\n"
+#: src/dht/gnunet-dht-put.c:169
+msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
-#, c-format
-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+#: src/dht/gnunet-dht-put.c:175
+msgid "how many replicas to create"
 msgstr ""
 
-#: src/util/crypto_rsa.c:738
-#, c-format
-msgid "I am host `%s'.  Read private key from `%s'.\n"
+#: src/dht/gnunet-dht-put.c:178
+msgid "the type to insert data as"
 msgstr ""
 
-#: src/util/crypto_rsa.c:959
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
+#: src/dht/gnunet-dht-put.c:203
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:882 src/dht/gnunet-dht-get.c:213
-#: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:596
-#: src/fs/gnunet-download.c:263
-msgid "be verbose (print progress information)"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:900
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:588
+#: src/testing/testing.c:2087 src/testing/testing.c:2121
 #, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "无法访问该服务"
+msgid "Failed to connect to transport service!\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/nse/gnunet-service-nse.c:938
-#, c-format
-msgid "Proof of work invalid: %llu!\n"
+#: src/dht/gnunet-service-dht_clients.c:371
+msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1393 src/nse/gnunet-service-nse.c:1412
-#: src/nse/gnunet-service-nse.c:1433
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+#: src/dht/gnunet-service-dht_clients.c:462
+msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1400
-msgid "Invalid work requirement for NSE service. Exiting.\n"
+#: src/dht/gnunet-service-dht_clients.c:529
+msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1421
-#, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/dht/gnunet-service-dht_clients.c:624
+msgid "# GET STOP requests received from clients"
+msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
+#: src/dht/gnunet-service-dht_clients.c:854
+msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
-msgid "# peers known"
+#: src/dht/gnunet-service-dht_clients.c:869
+msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/dht/gnunet-service-dht_clients.c:906
 #, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
-#, c-format
-msgid "Still no peers found in `%s'!\n"
+#: src/dht/gnunet-service-dht_clients.c:928
+msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:258
-#, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "无法连接到 %s:%u:%s\n"
-
-#: src/peerinfo/peerinfo_api.c:279
-#, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/peerinfo/peerinfo_api.c:435
-msgid "Failed to receive response from `PEERINFO' service."
+#: src/dht/gnunet-service-dht_clients.c:979
+#: src/dht/gnunet-service-dht_clients.c:1022
+msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
-msgid "Received invalid message from `PEERINFO' service.\n"
+#: src/dht/gnunet-service-dht_clients.c:989
+msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:523
-#, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/peerinfo/peerinfo_api.c:557
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+#: src/dht/gnunet-service-dht_datacache.c:93
+#, c-format
+msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:424
-msgid "Sqlite datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:103
+msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/datacache/datacache.c:183
-#, c-format
-msgid "Loading `%s' datacache plugin\n"
+#: src/dht/gnunet-service-dht_datacache.c:209
+msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/datacache.c:191
-#, c-format
-msgid "Failed to load datacache plugin for `%s'\n"
+#: src/dht/gnunet-service-dht_datacache.c:220
+msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/datacache.c:281
-msgid "# requests received"
+#: src/dht/gnunet-service-dht_datacache.c:226
+msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/datacache.c:291
-msgid "# requests filtered by bloom filter"
+#: src/dht/gnunet-service-dht_datacache.c:238
+msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "无法初始化 SQLite:%s。\n"
-
-#: src/datacache/plugin_datacache_postgres.c:500
-msgid "Postgres datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:241
+#, c-format
+msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_template.c:121
-msgid "Template datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:271
+msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:979
-msgid "MySQL datacache running\n"
+#: src/dht/gnunet-service-dht_hello.c:82
+msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:481
@@ -1435,439 +1386,332 @@
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/dht_api.c:282
-#, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/dht/gnunet-service-dht.c:163
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
-msgid "the query key"
+#: src/dht/gnunet-service-dht_nse.c:59
+msgid "# Network size estimates received"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204
-msgid "how many parallel requests (replicas) to create"
+#: src/dht/gnunet-service-dht_routing.c:211
+msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207
-msgid "the type of data to look for"
+#: src/dht/gnunet-service-dht_routing.c:220
+msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
-msgid "how long to execute this query before giving up?"
+#: src/dht/gnunet-service-dht_routing.c:226
+msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:232
-msgid "Issue a GET request to the GNUnet DHT, prints results."
+#: src/dht/gnunet-service-dht_routing.c:236
+msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:371
-msgid "# GET requests from clients injected"
+#: src/dht/gnunet-service-dht_routing.c:314
+#: src/dht/gnunet-service-dht_routing.c:368
+msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:462
-msgid "# PUT requests received from clients"
+#: src/dht/gnunet-service-dht_routing.c:324
+msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:529
-msgid "# GET requests received from clients"
+#: src/dht/plugin_block_dht.c:124
+#, c-format
+msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:624
-msgid "# GET STOP requests received from clients"
+#: src/dht/plugin_block_dht.c:131
+msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:854
-msgid "# Key match, type mismatches in REPLY to CLIENT"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:869
-msgid "# Duplicate REPLIES to CLIENT request dropped"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:906
+#: src/dht/plugin_block_dht.c:140
 #, c-format
-msgid "Unsupported block type (%u) in request!\n"
+msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:928
-msgid "# RESULTS queued for clients"
+#: src/dns/gnunet-dns-monitor.c:337
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:979
-#: src/dht/gnunet-service-dht_clients.c:1022
-msgid "# REPLIES ignored for CLIENTS (no match)"
+#: src/dns/gnunet-dns-monitor.c:340
+msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
-msgid "Could not pass reply to client, message too big!\n"
+#: src/dns/gnunet-dns-monitor.c:348
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_nse.c:59
-msgid "# Network size estimates received"
+#: src/dns/gnunet-dns-redirector.c:236
+msgid "set A records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:100
-msgid "PUT request sent!\n"
+#: src/dns/gnunet-dns-redirector.c:239
+msgid "set AAAA records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
-msgid "Must provide KEY and DATA for DHT put!\n"
+#: src/dns/gnunet-dns-redirector.c:247
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:132
+#: src/dns/gnunet-service-dns.c:480
 #, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
-msgstr "无法连接到 %s:%u:%s\n"
+msgid "Could not bind to any port: %s\n"
+msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/dht/gnunet-dht-put.c:137
-#, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/dht/gnunet-dht-put.c:152
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+#: src/dns/gnunet-service-dns.c:634
+msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:166
-msgid "the data to insert under the key"
+#: src/dns/gnunet-service-dns.c:818
+msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:169
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/dns/gnunet-service-dns.c:1001
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:175
-msgid "how many replicas to create"
+#: src/dns/gnunet-service-dns.c:1046
+msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:178
-msgid "the type to insert data as"
+#: src/dns/gnunet-service-dns.c:1165
+msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:203
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+#: src/dns/gnunet-service-dns.c:1198
+msgid "Changing DNS reply according to client specifications\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:211
-msgid "# Good REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1279
+msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Duplicate REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1294
+msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
-msgid "# Invalid REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1303
+#, c-format
+msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:236
-msgid "# Unsupported REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1312
+msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:314
-#: src/dht/gnunet-service-dht_routing.c:368
-msgid "# Entries removed from routing table"
+#: src/dns/gnunet-service-dns.c:1377
+msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
-msgid "# Entries added to routing table"
+#: src/dns/gnunet-service-dns.c:1461
+#, c-format
+msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:93
-#, c-format
-msgid "%s request received, but have no datacache!\n"
+#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2671
+msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:103
-msgid "# ITEMS stored in datacache"
+#: src/dns/gnunet-service-dns.c:1567
+msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:209
-msgid "# Good RESULTS found in datacache"
+#: src/dv/dv_api.c:179
+#, fuzzy
+msgid "Failed to connect to the dv service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/dv/plugin_transport_dv.c:159
+#, c-format
+msgid "%s Received message from %s of type %d, distance %u!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:220
-msgid "# Duplicate RESULTS found in datacache"
+#: src/exit/gnunet-daemon-exit.c:508
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:226
-msgid "# Invalid RESULTS found in datacache"
+#: src/exit/gnunet-daemon-exit.c:563
+msgid "# Bytes transmitted via mesh tunnels"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
-msgid "# Unsupported RESULTS found in datacache"
+#: src/exit/gnunet-daemon-exit.c:678 src/exit/gnunet-daemon-exit.c:2066
+#: src/exit/gnunet-daemon-exit.c:2316 src/vpn/gnunet-service-vpn.c:1388
+#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:241
-#, c-format
-msgid "Unsupported block type (%u) in local response!\n"
+#: src/exit/gnunet-daemon-exit.c:714 src/exit/gnunet-daemon-exit.c:2125
+#: src/exit/gnunet-daemon-exit.c:2375 src/vpn/gnunet-service-vpn.c:1444
+#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:271
-msgid "# GET requests given to datacache"
+#: src/exit/gnunet-daemon-exit.c:754
+msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:82
-msgid "# HELLOs obtained from peerinfo"
+#: src/exit/gnunet-daemon-exit.c:761
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:149
-#, fuzzy, c-format
-msgid "Service `%s' is unknown to ARM.\n"
-msgstr "服务已删除。\n"
-
-#: src/arm/gnunet-arm.c:154
-#, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "服务已删除。\n"
-
-#: src/arm/gnunet-arm.c:157
-#, fuzzy, c-format
-msgid "Service `%s' was already running.\n"
-msgstr "服务已删除。\n"
-
-#: src/arm/gnunet-arm.c:162
-#, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "服务已删除。\n"
-
-#: src/arm/gnunet-arm.c:165
-#, fuzzy, c-format
-msgid "Service `%s' was already being stopped.\n"
-msgstr "服务已删除。\n"
-
-#: src/arm/gnunet-arm.c:169
-#, fuzzy, c-format
-msgid "Service `%s' was already not running.\n"
-msgstr "服务已删除。\n"
-
-#: src/arm/gnunet-arm.c:173
-msgid "Request ignored as ARM is shutting down.\n"
+#: src/exit/gnunet-daemon-exit.c:838
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:177
-msgid "Error communicating with ARM service.\n"
+#: src/exit/gnunet-daemon-exit.c:913
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:181
-msgid "Timeout communicating with ARM service.\n"
+#: src/exit/gnunet-daemon-exit.c:966
+msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:185
-msgid "Operation failed.\n"
+#: src/exit/gnunet-daemon-exit.c:980
+msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:189
-msgid "Unknown response code from ARM.\n"
+#: src/exit/gnunet-daemon-exit.c:1006
+msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/exit/gnunet-daemon-exit.c:1033
 #, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
-msgid "Fatal error initializing ARM API.\n"
+#: src/exit/gnunet-daemon-exit.c:1079
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
-#, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/arm/gnunet-arm.c:253
+#: src/exit/gnunet-daemon-exit.c:1087
 #, c-format
-msgid "Failed to remove servicehome directory %s\n"
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:355
-#, fuzzy
-msgid "stop all GNUnet services"
-msgstr "卸载 GNUnet 服务"
+#: src/exit/gnunet-daemon-exit.c:1468
+msgid "# TCP packets sent via TUN"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:357
-msgid "start a particular service"
+#: src/exit/gnunet-daemon-exit.c:1568
+msgid "# TCP service creation requests received via mesh"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
-msgid "stop a particular service"
+#: src/exit/gnunet-daemon-exit.c:1571 src/exit/gnunet-daemon-exit.c:1650
+#: src/exit/gnunet-daemon-exit.c:1760 src/exit/gnunet-daemon-exit.c:1990
+#: src/exit/gnunet-daemon-exit.c:2232 src/exit/gnunet-daemon-exit.c:2513
+#: src/exit/gnunet-daemon-exit.c:2613
+msgid "# Bytes received from MESH"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
-#, fuzzy
-msgid "start all GNUnet default services"
-msgstr "卸载 GNUnet 服务"
-
-#: src/arm/gnunet-arm.c:364
-#, fuzzy
-msgid "stop and start all GNUnet default services"
-msgstr "卸载 GNUnet 服务"
-
-#: src/arm/gnunet-arm.c:367
-msgid "delete config file and directory on exit"
+#: src/exit/gnunet-daemon-exit.c:1604 src/exit/gnunet-daemon-exit.c:2635
+#, c-format
+msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
-msgid "don't print status messages"
+#: src/exit/gnunet-daemon-exit.c:1608
+msgid "# TCP requests dropped (no such service)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:372
-#, fuzzy
-msgid "timeout for completing current operation"
-msgstr "等待一次迭代完成的时间(毫秒)"
-
-#: src/arm/gnunet-arm.c:383
-msgid "Control services and the Automated Restart Manager (ARM)"
+#: src/exit/gnunet-daemon-exit.c:1653
+msgid "# TCP IP-exit creation requests received via mesh"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:959
-msgid "Failed to transmit shutdown ACK.\n"
+#: src/exit/gnunet-daemon-exit.c:1763
+msgid "# TCP data requests received via mesh"
 msgstr ""
 
-#: src/arm/mockup-service.c:46
-msgid "Transmitting shutdown ACK.\n"
+#: src/exit/gnunet-daemon-exit.c:1777
+msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/arm/mockup-service.c:69
-msgid "Initiating shutdown as requested by client.\n"
+#: src/exit/gnunet-daemon-exit.c:1827
+msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:320
-#, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/arm/gnunet-service-arm.c:323
-#, c-format
-msgid "Starting service `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:1993
+msgid "# ICMP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:349
-msgid "Could not send status result to client\n"
+#: src/exit/gnunet-daemon-exit.c:2235
+msgid "# ICMP service requests received via mesh"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:476
-#, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "无法创建用户账户:"
-
-#: src/arm/gnunet-service-arm.c:498
-#, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+#: src/exit/gnunet-daemon-exit.c:2301 src/vpn/gnunet-service-vpn.c:1378
+#: src/vpn/gnunet-service-vpn.c:1945
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:512
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:2360 src/vpn/gnunet-service-vpn.c:1414
+#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:620
-#, c-format
-msgid "Preparing to stop `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:2410
+msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:774
-#, c-format
-msgid "Restarting service `%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:2516
+msgid "# UDP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:869
-msgid "exit"
+#: src/exit/gnunet-daemon-exit.c:2616
+msgid "# UDP service requests received via mesh"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:874
-msgid "signal"
+#: src/exit/gnunet-daemon-exit.c:2639
+msgid "# UDP requests dropped (no such service)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:879
-#, fuzzy
-msgid "unknown"
-msgstr "未知错误"
-
-#: src/arm/gnunet-service-arm.c:913
+#: src/exit/gnunet-daemon-exit.c:2879
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1052
-#, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not valid: %s\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/arm/gnunet-service-arm.c:1054
-msgid "option missing"
+#: src/exit/gnunet-daemon-exit.c:2893 src/exit/gnunet-daemon-exit.c:2905
+#, c-format
+msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1131
-#, fuzzy, c-format
-msgid "Starting default services `%s'\n"
-msgstr "卸载 GNUnet 服务"
-
-#: src/arm/gnunet-service-arm.c:1142
+#: src/exit/gnunet-daemon-exit.c:2916
 #, c-format
-msgid "Default service `%s' not configured correctly!\n"
+msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1156
+#: src/exit/gnunet-daemon-exit.c:3045
 msgid ""
-"No default services configured, GNUnet will not really start right now.\n"
+"This system does not support IPv4, will disable IPv4 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/arm/arm_api.c:187
-msgid "Failed to transmit shutdown request to client.\n"
+#: src/exit/gnunet-daemon-exit.c:3053
+msgid ""
+"This system does not support IPv6, will disable IPv6 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/arm/arm_api.c:378
-#, fuzzy, c-format
-msgid "Configuration failes to specify option `%s' in section `%s'!\n"
-msgstr "配置不满足配置规范文件“%s”的约束!\n"
-
-#: src/arm/arm_api.c:392
-#, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr "配置不满足配置规范文件“%s”的约束!\n"
-
-#: src/arm/arm_api.c:465
-#, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:3060
+msgid ""
+"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
+"ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/arm/arm_api.c:521
-#, c-format
-msgid "Requesting start of service `%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:3066
+msgid ""
+"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
+"ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/arm/arm_api.c:522
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:3072 src/pt/gnunet-daemon-pt.c:884
+msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:544
-#, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
+#: src/exit/gnunet-daemon-exit.c:3233
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/arm/arm_api.c:546
-#, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:579
-#, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
-msgstr ""
-
-#: src/arm/arm_api.c:652
-#, c-format
-msgid "Stopping service `%s' within %llu ms\n"
-msgstr ""
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -1912,242 +1756,326 @@
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:207
+#: src/fs/fs_api.c:284
+#, fuzzy, c-format
+msgid "Could not open file `%s': %s"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/fs/fs_api.c:293
+#, fuzzy, c-format
+msgid "Could not read file `%s': %s"
+msgstr "无法解析“%s”(%s):%s\n"
+
+#: src/fs/fs_api.c:299
 #, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
+msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:263
+#: src/fs/fs_api.c:877
+#, fuzzy, c-format
+msgid "Failed to resume publishing information `%s': %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/fs/fs_api.c:1334
 #, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:390
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/fs/fs_api.c:1376
+#, c-format
+msgid "Failure while resuming publishing operation `%s': %s\n"
+msgstr ""
 
-#: src/statistics/gnunet-statistics.c:98
-#, fuzzy
-msgid "Failed to obtain statistics.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/statistics/gnunet-statistics.c:126 src/fs/gnunet-pseudonym.c:151
+#: src/fs/fs_api.c:1392
 #, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "“%s”的参数无效。\n"
+msgid "Failed to resume publishing operation `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/statistics/gnunet-statistics.c:164
-msgid "limit output to statistics for the given NAME"
+#: src/fs/fs_api.c:2004
+#, c-format
+msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:167
-msgid "make the value being set persistent"
-msgstr ""
+#: src/fs/fs_api.c:2014
+#, fuzzy, c-format
+msgid "Failed to resume unindexing operation `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/statistics/gnunet-statistics.c:170
-msgid "limit output to the given SUBSYSTEM"
-msgstr ""
+#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#, fuzzy, c-format
+msgid "Failed to resume sub-download `%s': %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/statistics/gnunet-statistics.c:173
-msgid "just print the statistics value"
-msgstr ""
+#: src/fs/fs_api.c:2156
+#, fuzzy, c-format
+msgid "Failed to resume sub-search `%s': %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/statistics/gnunet-statistics.c:180
-msgid "Print statistics about GNUnet operations."
+#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#, c-format
+msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:89
-#, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
+#: src/fs/fs_api.c:2369
+#, fuzzy, c-format
+msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/fs_api.c:2615
+msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:96
+#: src/fs/fs_api.c:2709
 #, c-format
-msgid "Error unindexing: %s.\n"
+msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:101
-msgid "Unindexing done.\n"
+#: src/fs/fs_directory.c:210
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
-#: src/fs/gnunet-publish.c:163 src/fs/gnunet-download.c:144
-#, c-format
-msgid "Unexpected status: %d\n"
+#: src/fs/fs_download.c:313
+msgid ""
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:131
-#, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
+#: src/fs/fs_download.c:333
+msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
-#: src/fs/gnunet-publish.c:417 src/fs/gnunet-download.c:203
+#: src/fs/fs_download.c:491 src/fs/fs_download.c:503
 #, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Failed to open file `%s' for writing"
+msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-unindex.c:148
-msgid "Could not start unindex operation.\n"
+#: src/fs/fs_download.c:877
+#, c-format
+msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:176
-msgid "Unindex a file that was previously indexed with gnunet-publish."
+#: src/fs/fs_download.c:963
+#, c-format
+msgid ""
+"Internal error or bogus download URI (expected %u bytes at depth %u and "
+"offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:165
-#, c-format
-msgid "Namespace `%s' unknown.\n"
+#: src/fs/fs_download.c:989
+msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
+#: src/fs/fs_download.c:1012
 #, fuzzy, c-format
-msgid "Option `%s' ignored\n"
-msgstr "%s:选项“%s”有歧义\n"
+msgid "Download failed: could not open file `%s': %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:543
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr ""
+#: src/fs/fs_download.c:1024
+#, fuzzy, c-format
+msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-pseudonym.c:272
-msgid "create or advertise namespace NAME"
-msgstr ""
+#: src/fs/fs_download.c:1033
+#, fuzzy, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-pseudonym.c:275
-msgid "delete namespace NAME "
-msgstr ""
+#: src/fs/fs_download.c:1875
+#, fuzzy
+msgid "Invalid URI"
+msgstr "无效条目。\n"
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/fs_getopt.c:191
+#, c-format
 msgid ""
-"add an additional keyword for the advertisment (this option can be specified "
-"multiple times)"
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:562
-msgid "set the meta-data for the given TYPE to the given VALUE"
+#: src/fs/fs_list_indexed.c:90
+#, c-format
+msgid "Failed to receive response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
-msgid "print names of local namespaces"
+#: src/fs/fs_list_indexed.c:113
+#, c-format
+msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:288
-msgid "use the given PRIORITY for the advertisments"
-msgstr ""
+#: src/fs/fs_list_indexed.c:151
+#, fuzzy, c-format
+msgid "Failed to not connect to `%s' service.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-pseudonym.c:291
-msgid "do not print names of remote namespaces"
+#: src/fs/fs_misc.c:126
+#, c-format
+msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:581
-msgid "set the desired replication LEVEL"
-msgstr ""
+#: src/fs/fs_namespace_advertise.c:150
+#, fuzzy
+msgid "Unknown error"
+msgstr "未知错误"
 
-#: src/fs/gnunet-pseudonym.c:297
-msgid "specify ID of the root of the namespace"
-msgstr ""
+#: src/fs/fs_namespace_advertise.c:238 src/fs/fs_namespace_advertise.c:259
+#, fuzzy
+msgid "Failed to serialize meta data"
+msgstr "发送消息失败。\n"
 
-#: src/fs/gnunet-pseudonym.c:300
-msgid "change rating of namespace ID by VALUE"
-msgstr ""
+#: src/fs/fs_namespace_advertise.c:278
+#, fuzzy
+msgid "Failed to connect to datastore service"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-pseudonym.c:308
-msgid "Manage GNUnet pseudonyms."
-msgstr ""
-
-#: src/fs/fs_namespace.c:64 src/fs/fs_namespace.c:90
+#: src/fs/fs_namespace.c:57 src/fs/fs_namespace.c:83
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/fs/fs_namespace.c:119
+#: src/fs/fs_namespace.c:112
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_namespace.c:141 src/fs/fs_namespace.c:229
+#: src/fs/fs_namespace.c:134 src/fs/fs_namespace.c:222
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/fs_namespace.c:338
-#, fuzzy
-msgid "Unknown error"
-msgstr "未知错误"
-
-#: src/fs/fs_namespace.c:427 src/fs/fs_namespace.c:448
-#, fuzzy
-msgid "Failed to serialize meta data"
-msgstr "发送消息失败。\n"
-
-#: src/fs/fs_namespace.c:467
-#, fuzzy
-msgid "Failed to connect to datastore service"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/fs/fs_namespace.c:510
+#: src/fs/fs_namespace.c:256
 #, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:612
+#: src/fs/fs_namespace.c:371
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:840 src/fs/fs_publish.c:1535
+#: src/fs/fs_namespace.c:588 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_namespace.c:884
+#: src/fs/fs_namespace.c:631
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/gnunet-search.c:111
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:395
 #, c-format
-msgid "Failed to write directory with search results to `%s'\n"
+msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/gnunet-search.c:181
+#: src/fs/fs_publish.c:616 src/fs/fs_publish.c:633 src/fs/fs_publish.c:672
+#: src/fs/fs_publish.c:692 src/fs/fs_publish.c:717 src/fs/fs_publish.c:857
+#, c-format
+msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgstr ""
+
+#: src/fs/fs_publish.c:618
+msgid "timeout on index-start request to `fs' service"
+msgstr ""
+
+#: src/fs/fs_publish.c:630
+#, fuzzy
+msgid "unknown error"
+msgstr "未知错误"
+
+#: src/fs/fs_publish.c:673
+msgid "failed to compute hash"
+msgstr ""
+
+#: src/fs/fs_publish.c:693
+msgid "filename too long"
+msgstr ""
+
+#: src/fs/fs_publish.c:718
+msgid "could not connect to `fs' service"
+msgstr ""
+
+#: src/fs/fs_publish.c:741
 #, fuzzy, c-format
-msgid "Error searching: %s.\n"
-msgstr "创建用户出错"
+msgid "Failed to get file identifiers for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-search.c:231
-msgid "Could not create keyword URI from arguments.\n"
+#: src/fs/fs_publish.c:806
+#, c-format
+msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/gnunet-search.c:255
-msgid "Could not start searching.\n"
+#: src/fs/fs_publish.c:812
+#, c-format
+msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/gnunet-search.c:285 src/fs/gnunet-download.c:240
-msgid "set the desired LEVEL of receiver-anonymity"
+#: src/fs/fs_publish.c:858
+msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/gnunet-search.c:288 src/fs/gnunet-download.c:246
-msgid "only search the local peer (no P2P network search)"
+#: src/fs/fs_publish.c:1067
+#, c-format
+msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/gnunet-search.c:291
-msgid "write search results to file starting with PREFIX"
+#: src/fs/fs_publish.c:1138
+#, c-format
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:294
-msgid "automatically terminate search after VALUE ms"
+#: src/fs/fs_publish_ksk.c:258
+msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/gnunet-search.c:301
-msgid "automatically terminate search after VALUE results are found"
+#: src/fs/fs_search.c:810
+#, c-format
+msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-search.c:308
-msgid "Search GNUnet for files that were published on GNUnet"
+#: src/fs/fs_test_lib.c:269
+#, fuzzy, c-format
+msgid "Failed to start daemon: %s\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/fs/fs_unindex.c:58
+msgid "Failed to find given position in file"
 msgstr ""
 
+#: src/fs/fs_unindex.c:63
+#, fuzzy
+msgid "Failed to read file"
+msgstr "发送消息失败。\n"
+
+#: src/fs/fs_unindex.c:236
+msgid "Unexpected time for a response from `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:244
+msgid "Timeout waiting for `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:252
+#, fuzzy
+msgid "Invalid response from `fs' service."
+msgstr "“%s”的参数无效。\n"
+
+#: src/fs/fs_unindex.c:297
+msgid "Failed to connect to FS service for unindexing."
+msgstr ""
+
+#: src/fs/fs_unindex.c:332
+#, fuzzy
+msgid "Failed to connect to `datastore' service."
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/fs/fs_unindex.c:345
+#, fuzzy
+msgid "Failed to open file for unindexing."
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/fs/fs_unindex.c:379
+msgid "Failed to compute hash of file."
+msgstr ""
+
 #: src/fs/fs_uri.c:220
 #, c-format
 msgid "`%' must be followed by HEX number"
@@ -2220,359 +2148,447 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:118
+#: src/fs/gnunet-directory.c:49
 #, c-format
-msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
+msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:126
+#: src/fs/gnunet-directory.c:94
 #, c-format
-msgid "Error publishing: %s.\n"
+msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:137
+#: src/fs/gnunet-directory.c:97
 #, c-format
-msgid "Publishing `%s' done.\n"
+msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:141
-#, c-format
-msgid "URI is `%s'.\n"
-msgstr ""
+#: src/fs/gnunet-directory.c:132
+#, fuzzy
+msgid "You must specify a filename to inspect.\n"
+msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-publish.c:160
-msgid "Cleanup after abort complete.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:272
+#: src/fs/gnunet-directory.c:145
 #, fuzzy, c-format
-msgid "Meta data for file `%s' (%s)\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+msgid "Failed to read directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:274
+#: src/fs/gnunet-directory.c:154
 #, fuzzy, c-format
-msgid "Keywords for file `%s' (%s)\n"
-msgstr "无法解析“%s”(%s):%s\n"
+msgid "`%s' is not a GNUnet directory\n"
+msgstr "更改 GNUnet 目录的权限出错"
 
-#: src/fs/gnunet-publish.c:325
+#: src/fs/gnunet-directory.c:179
+#, fuzzy
+msgid "Display contents of a GNUnet directory"
+msgstr "更改 GNUnet 目录的权限出错"
+
+#: src/fs/gnunet-download.c:100
 #, fuzzy, c-format
-msgid "Failed to create namespace `%s'\n"
-msgstr "发送消息失败。\n"
+msgid "Starting download `%s'.\n"
+msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-publish.c:367
-#, c-format
-msgid "Cannot extract metadata from a URI!\n"
-msgstr ""
+#: src/fs/gnunet-download.c:109
+#, fuzzy
+msgid "<unknown time>"
+msgstr "未知错误"
 
-#: src/fs/gnunet-publish.c:374
+#: src/fs/gnunet-download.c:118
 #, c-format
-msgid "You must specify one and only one filename for insertion.\n"
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:380
+#: src/fs/gnunet-download.c:128
 #, c-format
-msgid "You must NOT specify an URI and a filename.\n"
+msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:388
+#: src/fs/gnunet-download.c:136
 #, c-format
-msgid "Option `%s' is required when using option `%s'.\n"
+msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:398 src/fs/gnunet-publish.c:405
-#: src/transport/gnunet-transport.c:503
+#: src/fs/gnunet-download.c:151 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
+msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:427
-#, fuzzy, c-format
-msgid "Could not create namespace `%s'\n"
-msgstr "无法解析“%s”(%s):%s\n"
+#: src/fs/gnunet-download.c:176
+#, fuzzy
+msgid "You need to specify a URI argument.\n"
+msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-publish.c:439 src/fs/gnunet-download.c:175
+#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/gnunet-publish.c:472
-#, fuzzy, c-format
-msgid "Could not access file: %s\n"
-msgstr "错误:无法访问服务:%s\n"
+#: src/fs/gnunet-download.c:189
+msgid "Only CHK or LOC URIs supported.\n"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-download.c:196
+msgid "Target filename must be specified.\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
-msgid "Could not publish `%s': %s\n"
-msgstr "无法解析“%s”(%s):%s\n"
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-publish.c:520
-msgid "Could not start publishing.\n"
+#: src/fs/gnunet-download.c:247 src/fs/gnunet-search.c:285
+msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:547
-msgid "disable adding the creation time to the metadata of the uploaded file"
+#: src/fs/gnunet-download.c:250
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:550
-msgid "do not use libextractor to add keywords or metadata"
+#: src/fs/gnunet-download.c:253 src/fs/gnunet-search.c:288
+msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:554
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
+#: src/fs/gnunet-download.c:256
+msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:558
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
+#: src/fs/gnunet-download.c:260
+msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:565
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
+#: src/fs/gnunet-download.c:264
+msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:570
+#: src/fs/gnunet-download.c:267
+msgid "download a GNUnet directory recursively"
+msgstr ""
+
+#: src/fs/gnunet-download.c:277
 msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:574
-msgid "specify the priority of the content"
+#: src/fs/gnunet-fs.c:117
+msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:578
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
+#: src/fs/gnunet-fs.c:124
+msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:584
-msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
+#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/fs/gnunet-pseudonym.c:165
+#, c-format
+msgid "Namespace `%s' unknown.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:588
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
+#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
+#: src/fs/gnunet-pseudonym.c:249
+#, fuzzy, c-format
+msgid "Option `%s' ignored\n"
+msgstr "%s:选项“%s”有歧义\n"
+
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-pseudonym.c:272
+msgid "create or advertise namespace NAME"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:275
+msgid "delete namespace NAME "
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:278
 msgid ""
-"URI to be published (can be used instead of passing a file to add keywords "
-"to the file with the respective URI)"
+"add an additional keyword for the advertisment (this option can be specified "
+"multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:605
-msgid "Publish a file or directory on GNUnet"
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/fs_search.c:810
-#, c-format
-msgid "Got result with unknown block type `%d', ignoring"
+#: src/fs/gnunet-pseudonym.c:285
+msgid "print names of local namespaces"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
-#: src/fs/gnunet-service-fs_lc.c:490
-msgid "# client searches active"
+#: src/fs/gnunet-pseudonym.c:288
+msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:254
-msgid "# replies received for local clients"
+#: src/fs/gnunet-pseudonym.c:291
+msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:319
-msgid "# client searches received"
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:358
-msgid "# client searches updated (merged content seen list)"
+#: src/fs/gnunet-pseudonym.c:297
+msgid "specify ID of the root of the namespace"
 msgstr ""
 
-#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
-msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
+#: src/fs/gnunet-pseudonym.c:300
+msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/fs_misc.c:126
+#: src/fs/gnunet-pseudonym.c:308
+msgid "Manage GNUnet pseudonyms."
+msgstr ""
+
+#: src/fs/gnunet-publish.c:147
 #, c-format
-msgid "Did not find mime type `%s' in extension list.\n"
+msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:49
+#: src/fs/gnunet-publish.c:155
 #, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
+#: src/fs/gnunet-publish.c:165
 #, c-format
-msgid "Directory `%s' meta data:\n"
+msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:97
+#: src/fs/gnunet-publish.c:169
 #, c-format
-msgid "Directory `%s' contents:\n"
+msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:132
-#, fuzzy
-msgid "You must specify a filename to inspect."
-msgstr "您必须指定一个昵称\n"
+#: src/fs/gnunet-publish.c:187
+msgid "Cleanup after abort complete.\n"
+msgstr ""
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-publish.c:299
 #, fuzzy, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "Meta data for file `%s' (%s)\n"
+msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-directory.c:176
+#: src/fs/gnunet-publish.c:301
+#, fuzzy, c-format
+msgid "Keywords for file `%s' (%s)\n"
+msgstr "无法解析“%s”(%s):%s\n"
+
+#: src/fs/gnunet-publish.c:352
+#, fuzzy, c-format
+msgid "Failed to create namespace `%s'\n"
+msgstr "发送消息失败。\n"
+
+#: src/fs/gnunet-publish.c:427
 #, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "更改 GNUnet 目录的权限出错"
+msgid "Could not publish\n"
+msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-service-fs_pr.c:287
-msgid "# Pending requests created"
+#: src/fs/gnunet-publish.c:454
+msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:623
-msgid "# Pending requests active"
+#: src/fs/gnunet-publish.c:485
+#, fuzzy, c-format
+msgid "Scanning directory `%s'.\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/gnunet-publish.c:487
+#, fuzzy, c-format
+msgid "Scanning file `%s'.\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/fs/gnunet-publish.c:492
+#, c-format
+msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:787
-msgid "# replies received and matched"
+#: src/fs/gnunet-publish.c:497
+msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:814
-msgid "# duplicate replies discarded (bloomfilter)"
+#: src/fs/gnunet-publish.c:501
+#, fuzzy, c-format
+msgid "Extracting meta data from file `%s' complete.\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/fs/gnunet-publish.c:505
+msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:830
+#: src/fs/gnunet-publish.c:512
+#, fuzzy
+msgid "Internal error scanning directory.\n"
+msgstr "未知错误。\n"
+
+#: src/fs/gnunet-publish.c:546
 #, c-format
-msgid "Unsupported block type %u\n"
+msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:845
-msgid "# results found locally"
+#: src/fs/gnunet-publish.c:553
+#, c-format
+msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:965
-msgid "# Datastore `PUT' failures"
+#: src/fs/gnunet-publish.c:559
+#, c-format
+msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:992
-msgid "# storage requests dropped due to high load"
+#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#, c-format
+msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1027
-msgid "# Replies received from DHT"
+#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
+#: src/transport/gnunet-transport.c:530
+#, c-format
+msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1120
-#, c-format
-msgid "Datastore lookup already took %llu ms!\n"
+#: src/fs/gnunet-publish.c:606
+#, fuzzy, c-format
+msgid "Could not create namespace `%s'\n"
+msgstr "无法解析“%s”(%s):%s\n"
+
+#: src/fs/gnunet-publish.c:639
+#, fuzzy, c-format
+msgid "Failed to access `%s': %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/fs/gnunet-publish.c:651
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1141
-#, c-format
-msgid "On-demand lookup already took %llu ms!\n"
+#: src/fs/gnunet-publish.c:676
+msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
-msgid "# Datastore lookups concluded (no results)"
+#: src/fs/gnunet-publish.c:679
+msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1202
-msgid "# Datastore lookups concluded (seen all)"
+#: src/fs/gnunet-publish.c:683
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
-msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
+#: src/fs/gnunet-publish.c:687
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1227
-msgid "# requested DBLOCK or IBLOCK not found"
+#: src/fs/gnunet-publish.c:694
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
-msgid "# on-demand blocks matched requests"
+#: src/fs/gnunet-publish.c:699
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1257
-msgid "# on-demand lookups performed successfully"
+#: src/fs/gnunet-publish.c:703
+msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
-msgid "# on-demand lookups failed"
+#: src/fs/gnunet-publish.c:707
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1289 src/fs/gnunet-service-fs_pr.c:1329
-#: src/fs/gnunet-service-fs_pr.c:1469
-msgid "# Datastore lookups concluded (error queueing)"
+#: src/fs/gnunet-publish.c:713
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1347
-msgid "# Datastore lookups concluded (found last result)"
+#: src/fs/gnunet-publish.c:717
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1360
-msgid "# Datastore lookups concluded (load too high)"
+#: src/fs/gnunet-publish.c:721
+msgid ""
+"URI to be published (can be used instead of passing a file to add keywords "
+"to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1446
-msgid "# Datastore lookups initiated"
+#: src/fs/gnunet-publish.c:736
+msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1530
-msgid "# GAP PUT messages received"
+#: src/fs/gnunet-search.c:111
+#, c-format
+msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1629 src/fs/gnunet-service-fs_pr.c:1638
+#: src/fs/gnunet-search.c:181
 #, fuzzy, c-format
-msgid "Configuration fails to specify `%s', assuming default value."
-msgstr "配置文件“%s”已写入。\n"
+msgid "Error searching: %s.\n"
+msgstr "创建用户出错"
 
-#: src/fs/gnunet-service-fs_pe.c:265
-msgid "# average retransmission delay (ms)"
+#: src/fs/gnunet-search.c:231
+msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:394
-msgid "# transmission failed (core has no bandwidth)"
+#: src/fs/gnunet-search.c:255
+msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:425
-msgid "# query messages sent to other peers"
+#: src/fs/gnunet-search.c:291
+msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:478
-msgid "# delay heap timeout"
+#: src/fs/gnunet-search.c:294
+msgid "automatically terminate search after VALUE ms"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:485
-msgid "# query plans executed"
+#: src/fs/gnunet-search.c:301
+msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:549
-msgid "# requests merged"
+#: src/fs/gnunet-search.c:308
+msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:555
-msgid "# requests refreshed"
+#: src/fs/gnunet-service-fs.c:240
+msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:608 src/fs/gnunet-service-fs_pe.c:694
-#: src/fs/gnunet-service-fs_pe.c:736
-msgid "# query plan entries"
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
+msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1544
-#: src/transport/gnunet-service-transport_neighbours.c:936
-#: src/transport/gnunet-service-transport_neighbours.c:1263
-#: src/transport/gnunet-service-transport_neighbours.c:1735
-#: src/transport/gnunet-service-transport_neighbours.c:2369
-#: src/transport/gnunet-service-transport_neighbours.c:2437
+#: src/fs/gnunet-service-fs.c:583 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/topology/gnunet-daemon-topology.c:1290
+#: src/topology/gnunet-daemon-topology.c:1297
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' service.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1546
 #: src/topology/gnunet-daemon-topology.c:654
 #: src/topology/gnunet-daemon-topology.c:756
+#: src/transport/gnunet-service-transport_neighbours.c:960
+#: src/transport/gnunet-service-transport_neighbours.c:1289
+#: src/transport/gnunet-service-transport_neighbours.c:1841
+#: src/transport/gnunet-service-transport_neighbours.c:2499
+#: src/transport/gnunet-service-transport_neighbours.c:2566
 msgid "# peers connected"
 msgstr ""
 
@@ -2593,7 +2609,7 @@
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1334
+#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1336
 msgid "# P2P searches active"
 msgstr ""
 
@@ -2601,69 +2617,62 @@
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:909
+#: src/fs/gnunet-service-fs_cp.c:911
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:919
+#: src/fs/gnunet-service-fs_cp.c:921
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:933
+#: src/fs/gnunet-service-fs_cp.c:935
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:971
+#: src/fs/gnunet-service-fs_cp.c:973
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1038
+#: src/fs/gnunet-service-fs_cp.c:1040
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1064
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1072
+#: src/fs/gnunet-service-fs_cp.c:1074
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1151
+#: src/fs/gnunet-service-fs_cp.c:1153
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1185
+#: src/fs/gnunet-service-fs_cp.c:1187
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1209
+#: src/fs/gnunet-service-fs_cp.c:1211
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1275
+#: src/fs/gnunet-service-fs_cp.c:1277
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1303
+#: src/fs/gnunet-service-fs_cp.c:1305
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1332
+#: src/fs/gnunet-service-fs_cp.c:1334
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1699
+#: src/fs/gnunet-service-fs_cp.c:1701
 msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:653
-#, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
-msgstr ""
-
 #: src/fs/gnunet-service-fs_indexing.c:113
 #: src/fs/gnunet-service-fs_indexing.c:163
 #, fuzzy, c-format
@@ -2716,1017 +2725,1238 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
-#, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
+#: src/fs/gnunet-service-fs_lc.c:494
+msgid "# client searches active"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:117
-#, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
+#: src/fs/gnunet-service-fs_lc.c:256
+msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:164
-#, fuzzy, c-format
-msgid "Failed to not connect to `%s' service.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/fs/gnunet-service-fs_lc.c:323
+msgid "# client searches received"
+msgstr ""
 
-#: src/fs/fs_unindex.c:58
-msgid "Failed to find given position in file"
+#: src/fs/gnunet-service-fs_lc.c:362
+msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
-#, fuzzy
-msgid "Failed to read file"
-msgstr "发送消息失败。\n"
+#: src/fs/gnunet-service-fs_pe.c:265
+msgid "# average retransmission delay (ms)"
+msgstr ""
 
-#: src/fs/fs_unindex.c:236
-msgid "Unexpected time for a response from `fs' service."
+#: src/fs/gnunet-service-fs_pe.c:394
+msgid "# transmission failed (core has no bandwidth)"
 msgstr ""
 
-#: src/fs/fs_unindex.c:244
-msgid "Timeout waiting for `fs' service."
+#: src/fs/gnunet-service-fs_pe.c:425
+msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/fs_unindex.c:252
-#, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "“%s”的参数无效。\n"
+#: src/fs/gnunet-service-fs_pe.c:478
+msgid "# delay heap timeout"
+msgstr ""
 
-#: src/fs/fs_unindex.c:297
-msgid "Failed to connect to FS service for unindexing."
+#: src/fs/gnunet-service-fs_pe.c:485
+msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/fs_unindex.c:332
-#, fuzzy
-msgid "Failed to connect to `datastore' service."
-msgstr "初始化“%s”服务失败。\n"
+#: src/fs/gnunet-service-fs_pe.c:549
+msgid "# requests merged"
+msgstr ""
 
-#: src/fs/fs_unindex.c:345
-#, fuzzy
-msgid "Failed to open file for unindexing."
-msgstr "打开日志文件“%s”失败:%s\n"
+#: src/fs/gnunet-service-fs_pe.c:555
+msgid "# requests refreshed"
+msgstr ""
 
-#: src/fs/fs_unindex.c:379
-msgid "Failed to compute hash of file."
+#: src/fs/gnunet-service-fs_pe.c:608 src/fs/gnunet-service-fs_pe.c:694
+#: src/fs/gnunet-service-fs_pe.c:761
+msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-download.c:100
-#, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "未知的命令“%s”。\n"
+#: src/fs/gnunet-service-fs_pr.c:287
+msgid "# Pending requests created"
+msgstr ""
 
-#: src/fs/gnunet-download.c:112
+#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:622
+msgid "# Pending requests active"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:787
+msgid "# replies received and matched"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:816
+msgid "# duplicate replies discarded (bloomfilter)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:832
 #, c-format
-msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
+msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:121
+#: src/fs/gnunet-service-fs_pr.c:847
+msgid "# results found locally"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:969
+msgid "# Datastore `PUT' failures"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:996
+msgid "# storage requests dropped due to high load"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1031
+msgid "# Replies received from DHT"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1124
 #, c-format
-msgid "Error downloading: %s.\n"
+msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:129
+#: src/fs/gnunet-service-fs_pr.c:1145
 #, c-format
-msgid "Downloading `%s' done (%s/s).\n"
+msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:169
-#, fuzzy
-msgid "You need to specify a URI argument.\n"
-msgstr "您必须指定一个昵称\n"
+#: src/fs/gnunet-service-fs_pr.c:1192
+msgid "# Datastore lookups concluded (no results)"
+msgstr ""
 
-#: src/fs/gnunet-download.c:182
-msgid "Only CHK or LOC URIs supported.\n"
+#: src/fs/gnunet-service-fs_pr.c:1206
+msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
-msgid "Target filename must be specified.\n"
+#: src/fs/gnunet-service-fs_pr.c:1215
+msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:243
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
+#: src/fs/gnunet-service-fs_pr.c:1231
+msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-download.c:249
-msgid "write the file to FILENAME"
+#: src/fs/gnunet-service-fs_pr.c:1248
+msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
-msgid "set the maximum number of parallel downloads that is allowed"
+#: src/fs/gnunet-service-fs_pr.c:1261
+msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
-msgid "set the maximum number of parallel requests for blocks that is allowed"
+#: src/fs/gnunet-service-fs_pr.c:1266
+msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:260
-msgid "download a GNUnet directory recursively"
+#: src/fs/gnunet-service-fs_pr.c:1293 src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1473
+msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:270
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+#: src/fs/gnunet-service-fs_pr.c:1351
+msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/fs_getopt.c:191
+#: src/fs/gnunet-service-fs_pr.c:1364
+msgid "# Datastore lookups concluded (load too high)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1450
+msgid "# Datastore lookups initiated"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1534
+msgid "# GAP PUT messages received"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1633 src/fs/gnunet-service-fs_pr.c:1642
+#, fuzzy, c-format
+msgid "Configuration fails to specify `%s', assuming default value."
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+"Invalid value specified for option `%s' in section `%s', content pushing "
+"disabled\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:150 src/fs/fs_publish.c:421
+#: src/fs/gnunet-unindex.c:89
 #, c-format
-msgid "Publishing failed: %s"
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:658 src/fs/fs_publish.c:675 src/fs/fs_publish.c:714
-#: src/fs/fs_publish.c:734 src/fs/fs_publish.c:761 src/fs/fs_publish.c:909
+#: src/fs/gnunet-unindex.c:96
 #, c-format
-msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:660
-msgid "timeout on index-start request to `fs' service"
+#: src/fs/gnunet-unindex.c:101
+msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:672
+#: src/fs/gnunet-unindex.c:131
+#, c-format
+msgid "You must specify one and only one filename for unindexing.\n"
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:148
+msgid "Could not start unindex operation.\n"
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:176
+msgid "Unindex a file that was previously indexed with gnunet-publish."
+msgstr ""
+
+#: src/fs/plugin_block_fs.c:131
+msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+msgstr ""
+
+#: src/gns/gns_api.c:221
 #, fuzzy
-msgid "unknown error"
-msgstr "未知错误"
+msgid "Failed to connect to the GNS service!\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_publish.c:715
-msgid "failed to compute hash"
+#: src/gns/gnunet-gns-lookup.c:216
+msgid "Issue a request to the GNUnet Naming System, prints results."
 msgstr ""
 
-#: src/fs/fs_publish.c:735
-msgid "filename too long"
+#: src/hostlist/gnunet-daemon-hostlist.c:264
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:762
-msgid "could not connect to `fs' service"
+#: src/hostlist/gnunet-daemon-hostlist.c:317
+msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/fs/fs_publish.c:786
-#, fuzzy, c-format
-msgid "Failed to get file identifiers for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/hostlist/gnunet-daemon-hostlist.c:322
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
+msgstr ""
 
-#: src/fs/fs_publish.c:856
-#, c-format
-msgid "Recursive upload failed at `%s': %s"
+#: src/hostlist/gnunet-daemon-hostlist.c:325
+msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/fs/fs_publish.c:862
+#: src/hostlist/gnunet-daemon-hostlist.c:329
+msgid "provide a hostlist server"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:341
+msgid "GNUnet hostlist server and client"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:286
+msgid "# bytes downloaded from hostlist servers"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
+msgid "# invalid HELLOs downloaded from hostlist servers"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
 #, c-format
-msgid "Recursive upload failed: %s"
+msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:910
-msgid "needs to be an actual file"
+#: src/hostlist/hostlist-client.c:330
+msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/fs/fs_publish.c:1092
+#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
 #, c-format
-msgid "Insufficient space for publishing: %s"
+msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1163
+#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
+#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
+#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
+#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
+#: src/transport/plugin_transport_http_client.c:108
+#: src/transport/plugin_transport_http_client.c:123
 #, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
+msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1499
-msgid "Could not connect to datastore."
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/fs/fs_api.c:284
-#, fuzzy, c-format
-msgid "Could not open file `%s': %s"
-msgstr "打开日志文件“%s”失败:%s\n"
+#: src/hostlist/hostlist-client.c:622
+#, c-format
+msgid "# advertised URI `%s' downloaded"
+msgstr ""
 
-#: src/fs/fs_api.c:293
-#, fuzzy, c-format
-msgid "Could not read file `%s': %s"
-msgstr "无法解析“%s”(%s):%s\n"
+#: src/hostlist/hostlist-client.c:663
+#, c-format
+msgid ""
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
+msgstr ""
 
-#: src/fs/fs_api.c:299
+#: src/hostlist/hostlist-client.c:805
 #, c-format
-msgid "Short read reading from file `%s'!"
+msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/hostlist/hostlist-client.c:822
+#, c-format
+msgid "Download limit of %u bytes exceeded, stopping download\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
-msgid "Failed to resume publishing information `%s': %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+msgid "%s failed for `%s' at %s:%d: `%s'\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/fs/fs_api.c:1323
+#: src/hostlist/hostlist-client.c:848
 #, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
+msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1365
+#: src/hostlist/hostlist-client.c:856
 #, c-format
-msgid "Failure while resuming publishing operation `%s': %s\n"
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1381
-#, fuzzy, c-format
-msgid "Failed to resume publishing operation `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/fs/fs_api.c:1993
+#: src/hostlist/hostlist-client.c:909
 #, c-format
-msgid "Failure while resuming unindexing operation `%s': %s\n"
+msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2003
-#, fuzzy, c-format
-msgid "Failed to resume unindexing operation `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/hostlist/hostlist-client.c:917
+msgid "# hostlist downloads initiated"
+msgstr ""
 
-#: src/fs/fs_api.c:2129 src/fs/fs_api.c:2368
-#, fuzzy, c-format
-msgid "Failed to resume sub-download `%s': %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+msgid "# milliseconds between hostlist downloads"
+msgstr ""
 
-#: src/fs/fs_api.c:2146
-#, fuzzy, c-format
-msgid "Failed to resume sub-search `%s': %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/fs/fs_api.c:2158 src/fs/fs_api.c:2177 src/fs/fs_api.c:2653
+#: src/hostlist/hostlist-client.c:1054
 #, c-format
-msgid "Failure while resuming search operation `%s': %s\n"
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2359
-#, fuzzy, c-format
-msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/hostlist/hostlist-client.c:1092
+msgid "Scheduled saving of hostlists\n"
+msgstr ""
 
-#: src/fs/fs_api.c:2605
-msgid "Could not resume running search, will resume as paused search\n"
+#: src/hostlist/hostlist-client.c:1096
+#, c-format
+msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2691
+#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
+msgid "# active connections"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1253
 #, c-format
-msgid "Failure while resuming download operation `%s': %s\n"
+msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/fs/fs_download.c:309
+#: src/hostlist/hostlist-client.c:1284
+#, c-format
 msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
+"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:329
-msgid "Directory too large for system address space\n"
+#: src/hostlist/hostlist-client.c:1290
+#, c-format
+msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
+#: src/hostlist/hostlist-client.c:1294
+#, c-format
+msgid "Hostlist file `%s' is not existing\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1305
 #, fuzzy, c-format
-msgid "Failed to open file `%s' for writing"
-msgstr "打开日志文件“%s”失败:%s\n"
+msgid "Could not open file `%s' for reading to load hostlists: %s\n"
+msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/fs/fs_download.c:873
+#: src/hostlist/hostlist-client.c:1338
 #, c-format
-msgid "Failed to create directory for recursive download of `%s'\n"
+msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/fs/fs_download.c:959
+#: src/hostlist/hostlist-client.c:1340
+msgid "# hostlist URIs read from file"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1373
 #, c-format
 msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:986
-msgid "internal error decrypting content"
+#: src/hostlist/hostlist-client.c:1387
+#, fuzzy, c-format
+msgid "Could not open file `%s' for writing to save hostlists: %s\n"
+msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
+
+#: src/hostlist/hostlist-client.c:1392
+#, c-format
+msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1009
-#, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#, c-format
+msgid "Error writing hostlist URIs to file `%s'\n"
+msgstr ""
 
-#: src/fs/fs_download.c:1021
-#, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+#: src/hostlist/hostlist-client.c:1428
+msgid "# hostlist URIs written to file"
+msgstr ""
 
-#: src/fs/fs_download.c:1030
-#, fuzzy, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/hostlist/hostlist-client.c:1480
+msgid "Learning is enabled on this peer\n"
+msgstr ""
 
-#: src/fs/fs_download.c:1829
-#, fuzzy
-msgid "Invalid URI"
-msgstr "无效条目。\n"
+#: src/hostlist/hostlist-client.c:1483
+#, c-format
+msgid "Hostlists will be saved to file again in  %llums\n"
+msgstr ""
 
-#: src/fs/gnunet-service-fs.c:240
-msgid "# running average P2P latency (ms)"
+#: src/hostlist/hostlist-client.c:1492
+msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
-msgid "# Loopback routes suppressed"
+#: src/hostlist/hostlist-client.c:1504
+#, c-format
+msgid ""
+"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
-#: src/topology/gnunet-daemon-topology.c:1297
-#: src/hostlist/gnunet-daemon-hostlist.c:297
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' service.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/hostlist/hostlist-client.c:1508
+#, c-format
+msgid "Hostlist file `%s' could not be removed\n"
+msgstr ""
 
-#: src/fs/fs_file_information.c:356
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s': %s"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+#: src/hostlist/hostlist-server.c:134
+msgid "bytes in hostlist"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:468
-msgid "# failed connection attempts due to timeout"
+#: src/hostlist/hostlist-server.c:157
+msgid "expired addresses encountered"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:859
-msgid "# peers disconnected due to external request"
+#: src/hostlist/hostlist-server.c:184
+#: src/topology/gnunet-daemon-topology.c:875
+#, c-format
+msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:942
-#, fuzzy
-msgid "# fast reconnects failed"
+#: src/hostlist/hostlist-server.c:205
+msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
-"\n"
-"按任意键继续\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:998
-msgid "# peers disconnected due to timeout"
+#: src/hostlist/hostlist-server.c:221
+msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1023
-msgid "# keepalives sent"
+#: src/hostlist/hostlist-server.c:269
+#, c-format
+msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1065
-msgid "# peers disconnected due to global disconnect"
+#: src/hostlist/hostlist-server.c:272
+msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1781
-#: src/transport/gnunet-service-transport_neighbours.c:1802
-msgid "# messages not sent (no such peer or not connected)"
+#: src/hostlist/hostlist-server.c:280
+msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1818
-msgid "# bytes in message queue for other peers"
+#: src/hostlist/hostlist-server.c:287
+#, c-format
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1870
-msgid "# messages discarded due to lack of neighbour record"
+#: src/hostlist/hostlist-server.c:291
+msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
-msgid "# bandwidth quota violations by other peers"
+#: src/hostlist/hostlist-server.c:299
+msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1924
-msgid "# ms throttling suggested"
+#: src/hostlist/hostlist-server.c:302
+msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1953
-msgid "# KEEPALIVE messages discarded (not connected)"
+#: src/hostlist/hostlist-server.c:306
+msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2005
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+#: src/hostlist/hostlist-server.c:307
+msgid "hostlist requests processed"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2013
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+#: src/hostlist/hostlist-server.c:350
+msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2079
-msgid "# SET QUOTA messages ignored (no such peer)"
+#: src/hostlist/hostlist-server.c:397
+msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2097
-msgid "# disconnects due to quota of 0"
+#: src/hostlist/hostlist-server.c:565
+#, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2215
-msgid "# disconnect messages ignored (old format)"
+#: src/hostlist/hostlist-server.c:574
+#, c-format
+msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2228
-msgid "# disconnect messages ignored (timestamp)"
+#: src/hostlist/hostlist-server.c:588
+#, c-format
+msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2305
-msgid "# unexpected CONNECT_ACK messages (no peer)"
+#: src/hostlist/hostlist-server.c:626
+#, c-format
+msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2322
-msgid "# unexpected CONNECT_ACK messages"
+#: src/mesh/gnunet-service-mesh.c:4595
+msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2415
-msgid "# unexpected ACK messages"
+#: src/mesh/gnunet-service-mesh.c:4789
+#, fuzzy
+msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
+msgstr "立即保存配置?"
+
+#: src/mesh/gnunet-service-mesh.c:4798
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/nat/gnunet-nat-server.c:289
+#, c-format
+msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
-#, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "无法解析“%s”(%s):%s\n"
+#: src/nat/gnunet-nat-server.c:328
+msgid "GNUnet NAT traversal test helper daemon"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:254
+#: src/nat/nat.c:803
 #, c-format
-msgid "Blacklist file `%s' is empty.\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/nat/nat.c:852
 #, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "Failed to start %s\n"
+msgstr "运行 %s失败:%s %d\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
+#: src/nat/nat.c:1121
 #, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "配置文件“%s”第 %d 行有语法错误。\n"
+msgid "Malformed %s `%s' given in configuration!\n"
+msgstr "保存配置失败。"
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/nat/nat.c:1187 src/nat/nat.c:1197
 #, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgid ""
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr "配置文件“%s”第 %d 行有语法错误。\n"
+#: src/nat/nat.c:1329
+msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/nat/nat.c:1341
 #, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:756
-msgid "# disconnects due to blacklist"
+#: src/nat/nat_test.c:348
+msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:191
-msgid ""
-"Could not create a new TLS certificate, program `gnunet-transport-"
-"certificate-creation' could not be started!\n"
+#: src/nat/nat_test.c:418
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:215
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/nse/gnunet-nse-profiler.c:926
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "无法访问该服务"
+
+#: src/nse/gnunet-service-nse.c:936
+#, c-format
+msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:172
-msgid "# refreshed my HELLO"
+#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
+#: src/nse/gnunet-service-nse.c:1431
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1567
-msgid "# IPv4 broadcast HELLO beacons received via udp"
+#: src/nse/gnunet-service-nse.c:1398
+msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1610
-msgid "# IPv6 multicast HELLO beacons received via udp"
+#: src/nse/gnunet-service-nse.c:1419
+#, fuzzy
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:133
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2106
-#: src/transport/plugin_transport_udp_new.c:1220
+#: src/peerinfo/gnunet-service-peerinfo.c:195
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:239
 #, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2157
-#: src/transport/plugin_transport_udp_new.c:1270
+#: src/peerinfo/gnunet-service-peerinfo.c:305
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:279
 #, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "无效的进程优先级“%s”\n"
+msgid "Failed to transmit message to `%s' service.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_udp.c:2301
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+#: src/peerinfo/peerinfo_api.c:435
+msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2372
-#: src/transport/plugin_transport_udp_new.c:1398
+#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
+msgid "Received invalid message from `PEERINFO' service.\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:523
 #, fuzzy
-msgid "Failed to open UDP sockets\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_http_client.c:108
-#: src/transport/plugin_transport_http_client.c:123
-#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
-#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
-#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
-#, c-format
-msgid "%s failed at %s:%d: `%s'\n"
+#: src/peerinfo/peerinfo_api.c:557
+msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:620
+#: src/peerinfo/peerinfo_api_notify.c:258
+#, fuzzy, c-format
+msgid "Could not connect to `%s' service.\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#, fuzzy, c-format
+msgid "Could not find option `%s:%s' in configuration.\n"
+msgstr "找不到主机“%s”的 IP:%s\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:223
 #, c-format
-msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
+msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:514
+#: src/peerinfo-tool/gnunet-peerinfo.c:235
 #, c-format
-msgid "Unexpected address length: %u bytes\n"
+msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:601
-#: src/transport/plugin_transport_tcp.c:690
-#: src/transport/plugin_transport_tcp.c:742
-#: src/transport/plugin_transport_tcp.c:831
-#: src/transport/plugin_transport_tcp.c:1173
-#: src/transport/plugin_transport_tcp.c:1254
-msgid "# bytes currently in TCP buffers"
+#: src/peerinfo-tool/gnunet-peerinfo.c:255
+msgid "output only the identity strings"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:607
-#: src/transport/plugin_transport_tcp.c:857
-#: src/transport/plugin_transport_tcp.c:1828
-msgid "# TCP sessions active"
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+msgid "output our own identity only"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:694
-msgid "# bytes discarded by TCP (timeout)"
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#, fuzzy
+msgid "Print information about peers."
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#: src/pt/gnunet-daemon-pt.c:264
+msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:745
-msgid "# bytes transmitted via TCP"
+#: src/pt/gnunet-daemon-pt.c:270
+msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:835
-msgid "# bytes discarded by TCP (disconnect)"
+#: src/pt/gnunet-daemon-pt.c:323
+msgid "# DNS records modified"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:956
-msgid "# bytes TCP was asked to transmit"
+#: src/pt/gnunet-daemon-pt.c:500
+msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1007
-msgid "# bytes discarded by TCP (no address and no connection)"
+#: src/pt/gnunet-daemon-pt.c:506
+msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1050
-#: src/transport/plugin_transport_tcp.c:1368
-#, c-format
-msgid "Address of unexpected length: %u\n"
+#: src/pt/gnunet-daemon-pt.c:602
+msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1067
-#: src/transport/plugin_transport_tcp.c:1404
-msgid "Found valid IPv4 NAT address (creating session)!\n"
+#: src/pt/gnunet-daemon-pt.c:632
+msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1118
-msgid "# bytes discarded by TCP (failed to connect)"
+#: src/pt/gnunet-daemon-pt.c:637
+msgid "# DNS requests dropped (DNS mesh tunnel down)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1508
-msgid "# transport-service disconnect requests for TCP"
+#: src/pt/gnunet-daemon-pt.c:645
+msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1871
-msgid "# TCP WELCOME messages received"
+#: src/pt/gnunet-daemon-pt.c:716
+msgid "# DNS replies received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2021
-msgid "# bytes received via TCP"
+#: src/pt/gnunet-daemon-pt.c:730
+msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2089
-msgid "# network-level TCP disconnect events"
+#: src/pt/gnunet-daemon-pt.c:748 src/pt/gnunet-daemon-pt.c:760
+msgid "# DNS requests aborted (tunnel down)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2242
-#, fuzzy
-msgid "Failed to start service.\n"
+#: src/pt/gnunet-daemon-pt.c:898 src/pt/gnunet-daemon-pt.c:907
+#: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
+#, fuzzy, c-format
+msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2307
+#: src/pt/gnunet-daemon-pt.c:973
+msgid "Daemon to run to perform IP protocol translation to GNUnet"
+msgstr ""
+
+#: src/statistics/gnunet-service-statistics.c:209
 #, c-format
-msgid "Failed to find option %s in section %s!\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2330
+#: src/statistics/gnunet-service-statistics.c:267
 #, c-format
-msgid "TCP transport listening on port %llu\n"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2334
-msgid "TCP transport not listening on any port (client only)\n"
+#: src/statistics/gnunet-statistics.c:98
+#, fuzzy
+msgid "Failed to obtain statistics.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/statistics/gnunet-statistics.c:164
+msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2338
-#, c-format
-msgid "TCP transport advertises itself as being on port %llu\n"
+#: src/statistics/gnunet-statistics.c:167
+msgid "make the value being set persistent"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:984
-msgid "Disabling IPv6 since it is not supported on this system!\n"
+#: src/statistics/gnunet-statistics.c:170
+msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1032
+#: src/statistics/gnunet-statistics.c:173
+msgid "just print the statistics value"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:180
+msgid "Print statistics about GNUnet operations."
+msgstr ""
+
+#: src/statistics/statistics_api.c:390
 #, fuzzy
-msgid "Require valid port number for service in configuration!\n"
-msgstr "保存配置失败。"
+msgid "Failed to connect to statistics service!\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_http.c:1179
-#, c-format
-msgid "Found %u addresses to report to NAT service\n"
+#: src/template/gnunet-template.c:68
+msgid "help text"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1192
+#: src/testing/gnunet-testing.c:157
+#, fuzzy
+msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/testing/gnunet-testing.c:159
 #, c-format
-msgid "FREEING %s\n"
+msgid "Specified hostkey file `%s' not found!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1267
-msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
+#: src/testing/gnunet-testing.c:273
+#, fuzzy
+msgid "create unique configuration files"
+msgstr "更改配置文件中的一个值"
+
+#: src/testing/gnunet-testing.c:275
+msgid "create hostkey files from pre-computed hostkey list"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1280
-#, fuzzy
-msgid "Port is required! Fix in configuration\n"
+#: src/testing/gnunet-testing.c:277
+msgid "host key file"
 msgstr ""
-"\n"
-"结束配置。\n"
 
-#: src/transport/plugin_transport_http.c:1291
-msgid "Port 0, client only mode\n"
+#: src/testing/gnunet-testing.c:279
+#, fuzzy
+msgid "number of unique configuration files or hostkeys to create"
+msgstr "打印配置文件中的一个值到标准输出"
+
+#: src/testing/gnunet-testing.c:281
+#, fuzzy
+msgid "configuration template"
+msgstr "配置已保存"
+
+#: src/testing/gnunet-testing.c:287
+msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1311
-#, c-format
-msgid ""
-"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
+#: src/testing/helper.c:56
+#, fuzzy
+msgid "Peer is lacking HOSTKEY configuration setting.\n"
+msgstr "立即保存配置?"
+
+#: src/testing/helper.c:64
+#, fuzzy
+msgid "Could not access hostkey.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/testing/testing.c:214
+msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1341
-#, c-format
-msgid ""
-"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
+#: src/testing/testing.c:228 src/testing/testing.c:849
+msgid "`scp' did not complete cleanly.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1096
+#: src/testing/testing.c:251
 #, fuzzy
-msgid "Failed to open UNIX sockets\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_smtp.c:370
+#: src/testing/testing.c:252
+#, fuzzy
+msgid "Failed to create pipe for `ssh' process.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/testing/testing.c:308
+#, fuzzy, c-format
+msgid "Could not start `%s' process to create hostkey.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/testing/testing.c:315
+#, fuzzy
+msgid "Failed to start `gnunet-peerinfo' process.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/testing/testing.c:316 src/testing/testing.c:514
+#, fuzzy
+msgid "Failed to start `ssh' process.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/testing/testing.c:378
 #, c-format
-msgid "Received malformed message via %s. Ignored.\n"
+msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:457
-msgid "SMTP filter string to invalid, lacks ': '\n"
+#: src/testing/testing.c:382
+msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:466
-#, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
-msgstr ""
+#: src/testing/testing.c:392
+#, fuzzy
+msgid "Failed to get hostkey!\n"
+msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
-#, c-format
-msgid "SMTP: `%s' failed: %s.\n"
+#: src/testing/testing.c:426
+msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:801
-msgid "No email-address specified, can not start SMTP transport.\n"
+#: src/testing/testing.c:506
+#, fuzzy, c-format
+msgid "Could not start `%s' process to start GNUnet.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/testing/testing.c:513
+#, fuzzy
+msgid "Failed to start `gnunet-arm' process.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/testing/testing.c:537 src/testing/testing.c:647
+msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:813
-msgid "# bytes received via SMTP"
+#: src/testing/testing.c:538 src/testing/testing.c:648
+#: src/testing/testing.c:668
+msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:814
-msgid "# bytes sent via SMTP"
+#: src/testing/testing.c:617
+msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:816
-msgid "# bytes dropped by SMTP (outgoing)"
+#: src/testing/testing.c:667
+msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:111
-msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+#: src/testing/testing.c:690 src/testing/testing.c:724
+msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:118
-#, c-format
-msgid "Starting transport plugins `%s'\n"
+#: src/testing/testing.c:705 src/testing/testing.c:762
+msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:122
-#, c-format
-msgid "Loading `%s' transport plugin\n"
+#: src/testing/testing.c:837
+msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:150
+#: src/testing/testing.c:1015
 #, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "Starting service %s for peer `%4s'\n"
+msgstr "卸载 GNUnet 服务"
 
-#: src/transport/plugin_transport_wlan.c:880
-msgid "# wlan session timeouts"
+#: src/testing/testing.c:1299 src/testing/testing_group.c:6278
+#, fuzzy, c-format
+msgid "Could not start `%s' process to copy configuration directory.\n"
+msgstr "找不到主机“%s”的 IP:%s\n"
+
+#: src/testing/testing.c:1387 src/testing/testing.c:1470
+#: src/testing/testing.c:1608
+#, fuzzy, c-format
+msgid "Terminating peer `%4s'\n"
+msgstr "未知的用户“%s”\n"
+
+#: src/testing/testing.c:1560
+#, fuzzy, c-format
+msgid "Setting d->dead on peer `%4s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/testing/testing.c:1698
+msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:904
-msgid "# wlan session created"
+#: src/testing/testing.c:1706
+#, fuzzy
+msgid "Failed to write new configuration to disk."
+msgstr "保存配置失败。"
+
+#: src/testing/testing.c:1737
+#, fuzzy, c-format
+msgid "Could not start `%s' process to copy configuration file.\n"
+msgstr "找不到主机“%s”的 IP:%s\n"
+
+#: src/testing/testing.c:1740
+#, fuzzy
+msgid "Failed to copy new configuration to remote machine."
+msgstr "保存配置失败。"
+
+#: src/testing/testing.c:1895
+#, fuzzy
+msgid "Peers failed to connect"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/transport/plugin_transport_wlan.c:988
-#: src/transport/plugin_transport_wlan.c:1151
-#: src/transport/plugin_transport_wlan.c:1172
-#: src/transport/plugin_transport_wlan.c:1203
-#: src/transport/plugin_transport_wlan.c:2378
-#: src/transport/plugin_transport_wlan.c:3240
-msgid "# wlan pending sessions"
+#: src/testing/testing.c:2035
+#, fuzzy
+msgid "Failed to connect to core service of first peer!\n"
+msgstr "加载 sqstore 服务失败。检查您的配置!\n"
+
+#: src/testing/testing.c:2274
+msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1246
-#: src/transport/plugin_transport_wlan.c:1933
-msgid "# wlan pending fragments"
+#: src/testing/testing_group.c:1910 src/testing/testing_group.c:1922
+#: src/testing/testing_group.c:2023 src/testing/testing_group.c:2082
+#: src/testing/testing_group.c:2171 src/testing/testing_group.c:2191
+#: src/testing/testing_group.c:2328 src/testing/testing_peergroup.c:940
+#, fuzzy, c-format
+msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+msgstr "配置不满足配置规范文件“%s”的约束!\n"
+
+#: src/testing/testing_group.c:1932
+#, c-format
+msgid "Target is %d connections per peer."
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1407
+#: src/testing/testing_group.c:2179
 #, c-format
 msgid ""
-"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
+"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
+"greater than 0\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1774
-msgid "# wlan hello beacons send"
+#: src/testing/testing_group.c:2209 src/testing/testing_group.c:2402
+#, c-format
+msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1807
-#: src/transport/plugin_transport_wlan.c:2022
-#: src/transport/plugin_transport_wlan.c:2117
+#: src/testing/testing_group.c:2246
 #, c-format
-msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
+msgid "natural log of %d is %d, will run %d iterations\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2008
-msgid "# wlan acks send"
+#: src/testing/testing_group.c:2249
+#, c-format
+msgid "Total connections added thus far: %u!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2079
-msgid "# wlan fragments send"
+#: src/testing/testing_group.c:2290
+#, c-format
+msgid "Total connections added for small world: %d!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2245
+#: src/testing/testing_group.c:2342
 #, c-format
-msgid "Wlan Address len %d is wrong\n"
+msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2250
-msgid "# wlan messages queued"
+#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#, c-format
+msgid ""
+"No `%s' specified in peer configuration in section `%s', cannot copy friends "
+"file!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2339
-#: src/transport/plugin_transport_wlan.c:2996
-#: src/transport/plugin_transport_wlan.c:3243
-msgid "# wlan mac endpoints"
+#: src/testing/testing_group.c:3020
+msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2567
-msgid "# wlan whole messages received"
+#: src/testing/testing_group.c:3133
+#, fuzzy, c-format
+msgid "Copying file with command cp %s %s\n"
+msgstr "“%s”以错误码 %s 失败:%s\n"
+
+#: src/testing/testing_group.c:3156
+#, fuzzy, c-format
+msgid "Copying file with command scp %s %s\n"
+msgstr "“%s”以错误码 %s 失败:%s\n"
+
+#: src/testing/testing_group.c:3173
+#, c-format
+msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2770
-msgid "# wlan hello messages received"
+#: src/testing/testing_group.c:3191
+#, c-format
+msgid "File %d copied\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2807
-msgid "# wlan fragments received"
+#: src/testing/testing_group.c:3206
+#, fuzzy
+msgid "Finished copying all blacklist files!\n"
+msgstr "无法解析“%s”(%s):%s\n"
+
+#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
+#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
+msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2859
-msgid "# wlan acks received"
+#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
+#: src/testing/testing_group.c:5035
+#, c-format
+msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2956
-msgid "# wlan mac endpoints timeouts"
+#: src/testing/testing_group.c:3608
+#, c-format
+msgid "Offering HELLO of peer %s to peer %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2980
-msgid "# wlan mac endpoints created"
+#: src/testing/testing_group.c:3734
+#, c-format
+msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3038
-msgid "# wlan WLAN_HELPER_DATA received"
+#: src/testing/testing_group.c:3988
+msgid "Creating clique topology\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3094
-msgid "# wlan messages for this client received"
+#: src/testing/testing_group.c:3993
+msgid "Creating small world (ring) topology\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3105
-msgid "# wlan messages inside WLAN_HELPER_DATA received"
+#: src/testing/testing_group.c:3998
+msgid "Creating small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:251
-msgid "No transport plugins configured, peer will never communicate\n"
+#: src/testing/testing_group.c:4002
+msgid "Creating ring topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:264
-#, c-format
-msgid "No port configured for plugin `%s', cannot test it\n"
+#: src/testing/testing_group.c:4006
+msgid "Creating 2d torus topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:314
-#, c-format
-msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
+#: src/testing/testing_group.c:4010
+msgid "Creating Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:321
-#, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
+#: src/testing/testing_group.c:4014
+msgid "Creating InterNAT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:354
-#, c-format
-msgid "Transmitting %u bytes to %s\n"
+#: src/testing/testing_group.c:4018
+msgid "Creating Scale Free topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:374
-#, fuzzy, c-format
-msgid "Connected to %s\n"
-msgstr "“%s”已连接到“%s”。\n"
+#: src/testing/testing_group.c:4023
+msgid "Creating straight line topology\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:405
-#, fuzzy, c-format
-msgid "Disconnected from %s\n"
-msgstr "“%s”已连接到“%s”。\n"
+#: src/testing/testing_group.c:4027
+msgid "Creating topology from file!\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:434
-#, c-format
-msgid "Received %u bytes from %s\n"
+#: src/testing/testing_group.c:4043
+msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:448
-#, fuzzy, c-format
-msgid "Peer `%s': %s %s\n"
-msgstr "运行 %s失败:%s %d\n"
+#: src/testing/testing_group.c:4058
+msgid "Failed during friend file copying!\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:512
-#, fuzzy, c-format
-msgid "Failed to parse peer identity `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/transport/gnunet-transport.c:549
-msgid "measure how fast we are receiving data (until CTRL-C)"
+#: src/testing/testing_group.c:4064
+msgid "Friend files created/copied successfully!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:552
-#, fuzzy
-msgid "try to connect to the given peer"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/transport/gnunet-transport.c:555
-msgid "provide information about all current connections (once)"
+#: src/testing/testing_group.c:4081
+msgid "Blacklisting all but clique topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:559
-msgid "send data for benchmarking to the other peer (until CTRL-C)"
+#: src/testing/testing_group.c:4087
+msgid "Blacklisting all but small world (ring) topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:562
-msgid "test transport configuration (involves external server)"
+#: src/testing/testing_group.c:4093
+msgid "Blacklisting all but small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:565
-msgid "do not resolve hostnames"
+#: src/testing/testing_group.c:4099
+msgid "Blacklisting all but ring topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:573
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/transport/gnunet-service-transport_validation.c:410
-msgid "# address records discarded"
+#: src/testing/testing_group.c:4105
+msgid "Blacklisting all but 2d torus topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:459
-#, c-format
-msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+#: src/testing/testing_group.c:4111
+msgid "Blacklisting all but Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:496
-msgid "# PING without HELLO messages sent"
+#: src/testing/testing_group.c:4117
+msgid "Blacklisting all but InterNAT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:554
-msgid "# address revalidations started"
+#: src/testing/testing_group.c:4152
+msgid "Blacklisting all but Scale Free topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:775
-msgid "# PING message for different peer received"
+#: src/testing/testing_group.c:4158
+msgid "Blacklisting all but straight line topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:810
-#, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+#: src/testing/testing_group.c:4173
+#, fuzzy
+msgid "Failed during blacklist file copying!\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/testing/testing_group.c:4179
+msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:878
-msgid "# PONGs unicast via reliable transport"
+#: src/testing/testing_group.c:5263
+msgid "Creating clique CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:887
-msgid "# PONGs multicast to all available addresses"
+#: src/testing/testing_group.c:5270
+msgid "Creating small world (ring) CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1009
-msgid "# PONGs dropped, no matching pending validation"
+#: src/testing/testing_group.c:5277
+msgid "Creating small world (2d-torus) CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1034
-msgid "# PONGs dropped, signature expired"
+#: src/testing/testing_group.c:5283
+msgid "Creating ring CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1093
-#, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
+#: src/testing/testing_group.c:5290
+msgid "Creating 2d torus CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:253
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+#: src/testing/testing_group.c:5297
+msgid "Creating Erdos-Renyi CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:258
-msgid "# messages dropped due to slow client"
+#: src/testing/testing_group.c:5304
+msgid "Creating InterNAT CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:405
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
+#: src/testing/testing_group.c:5311
+msgid "Creating Scale Free CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:523
-msgid "# bytes payload received for other peers"
+#: src/testing/testing_group.c:5318
+msgid "Creating straight line CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:540
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/testing/testing_group.c:5324
+msgid "Creating no CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:591
-msgid "# REQUEST CONNECT messages received"
+#: src/testing/testing_group.c:5330
+msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/transport/transport_api.c:588
+#: src/testing/testing_group.c:5340
 #, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
+msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:158
-msgid "# bytes payload discarded due to not connected peer "
+#: src/testing/testing_group.c:5348
+#, c-format
+msgid "Connecting a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:555
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+#: src/testing/testing_group.c:5357
+#, c-format
+msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:564
-msgid "Transport service could not access hostkey.  Exiting.\n"
-msgstr ""
-
-#: src/dv/plugin_transport_dv.c:159
+#: src/testing/testing_group.c:5367
 #, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
+msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/dv/dv_api.c:179
+#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:648
 #, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Could not read hostkeys file!\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
+#: src/testing/testing_group.c:6131
+#, fuzzy, c-format
+msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/topology/gnunet-daemon-topology.c:244
 msgid "# peers blacklisted"
 msgstr ""
@@ -3740,12 +3970,6 @@
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:875
-#: src/hostlist/hostlist-server.c:184
-#, c-format
-msgid "Error in communication with PEERINFO service: %s\n"
-msgstr ""
-
 #: src/topology/gnunet-daemon-topology.c:950
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
@@ -3829,709 +4053,1527 @@
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/chat/chat.c:175
-msgid "Could not transmit confirmation receipt\n"
-msgstr ""
+#: src/transport/gnunet-service-transport_blacklist.c:247
+#, fuzzy, c-format
+msgid "Could not read blacklist file `%s'\n"
+msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/chat/chat.c:283
-msgid "The current user must be the the first one joined\n"
+#: src/transport/gnunet-service-transport_blacklist.c:254
+#, c-format
+msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/chat/chat.c:412
+#: src/transport/gnunet-service-transport_blacklist.c:266
 #, fuzzy, c-format
-msgid "Unknown message type: '%u'\n"
-msgstr "未知操作“%s”。\n"
+msgid "Failed to read blacklist from `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/chat/chat.c:472
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
 #, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing\n"
-msgstr "配置文件“%s”已写入。\n"
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/chat/chat.c:480
-#, fuzzy, c-format
-msgid "Failed to access chat home directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/transport/gnunet-service-transport_blacklist.c:298
+#: src/transport/gnunet-service-transport_blacklist.c:336
+#, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgstr ""
 
-#: src/chat/chat.c:498
+#: src/transport/gnunet-service-transport_blacklist.c:350
 #, fuzzy, c-format
-msgid "Failed to create/open key in file `%s'\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/chat/chat.c:559
-msgid "Could not serialize metadata\n"
+#: src/transport/gnunet-service-transport_blacklist.c:364
+#, c-format
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/chat/chat.c:674
-#, fuzzy
-msgid "Failed to connect to the chat service\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/transport/gnunet-service-transport_blacklist.c:523
+#: src/transport/gnunet-service-transport_blacklist.c:764
+msgid "# disconnects due to blacklist"
+msgstr ""
 
-#: src/chat/chat.c:680
-msgid "Undefined mandatory parameter: joinCallback\n"
+#: src/transport/gnunet-service-transport.c:158
+msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/chat/chat.c:686
-msgid "Undefined mandatory parameter: messageCallback\n"
+#: src/transport/gnunet-service-transport.c:572
+msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/chat/chat.c:692
-msgid "Undefined mandatory parameter: memberCallback\n"
+#: src/transport/gnunet-service-transport.c:581
+msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:267
-#, fuzzy
-msgid "Failed to queue a message notification\n"
-msgstr "保存配置失败。"
+#: src/transport/gnunet-service-transport_clients.c:353
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:546
-#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "保存配置失败。"
+#: src/transport/gnunet-service-transport_clients.c:358
+msgid "# messages dropped due to slow client"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:729
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "保存配置失败。"
+#: src/transport/gnunet-service-transport_clients.c:510
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:907
+#: src/transport/gnunet-service-transport_clients.c:628
+msgid "# bytes payload received for other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:645
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:696
+msgid "# REQUEST CONNECT messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_hello.c:172
+msgid "# refreshed my HELLO"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:482
+msgid "# failed connection attempts due to timeout"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:883
+msgid "# peers disconnected due to external request"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:966
 #, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "保存配置失败。"
+msgid "# fast reconnects failed"
+msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/chat/gnunet-chat.c:92
-msgid "Joined\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1022
+msgid "# peers disconnected due to timeout"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
-msgid "anonymous"
-msgstr "匿名"
+#: src/transport/gnunet-service-transport_neighbours.c:1047
+msgid "# keepalives sent"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:130
+#: src/transport/gnunet-service-transport_neighbours.c:1088
+msgid "# peers disconnected due to global disconnect"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1909
+msgid "# messages not sent (no such peer or not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1925
+msgid "# bytes in message queue for other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1977
+msgid "# messages discarded due to lack of neighbour record"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2013
+msgid "# bandwidth quota violations by other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2031
+msgid "# ms throttling suggested"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2060
+msgid "# KEEPALIVE messages discarded (not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2113
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2121
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2187
+msgid "# SET QUOTA messages ignored (no such peer)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2205
+msgid "# disconnects due to quota of 0"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2323
+msgid "# disconnect messages ignored (old format)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2336
+msgid "# disconnect messages ignored (timestamp)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2411
+msgid "# unexpected CONNECT_ACK messages (no peer)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2453
+msgid "# unexpected CONNECT_ACK messages"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2544
+msgid "# unexpected ACK messages"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:111
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:118
+#, c-format
+msgid "Starting transport plugins `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:122
+#, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:150
 #, fuzzy, c-format
-msgid "(%s) `%s' said: %s\n"
-msgstr "“%s”说:%s\n"
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/transport/gnunet-service-transport_validation.c:410
+msgid "# address records discarded"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:459
+#, c-format
+msgid ""
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:508
+msgid "# PING without HELLO messages sent"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:566
+msgid "# address revalidations started"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:798
+msgid "# PING message for different peer received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:833
+#, c-format
+msgid ""
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:919
+msgid "# PONGs unicast via reliable transport"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:928
+msgid "# PONGs multicast to all available addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1050
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1075
+msgid "# PONGs dropped, signature expired"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1134
+#, c-format
+msgid "Adding `%s' without addresses for peer `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:256
+msgid "No transport plugins configured, peer will never communicate\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:269
+#, c-format
+msgid "No port configured for plugin `%s', cannot test it\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:319
+#, c-format
+msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:326
+#, c-format
+msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:359
+#, c-format
+msgid "Transmitting %u bytes to %s\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:379
 #, fuzzy, c-format
-msgid "(%s) `%s' said to you: %s\n"
-msgstr "“%s”对您说:%s\n"
+msgid "Connected to %s\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/chat/gnunet-chat.c:139
+#: src/transport/gnunet-transport.c:410
 #, fuzzy, c-format
-msgid "(%s) `%s' said for sure: %s\n"
-msgstr "“%s”对您说:%s\n"
+msgid "Disconnected from %s\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/chat/gnunet-chat.c:142
+#: src/transport/gnunet-transport.c:439
+#, c-format
+msgid "Received %u bytes from %s\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:453
 #, fuzzy, c-format
-msgid "(%s) `%s' said to you for sure: %s\n"
-msgstr "“%s”对您说:%s\n"
+msgid "Peer `%s': %s %s\n"
+msgstr "运行 %s失败:%s %d\n"
 
-#: src/chat/gnunet-chat.c:145
+#: src/transport/gnunet-transport.c:483
+#, fuzzy, c-format
+msgid "Peer `%s' disconnected\n"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/transport/gnunet-transport.c:539
+#, fuzzy, c-format
+msgid "Failed to parse peer identity `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/gnunet-transport.c:587
+msgid "measure how fast we are receiving data (until CTRL-C)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:590
+#, fuzzy
+msgid "try to connect to the given peer"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:593
+msgid "provide information about all current connections (once)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:596
+msgid "provide information about all current connections (continuously)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:599
+msgid "do not resolve hostnames"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:603
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:606
+msgid "test transport configuration (involves external server)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:614
+#, fuzzy
+msgid "Direct access to transport service."
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/plugin_transport_http.c:981
+msgid "Disabling IPv6 since it is not supported on this system!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:1029
+#, fuzzy
+msgid "Require valid port number for service in configuration!\n"
+msgstr "保存配置失败。"
+
+#: src/transport/plugin_transport_http.c:1054 src/util/service.c:986
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/transport/plugin_transport_http.c:1071 src/util/service.c:1003
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/transport/plugin_transport_http.c:1176
 #, c-format
-msgid "(%s) `%s' was confirmed that you received: %s\n"
+msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:148
+#: src/transport/plugin_transport_http.c:1189
 #, c-format
-msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
+msgid "FREEING %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:151
+#: src/transport/plugin_transport_http.c:1264
+msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:1277
+#, fuzzy
+msgid "Port is required! Fix in configuration\n"
+msgstr ""
+"\n"
+"结束配置。\n"
+
+#: src/transport/plugin_transport_http.c:1288
+msgid "Port 0, client only mode\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:1308
 #, c-format
-msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
+msgid ""
+"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:156
+#: src/transport/plugin_transport_http.c:1338
 #, c-format
 msgid ""
-"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
+"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:159
-#, fuzzy, c-format
-msgid "(%s) `%s' said off the record: %s\n"
-msgstr "“%s”对您说:%s\n"
+#: src/transport/plugin_transport_http_client.c:621
+#, c-format
+msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:162
+#: src/transport/plugin_transport_http_server.c:189
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:213
+msgid "No usable TLS certificate found and creating one failed!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:370
 #, c-format
-msgid "(%s) <%s> said using an unknown message type: %s\n"
+msgid "Received malformed message via %s. Ignored.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:193
+#: src/transport/plugin_transport_smtp.c:457
+msgid "SMTP filter string to invalid, lacks ': '\n"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:466
 #, c-format
-msgid "'%s' acknowledged message #%d\n"
+msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/transport/plugin_transport_smtp.c:561
+#: src/transport/plugin_transport_smtp.c:571
+#: src/transport/plugin_transport_smtp.c:584
+#: src/transport/plugin_transport_smtp.c:603
+#: src/transport/plugin_transport_smtp.c:626
+#: src/transport/plugin_transport_smtp.c:634
+#: src/transport/plugin_transport_smtp.c:647
+#: src/transport/plugin_transport_smtp.c:658
 #, c-format
-msgid "`%s' entered the room\n"
-msgstr "“%s”进入了房间\n"
+msgid "SMTP: `%s' failed: %s.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/transport/plugin_transport_smtp.c:801
+msgid "No email-address specified, can not start SMTP transport.\n"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:813
+msgid "# bytes received via SMTP"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:814
+msgid "# bytes sent via SMTP"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:816
+msgid "# bytes dropped by SMTP (outgoing)"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:512
 #, c-format
-msgid "`%s' left the room\n"
-msgstr "“%s”离开了房间\n"
+msgid "Unexpected address length: %u bytes\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/transport/plugin_transport_tcp.c:616
+#: src/transport/plugin_transport_tcp.c:705
+#: src/transport/plugin_transport_tcp.c:757
+#: src/transport/plugin_transport_tcp.c:830
+#: src/transport/plugin_transport_tcp.c:909
+msgid "# bytes currently in TCP buffers"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:622
+#: src/transport/plugin_transport_tcp.c:856
+#: src/transport/plugin_transport_tcp.c:1561
+msgid "# TCP sessions active"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:709
+msgid "# bytes discarded by TCP (timeout)"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:760
+msgid "# bytes transmitted via TCP"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:834
+msgid "# bytes discarded by TCP (disconnect)"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1081
+#, c-format
+msgid "Address of unexpected length: %u\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1116
+msgid "Found valid IPv4 NAT address (creating session)!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1186
+msgid "# transport-service disconnect requests for TCP"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1603
+msgid "# TCP WELCOME messages received"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1756
+msgid "# bytes received via TCP"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1823
+msgid "# network-level TCP disconnect events"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1976
 #, fuzzy
-msgid "Could not change username\n"
-msgstr "已将用户名改为“%s”。\n"
+msgid "Failed to start service.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/transport/plugin_transport_tcp.c:2039
 #, c-format
-msgid "Joining room `%s' as user `%s'...\n"
+msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:320
-#, fuzzy, c-format
-msgid "Changed username to `%s'\n"
-msgstr "已将用户名改为“%s”。\n"
+#: src/transport/plugin_transport_tcp.c:2062
+#, c-format
+msgid "TCP transport listening on port %llu\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:333
+#: src/transport/plugin_transport_tcp.c:2066
+msgid "TCP transport not listening on any port (client only)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2070
 #, c-format
-msgid "Users in room `%s': "
-msgstr "房间“%s”中的用户:"
+msgid "TCP transport advertises itself as being on port %llu\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:371
-msgid "Syntax: /msg USERNAME MESSAGE"
-msgstr "语法:/msg 用户名 消息"
+#: src/transport/plugin_transport_udp_broadcasting.c:130
+msgid "# IPv6 multicast HELLO beacons received via udp"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:379
+#: src/transport/plugin_transport_udp_broadcasting.c:172
+msgid "# IPv4 broadcast HELLO beacons received via udp"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:393
 #, c-format
-msgid "Unknown user `%s'\n"
-msgstr "未知的用户“%s”\n"
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:395
+#: src/transport/plugin_transport_udp.c:1971
+#, fuzzy
+msgid "Failed to open UDP sockets\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/transport/plugin_transport_udp.c:2054
 #, c-format
-msgid "User `%s' is currently not in the room!\n"
-msgstr "用户“%s”当前不在房间里!\n"
+msgid "Given `%s' option is out of range: %llu > %u\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:448
+#: src/transport/plugin_transport_udp.c:2098
 #, fuzzy, c-format
-msgid "Unknown command `%s'\n"
-msgstr "未知的命令“%s”。\n"
+msgid "Invalid IPv6 address: `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
 
-#: src/chat/gnunet-chat.c:459
-msgid ""
-"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
-"leave the current room"
+#: src/transport/plugin_transport_unix.c:1051
+#, fuzzy
+msgid "Failed to open UNIX sockets\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/transport/plugin_transport_wlan.c:880
+msgid "# wlan session timeouts"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:463
-msgid ""
-"Use `/nick nickname' to change your nickname.  This will cause you to leave "
-"the current room and immediately rejoin it with the new name."
+#: src/transport/plugin_transport_wlan.c:904
+msgid "# wlan session created"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/transport/plugin_transport_wlan.c:988
+#: src/transport/plugin_transport_wlan.c:1151
+#: src/transport/plugin_transport_wlan.c:1172
+#: src/transport/plugin_transport_wlan.c:1203
+#: src/transport/plugin_transport_wlan.c:2398
+#: src/transport/plugin_transport_wlan.c:3260
+msgid "# wlan pending sessions"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1246
+#: src/transport/plugin_transport_wlan.c:1933
+msgid "# wlan pending fragments"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1407
+#, c-format
 msgid ""
-"Use `/msg nickname message' to send a private message to the specified user"
+"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:470
-msgid "The `/notice' command is an alias for `/msg'"
+#: src/transport/plugin_transport_wlan.c:1774
+msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:472
-msgid "The `/query' command is an alias for `/msg'"
+#: src/transport/plugin_transport_wlan.c:1807
+#: src/transport/plugin_transport_wlan.c:2022
+#: src/transport/plugin_transport_wlan.c:2117
+#, c-format
+msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
-msgid "Use `/sig message' to send a signed public message"
+#: src/transport/plugin_transport_wlan.c:2008
+msgid "# wlan acks send"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
-msgid "Use `/ack message' to require signed acknowledgment of the message"
+#: src/transport/plugin_transport_wlan.c:2079
+msgid "# wlan fragments send"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
-msgid "Use `/anonymous message' to send a public anonymous message"
+#: src/transport/plugin_transport_wlan.c:2223
+#, c-format
+msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
-msgid "The `/anon' command is an alias for `/anonymous'"
+#: src/transport/plugin_transport_wlan.c:2359
+#: src/transport/plugin_transport_wlan.c:3016
+#: src/transport/plugin_transport_wlan.c:3263
+msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:484
-msgid "Use `/quit' to terminate gnunet-chat"
+#: src/transport/plugin_transport_wlan.c:2587
+msgid "# wlan whole messages received"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
-msgid "The `/leave' command is an alias for `/quit'"
+#: src/transport/plugin_transport_wlan.c:2790
+msgid "# wlan hello messages received"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
-msgid "Use `/names' to list all of the current members in the chat room"
+#: src/transport/plugin_transport_wlan.c:2827
+msgid "# wlan fragments received"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
-msgid "Use `/help command' to get help for a specific command"
+#: src/transport/plugin_transport_wlan.c:2879
+msgid "# wlan acks received"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:606
-msgid "You must specify a nickname\n"
-msgstr "您必须指定一个昵称\n"
+#: src/transport/plugin_transport_wlan.c:2976
+msgid "# wlan mac endpoints timeouts"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:622
-#, c-format
-msgid "Failed to join room `%s'\n"
+#: src/transport/plugin_transport_wlan.c:3000
+msgid "# wlan mac endpoints created"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:655
-msgid "set the nickname to use (required)"
-msgstr "设置要使用的昵称(必须)"
+#: src/transport/plugin_transport_wlan.c:3058
+msgid "# wlan WLAN_HELPER_DATA received"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:658
-msgid "set the chat room to join"
-msgstr "设置要加入的聊天室"
+#: src/transport/plugin_transport_wlan.c:3114
+msgid "# wlan messages for this client received"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:670
-msgid "Join a chat on GNUnet."
+#: src/transport/plugin_transport_wlan.c:3125
+msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:289
+#: src/transport/transport_api.c:588
 #, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
+msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:328
-msgid "GNUnet NAT traversal test helper daemon"
+#: src/util/bio.c:136 src/util/bio.c:142
+#, fuzzy, c-format
+msgid "Error reading `%s': %s"
+msgstr "创建用户出错"
+
+#: src/util/bio.c:143
+msgid "End of file"
 msgstr ""
 
-#: src/nat/nat.c:803
+#: src/util/bio.c:195
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/nat/nat.c:852
-#, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "运行 %s失败:%s %d\n"
+#: src/util/bio.c:205
+#, c-format
+msgid "String `%s' longer than allowed (%u > %u)"
+msgstr ""
 
-#: src/nat/nat.c:1121
-#, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "保存配置失败。"
+#: src/util/bio.c:250
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+msgstr ""
 
-#: src/nat/nat.c:1187 src/nat/nat.c:1197
+#: src/util/bio.c:264
 #, c-format
+msgid "Metadata `%s' failed to deserialize"
+msgstr ""
+
+#: src/util/client.c:304
+#, c-format
 msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
+"Could not determine valid hostname and port for service `%s' from "
+"configuration.\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+#: src/util/client.c:312
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/util/client.c:657
+msgid "Failure to transmit TEST request.\n"
+msgstr ""
+
+#: src/util/client.c:717 src/util/service.c:919
 #, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/nat/nat_test.c:348
-msgid "Failed to connect to `gnunet-nat-server'\n"
+#: src/util/client.c:859
+#, c-format
+msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/nat/nat_test.c:418
+#: src/util/client.c:875
 #, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:124
+#: src/util/client.c:1143
+msgid "Could not submit request, not expecting to receive a response.\n"
+msgstr ""
+
+#: src/util/common_logging.c:239 src/util/common_logging.c:889
+msgid "DEBUG"
+msgstr "调试"
+
+#: src/util/common_logging.c:241 src/util/common_logging.c:887
+msgid "INFO"
+msgstr "信息"
+
+#: src/util/common_logging.c:243 src/util/common_logging.c:885
+msgid "WARNING"
+msgstr "警告"
+
+#: src/util/common_logging.c:245 src/util/common_logging.c:883
+msgid "ERROR"
+msgstr "错误"
+
+#: src/util/common_logging.c:247 src/util/common_logging.c:891
+msgid "NONE"
+msgstr ""
+
+#: src/util/common_logging.c:609
+#, fuzzy, c-format
+msgid "Failed to create or access directory for log file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/util/common_logging.c:724
+#, fuzzy, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
+
+#: src/util/common_logging.c:892
+msgid "INVALID"
+msgstr ""
+
+#: src/util/common_logging.c:991
+msgid "unknown address"
+msgstr ""
+
+#: src/util/common_logging.c:1029
+msgid "invalid address"
+msgstr ""
+
+#: src/util/configuration.c:245
+#, fuzzy, c-format
+msgid "Syntax error in configuration file `%s' at line %u.\n"
+msgstr "配置文件“%s”第 %d 行有语法错误。\n"
+
+#: src/util/configuration.c:817
 #, c-format
-msgid "Block not of type %u\n"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:131
-msgid "Size mismatch for block\n"
+#: src/util/connection.c:461
+#, fuzzy, c-format
+msgid "Access denied to `%s'\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/util/connection.c:476
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:140
+#: src/util/connection.c:642
 #, c-format
-msgid "Block of type %u is malformed\n"
+msgid ""
+"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/fs/plugin_block_fs.c:131
-msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+#: src/util/connection.c:852 src/util/connection.c:1025
+#, fuzzy, c-format
+msgid "Trying to connect to `%s' (%p)\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/util/connection.c:862
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' (%p)\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/util/connection.c:1015
+#, c-format
+msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/block/block.c:105
+#: src/util/connection.c:1528
+#, c-format
+msgid ""
+"Could not satisfy pending transmission request, socket closed or connect "
+"failed (%p).\n"
+msgstr ""
+
+#: src/util/connection.c:1564
 #, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
+msgid "Failed to send to `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/mesh/gnunet-service-mesh.c:4214
-msgid "MESH: Wrong CORE service\n"
+#: src/util/container_bloomfilter.c:507
+#, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4419
-#, fuzzy
-msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
-msgstr "立即保存配置?"
+#: src/util/crypto_random.c:280
+#, c-format
+msgid "Starting `%s' process to generate entropy\n"
+msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4428
+#: src/util/crypto_random.c:308
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
+
+#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#, fuzzy, c-format
+msgid "Could not aquire lock on file `%s': %s...\n"
+msgstr "无法解析“%s”(%s):%s\n"
+
+#: src/util/crypto_rsa.c:623
 #, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+msgid "Creating a new private key.  This may take a while.\n"
+msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/hostlist/hostlist-client.c:286
-msgid "# bytes downloaded from hostlist servers"
+#: src/util/crypto_rsa.c:641
+#, c-format
+msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
-msgid "# invalid HELLOs downloaded from hostlist servers"
+#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/util/crypto_rsa.c:700
 #, c-format
-msgid "Invalid `%s' message received from hostlist at `%s'\n"
+msgid ""
+"When trying to read hostkey file `%s' I found %u bytes but I need at least "
+"%u.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:330
-msgid "# valid HELLOs downloaded from hostlist servers"
+#: src/util/crypto_rsa.c:720
+#, c-format
+msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#: src/util/crypto_rsa.c:738
 #, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
+msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
-msgid "# advertised hostlist URIs"
+#: src/util/crypto_rsa.c:959
+#, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/util/disk.c:479
+#, fuzzy, c-format
+msgid "`%s' failed for drive `%S': %u\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+
+#: src/util/disk.c:1087
 #, c-format
-msgid "# advertised URI `%s' downloaded"
+msgid "Expected `%s' to be a directory!\n"
+msgstr "“%s”应为目录!\n"
+
+#: src/util/disk.c:1441 src/util/service.c:1580
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#: src/util/disk.c:1759
+#, c-format
+msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:663
+#: src/util/getopt.c:672
 #, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s:选项“%s”有歧义\n"
+
+#: src/util/getopt.c:696
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s:选项“--%s”不允许有参数\n"
+
+#: src/util/getopt.c:701
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s:选项“%c%s”不允许有参数\n"
+
+#: src/util/getopt.c:718 src/util/getopt.c:886
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s:选项“%s”要求有一个参数\n"
+
+#: src/util/getopt.c:747
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s:无法识别的选项“--%s”\n"
+
+#: src/util/getopt.c:751
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s:无法识别的选项“%c%s”\n"
+
+#: src/util/getopt.c:776
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s:非法选项 -- %c\n"
+
+#: src/util/getopt.c:778
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s:无效选项 -- %c\n"
+
+#: src/util/getopt.c:806 src/util/getopt.c:934
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s:选项要求有一个参数 -- %c\n"
+
+#: src/util/getopt.c:854
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s:选项“-W %s”有歧义\n"
+
+#: src/util/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s:选项“-W %s” 不允许有参数\n"
+
+#: src/util/getopt.c:1038
+#, fuzzy, c-format
+msgid "Use %s to get a list of options.\n"
+msgstr "请使用 --help 获取选项列表。\n"
+
+#: src/util/getopt_helpers.c:84
+#, c-format
 msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr "长选项的必选参数对短选项也是必选的。\n"
+
+#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+
+#: src/util/gnunet-resolver.c:148
+msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:805
+#: src/util/gnunet-resolver.c:154
+msgid "Use build-in GNUnet stub resolver"
+msgstr ""
+
+#: src/util/gnunet-service-resolver.c:288
 #, c-format
-msgid "Timeout trying to download hostlist from `%s'\n"
+msgid "Could not resolve `%s' (%s): %s\n"
+msgstr "无法解析“%s”(%s):%s\n"
+
+#: src/util/gnunet-service-resolver.c:358
+#: src/util/gnunet-service-resolver.c:399
+#, c-format
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "找不到主机“%s”的 IP:%s\n"
+
+#: src/util/gnunet-service-resolver.c:494
+#, c-format
+msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:822
+#: src/util/gnunet-service-resolver.c:529
 #, c-format
-msgid "Download limit of %u bytes exceeded, stopping download\n"
+msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/util/helper.c:239
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+msgid "Error reading from `%s': %s\n"
+msgstr "创建用户出错"
 
-#: src/hostlist/hostlist-client.c:848
+#: src/util/helper.c:254
 #, c-format
-msgid "Download of hostlist `%s' completed.\n"
+msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:856
+#: src/util/helper.c:264
 #, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
+msgid "Got %u bytes from helper `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:909
+#: src/util/helper.c:273
+#, fuzzy, c-format
+msgid "Failed to parse inbound message from helper `%s'\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/util/helper.c:431
+#, fuzzy, c-format
+msgid "Error writing to `%s': %s\n"
+msgstr "创建用户出错"
+
+#: src/util/network.c:1204
 #, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
-msgid "# hostlist downloads initiated"
-msgstr ""
+#: src/util/os_installation.c:299
+#, fuzzy, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
-msgid "# milliseconds between hostlist downloads"
+#: src/util/os_installation.c:486
+#, fuzzy, c-format
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "找不到主机“%s”的 IP:%s\n"
+
+#: src/util/os_installation.c:492
+#, fuzzy, c-format
+msgid "access (%s, X_OK) failed: %s\n"
+msgstr "“%s”说:%s\n"
+
+#: src/util/os_installation.c:507
+#, fuzzy, c-format
+msgid "stat (%s) failed: %s\n"
+msgstr "“%s”说:%s\n"
+
+#: src/util/os_priority.c:117
+#, c-format
+msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/util/plugin.c:89
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "插件机构初始化失败:%s!\n"
+
+#: src/util/plugin.c:146
+#, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
-msgid "Scheduled saving of hostlists\n"
+#: src/util/plugin.c:219
+#, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/util/plugin.c:349
+#, fuzzy
+msgid "Could not determine plugin installation path.\n"
+msgstr "无法确定用户界面定义文件。"
+
+#: src/util/pseudonym.c:273
+#, fuzzy, c-format
+msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/util/pseudonym.c:338
+msgid "no-name"
+msgstr "无名称"
+
+#: src/util/resolver_api.c:202
 #, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
+msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
-msgid "# active connections"
+#: src/util/resolver_api.c:221
+#, c-format
+msgid ""
+"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1253
+#: src/util/resolver_api.c:351
+#, fuzzy, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr "GNUnet 现在使用 IP 地址 %s。\n"
+
+#: src/util/resolver_api.c:355
 #, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
+msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1284
+#: src/util/resolver_api.c:426
 #, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
+msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/util/resolver_api.c:807
 #, c-format
-msgid "Loading saved hostlist entries from file `%s' \n"
+msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/util/resolver_api.c:901
 #, c-format
-msgid "Hostlist file `%s' is not existing\n"
+msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1305
+#: src/util/resolver_api.c:906
 #, fuzzy, c-format
-msgid "Could not open file `%s' for reading to load hostlists: %s\n"
-msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
+msgid "Could not resolve our FQDN : %s\n"
+msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/hostlist/hostlist-client.c:1338
+#: src/util/resolver_api.c:938
 #, c-format
-msgid "%u hostlist URIs loaded from file\n"
+msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1340
-msgid "# hostlist URIs read from file"
+#: src/util/scheduler.c:870
+msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/util/scheduler.c:1000
 #, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1387
+#: src/util/server.c:397
 #, fuzzy, c-format
-msgid "Could not open file `%s' for writing to save hostlists: %s\n"
-msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/hostlist/hostlist-client.c:1392
+#: src/util/server.c:406
 #, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
+msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#: src/util/server.c:411
+#, fuzzy, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+
+#: src/util/server.c:640
 #, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
+msgid ""
+"Processing code for message of type %u did not call "
+"GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1428
-msgid "# hostlist URIs written to file"
-msgstr ""
+#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
+#: src/util/service.c:207 src/util/service.c:214
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "IP 格式无效:“%s”\n"
 
-#: src/hostlist/hostlist-client.c:1480
-msgid "Learning is enabled on this peer\n"
+#: src/util/service.c:170
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
+
+#: src/util/service.c:263
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "无效的网络表示法(没有以“;”结尾:“%s”)\n"
+
+#: src/util/service.c:296
+#, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "网络掩码的格式“%s”错误\n"
+
+#: src/util/service.c:326
+#, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "网络的格式“%s”错误\n"
+
+#: src/util/service.c:668
+#, c-format
+msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/util/service.c:673
 #, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
+msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
-msgid "Learning is not enabled on this peer\n"
+#: src/util/service.c:680
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1504
+#: src/util/service.c:724
 #, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1508
+#: src/util/service.c:752
 #, c-format
-msgid "Hostlist file `%s' could not be removed\n"
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:264
+#: src/util/service.c:869
+#, c-format
 msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:317
-msgid "advertise our hostlist to other peers"
+#: src/util/service.c:939
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:322
-msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
+#: src/util/service.c:956
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
-msgid "enable learning about hostlist servers from other peers"
+#: src/util/service.c:1191
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
-msgid "provide a hostlist server"
+#: src/util/service.c:1242 src/util/service.c:1260
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
-msgid "GNUnet hostlist server and client"
+#: src/util/service.c:1287
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:134
-msgid "bytes in hostlist"
+#: src/util/service.c:1442
+#, fuzzy, c-format
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/util/service.c:1475
+#, c-format
+msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:157
-msgid "expired addresses encountered"
+#: src/util/service.c:1521
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:205
-msgid "HELLOs without addresses encountered (ignored)"
+#: src/util/service.c:1525
+msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:221
-msgid "bytes not included in hostlist (size limit)"
+#: src/util/service.c:1529
+msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:269
+#: src/util/service.c:1581
+msgid "No such user"
+msgstr "无此用户"
+
+#: src/util/service.c:1594
 #, c-format
-msgid "Refusing `%s' request to hostlist server\n"
-msgstr ""
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "无法更改用户/组为“%s”:%s\n"
 
-#: src/hostlist/hostlist-server.c:272
-msgid "hostlist requests refused (not HTTP GET)"
+#: src/util/service.c:1657
+msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:280
-msgid "Sending 100 CONTINUE reply\n"
+#: src/util/signal.c:80
+#, c-format
+msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:287
+#: src/util/strings.c:143
+msgid "b"
+msgstr "b"
+
+#: src/util/strings.c:354
 #, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\n"
+msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:291
-msgid "hostlist requests refused (upload data)"
+#: src/util/strings.c:462
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+msgstr "扩展“$HOME”失败:没有设置环境变量“HOME”"
+
+#: src/util/strings.c:554
+msgid "ms"
+msgstr "毫秒"
+
+#: src/util/strings.c:559
+msgid "eternity"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
-msgid "Could not handle hostlist request since I do not have a response yet\n"
+#: src/util/strings.c:563
+msgid "s"
+msgstr "秒"
+
+#: src/util/strings.c:567
+msgid "m"
+msgstr "分"
+
+#: src/util/strings.c:571
+msgid "h"
+msgstr "时"
+
+#: src/util/strings.c:575
+msgid " days"
+msgstr " 天"
+
+#: src/util/strings.c:599
+msgid "end of time"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
-msgid "hostlist requests refused (not ready)"
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+msgid "# Active tunnels"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:306
-msgid "Received request for our hostlist\n"
+#: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
+#, fuzzy
+msgid "# Peers connected to mesh tunnels"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/hostlist/hostlist-server.c:307
-msgid "hostlist requests processed"
+#: src/vpn/gnunet-service-vpn.c:699
+msgid "# Bytes given to mesh for transmission"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:350
-msgid "# hostlist advertisements send"
+#: src/vpn/gnunet-service-vpn.c:737
+msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:397
-msgid "Advertisement message could not be queued by core\n"
+#: src/vpn/gnunet-service-vpn.c:772
+msgid "# Mesh tunnels created"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
+#: src/vpn/gnunet-service-vpn.c:795
+#, fuzzy
+msgid "Failed to setup mesh tunnel!\n"
+msgstr "发送消息失败。\n"
+
+#: src/vpn/gnunet-service-vpn.c:967
 #, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:574
+#: src/vpn/gnunet-service-vpn.c:1285
+msgid "# ICMPv4 packets dropped (not allowed)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1306
+msgid "# ICMPv6 packets dropped (not allowed)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1511
+msgid "# Packets received from TUN interface"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
 #, c-format
-msgid "Hostlist service starts on %s:%llu\n"
+msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/vpn/gnunet-service-vpn.c:1600
+msgid "Received IPv4 packet with options (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1614
 #, c-format
-msgid "Address to obtain hostlist: `%s'\n"
+msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:626
+#: src/vpn/gnunet-service-vpn.c:1697
+msgid "# ICMP packets received from mesh"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2038
+msgid "# UDP packets received from mesh"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2196
+msgid "# TCP packets received from mesh"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2347
+msgid "Failed to find unallocated IPv4 address in VPN's range\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2402
+msgid "Failed to find unallocated IPv6 address in VPN's range\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
+msgid "# Active destinations"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2726
+msgid "Failed to allocate IP address for new destination\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3133
+msgid "IPv6 support disabled as this system does not support IPv6\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3165
+msgid "IPv4 support disabled as this system does not support IPv4\n"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:151
+#, fuzzy
+msgid "Error creating tunnel\n"
+msgstr "创建用户出错"
+
+#: src/vpn/gnunet-vpn.c:195 src/vpn/gnunet-vpn.c:226
 #, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
+msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/vpn/gnunet-vpn.c:208
 #, fuzzy, c-format
-msgid "Could not find option `%s:%s' in configuration.\n"
-msgstr "找不到主机“%s”的 IP:%s\n"
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "%s:选项“%s”有歧义\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/vpn/gnunet-vpn.c:220
 #, c-format
-msgid "Loading hostkey from `%s' failed.\n"
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
-#, c-format
-msgid "I am peer `%s'.\n"
+#: src/vpn/gnunet-vpn.c:238
+#, fuzzy, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/vpn/gnunet-vpn.c:260
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/vpn/gnunet-vpn.c:296
+msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
-msgid "output only the identity strings"
+#: src/vpn/gnunet-vpn.c:299
+msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
-msgid "output our own identity only"
+#: src/vpn/gnunet-vpn.c:302
+msgid "print IP address only after mesh tunnel has been created"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
-#, fuzzy
-msgid "Print information about peers."
-msgstr "无法获取有关用户“%s”的信息:%s\n"
+#: src/vpn/gnunet-vpn.c:305
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:144
-msgid "print this help"
+#: src/vpn/gnunet-vpn.c:308
+msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:154
-msgid "print the version number"
+#: src/vpn/gnunet-vpn.c:311
+msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:163
-msgid "configure logging to write logs to LOGFILE"
+#: src/vpn/gnunet-vpn.c:314
+msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:172
-msgid "configure logging to use LOGLEVEL"
+#: src/vpn/gnunet-vpn.c:317
+msgid "service is offered via TCP"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:181
-msgid "be verbose"
+#: src/vpn/gnunet-vpn.c:320
+msgid "service is offered via UDP"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:190
-msgid "use configuration file FILENAME"
+#: src/vpn/gnunet-vpn.c:329
+msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:430 src/include/gnunet_common.h:435
-#: src/include/gnunet_common.h:441
+#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
+#: src/include/gnunet_common.h:490
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:451
+#: src/include/gnunet_common.h:500
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:472 src/include/gnunet_common.h:479
+#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not access file: %s\n"
+#~ msgstr "错误:无法访问服务:%s\n"
+
+#, fuzzy
+#~ msgid "`%s' failed on file `%s': %s"
+#~ msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+
+#, fuzzy
 #~ msgid "Failed to stop service `%s'!\n"
 #~ msgstr "打开日志文件“%s”失败:%s\n"
 
@@ -4564,46 +5606,10 @@
 #~ msgstr "TiB"
 
 #, fuzzy
-#~ msgid "Copying file with command cp %s %s\n"
-#~ msgstr "“%s”以错误码 %s 失败:%s\n"
-
-#, fuzzy
-#~ msgid "Could not create configuration for peer number %u on `%s'!\n"
-#~ msgstr "解析配置文件“%s”失败\n"
-
-#, fuzzy
-#~ msgid "Failed to create pipe for `ssh' process.\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
-#, fuzzy
-#~ msgid "Failed to start `ssh' process.\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
-#, fuzzy
-#~ msgid "`Failed to get hostkey!\n"
-#~ msgstr "发送消息失败。\n"
-
-#, fuzzy
-#~ msgid "Failed to write new configuration to disk."
-#~ msgstr "保存配置失败。"
-
-#, fuzzy
-#~ msgid "Failed to copy new configuration to remote machine."
-#~ msgstr "保存配置失败。"
-
-#, fuzzy
-#~ msgid "Failed to connect to core service of first peer!\n"
-#~ msgstr "加载 sqstore 服务失败。检查您的配置!\n"
-
-#, fuzzy
 #~ msgid "Could not resolve our FQDN : %s %u\n"
 #~ msgstr "无法解析“%s”(%s):%s\n"
 
 #, fuzzy
-#~ msgid "Failed to start daemon: %s\n"
-#~ msgstr "运行 %s失败:%s %d\n"
-
-#, fuzzy
 #~ msgid "Failed to load dhtlog plugin for `%s'\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 
@@ -4616,10 +5622,6 @@
 #~ msgstr "无法为守护程序创建用户账户。"
 
 #, fuzzy
-#~ msgid "Found peer `%s'\n"
-#~ msgstr "未知的用户“%s”\n"
-
-#, fuzzy
 #~ msgid "Phase 3: sending messages\n"
 #~ msgstr "发送消息失败。\n"
 
@@ -4916,9 +5918,6 @@
 #~ msgid "Error: can't delete service: %s\n"
 #~ msgstr "错误:无法删除服务:%s\n"
 
-#~ msgid "Configuration saved."
-#~ msgstr "配置已保存"
-
 #~ msgid "Configuration changed. Save?"
 #~ msgstr "配置已更改。保存吗?"
 
@@ -4962,15 +5961,9 @@
 #~ msgid "generate configuration for gnunetd, the GNUnet daemon"
 #~ msgstr "为 GNUnet 守护程序 gnunetd 生成配置"
 
-#~ msgid "print a value from the configuration file to stdout"
-#~ msgstr "打印配置文件中的一个值到标准输出"
-
 #~ msgid "Tool to setup GNUnet."
 #~ msgstr "设置 GNUnet 的工具。"
 
-#~ msgid "update a value in the configuration file"
-#~ msgstr "更改配置文件中的一个值"
-
 #~ msgid "Too many arguments.\n"
 #~ msgstr "参数过多。\n"
 
@@ -4983,9 +5976,6 @@
 #~ msgid "Undefined option.\n"
 #~ msgstr "未定义的选项。\n"
 
-#~ msgid "`%s' is not available.\n"
-#~ msgstr "“%s”不可用。\n"
-
 #~ msgid "yes"
 #~ msgstr "是"
 

Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am  2012-02-24 15:12:56 UTC (rev 20010)
+++ gnunet/src/ats/Makefile.am  2012-02-24 15:14:18 UTC (rev 20011)
@@ -80,7 +80,7 @@
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
-  
+
 perf_ats_mlp_SOURCES = \
  $(GN_MLP_SRC) \
  perf_ats_mlp.c




reply via email to

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