gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r17863 - in gnunet: po src/datastore src/nse src/transport


From: gnunet
Subject: [GNUnet-SVN] r17863 - in gnunet: po src/datastore src/nse src/transport
Date: Sun, 30 Oct 2011 19:28:26 +0100

Author: grothoff
Date: 2011-10-30 19:28:26 +0100 (Sun, 30 Oct 2011)
New Revision: 17863

Modified:
   gnunet/po/de.gmo
   gnunet/po/de.po
   gnunet/po/es.gmo
   gnunet/po/es.po
   gnunet/po/gnunet.pot
   gnunet/po/sv.gmo
   gnunet/po/sv.po
   gnunet/po/vi.gmo
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/datastore/Makefile.am
   gnunet/src/nse/Makefile.am
   gnunet/src/transport/Makefile.am
Log:
missing extra dists

Modified: gnunet/po/de.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2011-10-30 18:21:10 UTC (rev 17862)
+++ gnunet/po/de.po     2011-10-30 18:28:26 UTC (rev 17863)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-09-19 13:28+0200\n"
+"POT-Creation-Date: 2011-10-30 19:19+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,2171 +17,2058 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/fragmentation/defragmentation.c:270
-msgid "# acknowledgements sent for fragment"
-msgstr ""
+#: 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/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:90 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:380
+#: src/include/gnunet_common.h:387
+#, 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/fragmentation/defragmentation.c:454
-#, fuzzy
-msgid "# fragments received"
-msgstr "# verworfener Nachrichten"
+#: src/datastore/plugin_datastore_sqlite.c:61
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%u with error: %s"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/fragmentation/defragmentation.c:513
-#, fuzzy
-msgid "# duplicate fragments received"
-msgstr "# Bytes empfangen über TCP"
+#: src/datastore/plugin_datastore_sqlite.c:239
+#, fuzzy, c-format
+msgid "Option `%s' in section `%s' missing in configuration!\n"
+msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/fragmentation/defragmentation.c:532
-msgid "# messages defragmented"
-msgstr "# defragmentierter Nachrichten"
+#: src/datastore/plugin_datastore_sqlite.c:266
+#, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/fragmentation/fragmentation.c:183
-#, fuzzy
-msgid "# fragments transmitted"
-msgstr "# Selbstbekanntmachungen übertragen"
+#: src/datastore/plugin_datastore_sqlite.c:420
+#: src/datacache/plugin_datacache_sqlite.c:471
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+msgstr ""
 
-#: src/fragmentation/fragmentation.c:186
+#: src/datastore/plugin_datastore_sqlite.c:677
 #, fuzzy
-msgid "# fragments retransmitted"
-msgstr "# Selbstbekanntmachungen übertragen"
+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/fragmentation/fragmentation.c:248
-msgid "# messages fragmented"
-msgstr "# fragmentierter Nachrichten"
-
-#: src/fragmentation/fragmentation.c:251
-msgid "# total size of fragmented messages"
+#: src/datastore/plugin_datastore_sqlite.c:1130
+msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:335
-#, fuzzy
-msgid "# fragment acknowledgements received"
-msgstr "# Knotenankündigungen empfangen"
-
-#: src/fragmentation/fragmentation.c:341
-msgid "# bits removed from fragmentation ACKs"
+#: src/datastore/plugin_datastore_sqlite.c:1149
+#, c-format
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:365
+#: src/datastore/plugin_datastore_sqlite.c:1188
 #, fuzzy
-msgid "# fragmentation transmissions completed"
-msgstr "# Klartext PONG Nachrichten empfangen"
+msgid "Sqlite database running\n"
+msgstr "sqlite Datenspeicher"
 
-#: src/nat/nat.c:778
+#: src/datastore/plugin_datastore_mysql.c:316
+#: src/datacache/plugin_datacache_mysql.c:224
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
-msgstr ""
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
 
-#: src/nat/nat.c:828
+#: src/datastore/plugin_datastore_mysql.c:322
+#: src/datacache/plugin_datacache_mysql.c:230
 #, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "Fehler beim Starten der Collection.\n"
+msgid "Could not access file `%s': %s\n"
+msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/nat/nat.c:1096
+#: src/datastore/plugin_datastore_mysql.c:529
 #, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "Fehler beim Speichern der Konfiguration!"
+msgid "Failed to prepare statement `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/nat/nat.c:1158 src/nat/nat.c:1168
-#, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
-msgstr ""
+#: src/datastore/plugin_datastore_mysql.c:622
+#, 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/nat/nat.c:1300
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+#: src/datastore/plugin_datastore_mysql.c:1500
+msgid "Mysql database running\n"
 msgstr ""
 
-#: src/nat/nat.c:1312
-#, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
+#: src/datastore/plugin_datastore_postgres.c:93
+#: src/datacache/plugin_datacache_postgres.c:79
+#, 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/datastore/plugin_datastore_postgres.c:173
+#, fuzzy, c-format
+msgid "Unable to initialize Postgres with configuration `%s': %s"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/datastore/plugin_datastore_postgres.c:979
+msgid "Postgres database running\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:289
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\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/datastore/datastore_api.c:372
+msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:328
-msgid "GNUnet NAT traversal test helper daemon"
+#: src/datastore/datastore_api.c:418
+msgid "# queue overflows"
 msgstr ""
 
-#: src/nat/nat_test.c:349
+#: src/datastore/datastore_api.c:445
 #, fuzzy
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+msgid "# queue entries created"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/nat/nat_test.c:419
-#, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+#: src/datastore/datastore_api.c:465
+#, fuzzy
+msgid "# Requests dropped from datastore queue"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/datastore/datastore_api.c:513
+msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1279 src/template/gnunet-template.c:68
-#: src/core/test_core_api_send_to_self.c:217
+#: src/datastore/datastore_api.c:540
+msgid "# reconnected to DATASTORE"
+msgstr ""
+
+#: src/datastore/datastore_api.c:605
 #, fuzzy
-msgid "help text"
-msgstr "Hilfetext für -t"
+msgid "Failed to transmit request to DATASTORE.\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/vpn/gnunet-daemon-exit.c:1493
-msgid "Daemon to run to provide an IP exit node for the VPN"
-msgstr ""
+#: src/datastore/datastore_api.c:607
+#, fuzzy
+msgid "# transmission request failures"
+msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/datacache/datacache.c:108 src/datacache/datacache.c:236
-#: src/datastore/gnunet-service-datastore.c:824
+#: src/datastore/datastore_api.c:630
 #, fuzzy
-msgid "# bytes stored"
+msgid "# bytes sent to datastore"
 msgstr "# bytes in der Datenbank"
 
-#: src/datacache/datacache.c:134 src/datacache/datacache.c:142
-#: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486
-#: src/datastore/test_plugin_datastore.c:192
-#: src/datastore/test_plugin_datastore.c:315
-#: src/datastore/perf_plugin_datastore.c:309
-#: src/datastore/perf_plugin_datastore.c:413
-#, fuzzy, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+#: src/datastore/datastore_api.c:767
+#, fuzzy
+msgid "Failed to receive status response from database."
+msgstr ""
+"\n"
+"Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datacache/datacache.c:167
-#, c-format
-msgid "Loading `%s' datacache plugin\n"
+#: src/datastore/datastore_api.c:780
+msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datacache/datacache.c:176
-#, fuzzy, c-format
-msgid "Failed to load datacache plugin for `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+#: src/datastore/datastore_api.c:792 src/datastore/datastore_api.c:798
+#, fuzzy
+msgid "Invalid error message received from datastore service"
+msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/datacache/datacache.c:262
+#: src/datastore/datastore_api.c:804
 #, fuzzy
-msgid "# requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+msgid "# status messages received"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/datacache/datacache.c:268
-msgid "# requests filtered by bloom filter"
-msgstr ""
+#: src/datastore/datastore_api.c:875
+#, fuzzy
+msgid "# PUT requests executed"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datacache/plugin_datacache_template.c:121
-msgid "Template datacache running\n"
+#: src/datastore/datastore_api.c:946
+#, fuzzy
+msgid "# RESERVE requests executed"
+msgstr "# dht Anfragen weitergeleitet"
+
+#: src/datastore/datastore_api.c:1011
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:66
-#: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:122
-#: src/datacache/plugin_datacache_sqlite.c:191
-#: src/datacache/plugin_datacache_sqlite.c:232
-#: src/datacache/plugin_datacache_sqlite.c:295
-#: src/datacache/plugin_datacache_sqlite.c:304
-#: src/datacache/plugin_datacache_sqlite.c:315
-#: src/datacache/plugin_datacache_sqlite.c:322
-#: src/datacache/plugin_datacache_sqlite.c:332
-#: src/datacache/plugin_datacache_sqlite.c:340
-#: src/datacache/plugin_datacache_sqlite.c:348
-#: 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/util/crypto_rsa.c:84
-#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:581
-#: src/dht/plugin_dhtlog_mysql.c:590 src/dht/plugin_dhtlog_mysql.c:648
-#: src/dht/plugin_dhtlog_mysql.c:663
-#: 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/include/gnunet_common.h:324
-#, 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/datastore/datastore_api.c:1072
+#, fuzzy
+msgid "# UPDATE requests executed"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datacache/plugin_datacache_sqlite.c:413
-msgid "Sqlite datacache running\n"
-msgstr ""
+#: src/datastore/datastore_api.c:1140
+#, fuzzy
+msgid "# REMOVE requests executed"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datacache/plugin_datacache_sqlite.c:446
-#: src/datastore/plugin_datastore_sqlite.c:420
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+#: src/datastore/datastore_api.c:1185
+#, fuzzy
+msgid "Failed to receive response from database.\n"
 msgstr ""
+"\n"
+"Fehler beim Empfangen der Antwort von gnunetd.\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/datastore/datastore_api.c:1245
+#, fuzzy
+msgid "# Results received"
+msgstr "# Bytes empfangen über TCP"
 
-#: 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/datastore/datastore_api.c:1316
+msgid "# GET REPLICATION requests executed"
+msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:500
-msgid "Postgres datacache running\n"
+#: src/datastore/datastore_api.c:1383
+msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:224
-#: src/datastore/plugin_datastore_mysql.c:316
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
+#: src/datastore/datastore_api.c:1447
+#, fuzzy
+msgid "# GET requests executed"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: 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/datacache/plugin_datacache_mysql.c:979
-msgid "MySQL datacache running\n"
+#: src/datastore/plugin_datastore_template.c:241
+msgid "Template database running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1903 src/testing/testing_group.c:1915
-#: src/testing/testing_group.c:2016 src/testing/testing_group.c:2075
-#: src/testing/testing_group.c:2164 src/testing/testing_group.c:2184
-#: src/testing/testing_group.c:2321 src/testing/test_testing_topology.c:1078
-#: src/testing/test_testing_topology_blacklist.c:448
-#: src/testing/testing_peergroup.c:876
-#: src/testing/test_testing_large_topology.c:1022
-#: src/dht/test_dht_multipeer.c:864 src/dht/gnunet-dht-driver.c:3897
-#: src/dv/test_transport_api_dv.c:1132
-#, c-format
-msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:52
+#, fuzzy
+msgid "# bytes used in file-sharing datastore"
+msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/testing/testing_group.c:1925
-#, fuzzy, c-format
-msgid "Target is %d connections per peer."
-msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
+#: src/datastore/gnunet-service-datastore.c:331
+#, fuzzy
+msgid "# bytes expired"
+msgstr "# Bytes empfangen über TCP"
 
-#: src/testing/testing_group.c:2172
-#, c-format
-msgid ""
-"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
-"greater than 0\n"
+#: src/datastore/gnunet-service-datastore.c:397
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/testing/testing_group.c:2202 src/testing/testing_group.c:2395
-#, c-format
-msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
+#: src/datastore/gnunet-service-datastore.c:457
+msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2239
-#, c-format
-msgid "natural log of %d is %d, will run %d iterations\n"
+#: src/datastore/gnunet-service-datastore.c:610
+msgid "# results found"
 msgstr ""
 
-#: src/testing/testing_group.c:2242
+#: src/datastore/gnunet-service-datastore.c:655
 #, c-format
-msgid "Total connections added thus far: %u!\n"
+msgid ""
+"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2283
+#: src/datastore/gnunet-service-datastore.c:666
 #, c-format
-msgid "Total connections added for small world: %d!\n"
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2335
-#, c-format
-msgid "rand is %f probability is %f\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2910 src/testing/testing_group.c:3109
-#, fuzzy, c-format
+#: src/datastore/gnunet-service-datastore.c:670
 msgid ""
-"No `%s' specified in peer configuration in section `%s', cannot copy friends "
-"file!\n"
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
-"Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
-"gesetzt, sie wird auf %dm gesetzt.\n"
 
-#: src/testing/testing_group.c:3011
-msgid "Finished copying all friend files!\n"
+#: src/datastore/gnunet-service-datastore.c:676
+msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/testing/testing_group.c:3124
-#, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#: src/testing/testing_group.c:3147
-#, c-format
-msgid "Copying file with command scp %s %s\n"
+#: src/datastore/gnunet-service-datastore.c:681
+#: src/datastore/gnunet-service-datastore.c:735
+#: src/datastore/gnunet-service-datastore.c:956
+#: src/datastore/gnunet-service-datastore.c:1441
+msgid "# reserved"
 msgstr ""
 
-#: src/testing/testing_group.c:3164
-#, c-format
-msgid "Checking copy status of file %d\n"
+#: src/datastore/gnunet-service-datastore.c:750
+msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/testing/testing_group.c:3182
+#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:119
+#: src/datacache/datacache.c:250
+#, fuzzy
+msgid "# bytes stored"
+msgstr "# bytes in der Datenbank"
+
+#: src/datastore/gnunet-service-datastore.c:838
 #, c-format
-msgid "File %d copied\n"
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3197
-msgid "Finished copying all blacklist files!\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1004
+#, fuzzy
+msgid "# GET requests received"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/testing/testing_group.c:3580 src/testing/testing_group.c:3717
-#: src/testing/testing_group.c:4925 src/testing/testing_group.c:5066
-msgid "Delaying connect, we have too many outstanding connections!\n"
+#: src/datastore/gnunet-service-datastore.c:1018
+msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/testing/testing_group.c:3590 src/testing/testing_group.c:4935
-#: src/testing/testing_group.c:5076
-#, c-format
-msgid "Creating connection, outstanding_connections is %d\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1046
+#, fuzzy
+msgid "# UPDATE requests received"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/testing/testing_group.c:3602
-#, 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/datastore/gnunet-service-datastore.c:1080
+#, fuzzy
+msgid "# GET REPLICATION requests received"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/testing/testing_group.c:3728
-#, c-format
-msgid "Creating connection, outstanding_connections is %d (max %d)\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1115
+#, fuzzy
+msgid "# GET ZERO ANONYMITY requests received"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/testing/testing_group.c:3983
-msgid "Creating clique topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1142
+#, fuzzy
+msgid "Content not found"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/testing/testing_group.c:3990
-msgid "Creating small world (ring) topology\n"
+#: src/datastore/gnunet-service-datastore.c:1152
+msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/testing/testing_group.c:3997
-msgid "Creating small world (2d-torus) topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1186
+#, fuzzy
+msgid "# REMOVE requests received"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/testing/testing_group.c:4003
-msgid "Creating ring topology\n"
+#: src/datastore/gnunet-service-datastore.c:1230
+#, c-format
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4009
-msgid "Creating 2d torus topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1295
+#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:145
+#: src/datacache/datacache.c:152
+#, fuzzy, c-format
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/testing/testing_group.c:4015
-msgid "Creating Erdos-Renyi topology\n"
+#: src/datastore/gnunet-service-datastore.c:1303
+#, c-format
+msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4021
-msgid "Creating InterNAT topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1312
+#, fuzzy, c-format
+msgid "Failed to load datastore plugin for `%s'\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing_group.c:4027
-msgid "Creating Scale Free topology\n"
+#: src/datastore/gnunet-service-datastore.c:1491
+msgid "# quota"
 msgstr ""
 
-#: src/testing/testing_group.c:4034
-msgid "Creating straight line topology\n"
+#: src/datastore/gnunet-service-datastore.c:1493
+msgid "# cache size"
 msgstr ""
 
-#: src/testing/testing_group.c:4040
-msgid "Creating topology from file!\n"
+#: src/datastore/gnunet-service-datastore.c:1503
+#, c-format
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4058
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1516
+#, fuzzy
+msgid "Failed to initialize bloomfilter.\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing_group.c:4075
-msgid "Failed during friend file copying!\n"
+#: src/core/gnunet-service-core_sessions.c:204
+#: src/core/gnunet-service-core_sessions.c:275
+msgid "# entries in session map"
 msgstr ""
 
-#: src/testing/testing_group.c:4083
-msgid "Friend files created/copied successfully!\n"
-msgstr ""
+#: src/core/gnunet-service-core_sessions.c:236
+#, fuzzy
+msgid "# type map refreshes sent"
+msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/testing/testing_group.c:4102
-msgid "Blacklisting all but clique topology\n"
-msgstr ""
+#: src/core/gnunet-service-core_sessions.c:360
+#, fuzzy
+msgid "# send requests dropped (disconnected)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/testing/testing_group.c:4110
-msgid "Blacklisting all but small world (ring) topology\n"
+#: src/core/gnunet-service-core_sessions.c:427
+msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/testing/testing_group.c:4118
-msgid "Blacklisting all but small world (2d-torus) topology\n"
-msgstr ""
+#: src/core/gnunet-core-list-connections.c:77
+#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#, fuzzy, c-format
+msgid "Peer `%s'\n"
+msgstr "Ich bin Peer `%s'.\n"
 
-#: src/testing/testing_group.c:4126
-msgid "Blacklisting all but ring topology\n"
-msgstr ""
+#: src/core/gnunet-core-list-connections.c:167
+#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#, fuzzy, c-format
+msgid "Invalid command line argument `%s'\n"
+msgstr "Ungültige Kommandozeilen Parameter:\n"
 
-#: src/testing/testing_group.c:4134
-msgid "Blacklisting all but 2d torus topology\n"
+#: src/core/gnunet-core-list-connections.c:188
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+msgid "don't resolve host names"
 msgstr ""
 
-#: src/testing/testing_group.c:4142
-msgid "Blacklisting all but Erdos-Renyi topology\n"
-msgstr ""
+#: src/core/gnunet-core-list-connections.c:195
+#, fuzzy
+msgid "Print information about connected peers."
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/testing/testing_group.c:4150
-msgid "Blacklisting all but InterNAT topology\n"
-msgstr ""
+#: src/core/gnunet-service-core_clients.c:452
+#, fuzzy
+msgid "# messages discarded (session disconnected)"
+msgstr "# defragmentierter Nachrichten"
 
-#: src/testing/testing_group.c:4187
-msgid "Blacklisting all but Scale Free topology\n"
-msgstr ""
+#: src/core/gnunet-service-core_clients.c:796
+#, fuzzy, c-format
+msgid "# bytes of messages of type %u received"
+msgstr "# Bytes Rauschen empfangen"
 
-#: src/testing/testing_group.c:4195
-msgid "Blacklisting all but straight line topology\n"
+#: src/core/gnunet-service-core.c:101
+#, c-format
+msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4212
-msgid "Failed during blacklist file copying!\n"
-msgstr ""
+#: src/core/gnunet-service-core_typemap.c:111
+#: src/core/gnunet-service-core_typemap.c:124
+#, fuzzy
+msgid "# type maps received"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/testing/testing_group.c:4220
-msgid "Blacklist files created/copied successfully!\n"
+#: src/core/gnunet-service-core_typemap.c:156
+msgid "# updates to my type map"
 msgstr ""
 
-#: src/testing/testing_group.c:5301
-msgid "Creating clique CONNECT topology\n"
-msgstr ""
+#: src/core/gnunet-service-core_neighbours.c:162
+#, fuzzy
+msgid "# sessions terminated by transport disconnect"
+msgstr "# Knotenankündigungen empfangen"
 
-#: src/testing/testing_group.c:5308
-msgid "Creating small world (ring) CONNECT topology\n"
+#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:343
+msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/testing/testing_group.c:5315
-msgid "Creating small world (2d-torus) CONNECT topology\n"
+#: src/core/gnunet-service-core_neighbours.c:251
+msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/testing/testing_group.c:5321
-msgid "Creating ring CONNECT topology\n"
-msgstr ""
+#: src/core/gnunet-service-core_neighbours.c:432
+#, fuzzy, c-format
+msgid "Unsupported message of type %u received.\n"
+msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/testing/testing_group.c:5328
-msgid "Creating 2d torus CONNECT topology\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:491
+msgid "# bytes encrypted"
+msgstr "# Bytes verschlüsselt"
 
-#: src/testing/testing_group.c:5335
-msgid "Creating Erdos-Renyi CONNECT topology\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:541
+msgid "# bytes decrypted"
+msgstr "# Bytes entschlüsselt"
 
-#: src/testing/testing_group.c:5342
-msgid "Creating InterNAT CONNECT topology\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3000
+#: src/hostlist/hostlist-server.c:439 src/peerinfo-tool/gnunet-peerinfo.c:157
+#, fuzzy, c-format
+msgid "Error in communication with PEERINFO service\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/testing/testing_group.c:5349
-msgid "Creating Scale Free CONNECT topology\n"
+#: src/core/gnunet-service-core_kx.c:618
+msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/testing/testing_group.c:5356
-msgid "Creating straight line CONNECT topology\n"
+#: src/core/gnunet-service-core_kx.c:669
+msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/testing/testing_group.c:5362
-msgid "Creating no CONNECT topology\n"
+#: src/core/gnunet-service-core_kx.c:693
+msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/testing/testing_group.c:5368
+#: src/core/gnunet-service-core_kx.c:746
 #, fuzzy
-msgid "Unknown topology specification, can't connect peers!\n"
-msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
+msgid "# session keys received"
+msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/testing/testing_group.c:5378
-#, c-format
-msgid "Connecting random subset (%'.2f percent) of possible peers\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:764
+#, fuzzy, c-format
+msgid "`%s' is for `%s', not for me.  Ignoring.\n"
+msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
 
-#: src/testing/testing_group.c:5386
-#, c-format
-msgid "Connecting a minimum of %u peers each (if possible)\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:803
+#, fuzzy
+msgid "# SET_KEY messages decrypted"
+msgstr "# defragmentierter Nachrichten"
 
-#: src/testing/testing_group.c:5395
-#, c-format
-msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:884
+#: src/transport/gnunet-service-transport_validation.c:601
+#, fuzzy
+msgid "# PING messages received"
+msgstr "# PING Nachrichten erstellt"
 
-#: src/testing/testing_group.c:5405
+#: src/core/gnunet-service-core_kx.c:918
 #, c-format
-msgid "Finding additional %u closest peers each (if possible)\n"
+msgid ""
+"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
+"%s'\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6084
+#: src/core/gnunet-service-core_kx.c:941
 #, fuzzy
-msgid "Could not read hostkeys file!\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "# PONG messages created"
+msgstr "# PING Nachrichten erstellt"
 
-#: src/testing/testing_group.c:6154
-#, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1029
+#, fuzzy
+msgid "# sessions terminated by timeout"
+msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/testing/testing_group.c:6298 src/testing/testing.c:1273
-#, c-format
-msgid "Could not start `%s' process to copy configuration directory.\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1042
+#, fuzzy
+msgid "# keepalive messages sent"
+msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/testing/testing.c:209
-msgid "`scp' does not seem to terminate (timeout copying config).\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1098
+#: src/transport/gnunet-service-transport_validation.c:934
+#, fuzzy
+msgid "# PONG messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/testing/testing.c:223 src/testing/testing.c:823
+#: src/core/gnunet-service-core_kx.c:1128
 #, fuzzy
-msgid "`scp' did not complete cleanly.\n"
-msgstr "`%s' ist zu keinem Knoten verbunden.\n"
+msgid "# PONG messages decrypted"
+msgstr "# PING Nachrichten erstellt"
 
-#: src/testing/testing.c:246
-msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1161
+#, fuzzy
+msgid "# session keys confirmed via PONG"
+msgstr "# Knotenankündigungen empfangen"
 
-#: src/testing/testing.c:247
+#: src/core/gnunet-service-core_kx.c:1224
 #, fuzzy
-msgid "Failed to create pipe for `ssh' process.\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+msgid "# SET_KEY and PING messages created"
+msgstr "# PING Nachrichten erstellt"
 
-#: src/testing/testing.c:303
-#, c-format
-msgid "Could not start `%s' process to create hostkey.\n"
+#: src/core/gnunet-service-core_kx.c:1372
+msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/testing/testing.c:310
+#: src/core/gnunet-service-core_kx.c:1416
+#: src/core/gnunet-service-core_kx.c:1441
 #, fuzzy
-msgid "Failed to start `gnunet-peerinfo' process.\n"
-msgstr "Fehler beim Starten der Collection.\n"
+msgid "# bytes dropped (duplicates)"
+msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/testing/testing.c:311 src/testing/testing.c:509
+#: src/core/gnunet-service-core_kx.c:1428
 #, fuzzy
-msgid "Failed to start `ssh' process.\n"
-msgstr "Fehler beim Starten der Collection.\n"
+msgid "# bytes dropped (out of sequence)"
+msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/testing/testing.c:373
+#: src/core/gnunet-service-core_kx.c:1465
 #, fuzzy, c-format
-msgid "Error reading from gnunet-peerinfo: %s\n"
-msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
+msgid "Message received far too old (%llu ms). Content ignored.\n"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/testing/testing.c:377
-msgid "Malformed output from gnunet-peerinfo!\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1469
+#, fuzzy
+msgid "# bytes dropped (ancient message)"
+msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/testing/testing.c:387
+#: src/core/gnunet-service-core_kx.c:1477
 #, fuzzy
-msgid "`Failed to get hostkey!\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+msgid "# bytes of payload decrypted"
+msgstr "# Bytes entschlüsselt"
 
-#: src/testing/testing.c:421
-msgid "`Failed while waiting for topology setup!\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1541
+#, fuzzy
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "GNUnet Konfiguration"
 
-#: src/testing/testing.c:501
-#, c-format
-msgid "Could not start `%s' process to start GNUnet.\n"
+#: src/core/gnunet-service-core_kx.c:1549
+msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/testing/testing.c:508
-#, fuzzy
-msgid "Failed to start `gnunet-arm' process.\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+#: src/core/gnunet-service-core_kx.c:1559
+#: src/transport/gnunet-service-transport.c:542
+#: src/hostlist/hostlist-server.c:558 src/peerinfo-tool/gnunet-peerinfo.c:208
+#, fuzzy, c-format
+msgid "Could not access PEERINFO service.  Exiting.\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/testing/testing.c:532 src/testing/testing.c:631
-msgid "`gnunet-arm' does not seem to terminate.\n"
+#: src/core/core_api.c:798
+msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/testing/testing.c:533 src/testing/testing.c:632
-#: src/testing/testing.c:652
-msgid "`ssh' does not seem to terminate.\n"
+#: src/vpn/gnunet-daemon-exit.c:1500
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/testing/testing.c:572 src/testing/testing.c:2074
-#: src/testing/testing.c:2093
+#: src/vpn/gnunet-daemon-vpn.c:1292
 #, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+msgid "help text"
+msgstr "Hilfetext für -t"
 
-#: src/testing/testing.c:601
-msgid "Unable to get HELLO for peer!\n"
+#: src/util/getopt_helpers.c:84
+#, c-format
+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/testing/testing.c:651
-msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
-msgstr ""
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:287
+#, 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/testing/testing.c:674 src/testing/testing.c:708
-msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
-msgstr ""
+#: src/util/common_logging.c:242 src/util/common_logging.c:838
+msgid "DEBUG"
+msgstr "DEBUG"
 
-#: src/testing/testing.c:689 src/testing/testing.c:738
-msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
-msgstr ""
+#: src/util/common_logging.c:244 src/util/common_logging.c:836
+msgid "INFO"
+msgstr "INFO"
 
-#: src/testing/testing.c:811
-msgid "`scp' does not seem to terminate.\n"
-msgstr ""
+#: src/util/common_logging.c:246 src/util/common_logging.c:834
+msgid "WARNING"
+msgstr "WARNUNG"
 
-#: src/testing/testing.c:989
-#, fuzzy, c-format
-msgid "Starting service %s for peer `%4s'\n"
-msgstr "Collection `%s' begonnen.\n"
+#: src/util/common_logging.c:248 src/util/common_logging.c:832
+msgid "ERROR"
+msgstr "FEHLER"
 
-#: src/testing/testing.c:1361 src/testing/testing.c:1444
-#: src/testing/testing.c:1582
-#, fuzzy, c-format
-msgid "Terminating peer `%4s'\n"
-msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
+#: src/util/common_logging.c:250 src/util/common_logging.c:840
+msgid "NONE"
+msgstr ""
 
-#: src/testing/testing.c:1534
+#: src/util/common_logging.c:554
 #, fuzzy, c-format
-msgid "Setting d->dead on peer `%4s'\n"
-msgstr "Collection `%s' begonnen.\n"
+msgid "Failed to create or access directory for log file `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/testing/testing.c:1669
-msgid "Peer not yet running, can not change configuration at this point."
+#: src/util/common_logging.c:672
+#, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1677
-#, fuzzy
-msgid "Failed to write new configuration to disk."
-msgstr "Fehler beim Speichern der Konfiguration!"
-
-#: src/testing/testing.c:1708
-#, fuzzy, c-format
-msgid "Could not start `%s' process to copy configuration file.\n"
+#: src/util/common_logging.c:841
+msgid "INVALID"
 msgstr ""
-"IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
-"der Konfigurationsdatei an.\n"
 
-#: src/testing/testing.c:1711
+#: src/util/common_logging.c:923
 #, fuzzy
-msgid "Failed to copy new configuration to remote machine."
-msgstr "Fehler beim Speichern der Konfiguration!"
+msgid "unknown address"
+msgstr "Unbekannter Fehler"
 
-#: src/testing/testing.c:1883
+#: src/util/common_logging.c:961
 #, fuzzy
-msgid "Peers failed to connect"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+msgid "invalid address"
+msgstr "Ungültige Parameter: "
 
-#: src/testing/testing.c:2038
-#, fuzzy
-msgid "Failed to connect to core service of first peer!\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+#: src/util/plugin.c:89
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
 
-#: src/testing/testing.c:2238
-msgid "Peers are not fully running yet, can not connect!\n"
+#: 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/peerinfo/gnunet-service-peerinfo.c:136
+#: src/util/plugin.c:219
 #, fuzzy, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Verfügbare(r) Transport(e): %s\n"
+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/peerinfo/gnunet-service-peerinfo.c:197
-msgid "# peers known"
-msgstr ""
+#: src/util/configuration.c:249
+#, fuzzy, c-format
+msgid "Syntax error in configuration file `%s' at line %u.\n"
+msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:241
+#: src/util/configuration.c:812
 #, c-format
 msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
-"Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
-"Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:306
-#, fuzzy, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
+#: src/util/getopt.c:670
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:257
-#, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+#: src/util/getopt.c:695
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: Option '--%s' erlaubt keinen Parameter\n"
 
-#: src/peerinfo/test_peerinfo_api.c:109 src/hostlist/hostlist-server.c:437
-#: src/peerinfo-tool/gnunet-peerinfo.c:157 src/dv/gnunet-service-dv.c:2998
-#: src/core/gnunet-service-core.c:3034 src/core/gnunet-service-core.c:3328
-#, fuzzy, c-format
-msgid "Error in communication with PEERINFO service\n"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+#: 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/peerinfo/peerinfo_api.c:276
-#, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+#: src/util/getopt.c:720 src/util/getopt.c:889
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: Option `%s' benötigt einen Parameter\n"
 
-#: src/peerinfo/peerinfo_api.c:432
-#, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
+#: src/util/getopt.c:749
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: unbekannte Option '--%s'\n"
 
-#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
-#, fuzzy
-msgid "Received invalid message from `PEERINFO' service.\n"
-msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
+#: src/util/getopt.c:753
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: unbekannte Option '%c%s'\n"
 
-#: src/peerinfo/peerinfo_api.c:521
-#, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+#: src/util/getopt.c:778
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: unerlaubte Option -- %c\n"
 
-#: src/peerinfo/peerinfo_api.c:555
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
-msgstr ""
+#: src/util/getopt.c:780
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ungültige Option -- %c\n"
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:259
-#: src/hostlist/hostlist-client.c:622
+#: src/util/getopt.c:808 src/util/getopt.c:938
 #, c-format
-msgid "# advertised URI `%s' downloaded"
-msgstr ""
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: Option benötigt einen Parameter -- %c\n"
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:274
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1338
-msgid "# advertised hostlist URIs"
-msgstr ""
+#: src/util/getopt.c:856
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: Option '-W %s' ist mehrdeutig\n"
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:286
-#: src/hostlist/hostlist-server.c:353
-#, fuzzy
-msgid "# hostlist advertisements send"
-msgstr "# Bekanntmachungen von anderen übertragen"
+#: src/util/getopt.c:874
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s: Option '-W %s' erlaubt keinen Parameter\n"
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:389
+#: src/util/getopt.c:1042
 #, c-format
-msgid "Hostlist file `%s' was removed\n"
+msgid "Use --help to get a list of options.\n"
+msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
+
+#: src/util/scheduler.c:863
+msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:253
-msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
+#: src/util/scheduler.c:994
+#, c-format
+msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:286
-#: src/topology/gnunet-daemon-topology.c:1315
-#: src/topology/gnunet-daemon-topology.c:1322 src/fs/gnunet-service-fs.c:519
+#: src/util/connection.c:462
 #, fuzzy, c-format
-msgid "Failed to connect to `%s' service.\n"
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+msgid "Access denied to `%s'\n"
+msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:306
-msgid "advertise our hostlist to other peers"
+#: src/util/connection.c:477
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:311
+#: src/util/connection.c:646
+#, fuzzy, c-format
 msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
-msgstr ""
+"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
+msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:314
-msgid "enable learning about hostlist servers from other peers"
-msgstr ""
+#: src/util/connection.c:858 src/util/connection.c:1034
+#, fuzzy, c-format
+msgid "Trying to connect to `%s' (%p)\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:318
-msgid "provide a hostlist server"
-msgstr ""
+#: src/util/connection.c:869
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' (%p)\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:330
-msgid "GNUnet hostlist server and client"
-msgstr ""
+#: src/util/connection.c:1024
+#, fuzzy, c-format
+msgid "Attempt to connect to `%s' failed\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/hostlist/hostlist-server.c:134
-#, fuzzy
-msgid "bytes in hostlist"
-msgstr "# bytes in der Datenbank"
-
-#: src/hostlist/hostlist-server.c:160
-msgid "expired addresses encountered"
+#: src/util/connection.c:1540
+#, c-format
+msgid ""
+"Could not satisfy pending transmission request, socket closed or connect "
+"failed (%p).\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:187
-#: src/topology/gnunet-daemon-topology.c:900
+#: src/util/connection.c:1576
 #, fuzzy, c-format
-msgid "Error in communication with PEERINFO service: %s\n"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+msgid "Failed to send to `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-server.c:208
-msgid "HELLOs without addresses encountered (ignored)"
+#: src/util/signal.c:81
+#, fuzzy, c-format
+msgid "signal (%d, %p) returned %d.\n"
+msgstr "Aufruf von `%s' gibt %d zurück.\n"
+
+#: src/util/network.c:1204
+#, c-format
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
-msgid "bytes not included in hostlist (size limit)"
+#: src/util/os_installation.c:295
+#, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
+#: src/util/os_installation.c:481
 #, fuzzy, c-format
-msgid "Refusing `%s' request to hostlist server\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/hostlist/hostlist-server.c:275
-#, fuzzy
-msgid "hostlist requests refused (not HTTP GET)"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/util/os_installation.c:486
+#, fuzzy, c-format
+msgid "stat (%s) failed: %s\n"
+msgstr "`%s' schlug fehl: %s\n"
 
-#: src/hostlist/hostlist-server.c:283
-msgid "Sending 100 CONTINUE reply\n"
+#: src/util/strings.c:144
+msgid "b"
+msgstr "b"
+
+#: src/util/strings.c:150
+msgid "KiB"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:290
-#, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\n"
+#: src/util/strings.c:154
+msgid "MiB"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:294
-#, fuzzy
-msgid "hostlist requests refused (upload data)"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/util/strings.c:158
+msgid "GiB"
+msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
-msgid "Could not handle hostlist request since I do not have a response yet\n"
+#: src/util/strings.c:162
+msgid "TiB"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:305
-#, fuzzy
-msgid "hostlist requests refused (not ready)"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/util/strings.c:198
+#, c-format
+msgid "Character set requested was `%s'\n"
+msgstr ""
 
-#: src/hostlist/hostlist-server.c:309
-msgid "Received request for our hostlist\n"
+#: src/util/strings.c:276
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:310
-#, fuzzy
-msgid "hostlist requests processed"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/util/strings.c:368
+msgid "ms"
+msgstr "ms"
 
-#: src/hostlist/hostlist-server.c:398
-msgid "Advertisement message could not be queued by core\n"
+#: src/util/strings.c:373
+msgid "eternity"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:556
-#: src/transport/gnunet-service-transport.c:462
-#: src/peerinfo-tool/gnunet-peerinfo.c:208 src/core/gnunet-service-core.c:4607
-#, fuzzy, c-format
-msgid "Could not access PEERINFO service.  Exiting.\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+#: src/util/strings.c:377
+msgid "s"
+msgstr "s"
 
-#: src/hostlist/hostlist-server.c:566
-#, fuzzy, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
-msgstr "Ungültige Parameter. Abbruch.\n"
+#: src/util/strings.c:381
+msgid "m"
+msgstr "m"
 
-#: src/hostlist/hostlist-server.c:575
-#, c-format
-msgid "Hostlist service starts on %s:%llu\n"
+#: src/util/strings.c:385
+msgid "h"
+msgstr "h"
+
+#: src/util/strings.c:389
+msgid " days"
+msgstr " Tage"
+
+#: src/util/strings.c:413
+msgid "end of time"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:589
+#: src/util/server.c:392
 #, fuzzy, c-format
-msgid "Address to obtain hostlist: `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/hostlist/hostlist-server.c:627
+#: src/util/server.c:400
 #, 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 "`%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/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:405
 #, 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:623
 #, 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: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/test_plugin_transport_https.c:829
-#: src/transport/test_plugin_transport_https.c:837
-#: src/transport/plugin_transport_http.c:2059
-#: src/transport/plugin_transport_http.c:2067
-#: src/transport/test_plugin_transport_http.c:795
-#: src/transport/test_plugin_transport_http.c:803
+#: src/util/crypto_random.c:240
 #, c-format
-msgid "%s failed at %s:%d: `%s'\n"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+msgid "Starting `%s' process to generate entropy\n"
+msgstr ""
 
-#: src/hostlist/hostlist-client.c:663
+#: src/util/crypto_random.c:267
 #, c-format
-msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
+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/hostlist/hostlist-client.c:805
+#: src/util/disk.c:435
 #, fuzzy, c-format
-msgid "Timeout trying to download hostlist from `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "`%s' failed for drive `%s': %u\n"
+msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/hostlist/hostlist-client.c:822
-#, c-format
-msgid "Download limit of %u bytes exceeded, stopping download\n"
-msgstr ""
+#: src/util/disk.c:837
+#, fuzzy, c-format
+msgid "Expected `%s' to be a directory!\n"
+msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/util/disk.c:1188 src/util/service.c:1473
 #, 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 "Cannot obtain information about user `%s': %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/hostlist/hostlist-client.c:848
+#: src/util/disk.c:1496
 #, 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"
+msgid "No `%s' specified for service `%s' in configuration.\n"
+msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/hostlist/hostlist-client.c:856
+#: src/util/service.c:118 src/util/service.c:144 src/util/service.c:188
+#: src/util/service.c:209 src/util/service.c:216
 #, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
-msgstr ""
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/hostlist/hostlist-client.c:909
+#: src/util/service.c:171
 #, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
-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:917
-msgid "# hostlist downloads initiated"
-msgstr ""
+#: src/util/service.c:265
+#, c-format
+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:1045 src/hostlist/hostlist-client.c:1511
-msgid "# milliseconds between hostlist downloads"
-msgstr ""
+#: src/util/service.c:301
+#, fuzzy, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/util/service.c:332
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Falsches Format `%s' für Netzwerk: %s\n"
+
+#: src/util/service.c:638
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
-msgid "Scheduled saving of hostlists\n"
+#: src/util/service.c:643
+#, fuzzy, c-format
+msgid "Unknown address family %d\n"
+msgstr "Unbekannte Operation `%s'\n"
+
+#: src/util/service.c:650
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/util/service.c:694
 #, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1117 src/hostlist/hostlist-client.c:1133
-#, fuzzy
-msgid "# active connections"
-msgstr "GNUnet Konfiguration"
-
-#: src/hostlist/hostlist-client.c:1249
+#: src/util/service.c:723
 #, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/util/service.c:841
 #, c-format
 msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1286
-#, 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:1290
+#: src/util/service.c:862 src/transport/plugin_transport_tcp.c:1939
 #, c-format
-msgid "Hostlist file `%s' is not existing\n"
+msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1301
-#, 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:1334
+#: src/util/service.c:893 src/util/client.c:712
 #, c-format
-msgid "%u hostlist URIs loaded from file\n"
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1336
-msgid "# hostlist URIs read from file"
+#: src/util/service.c:913
+#, 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:1369
+#: src/util/service.c:930
 #, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1383
+#: src/util/service.c:960 src/transport/plugin_transport_http.c:903
 #, fuzzy, c-format
-msgid "Could not open file `%s' for writing to save hostlists: %s\n"
+msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1388
+#: src/util/service.c:978 src/transport/plugin_transport_http.c:920
 #, fuzzy, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/hostlist/hostlist-client.c:1412 src/hostlist/hostlist-client.c:1429
+#: src/util/service.c:1135 src/util/service.c:1153
 #, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1424
-msgid "# hostlist URIs written to file"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1476
-msgid "Learning is enabled on this peer\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1479
+#: src/util/service.c:1181
 #, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1488
-msgid "Learning is not enabled on this peer\n"
-msgstr ""
+#: src/util/service.c:1333
+#, 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:1500
-#, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1504
+#: src/util/service.c:1366
 #, fuzzy, c-format
-msgid "Hostlist file `%s' could not be removed\n"
-msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
+msgid "Service `%s' runs at %s\n"
+msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:250
-msgid "# peers blacklisted"
+#: src/util/service.c:1414
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:402
-#, fuzzy
-msgid "# connect requests issued to core"
-msgstr "# Client Trace-Anfragen empfangen"
-
-#: src/topology/gnunet-daemon-topology.c:676
-#: src/topology/gnunet-daemon-topology.c:778
-#: src/transport/gnunet-service-transport_neighbours.c:465
-#: src/transport/gnunet-service-transport_neighbours.c:662
-#, fuzzy
-msgid "# peers connected"
-msgstr "# verbundener Knoten"
-
-#: src/topology/gnunet-daemon-topology.c:697
-#: src/topology/gnunet-daemon-topology.c:783
-#, fuzzy
-msgid "# friends connected"
-msgstr "# verbundener Knoten"
-
-#: src/topology/gnunet-daemon-topology.c:977
-msgid "Failed to connect to core service, can not manage topology!\n"
+#: src/util/service.c:1418
+msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1009
-#, c-format
-msgid "Option `%s' in section `%s' not specified!\n"
+#: src/util/service.c:1422
+msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1021
-#, 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:1027
-#, c-format
-msgid "Friends file `%s' is empty.\n"
+#: src/util/service.c:1474
+msgid "No such user"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1036
-#, 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"
-
-#: src/topology/gnunet-daemon-topology.c:1044
+#: src/util/service.c:1488
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/topology/gnunet-daemon-topology.c:1064
-#, fuzzy, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
-msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
-
-#: src/topology/gnunet-daemon-topology.c:1077
-#, 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:1087
-#, fuzzy, c-format
-msgid "Found friend `%s' in configuration\n"
-msgstr " gconfig\tGTK Konfiguration\n"
-
-#: src/topology/gnunet-daemon-topology.c:1093
-#, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
+#: src/util/service.c:1551
+msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1103
-#, fuzzy
-msgid "# friends in configuration"
-msgstr " gconfig\tGTK Konfiguration\n"
-
-#: src/topology/gnunet-daemon-topology.c:1109
-msgid ""
-"Fewer friends specified than required by minimum friend count. Will only "
-"connect to friends.\n"
+#: src/util/gnunet-resolver.c:76
+msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1116
-msgid ""
-"More friendly connections required than target total number of connections.\n"
+#: src/util/os_priority.c:117
+#, c-format
+msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1151
-#, fuzzy
-msgid "# HELLO messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
-
-#: src/topology/gnunet-daemon-topology.c:1208
-#, fuzzy
-msgid "# HELLO messages gossipped"
-msgstr "# ausgehender Nachrichten verworfen"
-
-#: src/topology/gnunet-daemon-topology.c:1348
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
-msgstr ""
-
-#: src/statistics/statistics_api.c:326
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/statistics/gnunet-statistics.c:89
+#: src/util/resolver_api.c:202
 #, fuzzy, c-format
-msgid "Failed to obtain statistics.\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+msgid "Must specify `%s' for `%s' in configuration!\n"
+msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
 
-#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
+#: src/util/resolver_api.c:221
 #, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/statistics/gnunet-statistics.c:155
-msgid "limit output to statistcs for the given NAME"
+msgid ""
+"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/statistics/gnunet-statistics.c:158
-msgid "make the value being set persistent"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:161
-msgid "limit output to the given SUBSYSTEM"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:168
-msgid "Print statistics about GNUnet operations."
-msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
-
-#: src/statistics/gnunet-service-statistics.c:208
+#: src/util/resolver_api.c:356
 #, fuzzy, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
-msgstr "Dateien aus dem GNUnet herunterladen."
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 
-#: src/statistics/gnunet-service-statistics.c:266
+#: src/util/resolver_api.c:360
 #, fuzzy, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
-msgstr "Dateien aus dem GNUnet herunterladen."
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/os_priority.c:110
+#: src/util/resolver_api.c:428
 #, c-format
-msgid "Not installing a handler because $%s=%s\n"
+msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/os_installation.c:291
+#: src/util/resolver_api.c:793
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/os_installation.c:474
-#, 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/util/os_installation.c:479
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "`%s' schlug fehl: %s\n"
-
-#: src/util/common_logging.c:154 src/util/common_logging.c:500
-#: src/util/test_common_logging.c:75
-msgid "DEBUG"
-msgstr "DEBUG"
-
-#: src/util/common_logging.c:156 src/util/common_logging.c:498
-#: src/util/test_common_logging.c:72
-msgid "INFO"
-msgstr "INFO"
-
-#: src/util/common_logging.c:158 src/util/common_logging.c:496
-#: src/util/test_common_logging.c:68
-msgid "WARNING"
-msgstr "WARNUNG"
-
-#: src/util/common_logging.c:160 src/util/common_logging.c:494
-#: src/util/test_common_logging.c:65
-msgid "ERROR"
-msgstr "FEHLER"
-
-#: src/util/common_logging.c:162
-msgid "NONE"
+#: src/util/resolver_api.c:877
+#, c-format
+msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:214 src/dht/plugin_dhtlog_mysql_dump.c:909
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:669
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:700
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:732
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:764
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:796
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:827
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:858
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:889
+#: src/util/resolver_api.c:882
 #, fuzzy, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+msgid "Could not resolve our FQDN : %s\n"
+msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/common_logging.c:331
+#: src/util/resolver_api.c:914
 #, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:501
-msgid "INVALID"
-msgstr ""
-
-#: src/util/common_logging.c:583
-#, fuzzy
-msgid "unknown address"
-msgstr "Unbekannter Fehler"
-
-#: src/util/common_logging.c:621
-#, fuzzy
-msgid "invalid address"
-msgstr "Ungültige Parameter: "
-
-#: src/util/pseudonym.c:263
+#: src/util/pseudonym.c:269
 #, 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:327
+#: src/util/pseudonym.c:333
 #, fuzzy
 msgid "no-name"
 msgstr "Name anzeigen"
 
-#: src/util/test_strings.c:42 src/util/strings.c:139
-msgid "b"
-msgstr "b"
-
-#: src/util/test_strings.c:45 src/util/strings.c:145
-msgid "KiB"
-msgstr ""
-
-#: src/util/test_strings.c:48 src/util/strings.c:157
-msgid "TiB"
-msgstr ""
-
-#: src/util/test_strings.c:51 src/util/strings.c:363
-msgid "ms"
-msgstr "ms"
-
-#: src/util/test_strings.c:56 src/util/strings.c:372
-msgid "s"
-msgstr "s"
-
-#: src/util/test_strings.c:61 src/util/strings.c:380
-msgid "h"
-msgstr "h"
-
-#: src/util/connection.c:457
+#: src/util/gnunet-service-resolver.c:262
 #, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
+msgid "Could not resolve `%s' (%s): %s\n"
+msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/connection.c:472
+#: src/util/gnunet-service-resolver.c:318
+#: src/util/gnunet-service-resolver.c:363
 #, c-format
-msgid "Accepting connection from `%s': %p\n"
-msgstr ""
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/util/connection.c:640
-#, 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/util/connection.c:852 src/util/connection.c:1028
-#, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/util/connection.c:863
-#, 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:1018
-#, 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:1534
+#: src/util/gnunet-service-resolver.c:462
 #, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
+msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/connection.c:1570
-#, fuzzy, c-format
-msgid "Failed to send to `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/util/plugin.c:87
+#: src/util/gnunet-service-resolver.c:509
 #, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
-
-#: src/util/plugin.c:144
-#, fuzzy, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
-"`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/plugin.c:217
+#: src/util/bio.c:137 src/util/bio.c:143
 #, 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/bio.c:134 src/util/bio.c:140
-#, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/bio.c:141
+#: src/util/bio.c:144
 #, fuzzy
 msgid "End of file"
 msgstr "Eine Konfigurationsdatei laden"
 
-#: src/util/bio.c:193
+#: src/util/bio.c:196
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:203
+#: src/util/bio.c:208
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:248
+#: src/util/bio.c:254
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:262
+#: src/util/bio.c:268
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/crypto_rsa.c:611 src/util/crypto_rsa.c:658
+#: src/util/client.c:303
+#, c-format
+msgid ""
+"Could not determine valid hostname and port for service `%s' from "
+"configuration.\n"
+msgstr ""
+
+#: src/util/client.c:311
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
+msgstr ""
+
+#: src/util/client.c:652
+msgid "Failure to transmit TEST request.\n"
+msgstr ""
+
+#: src/util/client.c:857
 #, 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/util/client.c:874
+#, fuzzy, c-format
+msgid "Failure to transmit request to service `%s'\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/util/client.c:1143
+msgid "Could not submit request, not expecting to receive a response.\n"
+msgstr ""
+
+#: src/util/crypto_rsa.c:624 src/util/crypto_rsa.c:672
+#, 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/util/crypto_rsa.c:616
+#: src/util/crypto_rsa.c:629
 #, 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:634
+#: src/util/crypto_rsa.c:648
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:662 src/util/crypto_rsa.c:698
+#: src/util/crypto_rsa.c:676 src/util/crypto_rsa.c:714
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:693
+#: src/util/crypto_rsa.c:709
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:714
+#: src/util/crypto_rsa.c:730
 #, 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:732
+#: src/util/crypto_rsa.c:748
 #, 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:953
+#: src/util/crypto_rsa.c:970
 #, 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/server.c:384
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
-
-#: src/util/server.c:392
-#, 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/util/server.c:397
-#, 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:612
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+#: src/nse/gnunet-nse-profiler.c:650 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:591
+#: src/fs/gnunet-download.c:263
+msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/util/network.c:1194
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
-msgstr ""
+#: src/nse/gnunet-nse-profiler.c:668
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/util/crypto_random.c:236
+#: src/nse/gnunet-service-nse.c:875
 #, c-format
-msgid "Starting `%s' process to generate entropy\n"
+msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/util/crypto_random.c:263
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
+#: src/nse/gnunet-service-nse.c:1298 src/nse/gnunet-service-nse.c:1317
+#: src/nse/gnunet-service-nse.c:1338
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
-"libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/test_resolver_api.c:53
-#, c-format
-msgid "Got IP address `%s' for our host.\n"
-msgstr ""
+#: src/nse/gnunet-service-nse.c:1305
+#, fuzzy
+msgid "Invalid work requirement for NSE service. Exiting.\n"
+msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/util/test_resolver_api.c:147 src/util/resolver_api.c:873
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
-msgstr ""
+#: src/nse/gnunet-service-nse.c:1326
+#, fuzzy
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/util/test_resolver_api.c:154
+#: src/peerinfo/gnunet-service-peerinfo.c:136
 #, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s %u\n"
-msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/util/test_resolver_api.c:264
-#, c-format
-msgid "gethostbyname() could not lookup IP address: %s\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:197
+msgid "# peers known"
 msgstr ""
 
-#: src/util/test_resolver_api.c:329
+#: src/peerinfo/gnunet-service-peerinfo.c:241
 #, c-format
-msgid "gethostbyaddr() could not lookup hostname: %s\n"
+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/util/configuration.c:244
+#: src/peerinfo/gnunet-service-peerinfo.c:306
 #, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
-msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
+msgid "Still no peers found in `%s'!\n"
+msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/util/configuration.c:801
-#, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
-msgstr ""
+#: 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/util/gnunet-resolver.c:76
-msgid "Test GNUnet DNS resolver code."
-msgstr ""
+#: src/peerinfo/peerinfo_api.c:278
+#, fuzzy, c-format
+msgid "Failed to transmit message to `%s' service.\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/util/client.c:304
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
-msgstr ""
+#: src/peerinfo/peerinfo_api.c:433
+#, fuzzy
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/util/client.c:312
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
+#, fuzzy
+msgid "Received invalid message from `PEERINFO' service.\n"
+msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
+
+#: src/peerinfo/peerinfo_api.c:521
+#, 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:555
+msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/util/client.c:669
-msgid "Failure to transmit TEST request.\n"
+#: src/datacache/plugin_datacache_sqlite.c:439
+msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/util/client.c:729 src/util/service.c:880
+#: src/datacache/datacache.c:177
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/util/client.c:871
+#: src/datacache/datacache.c:185
 #, fuzzy, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+msgid "Failed to load datacache plugin for `%s'\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/util/client.c:887
-#, fuzzy, c-format
-msgid "Failure to transmit request to service `%s'\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+#: src/datacache/datacache.c:276
+#, fuzzy
+msgid "# requests received"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/util/client.c:1158
-msgid "Could not submit request, not expecting to receive a response.\n"
+#: src/datacache/datacache.c:287
+msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/util/scheduler.c:859
-msgid "Looks like we're busy waiting...\n"
-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/util/scheduler.c:990
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
+#: src/datacache/plugin_datacache_postgres.c:500
+msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/util/strings.c:149
-msgid "MiB"
+#: src/datacache/plugin_datacache_template.c:121
+msgid "Template datacache running\n"
 msgstr ""
 
-#: src/util/strings.c:153
-msgid "GiB"
+#: src/datacache/plugin_datacache_mysql.c:979
+msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/util/strings.c:193
-#, c-format
-msgid "Character set requested was `%s'\n"
+#: src/dht/gnunet-service-dht_neighbours.c:479
+msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/util/strings.c:271
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr ""
+#: src/dht/gnunet-service-dht_neighbours.c:571
+#, fuzzy
+msgid "# FIND PEER messages initiated"
+msgstr "# PING Nachrichten erstellt"
 
-#: src/util/strings.c:368
-msgid "eternity"
-msgstr ""
+#: src/dht/gnunet-service-dht_neighbours.c:632
+#: src/dht/gnunet-service-dht_neighbours.c:697
+#, fuzzy
+msgid "# Peers connected"
+msgstr "# verbundener Knoten"
 
-#: src/util/strings.c:376
-msgid "m"
-msgstr "m"
+#: src/dht/gnunet-service-dht_neighbours.c:734
+#, fuzzy
+msgid "# Queued messages discarded (peer disconnected)"
+msgstr "# defragmentierter Nachrichten"
 
-#: src/util/strings.c:384
-msgid " days"
-msgstr " Tage"
+#: src/dht/gnunet-service-dht_neighbours.c:787
+#, fuzzy
+msgid "# Bytes transmitted to other peers"
+msgstr "# Bytes des Typs %d übertragen"
 
-#: src/util/strings.c:408
-msgid "end of time"
+#: src/dht/gnunet-service-dht_neighbours.c:824
+#, fuzzy
+msgid "# Bytes of bandwdith requested from core"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1051
+#: src/dht/gnunet-service-dht_neighbours.c:1078
+msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/util/disk.c:429
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%s': %u\n"
-msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1060
+#: src/dht/gnunet-service-dht_neighbours.c:1096
+#, fuzzy
+msgid "# Peer selection failed"
+msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/util/disk.c:829
-#, fuzzy, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1238
+#, fuzzy
+msgid "# PUT requests routed"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/util/disk.c:1180 src/util/service.c:1456
-#, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1267
+#, fuzzy
+msgid "# PUT messages queued for transmission"
+msgstr "# PING Nachrichten erstellt"
 
-#: src/util/disk.c:1486
-#, fuzzy, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
-msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1352
+#, fuzzy
+msgid "# GET requests routed"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/util/resolver_api.c:198
-#, fuzzy, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
-msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1384
+#, fuzzy
+msgid "# GET messages queued for transmission"
+msgstr "# PING Nachrichten erstellt"
 
-#: src/util/resolver_api.c:217
-#, fuzzy, c-format
-msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1485
+#, fuzzy
+msgid "# RESULT messages queued for transmission"
+msgstr "# PING Nachrichten erstellt"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1574
+#, fuzzy
+msgid "# P2P PUT requests received"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1700
+msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
-"Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
-"positive Zahl angeben.\n"
 
-#: src/util/resolver_api.c:354
-#, 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/dht/gnunet-service-dht_neighbours.c:1707
+msgid "# FIND PEER requests ignored due to lack of HELLO"
+msgstr ""
 
-#: src/util/resolver_api.c:358
-#, fuzzy, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1800
+#, fuzzy
+msgid "# P2P GET requests received"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/util/resolver_api.c:427
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1853
+#, fuzzy
+msgid "# P2P FIND PEER requests processed"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1872
+#, fuzzy
+msgid "# P2P GET requests ONLY routed"
+msgstr "# dht Anfragen weitergeleitet"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1941
+#, fuzzy
+msgid "# P2P RESULTS received"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/dht/dht_api.c:229
+#, fuzzy
+msgid "Failed to connect to the DHT service!\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/dht/gnunet-service-dht.c:165
+#, 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"
 msgstr ""
 
-#: src/util/resolver_api.c:789
-#, c-format
-msgid "Resolver returns `%s'.\n"
+#: src/dht/gnunet-dht-get.c:204
+msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/util/resolver_api.c:879
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s\n"
-msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
+#: src/dht/gnunet-dht-get.c:207
+msgid "the type of data to look for"
+msgstr ""
 
-#: src/util/resolver_api.c:911
-#, c-format
-msgid "Resolving our hostname `%s'\n"
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
+msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: 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/dht/gnunet-dht-get.c:232
+msgid "Issue a GET request to the GNUnet DHT, prints results."
+msgstr ""
 
-#: 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/dht/gnunet-service-dht_clients.c:321
+#, fuzzy
+msgid "# GET requests from clients injected"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/util/gnunet-service-resolver.c:460
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
+#: src/dht/gnunet-service-dht_clients.c:413
+#, fuzzy
+msgid "# PUT requests received from clients"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
+#: src/dht/gnunet-service-dht_clients.c:486
+#, fuzzy
+msgid "# GET requests received from clients"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
+#: src/dht/gnunet-service-dht_clients.c:585
+#, fuzzy
+msgid "# GET STOP requests received from clients"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
+#: src/dht/gnunet-service-dht_clients.c:790
+msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:508
-#, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
+#: src/dht/gnunet-service-dht_clients.c:808
+msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/util/getopt.c:668
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: Option `%s' ist mehrdeutig\n"
+#: src/dht/gnunet-service-dht_clients.c:852
+#, fuzzy, c-format
+msgid "Unsupported block type (%u) in request!\n"
+msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/util/getopt.c:692
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: Option '--%s' erlaubt keinen Parameter\n"
+#: src/dht/gnunet-service-dht_clients.c:875
+#, fuzzy
+msgid "# RESULTS queued for clients"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/util/getopt.c:697
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s: Option '%c%s' erlaubt keinen Parameter\n"
+#: src/dht/gnunet-service-dht_clients.c:928
+#: src/dht/gnunet-service-dht_clients.c:971
+msgid "# REPLIES ignored for CLIENTS (no match)"
+msgstr ""
 
-#: src/util/getopt.c:714 src/util/getopt.c:882
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: Option `%s' benötigt einen Parameter\n"
+#: src/dht/gnunet-service-dht_clients.c:937
+#, fuzzy
+msgid "Could not pass reply to client, message too big!\n"
+msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/util/getopt.c:743
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: unbekannte Option '--%s'\n"
+#: src/dht/gnunet-service-dht_nse.c:59
+#, fuzzy
+msgid "# Network size estimates received"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/util/getopt.c:747
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: unbekannte Option '%c%s'\n"
+#: src/dht/gnunet-dht-put.c:100
+#, fuzzy, c-format
+msgid "PUT request sent!\n"
+msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/util/getopt.c:772
+#: src/dht/gnunet-dht-put.c:124
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: unerlaubte Option -- %c\n"
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
 
-#: src/util/getopt.c:774
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ungültige Option -- %c\n"
+#: 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/util/getopt.c:802 src/util/getopt.c:930
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: Option benötigt einen Parameter -- %c\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/util/getopt.c:850
+#: src/dht/gnunet-dht-put.c:152
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: Option '-W %s' ist mehrdeutig\n"
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
 
-#: src/util/getopt.c:868
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s: Option '-W %s' erlaubt keinen Parameter\n"
+#: src/dht/gnunet-dht-put.c:166
+msgid "the data to insert under the key"
+msgstr ""
 
-#: src/util/getopt.c:1034
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
+#: src/dht/gnunet-dht-put.c:169
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr ""
 
-#: src/util/signal.c:78
-#, fuzzy, c-format
-msgid "signal (%d, %p) returned %d.\n"
-msgstr "Aufruf von `%s' gibt %d zurück.\n"
+#: src/dht/gnunet-dht-put.c:175
+msgid "how many replicas to create"
+msgstr ""
 
-#: src/util/getopt_helpers.c:82
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
+#: src/dht/gnunet-dht-put.c:178
+msgid "the type to insert data as"
 msgstr ""
-"Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
-"Optionen zwingend.\n"
 
-#: src/util/getopt_helpers.c:253 src/util/getopt_helpers.c:281
-#, 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/dht/gnunet-dht-put.c:203
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr ""
 
-#: src/util/service.c:112 src/util/service.c:138 src/util/service.c:182
-#: src/util/service.c:202 src/util/service.c:209
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Ungültiges Format für IP: `%s'\n"
+#: src/dht/gnunet-service-dht_routing.c:220
+msgid "# Good REPLIES matched against routing table"
+msgstr ""
 
-#: src/util/service.c:165
-#, 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/dht/gnunet-service-dht_routing.c:235
+msgid "# Duplicate REPLIES matched against routing table"
+msgstr ""
 
-#: src/util/service.c:258
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
+#: src/dht/gnunet-service-dht_routing.c:240
+msgid "# Invalid REPLIES matched against routing table"
+msgstr ""
 
-#: src/util/service.c:292
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Falsches Format `%s' für Netzmaske: %s\n"
+#: src/dht/gnunet-service-dht_routing.c:249
+msgid "# Unsupported REPLIES matched against routing table"
+msgstr ""
 
-#: src/util/service.c:323
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Falsches Format `%s' für Netzwerk: %s\n"
+#: src/dht/gnunet-service-dht_routing.c:332
+#: src/dht/gnunet-service-dht_routing.c:390
+msgid "# Entries removed from routing table"
+msgstr ""
 
-#: src/util/service.c:627
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
+#: src/dht/gnunet-service-dht_routing.c:342
+msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/util/service.c:632
+#: src/dht/gnunet-service-dht_datacache.c:92
 #, fuzzy, c-format
-msgid "Unknown address family %d\n"
-msgstr "Unbekannte Operation `%s'\n"
+msgid "%s request received, but have no datacache!\n"
+msgstr "# Bytes empfangen über TCP"
 
-#: src/util/service.c:639
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
+#: src/dht/gnunet-service-dht_datacache.c:103
+msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/util/service.c:683
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+#: src/dht/gnunet-service-dht_datacache.c:215
+msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:712
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+#: src/dht/gnunet-service-dht_datacache.c:229
+msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:829
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+#: src/dht/gnunet-service-dht_datacache.c:234
+msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1927
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+#: src/dht/gnunet-service-dht_datacache.c:245
+msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:900
+#: src/dht/gnunet-service-dht_datacache.c:248
 #, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+msgid "Unsupported block type (%u) in local response!\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/dht/gnunet-service-dht_datacache.c:280
+#, fuzzy
+msgid "# GET requests given to datacache"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/util/service.c:947
+#: src/dht/gnunet-service-dht_hello.c:86
+#, fuzzy
+msgid "# HELLOs obtained from peerinfo"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
+#: src/arm/gnunet-arm.c:161
 #, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "Service `%s' has been started.\n"
+msgstr "Dienst gelöscht.\n"
 
-#: src/util/service.c:965
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
+msgid "Failed to stop service `%s'!\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/util/service.c:1121 src/util/service.c:1139
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:171
+#, fuzzy, c-format
+msgid "Service `%s' has been stopped.\n"
+msgstr "Dienst gelöscht.\n"
 
-#: src/util/service.c:1166
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:175
+#, fuzzy, c-format
+msgid "Failed to start service `%s'!\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/util/service.c:1315
+#: src/arm/gnunet-arm.c:181
 #, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+msgid "Some error communicating with service `%s'.\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/util/service.c:1349
+#: src/arm/gnunet-arm.c:207
 #, fuzzy, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
+msgid "Service `%s' is running.\n"
+msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/util/service.c:1397
-msgid "Service process failed to initialize\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:212
+#, fuzzy, c-format
+msgid "Service `%s' is not running.\n"
+msgstr "`%s' ist keine Datei.\n"
 
-#: src/util/service.c:1401
-msgid "Service process could not initialize server function\n"
+#: src/arm/gnunet-arm.c:238
+#, 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/util/service.c:1405
-msgid "Service process failed to report status\n"
+#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
+msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/util/service.c:1457
-msgid "No such user"
-msgstr ""
+#: src/arm/gnunet-arm.c:269
+#, fuzzy, c-format
+msgid "Failed to remove configuration file %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/util/service.c:1471
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
+#: src/arm/gnunet-arm.c:275
+#, fuzzy, c-format
+msgid "Failed to remove servicehome directory %s\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/util/service.c:1534
-msgid "do daemonize (detach from terminal)"
+#: src/arm/gnunet-arm.c:387
+msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/fs/fs_uri.c:214
-#, c-format
-msgid "`%' must be followed by HEX number"
+#: src/arm/gnunet-arm.c:389
+msgid "start a particular service"
 msgstr ""
 
-#: src/fs/fs_uri.c:273
-#, fuzzy
-msgid "Malformed KSK URI (must not begin or end with `+')"
-msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
-
-#: src/fs/fs_uri.c:291
-msgid "`++' not allowed in KSK URI"
+#: src/arm/gnunet-arm.c:391
+msgid "stop a particular service"
 msgstr ""
 
-#: src/fs/fs_uri.c:298
-msgid "Quotes not balanced in KSK URI"
+#: src/arm/gnunet-arm.c:393
+msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
-msgid "Malformed SKS URI"
+#: src/arm/gnunet-arm.c:396
+msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
-msgid "Malformed CHK URI"
+#: src/arm/gnunet-arm.c:399
+msgid "test if a particular service is running"
 msgstr ""
 
-#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
-#: src/fs/fs_uri.c:615
-msgid "SKS URI malformed"
+#: src/arm/gnunet-arm.c:402
+msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
-msgid "SKS URI malformed (could not decode public key)"
+#: src/arm/gnunet-arm.c:404
+msgid "don't print status messages"
 msgstr ""
 
-#: src/fs/fs_uri.c:603
-msgid "SKS URI malformed (could not find signature)"
-msgstr ""
+#: src/arm/gnunet-arm.c:407
+#, fuzzy
+msgid "timeout for completing current operation"
+msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
 
-#: src/fs/fs_uri.c:609
-msgid "SKS URI malformed (could not decode signature)"
+#: src/arm/gnunet-arm.c:418
+msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/fs/fs_uri.c:622
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
+#, fuzzy
+msgid "Failed to transmit shutdown ACK.\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
+msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:634
-msgid "SKS URI malformed (signature failed validation)"
+#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
+msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:672
-msgid "Unrecognized URI type"
+#: src/arm/gnunet-service-arm.c:206
+#, c-format
+msgid "Restarting service `%s' due to configuration file change.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:897
+#: src/arm/gnunet-service-arm.c:234
 #, fuzzy
-msgid "Lacking key configuration settings.\n"
-msgstr "GNUnet Konfiguration"
+msgid "Could not send status result to client\n"
+msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/fs/fs_uri.c:904
+#: src/arm/gnunet-service-arm.c:268
+msgid "Not sending status result to client: no client known\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:406
 #, fuzzy, c-format
-msgid "Could not access hostkey file `%s'.\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+msgid "Failed to start service `%s'\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/fs/fs_uri.c:1212 src/fs/fs_uri.c:1239
-msgid "No keywords specified!\n"
-msgstr "Keine Schlüsselwörter angegeben!\n"
+#: src/arm/gnunet-service-arm.c:409
+#, fuzzy, c-format
+msgid "Starting service `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/fs_uri.c:1245
-msgid "Number of double-quotes not balanced!\n"
+#: src/arm/gnunet-service-arm.c:435
+#, c-format
+msgid "ARM is shutting down, service `%s' not started.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
+#: src/arm/gnunet-service-arm.c:443
 #, 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 "Service `%s' already running.\n"
+msgstr "Diese Suche läuft bereits!\n"
 
-#: src/fs/fs_list_indexed.c:117
+#: src/arm/gnunet-service-arm.c:453
 #, 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"
+msgid "Binary implementing service `%s' not known!\n"
+msgstr ""
+"Signatur kann nicht verifiziert werden, der Knoten `%s' ist uns nicht "
+"bekannt!\n"
 
-#: src/fs/fs_list_indexed.c:164
+#: src/arm/gnunet-service-arm.c:464
 #, fuzzy, c-format
-msgid "Failed to not connect to `%s' service.\n"
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+msgid "Configuration file `%s' for service `%s' not known!\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
-#: src/fs/gnunet-service-fs_lc.c:480
-#, fuzzy
-msgid "# client searches active"
-msgstr "# gap Anfragen insgesamt empfangen"
+#: src/arm/gnunet-service-arm.c:498
+#, fuzzy, c-format
+msgid "Preparing to stop `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:254
-#, fuzzy
-msgid "# replies received for local clients"
-msgstr "# gap Anfragen insgesamt empfangen"
-
-#: src/fs/gnunet-service-fs_lc.c:312
-#, fuzzy
-msgid "# client searches received"
-msgstr "# gap Anfragen insgesamt empfangen"
-
-#: src/fs/gnunet-service-fs_lc.c:351
-msgid "# client searches updated (merged content seen list)"
+#: src/arm/gnunet-service-arm.c:666
+msgid "Stopping all services\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
+#: src/arm/gnunet-service-arm.c:723
 #, fuzzy, c-format
-msgid "Publishing failed: %s"
+msgid "Restarting service `%s'.\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/arm/gnunet-service-arm.c:796
+msgid "exit"
 msgstr ""
-"\n"
-"Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
-#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
-#, fuzzy, c-format
-msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
-msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
-
-#: src/fs/fs_publish.c:649
-msgid "timeout on index-start request to `fs' service"
+#: src/arm/gnunet-service-arm.c:801
+msgid "signal"
 msgstr ""
 
-#: src/fs/fs_publish.c:661
+#: src/arm/gnunet-service-arm.c:806
 #, fuzzy
-msgid "unknown error"
+msgid "unknown"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_publish.c:704
-msgid "failed to compute hash"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:813
+#, fuzzy, c-format
+msgid "Service `%s' stopped\n"
+msgstr "Dienst gelöscht.\n"
 
-#: src/fs/fs_publish.c:724
-msgid "filename too long"
+#: src/arm/gnunet-service-arm.c:827
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:751
+#: src/arm/arm_api.c:201
 #, fuzzy
-msgid "could not connect to `fs' service"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+msgid "Failed to transmit shutdown request to client.\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/fs/fs_publish.c:775
+#: src/arm/arm_api.c:389
 #, fuzzy, c-format
-msgid "Failed to get file identifiers for `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\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/fs/fs_publish.c:845
+#: src/arm/arm_api.c:403
 #, fuzzy, c-format
-msgid "Recursive upload failed at `%s': %s"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\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/fs/fs_publish.c:851
+#: src/arm/arm_api.c:467
 #, fuzzy, c-format
-msgid "Recursive upload failed: %s"
+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:536
+#, c-format
+msgid "Requesting start of service `%s'.\n"
 msgstr ""
-"\n"
-"Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:899
-#, fuzzy
-msgid "needs to be an actual file"
-msgstr "`%s' ist keine normale Datei.\n"
+#: src/arm/arm_api.c:537
+#, c-format
+msgid "Requesting termination of service `%s'.\n"
+msgstr ""
 
-#: src/fs/fs_publish.c:1078
+#: src/arm/arm_api.c:559
 #, c-format
-msgid "Insufficient space for publishing: %s"
+msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1149
+#: src/arm/arm_api.c:560
 #, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
+msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1482
-#, fuzzy
-msgid "Could not connect to datastore."
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+#: src/arm/arm_api.c:592
+#, fuzzy, c-format
+msgid "Asked to start service `%s' within %llu ms\n"
+msgstr "`%s': Nachricht wurde nicht innerhalb %llu ms empfangen.\n"
 
-#: src/fs/fs_publish.c:1518 src/fs/fs_namespace.c:822
-#, fuzzy
-msgid "Internal error."
-msgstr "Unbekannter Fehler.\n"
-
-#: src/fs/gnunet-download.c:100
+#: src/arm/arm_api.c:664
 #, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "Collection `%s' begonnen.\n"
+msgid "Stopping service `%s' within %llu ms\n"
+msgstr "Keine Antwort innerhalb %llums erhalten.\n"
 
-#: src/fs/gnunet-download.c:112
+#: src/arm/gnunet-service-arm_interceptor.c:803
 #, c-format
-msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
+msgid "Unable to forward to service `%s': shutdown\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:121
+#: src/arm/gnunet-service-arm_interceptor.c:812
+#, c-format
+msgid "Unable to forward to service `%s': timeout before connect\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm_interceptor.c:868
 #, fuzzy, c-format
-msgid "Error downloading: %s.\n"
-msgstr "Fehler beim Download: %s\n"
+msgid "Unable to start service `%s': %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/fs/gnunet-download.c:129
+#: src/arm/gnunet-service-arm_interceptor.c:936
 #, fuzzy, c-format
-msgid "Downloading `%s' done (%s/s).\n"
-msgstr "Upload abgewiesen!"
+msgid "Unable to accept connection for service `%s': %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/fs/gnunet-download.c:144 src/fs/gnunet-unindex.c:109
-#: src/fs/gnunet-search.c:190 src/fs/gnunet-publish.c:155
-#, c-format
-msgid "Unexpected status: %d\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:169
+#: src/arm/gnunet-service-arm_interceptor.c:952
 #, fuzzy, c-format
-msgid "You need to specify a URI argument.\n"
-msgstr "Sie müssen einen Empfänger angeben!\n"
+msgid "Service `%s' started\n"
+msgstr "Dienst gelöscht.\n"
 
-#: src/fs/gnunet-download.c:175 src/fs/gnunet-publish.c:426
+#: src/arm/gnunet-service-arm_interceptor.c:1080
 #, fuzzy, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "Datei `%s' hat URI: %s\n"
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/fs/gnunet-download.c:182
+#: src/arm/gnunet-service-arm_interceptor.c:1102
 #, c-format
-msgid "Only CHK or LOC URIs supported.\n"
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
+#: src/arm/gnunet-service-arm_interceptor.c:1116
 #, c-format
-msgid "Target filename must be specified.\n"
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:203 src/fs/gnunet-unindex.c:141
-#: src/fs/gnunet-search.c:241 src/fs/gnunet-publish.c:404
-#, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+#: src/fragmentation/defragmentation.c:270
+msgid "# acknowledgements sent for fragment"
+msgstr ""
 
-#: src/fs/gnunet-download.c:240 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/fragmentation/defragmentation.c:454
+#, fuzzy
+msgid "# fragments received"
+msgstr "# verworfener Nachrichten"
 
-#: src/fs/gnunet-download.c:243
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
-msgstr ""
+#: src/fragmentation/defragmentation.c:513
+#, fuzzy
+msgid "# duplicate fragments received"
+msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-download.c:246 src/fs/gnunet-search.c:288
-msgid "only search the local peer (no P2P network search)"
-msgstr ""
+#: src/fragmentation/defragmentation.c:526
+msgid "# messages defragmented"
+msgstr "# defragmentierter Nachrichten"
 
-#: src/fs/gnunet-download.c:249
-msgid "write the file to FILENAME"
-msgstr "Schreibe die Datei in DATEINAME"
+#: src/fragmentation/fragmentation.c:183
+#, fuzzy
+msgid "# fragments transmitted"
+msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fs/gnunet-download.c:253
-msgid "set the maximum number of parallel downloads that is allowed"
+#: src/fragmentation/fragmentation.c:186
+#, fuzzy
+msgid "# fragments retransmitted"
+msgstr "# Selbstbekanntmachungen übertragen"
+
+#: src/fragmentation/fragmentation.c:248
+msgid "# messages fragmented"
+msgstr "# fragmentierter Nachrichten"
+
+#: src/fragmentation/fragmentation.c:251
+msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
-msgid "set the maximum number of parallel requests for blocks that is allowed"
+#: src/fragmentation/fragmentation.c:335
+#, fuzzy
+msgid "# fragment acknowledgements received"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/fragmentation/fragmentation.c:341
+msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fs/gnunet-download.c:260
-msgid "download a GNUnet directory recursively"
-msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
+#: src/fragmentation/fragmentation.c:365
+#, fuzzy
+msgid "# fragmentation transmissions completed"
+msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-download.c:263 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:585
-#: src/mesh/test_mesh_small.c:676 src/dht/gnunet-dht-get-peer.c:190
-#: src/dht/gnunet-dht-put.c:176 src/dht/gnunet-dht-get.c:204
-#: src/nse/gnunet-nse-profiler.c:655
-msgid "be verbose (print progress information)"
+#: src/statistics/gnunet-service-statistics.c:208
+#, fuzzy, c-format
+msgid "Loading %llu bytes of statistics from `%s'\n"
+msgstr "Dateien aus dem GNUnet herunterladen."
+
+#: src/statistics/gnunet-service-statistics.c:266
+#, fuzzy, c-format
+msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgstr "Dateien aus dem GNUnet herunterladen."
+
+#: src/statistics/statistics_api.c:325
+#, fuzzy
+msgid "Failed to connect to statistics service!\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/statistics/gnunet-statistics.c:89
+#, fuzzy, c-format
+msgid "Failed to obtain statistics.\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/statistics/gnunet-statistics.c:155
+msgid "limit output to statistcs for the given NAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:270
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+#: src/statistics/gnunet-statistics.c:158
+msgid "make the value being set persistent"
 msgstr ""
 
+#: src/statistics/gnunet-statistics.c:161
+msgid "limit output to the given SUBSYSTEM"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:168
+msgid "Print statistics about GNUnet operations."
+msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
+
 #: src/fs/gnunet-unindex.c:89
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
@@ -2199,11 +2086,23 @@
 msgid "Unindexing done.\n"
 msgstr "Dateien deindizieren."
 
+#: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
+#: src/fs/gnunet-publish.c:158 src/fs/gnunet-download.c:144
+#, c-format
+msgid "Unexpected status: %d\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/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
+#: src/fs/gnunet-publish.c:412 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
 #, fuzzy, c-format
 msgid "Could not start unindex operation.\n"
@@ -2213,55 +2112,6 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
-#, 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:107
-#, fuzzy, c-format
-msgid "Failed to open `%s' for writing: %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
-#, 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:323
-#, fuzzy
-msgid "Unknown error"
-msgstr "Unbekannter Fehler"
-
-#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
-#, fuzzy
-msgid "Failed to serialize meta data"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
-
-#: src/fs/fs_namespace.c:452
-#, fuzzy
-msgid "Failed to connect to datastore service"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/fs/fs_namespace.c:495
-#, 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:597
-#, 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:866
-#, fuzzy
-msgid "Failed to connect to datastore."
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
-
 #: src/fs/gnunet-pseudonym.c:165
 #, fuzzy, c-format
 msgid "Namespace `%s' unknown.\n"
@@ -2273,7 +2123,7 @@
 msgid "Option `%s' ignored\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:532
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:538
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
 
@@ -2294,7 +2144,7 @@
 "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:551
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:557
 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 "
@@ -2313,7 +2163,7 @@
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:570
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:576
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2331,6 +2181,60 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
+#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
+#, 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:107
+#, fuzzy, c-format
+msgid "Failed to open `%s' for writing: %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
+#, 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:323
+#, fuzzy
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
+
+#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+#, fuzzy
+msgid "Failed to serialize meta data"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#: src/fs/fs_namespace.c:452
+#, fuzzy
+msgid "Failed to connect to datastore service"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/fs/fs_namespace.c:495
+#, 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:597
+#, 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:822 src/fs/fs_publish.c:1518
+#, fuzzy
+msgid "Internal error."
+msgstr "Unbekannter Fehler.\n"
+
+#: src/fs/fs_namespace.c:866
+#, 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"
@@ -2351,6 +2255,14 @@
 msgid "Could not start searching.\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\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/gnunet-search.c:288 src/fs/gnunet-download.c:246
+msgid "only search the local peer (no P2P network search)"
+msgstr ""
+
 #: src/fs/gnunet-search.c:291
 msgid "write search results to file starting with PREFIX"
 msgstr ""
@@ -2367,212 +2279,174 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/fs_unindex.c:58
-msgid "Failed to find given position in file"
+#: src/fs/fs_uri.c:214
+#, c-format
+msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_uri.c:273
 #, fuzzy
-msgid "Failed to read file"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+msgid "Malformed KSK URI (must not begin or end with `+')"
+msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_unindex.c:235
-msgid "Unexpected time for a response from `fs' service."
+#: src/fs/fs_uri.c:291
+msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_unindex.c:243
-msgid "Timeout waiting for `fs' service."
+#: src/fs/fs_uri.c:298
+msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_unindex.c:251
-#, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "Ungültige Antwort auf `%s'.\n"
+#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
+msgid "Malformed SKS URI"
+msgstr ""
 
-#: src/fs/fs_unindex.c:296
-#, fuzzy
-msgid "Failed to connect to FS service for unindexing."
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
+msgid "Malformed CHK URI"
+msgstr ""
 
-#: src/fs/fs_unindex.c:331
-#, fuzzy
-msgid "Failed to connect to `datastore' service."
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
+#: src/fs/fs_uri.c:615
+msgid "SKS URI malformed"
+msgstr ""
 
-#: src/fs/fs_unindex.c:344
-#, fuzzy
-msgid "Failed to open file for unindexing."
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+#: src/fs/fs_uri.c:597
+msgid "SKS URI malformed (could not decode public key)"
+msgstr ""
 
-#: src/fs/fs_unindex.c:378
-#, fuzzy
-msgid "Failed to compute hash of file."
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+#: src/fs/fs_uri.c:603
+msgid "SKS URI malformed (could not find signature)"
+msgstr ""
 
-#: src/fs/gnunet-directory.c:49
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
+#: src/fs/fs_uri.c:609
+msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
-#, fuzzy, c-format
-msgid "Directory `%s' meta data:\n"
-msgstr "==> Verzeichnis `%s':\n"
+#: src/fs/fs_uri.c:622
+msgid "SKS URI malformed (could not parse expiration time)"
+msgstr ""
 
-#: 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, c-format
-msgid "You must specify a filename to inspect."
-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:176
-#, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#: src/fs/fs_file_information.c:349
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s': %s"
-msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
-
-#: 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/gnunet-service-fs_pe.c:228
-msgid "# average retransmission delay (ms)"
+#: src/fs/fs_uri.c:634
+msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:334
-msgid "# queries messages sent to other peers"
+#: src/fs/fs_uri.c:672
+msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:457
+#: src/fs/fs_uri.c:897
 #, fuzzy
-msgid "# requests merged"
-msgstr "# Client Trace-Anfragen empfangen"
+msgid "Lacking key configuration settings.\n"
+msgstr "GNUnet Konfiguration"
 
-#: src/fs/gnunet-service-fs_pe.c:463
-#, fuzzy
-msgid "# requests refreshed"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/fs/fs_uri.c:904
+#, fuzzy, c-format
+msgid "Could not access hostkey file `%s'.\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:511 src/fs/gnunet-service-fs_pe.c:586
-#: src/fs/gnunet-service-fs_pe.c:622
-msgid "# query plan entries"
-msgstr ""
+#: src/fs/fs_uri.c:1238 src/fs/fs_uri.c:1265
+msgid "No keywords specified!\n"
+msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_getopt.c:191
-#, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+#: src/fs/fs_uri.c:1271
+msgid "Number of double-quotes not balanced!\n"
 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-publish.c:115
+#: src/fs/gnunet-publish.c:118
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:123
+#: src/fs/gnunet-publish.c:126
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-publish.c:134
+#: src/fs/gnunet-publish.c:137
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:138
+#: src/fs/gnunet-publish.c:141
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:265
+#: src/fs/gnunet-publish.c:267
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:267
+#: src/fs/gnunet-publish.c:269
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:312
+#: src/fs/gnunet-publish.c:320
 #, 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:354
+#: src/fs/gnunet-publish.c:362
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:361
+#: src/fs/gnunet-publish.c:369
 #, 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:367
+#: src/fs/gnunet-publish.c:375
 #, 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:375
+#: src/fs/gnunet-publish.c:383
 #, 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:385 src/fs/gnunet-publish.c:392
+#: src/fs/gnunet-publish.c:393 src/fs/gnunet-publish.c:400
+#: src/transport/gnunet-transport.c:328
 #, 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:414
+#: src/fs/gnunet-publish.c:422
 #, 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:459
+#: src/fs/gnunet-publish.c:434 src/fs/gnunet-download.c:175
 #, fuzzy, c-format
+msgid "Failed to parse URI: %s\n"
+msgstr "Datei `%s' hat URI: %s\n"
+
+#: src/fs/gnunet-publish.c:467
+#, fuzzy, c-format
 msgid "Could not access file: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:484
+#: src/fs/gnunet-publish.c:492
 #, fuzzy, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:507
+#: src/fs/gnunet-publish.c:515
 #, fuzzy, c-format
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:536
+#: src/fs/gnunet-publish.c:542
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:539
+#: src/fs/gnunet-publish.c:545
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:543
+#: src/fs/gnunet-publish.c:549
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2580,7 +2454,7 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:547
+#: src/fs/gnunet-publish.c:553
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2588,7 +2462,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:554
+#: src/fs/gnunet-publish.c:560
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2596,7 +2470,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:565
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2604,1211 +2478,900 @@
 "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:563
+#: src/fs/gnunet-publish.c:569
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-publish.c:567
+#: src/fs/gnunet-publish.c:573
 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:573
+#: src/fs/gnunet-publish.c:579
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:577
+#: src/fs/gnunet-publish.c:583
 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:581
+#: src/fs/gnunet-publish.c:587
 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:594
+#: src/fs/gnunet-publish.c:600
 msgid "Publish a file or directory on GNUnet"
 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 "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#: src/fs/gnunet-service-fs_cp.c:694
+#: src/fs/fs_search.c:798
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %llu ms\n"
+msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:729
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
+#: src/fs/gnunet-service-fs_lc.c:480
 #, fuzzy
-msgid "# replies transmitted to other peers"
-msgstr "# Bytes des Typs %d übertragen"
+msgid "# client searches active"
+msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:735
-msgid "# replies dropped"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:764 src/fs/gnunet-service-fs_cp.c:880
-#: src/fs/gnunet-service-fs_cp.c:1290 src/fs/gnunet-service-fs_cp.c:1327
-msgid "# P2P searches active"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:837
-msgid "# artificial delays introduced (ms)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:900
+#: src/fs/gnunet-service-fs_lc.c:254
 #, fuzzy
-msgid "# replies received for other peers"
-msgstr "# Bytes des Typs %d empfangen"
+msgid "# replies received for local clients"
+msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:914
-msgid "# replies dropped due to insufficient cover traffic"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:952
-msgid "# P2P searches destroyed due to ultimate reply"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1019
+#: src/fs/gnunet-service-fs_lc.c:312
 #, fuzzy
-msgid "# requests done for free (low load)"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+msgid "# client searches received"
+msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1043
-msgid "# request dropped, priority insufficient"
+#: src/fs/gnunet-service-fs_lc.c:351
+msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1053
+#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
 #, fuzzy
-msgid "# requests done for a price (normal load)"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1132
-msgid "# GET requests received (from other peers)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1166
-#, fuzzy
-msgid "# requests dropped due to initiator not being connected"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
-
-#: src/fs/gnunet-service-fs_cp.c:1190
-#, fuzzy
-msgid "# requests dropped due to missing reverse route"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
-
-#: src/fs/gnunet-service-fs_cp.c:1256
-#, fuzzy
-msgid "# requests dropped due TTL underflow"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
-
-#: src/fs/gnunet-service-fs_cp.c:1284
-#, fuzzy
-msgid "# requests dropped due to higher-TTL request"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
-
-#: src/fs/gnunet-service-fs_cp.c:1325
-#, fuzzy
-msgid "# P2P query messages received and processed"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
-
-#: src/fs/fs_download.c:309
-#, 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"
-
-#: src/fs/fs_download.c:329
-msgid "Directory too large for system address space\n"
-msgstr ""
-
-#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
+#: src/fs/fs_misc.c:126
 #, fuzzy, c-format
-msgid "Failed to open file `%s' for writing"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+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/fs_download.c:872
-#, fuzzy, c-format
-msgid "Failed to create directory for recursive download of `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#: src/fs/fs_download.c:958
+#: src/fs/gnunet-directory.c:49
 #, c-format
-msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/fs_download.c:985
-msgid "internal error decrypting content"
-msgstr ""
-
-#: src/fs/fs_download.c:1008
+#: src/fs/gnunet-directory.c:94
 #, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "Directory `%s' meta data:\n"
+msgstr "==> Verzeichnis `%s':\n"
 
-#: src/fs/fs_download.c:1020
+#: src/fs/gnunet-directory.c:97
 #, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "Directory `%s' contents:\n"
+msgstr "==> Verzeichnis `%s':\n"
 
-#: src/fs/fs_download.c:1029
-#, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr ""
-
-#: src/fs/fs_download.c:1826
-#, fuzzy
-msgid "Invalid URI"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/fs/gnunet-service-fs_indexing.c:113
-#: src/fs/gnunet-service-fs_indexing.c:163
+#: src/fs/gnunet-directory.c:132
 #, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing.\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+msgid "You must specify a filename to inspect."
+msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:121
-#: src/fs/gnunet-service-fs_indexing.c:177
+#: src/fs/gnunet-directory.c:145
 #, fuzzy, c-format
-msgid "Could not open `%s'.\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "Failed to read directory `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\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:487
-#, 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:552
-#, 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:554
+#: src/fs/gnunet-directory.c:176
 #, fuzzy
-msgid "not indexed"
-msgstr "Deindizierung schlug fehl."
+msgid "Display contents of a GNUnet directory"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:569
-#, fuzzy, c-format
-msgid "Indexed file `%s' changed at offset %llu\n"
-msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
-
-#: src/fs/fs_search.c:798
-#, c-format
-msgid "Got result with unknown block type `%d', ignoring"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:300
+#: src/fs/gnunet-service-fs_pr.c:272
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:379 src/fs/gnunet-service-fs_pr.c:638
+#: src/fs/gnunet-service-fs_pr.c:352 src/fs/gnunet-service-fs_pr.c:607
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:802
+#: src/fs/gnunet-service-fs_pr.c:771
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:798
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:845
+#: src/fs/gnunet-service-fs_pr.c:814
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:860
+#: src/fs/gnunet-service-fs_pr.c:829
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:952
+#: src/fs/gnunet-service-fs_pr.c:921
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:979
+#: src/fs/gnunet-service-fs_pr.c:948
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_pr.c:1012
+#: src/fs/gnunet-service-fs_pr.c:983
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1102
+#: src/fs/gnunet-service-fs_pr.c:1074
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1123
+#: src/fs/gnunet-service-fs_pr.c:1095
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1170
+#: src/fs/gnunet-service-fs_pr.c:1142
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1184
+#: src/fs/gnunet-service-fs_pr.c:1156
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1193
+#: src/fs/gnunet-service-fs_pr.c:1165
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1209
+#: src/fs/gnunet-service-fs_pr.c:1181
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1226
+#: src/fs/gnunet-service-fs_pr.c:1198
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1239
+#: src/fs/gnunet-service-fs_pr.c:1211
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1216
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1270 src/fs/gnunet-service-fs_pr.c:1311
-#: src/fs/gnunet-service-fs_pr.c:1426
+#: src/fs/gnunet-service-fs_pr.c:1242 src/fs/gnunet-service-fs_pr.c:1281
+#: src/fs/gnunet-service-fs_pr.c:1416
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1329
-msgid "# Datastore lookups concluded (found ultimate result)"
+#: src/fs/gnunet-service-fs_pr.c:1299
+msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1342
+#: src/fs/gnunet-service-fs_pr.c:1312
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1404
+#: src/fs/gnunet-service-fs_pr.c:1394
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1487
+#: src/fs/gnunet-service-fs_pr.c:1474
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:1576
+#: src/fs/gnunet-service-fs_pr.c:1565 src/fs/gnunet-service-fs_pr.c:1576
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/fs/fs.c:284
-#, fuzzy, c-format
-msgid "Could not open file `%s': %s"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/fs/fs.c:293
-#, fuzzy, c-format
-msgid "Could not read file `%s': %s"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/fs/fs.c:299
-#, c-format
-msgid "Short read reading from file `%s'!"
+#: src/fs/gnunet-service-fs_pe.c:259
+msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/fs.c:877
-#, fuzzy, c-format
-msgid "Failed to resume publishing information `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+#: src/fs/gnunet-service-fs_pe.c:354
+#, fuzzy
+msgid "# transmission failed (core has no bandwidth)"
+msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/fs/fs.c:1323
-#, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
-msgstr ""
+#: src/fs/gnunet-service-fs_pe.c:385
+#, fuzzy
+msgid "# query messages sent to other peers"
+msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/fs/fs.c:1364
-#, c-format
-msgid "Failure while resuming publishing operation `%s': %s\n"
+#: src/fs/gnunet-service-fs_pe.c:440
+msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/fs.c:1380
-#, fuzzy, c-format
-msgid "Failed to resume publishing operation `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+#: src/fs/gnunet-service-fs_pe.c:450
+#, fuzzy
+msgid "# query plans executed"
+msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/fs.c:1984
-#, c-format
-msgid "Failure while resuming unindexing operation `%s': %s\n"
-msgstr ""
+#: src/fs/gnunet-service-fs_pe.c:516
+#, fuzzy
+msgid "# requests merged"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/fs.c:1994
-#, fuzzy, c-format
-msgid "Failed to resume unindexing operation `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+#: src/fs/gnunet-service-fs_pe.c:522
+#, fuzzy
+msgid "# requests refreshed"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/fs.c:2107 src/fs/fs.c:2346
-#, fuzzy, c-format
-msgid "Failed to resume sub-download `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+#: src/fs/gnunet-service-fs_pe.c:576 src/fs/gnunet-service-fs_pe.c:665
+#: src/fs/gnunet-service-fs_pe.c:706
+msgid "# query plan entries"
+msgstr ""
 
-#: src/fs/fs.c:2124
-#, fuzzy, c-format
-msgid "Failed to resume sub-search `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1552
+#: src/transport/gnunet-service-transport_neighbours.c:858
+#: src/transport/gnunet-service-transport_neighbours.c:1972
+#: src/transport/gnunet-service-transport_neighbours.c:2058
+#: src/topology/gnunet-daemon-topology.c:653
+#: src/topology/gnunet-daemon-topology.c:755
+#, fuzzy
+msgid "# peers connected"
+msgstr "# verbundener Knoten"
 
-#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
-#, c-format
-msgid "Failure while resuming search operation `%s': %s\n"
-msgstr ""
+#: src/fs/gnunet-service-fs_cp.c:701
+#, fuzzy
+msgid "# migration stop messages received"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/fs.c:2337
+#: src/fs/gnunet-service-fs_cp.c:705
 #, c-format
-msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
+msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/fs.c:2583
-msgid "Could not resume running search, will resume as paused search\n"
-msgstr ""
+#: src/fs/gnunet-service-fs_cp.c:740
+#, fuzzy
+msgid "# replies transmitted to other peers"
+msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/fs.c:2669
-#, c-format
-msgid "Failure while resuming download operation `%s': %s\n"
+#: src/fs/gnunet-service-fs_cp.c:746
+msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:642
-#, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
+#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:891
+#: src/fs/gnunet-service-fs_cp.c:1301 src/fs/gnunet-service-fs_cp.c:1340
+msgid "# P2P searches active"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:128
-msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+#: src/fs/gnunet-service-fs_cp.c:848
+msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:99
-#, fuzzy, c-format
-msgid "Block not of type %u\n"
-msgstr "Kein Transport des Typs %d bekannt.\n"
+#: src/fs/gnunet-service-fs_cp.c:911
+#, fuzzy
+msgid "# replies received for other peers"
+msgstr "# Bytes des Typs %d empfangen"
 
-#: src/block/plugin_block_dht.c:106
-msgid "Size mismatch for block\n"
+#: src/fs/gnunet-service-fs_cp.c:925
+msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:115
-#, c-format
-msgid "Block of type %u is malformed\n"
+#: src/fs/gnunet-service-fs_cp.c:963
+msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/block/block.c:108
-#, fuzzy, c-format
-msgid "Loading block plugins `%s'\n"
-msgstr "Teste Transport(e) %s\n"
+#: src/fs/gnunet-service-fs_cp.c:1030
+#, fuzzy
+msgid "# requests done for free (low load)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/block/block.c:118
-#, fuzzy, c-format
-msgid "Failed to load block plugin `%s'\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/mesh/test_mesh_small.c:689
-msgid "Test mesh in a small network."
+#: src/fs/gnunet-service-fs_cp.c:1054
+msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
+#: src/fs/gnunet-service-fs_cp.c:1064
 #, fuzzy
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr "Fehler beim Starten der Collection.\n"
+msgid "# requests done for a price (normal load)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
-msgid "Transmitting shutdown ACK.\n"
+#: src/fs/gnunet-service-fs_cp.c:1143
+msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
-msgid "Initiating shutdown as requested by client.\n"
-msgstr ""
+#: src/fs/gnunet-service-fs_cp.c:1177
+#, fuzzy
+msgid "# requests dropped due to initiator not being connected"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/arm/gnunet-service-arm.c:206
-#, c-format
-msgid "Restarting service `%s' due to configuration file change.\n"
-msgstr ""
+#: src/fs/gnunet-service-fs_cp.c:1201
+#, fuzzy
+msgid "# requests dropped due to missing reverse route"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/arm/gnunet-service-arm.c:234
+#: src/fs/gnunet-service-fs_cp.c:1267
 #, fuzzy
-msgid "Could not send status result to client\n"
-msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
+msgid "# requests dropped due TTL underflow"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/arm/gnunet-service-arm.c:268
-msgid "Not sending status result to client: no client known\n"
+#: src/fs/gnunet-service-fs_cp.c:1295
+#, fuzzy
+msgid "# requests dropped due to higher-TTL request"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/fs/gnunet-service-fs_cp.c:1338
+#, fuzzy
+msgid "# P2P query messages received and processed"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#: src/fs/gnunet-service-fs_push.c:642
+#, c-format
+msgid ""
+"Invalid value specified for option `%s' in section `%s', content pushing "
+"disabled\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:406
+#: src/fs/gnunet-service-fs_indexing.c:113
+#: src/fs/gnunet-service-fs_indexing.c:163
 #, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+msgid "Configuration option `%s' in section `%s' missing.\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/arm/gnunet-service-arm.c:409
+#: src/fs/gnunet-service-fs_indexing.c:121
+#: src/fs/gnunet-service-fs_indexing.c:177
 #, fuzzy, c-format
-msgid "Starting service `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
+msgid "Could not open `%s'.\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/arm/gnunet-service-arm.c:435
+#: 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 "ARM is shutting down, service `%s' not started.\n"
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:443
+#: 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:487
 #, fuzzy, c-format
-msgid "Service `%s' already running.\n"
-msgstr "Diese Suche läuft bereits!\n"
+msgid "Failed to delete bogus block: %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/arm/gnunet-service-arm.c:453
+#: src/fs/gnunet-service-fs_indexing.c:552
 #, fuzzy, c-format
-msgid "Binary implementing service `%s' not known!\n"
-msgstr ""
-"Signatur kann nicht verifiziert werden, der Knoten `%s' ist uns nicht "
-"bekannt!\n"
+msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
+msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/arm/gnunet-service-arm.c:464
+#: src/fs/gnunet-service-fs_indexing.c:554
+#, fuzzy
+msgid "not indexed"
+msgstr "Deindizierung schlug fehl."
+
+#: src/fs/gnunet-service-fs_indexing.c:569
 #, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not known!\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+msgid "Indexed file `%s' changed at offset %llu\n"
+msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
 
-#: src/arm/gnunet-service-arm.c:498
+#: src/fs/fs_list_indexed.c:90
 #, fuzzy, c-format
-msgid "Preparing to stop `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
+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/arm/gnunet-service-arm.c:666
-msgid "Stopping all services\n"
-msgstr ""
+#: src/fs/fs_list_indexed.c:117
+#, 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/arm/gnunet-service-arm.c:723
+#: src/fs/fs_list_indexed.c:164
 #, fuzzy, c-format
-msgid "Restarting service `%s'.\n"
-msgstr "Collection `%s' begonnen.\n"
+msgid "Failed to not connect to `%s' service.\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/arm/gnunet-service-arm.c:796
-msgid "exit"
+#: src/fs/fs_unindex.c:58
+msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:801
-msgid "signal"
+#: src/fs/fs_unindex.c:63
+#, fuzzy
+msgid "Failed to read file"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/fs/fs_unindex.c:235
+msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:806
+#: src/fs/fs_unindex.c:243
+msgid "Timeout waiting for `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:251
 #, fuzzy
-msgid "unknown"
-msgstr "Unbekannter Fehler"
+msgid "Invalid response from `fs' service."
+msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:813
-#, fuzzy, c-format
-msgid "Service `%s' stopped\n"
-msgstr "Dienst gelöscht.\n"
+#: src/fs/fs_unindex.c:296
+#, fuzzy
+msgid "Failed to connect to FS service for unindexing."
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/arm/gnunet-service-arm.c:827
-#, c-format
-msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
-msgstr ""
+#: src/fs/fs_unindex.c:331
+#, fuzzy
+msgid "Failed to connect to `datastore' service."
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/arm/gnunet-arm.c:161
-#, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "Dienst gelöscht.\n"
+#: src/fs/fs_unindex.c:344
+#, fuzzy
+msgid "Failed to open file for unindexing."
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/arm/gnunet-arm.c:165
-#, fuzzy, c-format
-msgid "Failed to stop service `%s'!\n"
-msgstr "Fehler beim Binden an UDP Port %d.\n"
+#: src/fs/fs_unindex.c:378
+#, fuzzy
+msgid "Failed to compute hash of file."
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/arm/gnunet-arm.c:171
+#: src/fs/gnunet-download.c:100
 #, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "Dienst gelöscht.\n"
+msgid "Starting download `%s'.\n"
+msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:175
-#, fuzzy, c-format
-msgid "Failed to start service `%s'!\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+#: src/fs/gnunet-download.c:112
+#, c-format
+msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:181
+#: src/fs/gnunet-download.c:121
 #, fuzzy, c-format
-msgid "Some error communicating with service `%s'.\n"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+msgid "Error downloading: %s.\n"
+msgstr "Fehler beim Download: %s\n"
 
-#: src/arm/gnunet-arm.c:207
+#: src/fs/gnunet-download.c:129
 #, fuzzy, c-format
-msgid "Service `%s' is running.\n"
-msgstr "Namespace `%s' hat das Rating %d.\n"
+msgid "Downloading `%s' done (%s/s).\n"
+msgstr "Upload abgewiesen!"
 
-#: src/arm/gnunet-arm.c:212
+#: src/fs/gnunet-download.c:169
 #, fuzzy, c-format
-msgid "Service `%s' is not running.\n"
-msgstr "`%s' ist keine Datei.\n"
+msgid "You need to specify a URI argument.\n"
+msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/arm/gnunet-arm.c:238
-#, fuzzy, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
+#: src/fs/gnunet-download.c:182
+#, c-format
+msgid "Only CHK or LOC URIs supported.\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:246 src/arm/gnunet-arm.c:356
-msgid "Fatal error initializing ARM API.\n"
+#: src/fs/gnunet-download.c:189
+#, c-format
+msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:269
-#, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+#: src/fs/gnunet-download.c:243
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:275
-#, fuzzy, c-format
-msgid "Failed to remove servicehome directory %s\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+#: src/fs/gnunet-download.c:249
+msgid "write the file to FILENAME"
+msgstr "Schreibe die Datei in DATEINAME"
 
-#: src/arm/gnunet-arm.c:387
-msgid "stop all GNUnet services"
+#: src/fs/gnunet-download.c:253
+msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:389
-msgid "start a particular service"
+#: src/fs/gnunet-download.c:257
+msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
-msgid "stop a particular service"
-msgstr ""
+#: src/fs/gnunet-download.c:260
+msgid "download a GNUnet directory recursively"
+msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
 
-#: src/arm/gnunet-arm.c:393
-msgid "start all GNUnet default services"
+#: src/fs/gnunet-download.c:270
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:396
-msgid "stop and start all GNUnet default services"
+#: src/fs/fs_getopt.c:191
+#, c-format
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:399
-msgid "test if a particular service is running"
+#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
+#, fuzzy, c-format
+msgid "Publishing failed: %s"
 msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
 
-#: src/arm/gnunet-arm.c:402
-msgid "delete config file and directory on exit"
-msgstr ""
+#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
+#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
+#, fuzzy, c-format
+msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/arm/gnunet-arm.c:404
-msgid "don't print status messages"
+#: src/fs/fs_publish.c:649
+msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:407
+#: src/fs/fs_publish.c:661
 #, fuzzy
-msgid "timeout for completing current operation"
-msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
+msgid "unknown error"
+msgstr "Unbekannter Fehler"
 
-#: src/arm/gnunet-arm.c:418
-msgid "Control services and the Automated Restart Manager (ARM)"
+#: src/fs/fs_publish.c:704
+msgid "failed to compute hash"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:803
-#, c-format
-msgid "Unable to forward to service `%s': shutdown\n"
+#: src/fs/fs_publish.c:724
+msgid "filename too long"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:812
-#, c-format
-msgid "Unable to forward to service `%s': timeout before connect\n"
-msgstr ""
+#: src/fs/fs_publish.c:751
+#, fuzzy
+msgid "could not connect to `fs' service"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:868
+#: src/fs/fs_publish.c:775
 #, fuzzy, c-format
-msgid "Unable to start service `%s': %s\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+msgid "Failed to get file identifiers for `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:936
+#: src/fs/fs_publish.c:845
 #, fuzzy, c-format
-msgid "Unable to accept connection for service `%s': %s\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+msgid "Recursive upload failed at `%s': %s"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:952
+#: src/fs/fs_publish.c:851
 #, fuzzy, c-format
-msgid "Service `%s' started\n"
-msgstr "Dienst gelöscht.\n"
+msgid "Recursive upload failed: %s"
+msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1080
-#, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "Fehler beim Anlegen des Benutzerkontos:"
+#: src/fs/fs_publish.c:899
+#, fuzzy
+msgid "needs to be an actual file"
+msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1102
+#: src/fs/fs_publish.c:1078
 #, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1116
+#: src/fs/fs_publish.c:1149
 #, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/arm/arm_api.c:201 src/arm/test_exponential_backoff.c:192
+#: src/fs/fs_publish.c:1482
 #, fuzzy
-msgid "Failed to transmit shutdown request to client.\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+msgid "Could not connect to datastore."
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/arm/arm_api.c:390
+#: src/fs/fs.c:284
 #, fuzzy, c-format
-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"
+msgid "Could not open file `%s': %s"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/arm/arm_api.c:405
+#: src/fs/fs.c:293
 #, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"angeben, in dem FS Daten gespeichert werden.\n"
+msgid "Could not read file `%s': %s"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/arm/arm_api.c:469
-#, 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:539
+#: src/fs/fs.c:299
 #, c-format
-msgid "Requesting start of service `%s'.\n"
+msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/arm/arm_api.c:540
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
-msgstr ""
+#: src/fs/fs.c:877
+#, fuzzy, c-format
+msgid "Failed to resume publishing information `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/arm/arm_api.c:563
+#: src/fs/fs.c:1323
 #, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
+msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:566
+#: src/fs/fs.c:1364
 #, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
+msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/arm/arm_api.c:598 src/arm/arm_api.c:602
+#: src/fs/fs.c:1380
 #, fuzzy, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
-msgstr "`%s': Nachricht wurde nicht innerhalb %llu ms empfangen.\n"
+msgid "Failed to resume publishing operation `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/arm/arm_api.c:675
-#, fuzzy, c-format
-msgid "Stopping service `%s' within %llu ms\n"
-msgstr "Keine Antwort innerhalb %llums erhalten.\n"
-
-#: src/dht/dhtlog.c:56
+#: src/fs/fs.c:1984
 #, c-format
-msgid "Loading `%s' dhtlog plugin\n"
+msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/dht/dhtlog.c:65
+#: src/fs/fs.c:1994
 #, fuzzy, c-format
-msgid "Failed to load dhtlog plugin for `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "Failed to resume unindexing operation `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:895
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:655
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:686
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:718
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:750
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:782
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:813
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:844
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:875
+#: src/fs/fs.c:2107 src/fs/fs.c:2346
 #, fuzzy, c-format
-msgid "Failed to get full path for `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+msgid "Failed to resume sub-download `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:924
-#, fuzzy
-msgid "Failed to create file for dhtlog.\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+#: src/fs/fs.c:2124
+#, fuzzy, c-format
+msgid "Failed to resume sub-search `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/dht/gnunet-dht-get-peer.c:84
+#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
 #, c-format
-msgid "Found %u peers\n"
+msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:115
-#, fuzzy, c-format
-msgid "Found peer `%s'\n"
-msgstr "Ich bin Peer `%s'.\n"
-
-#: src/dht/gnunet-dht-get-peer.c:184 src/dht/gnunet-dht-put.c:161
-#: src/dht/gnunet-dht-get.c:195
-msgid "the query key"
+#: src/fs/fs.c:2337
+#, c-format
+msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:187 src/dht/gnunet-dht-put.c:170
-#: src/dht/gnunet-dht-get.c:201
-msgid "how long to execute this query before giving up?"
+#: src/fs/fs.c:2583
+msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:209
-msgid "Issue a GET PEER request to the GNUnet DHT, print results."
+#: src/fs/fs.c:2669
+#, c-format
+msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:95
-#, fuzzy, c-format
-msgid "PUT request sent!\n"
-msgstr "# gap Anfragen insgesamt empfangen"
+#: src/fs/fs_download.c:309
+#, 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"
 
-#: src/dht/gnunet-dht-put.c:119
-#, c-format
-msgid "Must provide KEY and DATA for DHT put!\n"
+#: src/fs/fs_download.c:329
+msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:127
+#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
 #, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+msgid "Failed to open file `%s' for writing"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/dht/gnunet-dht-put.c:132
+#: src/fs/fs_download.c:872
 #, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
+msgid "Failed to create directory for recursive download of `%s'\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/dht/gnunet-dht-put.c:147
+#: src/fs/fs_download.c:958
 #, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+msgid ""
+"Internal error or bogus download URI (expected %u bytes at depth %u and "
+"offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:164
-msgid "the data to insert under the key"
+#: src/fs/fs_download.c:985
+msgid "internal error decrypting content"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:167
-msgid "the type to insert data as"
-msgstr ""
+#: src/fs/fs_download.c:1008
+#, fuzzy, c-format
+msgid "Download failed: could not open file `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/dht/gnunet-dht-put.c:173
-msgid "how long to store this entry in the dht (in seconds)"
-msgstr ""
+#: src/fs/fs_download.c:1020
+#, fuzzy, c-format
+msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/dht/gnunet-dht-put.c:195
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+#: src/fs/fs_download.c:1029
+#, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198
-msgid "the type of data to look for"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:223
-msgid "Issue a GET request to the GNUnet DHT, prints results."
-msgstr ""
-
-#: src/dht/dht_api.c:235
+#: src/fs/fs_download.c:1826
 #, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+msgid "Invalid URI"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/dht/plugin_dhtlog_mysql.c:1550
+#: src/fs/gnunet-service-fs.c:268 src/fs/gnunet-service-fs.c:448
 #, fuzzy
-msgid "Failed to initialize MySQL database connection for dhtlog.\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+msgid "# Loopback routes suppressed"
+msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/transport/test_plugin_transport_udp.c:185
-#: src/transport/test_plugin_transport_https.c:1271
-#: src/transport/test_plugin_transport.c:202
-#: src/transport/gnunet-service-transport.c:439
-#: src/transport/test_plugin_transport_http.c:1232
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
+#: src/fs/gnunet-service-fs.c:542 src/topology/gnunet-daemon-topology.c:1292
+#: src/topology/gnunet-daemon-topology.c:1299
+#: src/hostlist/gnunet-daemon-hostlist.c:290
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' service.\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/transport/test_plugin_transport_udp.c:195
-#: src/transport/test_plugin_transport_https.c:1335
-#: src/transport/test_plugin_transport.c:212
-#: src/transport/gnunet-service-transport.c:448
-#: src/transport/test_plugin_transport_http.c:1255
-msgid "Transport service could not access hostkey.  Exiting.\n"
-msgstr ""
+#: src/fs/fs_file_information.c:350
+#, fuzzy, c-format
+msgid "`%s' failed on file `%s': %s"
+msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/transport/test_plugin_transport_udp.c:205
-#, fuzzy
-msgid "Loading udp transport plugin\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/transport/test_plugin_transport_udp.c:213
-#, fuzzy
-msgid "Failed to load transport plugin for udp\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/transport/plugin_transport_wlan.c:1436
-#: src/transport/plugin_transport_wlan.c:1631
-#: src/transport/plugin_transport_wlan.c:1750
-#, c-format
-msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
+#: src/transport/gnunet-service-transport_neighbours.c:435
+msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1868
-#, c-format
-msgid "Wlan Address len %d is wrong\n"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:2728
-#, c-format
-msgid "Finished reading from wlan-helper stdout with code: %d\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:246
-#, 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:251
+#: src/transport/gnunet-service-transport_neighbours.c:807
 #, fuzzy
-msgid "# messages dropped due to slow client"
+msgid "# peers disconnected due to external request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_clients.c:394
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:511
+#: src/transport/gnunet-service-transport_neighbours.c:913
 #, fuzzy
-msgid "# bytes payload received for other peers"
-msgstr "# Bytes des Typs %d empfangen"
+msgid "# peers disconnected due to timeout"
+msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/transport/gnunet-service-transport_clients.c:528
-msgid "# bytes payload dropped (other peer was not connected)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:579
+#: src/transport/gnunet-service-transport_neighbours.c:937
 #, fuzzy
-msgid "# REQUEST CONNECT messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+msgid "# keepalives sent"
+msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_clients.c:607
+#: src/transport/gnunet-service-transport_neighbours.c:969
 #, fuzzy
-msgid "# SET QUOTA messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+msgid "# peers disconnected due to global disconnect"
+msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:811
+#: src/transport/gnunet-service-transport_neighbours.c:1499
+#: src/transport/gnunet-service-transport_neighbours.c:1520
 #, fuzzy
 msgid "# messages not sent (no such peer or not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:831
+#: src/transport/gnunet-service-transport_neighbours.c:1536
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:899
+#: src/transport/gnunet-service-transport_neighbours.c:1584
 #, fuzzy
+msgid "# messages discarded due to lack of neighbour record"
+msgstr "# defragmentierter Nachrichten"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1620
+#, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:917
+#: src/transport/gnunet-service-transport_neighbours.c:1638
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:942
+#: src/transport/gnunet-service-transport_neighbours.c:1663
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:972
+#: src/transport/gnunet-service-transport_neighbours.c:1693
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:984
+#: src/transport/gnunet-service-transport_neighbours.c:1706
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:108
-msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1820
+msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:115
-#, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/transport/gnunet-service-transport_plugins.c:119
-#, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/transport/gnunet-service-transport_plugins.c:139
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/transport/test_plugin_transport_https.c:409
-msgid "Phase 0: Test plugin functions failed\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1832
+msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:418
-msgid "Phase 1: Test connect with wrong data failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:427
-msgid "Phase 2: Test session selection failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:435
-msgid "Phase 3: Test sending with plugin failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:726
-#: src/transport/test_plugin_transport_http.c:692
+#: src/transport/gnunet-service-transport_blacklist.c:247
 #, fuzzy, c-format
-msgid "curl failed for `%s' at %s:%d: `%s'\n"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+msgid "Could not read blacklist file `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/test_plugin_transport_https.c:746
-#: src/transport/test_plugin_transport_http.c:712
-msgid "Connecting to peer without any peer identification: test failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:759
-#: src/transport/test_plugin_transport_http.c:725
-msgid "Connecting to peer with too short peer identification: test failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:772
-#: src/transport/test_plugin_transport_http.c:738
-msgid "Connecting to peer with too long peer identification: test failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:785
-msgid "Connecting to peer with valid peer identification: test failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:924
-#: src/transport/test_plugin_transport_http.c:887
+#: src/transport/gnunet-service-transport_blacklist.c:254
 #, c-format
-msgid "Unknown address size: ipv6 has %u ipv4 has %u but this has %u\n"
+msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:930
-#: src/transport/test_plugin_transport_http.c:893
-#, c-format
-msgid "Transport plugin notification for address: `%s':%u\n"
-msgstr ""
+#: src/transport/gnunet-service-transport_blacklist.c:266
+#, fuzzy, c-format
+msgid "Failed to read blacklist from `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/test_plugin_transport_https.c:1038
-#: src/transport/test_plugin_transport_http.c:1002
-msgid "Connecting to peer without any peer identification.\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 "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/transport/test_plugin_transport_https.c:1053
-#: src/transport/test_plugin_transport_http.c:1017
-msgid "Connecting to peer with too short peer identification.\n"
-msgstr ""
+#: 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/test_plugin_transport_https.c:1069
-#: src/transport/test_plugin_transport_http.c:1033
-msgid "Connecting to peer with too long peer identification.\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1083
-#: src/transport/test_plugin_transport_http.c:1047
-msgid "Connecting to peer with valid peer identification.\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1093
-msgid ""
-"\n"
-"Phase 1: transmit data to all suggested addresses\n"
-"\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1151
-msgid ""
-"\n"
-"Phase 2: session selection\n"
-"\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1187
-msgid ""
-"\n"
-"Phase 3: send multiple or big messages after disconnect\n"
-"\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1193
-#, fuzzy
-msgid "Phase 3: sending messages\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/transport/test_plugin_transport_https.c:1284
-#: src/transport/plugin_transport_http.c:3323
-#: src/transport/test_plugin_transport_http.c:1245
-#, c-format
-msgid "Require valid port number for transport plugin `%s' in configuration!\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1352
+#: src/transport/gnunet-service-transport_blacklist.c:350
 #, fuzzy, c-format
-msgid "Loading HTTPS transport plugin `%s'\n"
-msgstr "Teste Transport(e) %s\n"
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/transport/test_plugin_transport_https.c:1358
-#, fuzzy
-msgid "Failed to load transport plugin for https\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/transport/test_plugin_transport_https.c:1368
+#: src/transport/gnunet-service-transport_blacklist.c:364
 #, c-format
-msgid "Transport plugin returned %u addresses to connect to\n"
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1444
-msgid ""
-"\n"
-"Phase 0\n"
-"\n"
+#: src/transport/gnunet-service-transport_blacklist.c:522
+#: src/transport/gnunet-service-transport_blacklist.c:760
+msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1507
-#: src/transport/test_plugin_transport_https.c:1510
+#: src/transport/plugin_transport_http_server.c:184
 msgid ""
-"\n"
-"delete\n"
-"\n"
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/test_transport_api.c:120
-#, fuzzy
-msgid "Fail! Could not connect peers\n"
-msgstr "`%s': Verbindung konnte nicht hergestellt werden.\n"
-
-#: src/transport/gnunet-transport-list-connections.c:91
-#: src/peerinfo-tool/gnunet-peerinfo.c:200
-#: src/core/gnunet-core-list-connections.c:166
-#, fuzzy, c-format
-msgid "Invalid command line argument `%s'\n"
-msgstr "Ungültige Kommandozeilen Parameter:\n"
-
-#: src/transport/gnunet-transport-list-connections.c:112
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
-#: src/core/gnunet-core-list-connections.c:187
-msgid "don't resolve host names"
+#: src/transport/plugin_transport_http_server.c:208
+msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-list-connections.c:119
-#: src/core/gnunet-core-list-connections.c:194
-#, fuzzy
-msgid "Print information about connected peers."
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/transport/test_plugin_transport.c:224
-#, fuzzy
-msgid "Loading tcp transport plugin\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/transport/test_plugin_transport.c:232
-#, fuzzy
-msgid "Failed to load transport plugin for tcp\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/transport/gnunet-service-transport_hello.c:176
+#: src/transport/gnunet-service-transport_hello.c:177
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:698
-#: src/transport/plugin_transport_http.c:1231
-#: src/transport/plugin_transport_http.c:2551
+#: src/transport/plugin_transport_udp.c:1428
+#: src/transport/plugin_transport_udp.c:2132
 #, fuzzy
-msgid "# HTTP peers active"
-msgstr "# Bytes empfangen über TCP"
+msgid "# HELLO beacons received via udp"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_http.c:993
-#: src/transport/plugin_transport_http.c:1306
-msgid "# HTTP inbound sessions for peers active"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1889
+#: src/transport/plugin_transport_udp.c:1900
+#: src/transport/plugin_transport_udp_new.c:1209
 #, c-format
-msgid "Connection %X: HTTP PUT to peer `%s' (`%s') failed: `%s' `%s'\n"
+msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1915
-#, c-format
-msgid "Connection %X: HTTP GET to peer `%s' (`%s') failed: `%s' `%s'\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:2193
-#: src/transport/plugin_transport_http.c:2305
+#: src/transport/plugin_transport_udp.c:1953
+#: src/transport/plugin_transport_udp_new.c:1259
 #, fuzzy, c-format
-msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+msgid "Invalid IPv6 address: `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http.c:2592
-msgid "# HTTP outbound sessions for peers active"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:3351
-#: src/transport/plugin_transport_http.c:3380
+#: src/transport/plugin_transport_udp.c:2146
+#: src/transport/plugin_transport_udp_new.c:1388
 #, fuzzy
-msgid "Misconfigured address to bind to in configuration!\n"
-msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+msgid "Failed to open UDP sockets\n"
+msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_http.c:3406
-#, fuzzy, c-format
-msgid "Required configuration options missing in section `%s'\n"
-msgstr ""
-"Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in der "
-"Sektion `%s' angegeben werden.\n"
-
-#: src/transport/plugin_transport_http.c:3444
-msgid ""
-"Could not create a new TLS certificate, program `gnunet-transport-"
-"certificate-creation' could not be started!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:3460
-msgid "No usable TLS certificate found and creating one failed!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:3612
+#: src/transport/plugin_transport_http_client.c:107
+#: src/transport/plugin_transport_http_client.c:122
+#: 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 ""
-"HTTP Server with %s could not be started on port %u! %s plugin failed!\n"
-msgstr ""
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/transport/plugin_transport_http.c:3628
+#: src/transport/plugin_transport_http_client.c:617
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -3820,16 +3383,16 @@
 
 #: src/transport/plugin_transport_tcp.c:590
 #: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:728
-#: src/transport/plugin_transport_tcp.c:817
-#: src/transport/plugin_transport_tcp.c:1142
+#: src/transport/plugin_transport_tcp.c:732
+#: src/transport/plugin_transport_tcp.c:821
+#: src/transport/plugin_transport_tcp.c:1160
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
 #: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:843
-#: src/transport/plugin_transport_tcp.c:1531
+#: src/transport/plugin_transport_tcp.c:847
+#: src/transport/plugin_transport_tcp.c:1548
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
@@ -3839,135 +3402,132 @@
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:731
+#: src/transport/plugin_transport_tcp.c:735
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:821
+#: src/transport/plugin_transport_tcp.c:825
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:942
+#: src/transport/plugin_transport_tcp.c:946
 #, fuzzy
 msgid "# bytes TCP was asked to transmit"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:993
+#: src/transport/plugin_transport_tcp.c:997
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1034
+#: src/transport/plugin_transport_tcp.c:1040
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1051
+#: src/transport/plugin_transport_tcp.c:1057
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1103
+#: src/transport/plugin_transport_tcp.c:1108
 #, fuzzy
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1211
+#: src/transport/plugin_transport_tcp.c:1228
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1574
+#: src/transport/plugin_transport_tcp.c:1591
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:1722
+#: src/transport/plugin_transport_tcp.c:1736
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:1788
+#: src/transport/plugin_transport_tcp.c:1800
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1941
+#: src/transport/plugin_transport_tcp.c:1953
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2001
+#: src/transport/plugin_transport_tcp.c:2013
 #, 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:2024
+#: src/transport/plugin_transport_tcp.c:2036
 #, fuzzy, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_tcp.c:2028
+#: src/transport/plugin_transport_tcp.c:2040
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/plugin_transport_tcp.c:2044
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:518
-msgid "# address records discarded"
+#: src/transport/plugin_transport_http.c:829
+msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:604
-#: src/core/gnunet-service-core.c:4187
+#: src/transport/plugin_transport_http.c:878
 #, fuzzy
-msgid "# PING messages received"
-msgstr "# PING Nachrichten erstellt"
+msgid "Require valid port number for service in configuration!\n"
+msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/transport/gnunet-service-transport_validation.c:626
+#: src/transport/plugin_transport_http.c:1025
 #, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:683
-msgid "# PONGs unicast via reliable transport"
+#: src/transport/plugin_transport_http.c:1040
+#, c-format
+msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:692
-msgid "# PONGs multicast to all available addresses"
+#: src/transport/plugin_transport_http.c:1115
+#, 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:1128
+#, fuzzy
+msgid "Port is required! Fix in configuration\n"
+msgstr " gconfig\tGTK Konfiguration\n"
+
+#: src/transport/plugin_transport_http.c:1139
+msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:756
+#: src/transport/plugin_transport_http.c:1155
 #, c-format
 msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:790
-#, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# Klartext PING Nachrichten gesendet"
-
-#: src/transport/gnunet-service-transport_validation.c:862
-msgid "# address revalidations started"
+#: src/transport/plugin_transport_http.c:1181
+#, c-format
+msgid ""
+"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:921
-#: src/core/gnunet-service-core.c:4210
+#: src/transport/plugin_transport_unix.c:1088
 #, fuzzy
-msgid "# PONG messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+msgid "Failed to open UNIX sockets\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:943
-msgid "# PONGs dropped, no matching pending validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:959
-msgid "# PONGs dropped, signature expired"
-msgstr ""
-
 #: src/transport/plugin_transport_smtp.c:367
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -4018,89 +3578,397 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/test_plugin_transport_http.c:1271
+#: src/transport/gnunet-service-transport_plugins.c:108
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:115
 #, fuzzy, c-format
-msgid "Loading HTTP transport plugin `%s'\n"
+msgid "Starting transport plugins `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/test_plugin_transport_http.c:1278
-#, fuzzy
-msgid "Failed to load transport plugin for http\n"
+#: src/transport/gnunet-service-transport_plugins.c:119
+#, fuzzy, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr "Teste Transport(e) %s\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:139
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/test_plugin_transport_http.c:1364
+#: src/transport/plugin_transport_wlan.c:877
+#, fuzzy
+msgid "# wlan session timeouts"
+msgstr "# Sitzungsschlüssel akzeptiert"
+
+#: src/transport/plugin_transport_wlan.c:902
+#, fuzzy
+msgid "# wlan session created"
+msgstr "# Sitzungsschlüssel akzeptiert"
+
+#: src/transport/plugin_transport_wlan.c:985
+#: src/transport/plugin_transport_wlan.c:1143
+#: src/transport/plugin_transport_wlan.c:1163
+#: src/transport/plugin_transport_wlan.c:1193
+#: src/transport/plugin_transport_wlan.c:2361
+#: src/transport/plugin_transport_wlan.c:3192
+msgid "# wlan pending sessions"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1455
+#, c-format
+msgid "Finished reading from wlan-helper stdout with code: %d\n"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1771
+msgid "# wlan hello beacons send"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1803
+#: src/transport/plugin_transport_wlan.c:2016
+#: src/transport/plugin_transport_wlan.c:2109
+#, c-format
+msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:2003
+msgid "# wlan acks send"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:2072
+#, fuzzy
+msgid "# wlan fragments send"
+msgstr "# verworfener Nachrichten"
+
+#: src/transport/plugin_transport_wlan.c:2231
+#, c-format
+msgid "Wlan Address len %d is wrong\n"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:2236
+#, fuzzy
+msgid "# wlan messages queued"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#: src/transport/plugin_transport_wlan.c:2323
+#: src/transport/plugin_transport_wlan.c:2959
+#: src/transport/plugin_transport_wlan.c:3194
+msgid "# wlan mac endpoints"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:2543
+#, fuzzy
+msgid "# wlan whole messages received"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#: src/transport/plugin_transport_wlan.c:2741
+#, fuzzy
+msgid "# wlan hello messages received"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#: src/transport/plugin_transport_wlan.c:2775
+#, fuzzy
+msgid "# wlan fragments received"
+msgstr "# verworfener Nachrichten"
+
+#: src/transport/plugin_transport_wlan.c:2827
+#, fuzzy
+msgid "# wlan acks received"
+msgstr "# gap Anfragen insgesamt empfangen"
+
+#: src/transport/plugin_transport_wlan.c:2920
+msgid "# wlan mac endpoints timeouts"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:2943
+#, fuzzy
+msgid "# wlan mac endpoints created"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/transport/plugin_transport_wlan.c:2999
+msgid "# wlan WLAN_HELPER_DATA received"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:3050
+#, fuzzy
+msgid "# wlan messaged for this client received"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#: src/transport/plugin_transport_wlan.c:3058
+msgid "# wlan messaged inside WLAN_HELPER_DATA received"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:128
+#, c-format
+msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:137
+#, c-format
+msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:176
+#, fuzzy, c-format
+msgid "Transmitting %u bytes to %s\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/transport/gnunet-transport.c:202
+#, fuzzy, c-format
+msgid "Connected to %s\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#: src/transport/gnunet-transport.c:243
+#, fuzzy, c-format
+msgid "Disconnected from %s\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#: src/transport/gnunet-transport.c:283
+#, 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:305
+#, fuzzy, c-format
+msgid "Peer `%s' plugin: `%s' address `%s'\n"
+msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
+
+#: src/transport/gnunet-transport.c:339
+#, 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:377
+msgid "measure how fast we are receiving data (until CTRL-C)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:380
+#, fuzzy
+msgid "try to connect to the given peer"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/transport/gnunet-transport.c:383
+#, fuzzy
+msgid "provide information about all current connections (once)"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/transport/gnunet-transport.c:386
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:393
+#, 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:515
+msgid "# address records discarded"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:628
+#, c-format
 msgid ""
-"Phase 0\n"
-"\n"
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1280
+#: src/transport/gnunet-service-transport_validation.c:696
+msgid "# PONGs unicast via reliable transport"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:705
+msgid "# PONGs multicast to all available addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:769
 #, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+msgid ""
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1330
+#: src/transport/gnunet-service-transport_validation.c:803
+#, fuzzy
+msgid "# PING without HELLO messages sent"
+msgstr "# Klartext PING Nachrichten gesendet"
+
+#: src/transport/gnunet-service-transport_validation.c:875
+msgid "# address revalidations started"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:956
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:972
+msgid "# PONGs dropped, signature expired"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1050
 #, 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:1456
+#: src/transport/gnunet-service-transport_clients.c:250
+#, 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:255
 #, fuzzy
-msgid "Failed to open UDP sockets\n"
-msgstr "Fehler beim Binden an UDP6 Port %d.\n"
+msgid "# messages dropped due to slow client"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/transport_api.c:570
+#: src/transport/gnunet-service-transport_clients.c:405
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:522
+#, fuzzy
+msgid "# bytes payload received for other peers"
+msgstr "# Bytes des Typs %d empfangen"
+
+#: src/transport/gnunet-service-transport_clients.c:539
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:590
+#, fuzzy
+msgid "# REQUEST CONNECT messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/transport_api.c:588
 #, 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"
 
-#: src/transport/plugin_transport_unix.c:1092
+#: src/transport/gnunet-service-transport.c:162
 #, fuzzy
-msgid "Failed to open UNIX sockets\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "# bytes payload discarded due to not connected peer "
+msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
+#: src/transport/gnunet-service-transport.c:519
+msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:528
+msgid "Transport service could not access hostkey.  Exiting.\n"
+msgstr ""
+
+#: src/dv/plugin_transport_dv.c:159
 #, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\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/transport/gnunet-service-transport_blacklist.c:254
+#: 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/topology/gnunet-daemon-topology.c:244
+msgid "# peers blacklisted"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:379
+#, fuzzy
+msgid "# connect requests issued to transport"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/topology/gnunet-daemon-topology.c:674
+#: src/topology/gnunet-daemon-topology.c:760
+#, fuzzy
+msgid "# friends connected"
+msgstr "# verbundener Knoten"
+
+#: src/topology/gnunet-daemon-topology.c:877
+#: src/hostlist/hostlist-server.c:187
+#, fuzzy, c-format
+msgid "Error in communication with PEERINFO service: %s\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/topology/gnunet-daemon-topology.c:952
+msgid "Failed to connect to core service, can not manage topology!\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:984
 #, c-format
-msgid "Blacklist file `%s' is empty.\n"
+msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/topology/gnunet-daemon-topology.c:996
 #, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
+msgid "Could not read friends list `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
+#: src/topology/gnunet-daemon-topology.c:1002
+#, c-format
+msgid "Friends file `%s' is empty.\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:1011
 #, 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 "Failed to read friends list from `%s': out of memory\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/topology/gnunet-daemon-topology.c:1019
+#, 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:1039
 #, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
+#: src/topology/gnunet-daemon-topology.c:1052
 #, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/topology/gnunet-daemon-topology.c:1062
+#, fuzzy, c-format
+msgid "Found friend `%s' in configuration\n"
+msgstr " gconfig\tGTK Konfiguration\n"
+
+#: src/topology/gnunet-daemon-topology.c:1068
 #, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:754
-msgid "# disconnects due to blacklist"
+#: src/topology/gnunet-daemon-topology.c:1078
+#, fuzzy
+msgid "# friends in configuration"
+msgstr " gconfig\tGTK Konfiguration\n"
+
+#: src/topology/gnunet-daemon-topology.c:1084
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
 msgstr ""
 
+#: src/topology/gnunet-daemon-topology.c:1091
+msgid ""
+"More friendly connections required than target total number of connections.\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:1128
+#, fuzzy
+msgid "# HELLO messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/topology/gnunet-daemon-topology.c:1185
+#, fuzzy
+msgid "# HELLO messages gossipped"
+msgstr "# ausgehender Nachrichten verworfen"
+
+#: src/topology/gnunet-daemon-topology.c:1325
+msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+msgstr ""
+
 #: src/chat/chat.c:175
 #, fuzzy
 msgid "Could not transmit confirmation receipt\n"
@@ -4152,6 +4020,26 @@
 msgid "Undefined mandatory parameter: memberCallback\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
 #, c-format
 msgid "Joined\n"
@@ -4346,654 +4234,657 @@
 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/nat/gnunet-nat-server.c:289
+#, c-format
+msgid "Please pass valid port number as the first argument! (got `%s')\n"
+msgstr ""
 
-#: 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/nat/gnunet-nat-server.c:328
+msgid "GNUnet NAT traversal test helper daemon"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:729
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "Fehler beim Speichern der Konfiguration!"
+#: src/nat/nat.c:776
+#, c-format
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:907
-#, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "Fehler beim Speichern der Konfiguration!"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
-#: src/core/gnunet-core-list-connections.c:77
+#: src/nat/nat.c:825
 #, fuzzy, c-format
-msgid "Peer `%s'\n"
-msgstr "Ich bin Peer `%s'.\n"
+msgid "Failed to start %s\n"
+msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:222
+#: src/nat/nat.c:1094
 #, 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 "Malformed %s `%s' given in configuration!\n"
+msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
-#, 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:241
+#: src/nat/nat.c:1156 src/nat/nat.c:1166
 #, c-format
-msgid "I am peer `%s'.\n"
-msgstr "Ich bin Peer `%s'.\n"
+msgid ""
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\n"
+msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
-msgid "output only the identity strings"
+#: src/nat/nat.c:1298
+msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
-msgid "output our own identity only"
+#: src/nat/nat.c:1310
+#, c-format
+msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:270
+#: src/nat/nat_test.c:348
 #, fuzzy
-msgid "Print information about peers."
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:61
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%u with error: %s"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\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/datastore/plugin_datastore_sqlite.c:239
+#: src/block/plugin_block_dht.c:122
 #, fuzzy, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
-msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+msgid "Block not of type %u\n"
+msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:266
+#: src/block/plugin_block_dht.c:129
+msgid "Size mismatch for block\n"
+msgstr ""
+
+#: src/block/plugin_block_dht.c:138
 #, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+msgid "Block of type %u is malformed\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:677
-#, 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:1130
-msgid "sqlite version to old to determine size, assuming zero\n"
+#: src/block/plugin_block_fs.c:131
+msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1149
-#, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+#: src/block/block.c:109
+#, fuzzy, c-format
+msgid "Loading block plugins `%s'\n"
+msgstr "Teste Transport(e) %s\n"
+
+#: src/block/block.c:119
+#, fuzzy, c-format
+msgid "Failed to load block plugin `%s'\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#: src/mesh/gnunet-service-mesh.c:4121
+msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1188
+#: src/mesh/gnunet-service-mesh.c:4324
 #, fuzzy
-msgid "Sqlite database running\n"
-msgstr "sqlite Datenspeicher"
+msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
+msgstr "GNUnet Konfiguration"
 
-#: src/datastore/gnunet-service-datastore.c:52
+#: src/mesh/gnunet-service-mesh.c:4333
 #, fuzzy
-msgid "# bytes used in file-sharing datastore"
-msgstr "# bytes erlaubt in der Datenbank"
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:331
+#: 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 "# bytes expired"
-msgstr "# Bytes empfangen über TCP"
+msgid "# invalid HELLOs downloaded from hostlist servers"
+msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/datastore/gnunet-service-datastore.c:397
-msgid "# bytes purged (low-priority)"
+#: 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 "# valid HELLOs downloaded from hostlist servers"
+msgstr "# Hellos per HTTP heruntergeladen"
+
+#: 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/datastore/gnunet-service-datastore.c:457
-msgid "Transmission to client failed!\n"
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:610
-msgid "# results found"
+#: src/hostlist/hostlist-client.c:622
+#, c-format
+msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:655
+#: src/hostlist/hostlist-client.c:663
 #, c-format
 msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
-"%llu bytes\n"
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:666
+#: 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/hostlist/hostlist-client.c:822
 #, c-format
-msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:670
-msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+#: 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/datastore/gnunet-service-datastore.c:676
-msgid "Insufficient space to satisfy request"
+#: src/hostlist/hostlist-client.c:856
+#, c-format
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:681
-#: src/datastore/gnunet-service-datastore.c:735
-#: src/datastore/gnunet-service-datastore.c:956
-#: src/datastore/gnunet-service-datastore.c:1441
-msgid "# reserved"
+#: src/hostlist/hostlist-client.c:909
+#, c-format
+msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:750
-msgid "Could not find matching reservation"
+#: src/hostlist/hostlist-client.c:917
+msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:838
+#: 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 "Need %llu bytes more space (%llu allowed, using %llu)\n"
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1004
-#, fuzzy
-msgid "# GET requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/hostlist/hostlist-client.c:1092
+msgid "Scheduled saving of hostlists\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1018
-msgid "# requests filtered by bloomfilter"
+#: src/hostlist/hostlist-client.c:1096
+#, c-format
+msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1046
+#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
 #, fuzzy
-msgid "# UPDATE requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+msgid "# active connections"
+msgstr "GNUnet Konfiguration"
 
-#: src/datastore/gnunet-service-datastore.c:1080
-#, fuzzy
-msgid "# GET REPLICATION requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/hostlist/hostlist-client.c:1253
+#, c-format
+msgid "Initial time between hostlist downloads is %llums\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1115
-#, fuzzy
-msgid "# GET ZERO ANONYMITY requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/hostlist/hostlist-client.c:1284
+#, c-format
+msgid ""
+"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1142
-#, fuzzy
-msgid "Content not found"
-msgstr "Kommando `%s' wurde nicht gefunden!\n"
+#: 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/datastore/gnunet-service-datastore.c:1152
-msgid "# bytes removed (explicit request)"
+#: src/hostlist/hostlist-client.c:1294
+#, c-format
+msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1186
-#, fuzzy
-msgid "# REMOVE requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+#: 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/datastore/gnunet-service-datastore.c:1230
+#: src/hostlist/hostlist-client.c:1338
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1303
-#: src/datastore/test_plugin_datastore.c:322
-#: src/datastore/perf_plugin_datastore.c:420
+#: src/hostlist/hostlist-client.c:1340
+msgid "# hostlist URIs read from file"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1373
 #, c-format
-msgid "Loading `%s' datastore plugin\n"
+msgid ""
+"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1312
+#: src/hostlist/hostlist-client.c:1387
 #, fuzzy, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+msgid "Could not open file `%s' for writing to save hostlists: %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1491
-msgid "# quota"
+#: 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/datastore/gnunet-service-datastore.c:1493
-msgid "# cache size"
+#: src/hostlist/hostlist-client.c:1428
+msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/hostlist/hostlist-client.c:1480
+msgid "Learning is enabled on this peer\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1483
 #, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1516
-#, fuzzy
-msgid "Failed to initialize bloomfilter.\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+#: src/hostlist/hostlist-client.c:1492
+msgid "Learning is not enabled on this peer\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:241
-msgid "Template database running\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/datastore/datastore_api.c:287
-#, fuzzy
-msgid "Failed to transmit request to drop database.\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+#: 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/datastore/datastore_api.c:370
-msgid "# queue entry timeouts"
+#: src/hostlist/gnunet-daemon-hostlist.c:257
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:417
-msgid "# queue overflows"
+#: src/hostlist/gnunet-daemon-hostlist.c:310
+msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/datastore/datastore_api.c:444
-#, fuzzy
-msgid "# queue entries created"
-msgstr "# dht Anfragen weitergeleitet"
+#: src/hostlist/gnunet-daemon-hostlist.c:315
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
+msgstr ""
 
-#: src/datastore/datastore_api.c:465
-#, fuzzy
-msgid "# Requests dropped from datastore queue"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+#: src/hostlist/gnunet-daemon-hostlist.c:318
+msgid "enable learning about hostlist servers from other peers"
+msgstr ""
 
-#: src/datastore/datastore_api.c:514
-msgid "# datastore connections (re)created"
+#: src/hostlist/gnunet-daemon-hostlist.c:322
+msgid "provide a hostlist server"
 msgstr ""
 
-#: src/datastore/datastore_api.c:541
-msgid "# reconnected to DATASTORE"
+#: src/hostlist/gnunet-daemon-hostlist.c:334
+msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/datastore/datastore_api.c:606
+#: src/hostlist/hostlist-server.c:134
 #, fuzzy
-msgid "Failed to transmit request to DATASTORE.\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/datastore/datastore_api.c:608
-#, fuzzy
-msgid "# transmission request failures"
-msgstr "# Klartext PONG Nachrichten empfangen"
-
-#: src/datastore/datastore_api.c:631
-#, fuzzy
-msgid "# bytes sent to datastore"
+msgid "bytes in hostlist"
 msgstr "# bytes in der Datenbank"
 
-#: src/datastore/datastore_api.c:768
-#, fuzzy
-msgid "Failed to receive status response from database."
+#: src/hostlist/hostlist-server.c:160
+msgid "expired addresses encountered"
 msgstr ""
-"\n"
-"Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:781
-msgid "Error reading response from datastore service"
+#: src/hostlist/hostlist-server.c:208
+msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
-#, fuzzy
-msgid "Invalid error message received from datastore service"
-msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
+#: src/hostlist/hostlist-server.c:224
+msgid "bytes not included in hostlist (size limit)"
+msgstr ""
 
-#: src/datastore/datastore_api.c:806
-#, fuzzy
-msgid "# status messages received"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
+#: src/hostlist/hostlist-server.c:272
+#, fuzzy, c-format
+msgid "Refusing `%s' request to hostlist server\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/datastore/datastore_api.c:878
+#: src/hostlist/hostlist-server.c:275
 #, fuzzy
-msgid "# PUT requests executed"
-msgstr "# dht Anfragen weitergeleitet"
+msgid "hostlist requests refused (not HTTP GET)"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/datastore_api.c:950
-#, fuzzy
-msgid "# RESERVE requests executed"
-msgstr "# dht Anfragen weitergeleitet"
+#: src/hostlist/hostlist-server.c:283
+msgid "Sending 100 CONTINUE reply\n"
+msgstr ""
 
-#: src/datastore/datastore_api.c:1015
-msgid "# RELEASE RESERVE requests executed"
+#: src/hostlist/hostlist-server.c:290
+#, c-format
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1078
+#: src/hostlist/hostlist-server.c:294
 #, fuzzy
-msgid "# UPDATE requests executed"
-msgstr "# dht Anfragen weitergeleitet"
+msgid "hostlist requests refused (upload data)"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/datastore_api.c:1148
-#, fuzzy
-msgid "# REMOVE requests executed"
-msgstr "# dht Anfragen weitergeleitet"
-
-#: src/datastore/datastore_api.c:1193
-#, fuzzy
-msgid "Failed to receive response from database.\n"
+#: src/hostlist/hostlist-server.c:302
+msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
-"\n"
-"Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1254
+#: src/hostlist/hostlist-server.c:305
 #, fuzzy
-msgid "# Results received"
-msgstr "# Bytes empfangen über TCP"
+msgid "hostlist requests refused (not ready)"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/datastore_api.c:1326
-msgid "# GET REPLICATION requests executed"
+#: src/hostlist/hostlist-server.c:309
+msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1393
-msgid "# GET ZERO ANONYMITY requests executed"
-msgstr ""
+#: src/hostlist/hostlist-server.c:310
+#, fuzzy
+msgid "hostlist requests processed"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/datastore_api.c:1457
+#: src/hostlist/hostlist-server.c:353
 #, fuzzy
-msgid "# GET requests executed"
-msgstr "# dht Anfragen weitergeleitet"
+msgid "# hostlist advertisements send"
+msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+#: src/hostlist/hostlist-server.c:400
+msgid "Advertisement message could not be queued by core\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:622
+#: src/hostlist/hostlist-server.c:568
 #, 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 "Invalid port number %llu.  Exiting.\n"
+msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1500
-msgid "Mysql database running\n"
+#: src/hostlist/hostlist-server.c:577
+#, c-format
+msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:173
+#: src/hostlist/hostlist-server.c:591
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+msgid "Address to obtain hostlist: `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/datastore/plugin_datastore_postgres.c:979
-msgid "Postgres database running\n"
-msgstr ""
+#: src/hostlist/hostlist-server.c:629
+#, 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/dv/plugin_transport_dv.c:159
+#: src/peerinfo-tool/gnunet-peerinfo.c:222
 #, 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"
+msgid "Could not find option `%s:%s' in configuration.\n"
+msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/dv/dv_api.c:178
-#, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#, fuzzy, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
 
-#: src/nse/gnunet-service-nse.c:866
+#: src/peerinfo-tool/gnunet-peerinfo.c:241
 #, c-format
-msgid "Proof of work invalid: %llu!\n"
+msgid "I am peer `%s'.\n"
+msgstr "Ich bin Peer `%s'.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:261
+msgid "output only the identity strings"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1288 src/nse/gnunet-service-nse.c:1307
-#: src/nse/gnunet-service-nse.c:1328
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
+msgid "output our own identity only"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1295
+#: src/peerinfo-tool/gnunet-peerinfo.c:270
 #, fuzzy
-msgid "Invalid work requirement for NSE service. Exiting.\n"
-msgstr "Ungültige Parameter. Abbruch.\n"
+msgid "Print information about peers."
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/nse/gnunet-service-nse.c:1316
-#, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+#: src/include/gnunet_getopt_lib.h:144
+msgid "print this help"
+msgstr "Gibt diese Hilfe aus"
 
-#: src/nse/gnunet-nse-profiler.c:673
-#, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "Auf den Dienst konnte nicht zugegriffen werden"
+#: src/include/gnunet_getopt_lib.h:154
+msgid "print the version number"
+msgstr "Versionsnummer ausgeben"
 
-#: src/core/gnunet-service-core.c:920
-msgid "# total peer preference"
+#: src/include/gnunet_getopt_lib.h:163
+msgid "configure logging to write logs to LOGFILE"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1040
-msgid "# peer status changes"
+#: src/include/gnunet_getopt_lib.h:172
+msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1236
-#, fuzzy
-msgid "# send requests dropped (disconnected)"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+#: src/include/gnunet_getopt_lib.h:181
+msgid "be verbose"
+msgstr "umfangreiche Meldungen ausgeben"
 
-#: src/core/gnunet-service-core.c:1712
-#, c-format
-msgid ""
-"Client asked for preference change with peer `%s', which is not connected!\n"
-msgstr ""
+#: src/include/gnunet_getopt_lib.h:190
+msgid "use configuration file FILENAME"
+msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/core/gnunet-service-core.c:1793 src/core/gnunet-service-core.c:4240
-#: src/core/gnunet-service-core.c:4456
-msgid "# established sessions"
-msgstr ""
+#: src/include/gnunet_common.h:352 src/include/gnunet_common.h:357
+#: src/include/gnunet_common.h:363
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d.\n"
+msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/core/gnunet-service-core.c:1838
-msgid "# bytes encrypted"
-msgstr "# Bytes verschlüsselt"
+#: src/include/gnunet_common.h:373
+#, fuzzy, c-format
+msgid "External protocol violation detected at %s:%d.\n"
+msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/core/gnunet-service-core.c:1964 src/core/gnunet-service-core.c:2793
-#: src/core/gnunet-service-core.c:4532
-msgid "# neighbour entries allocated"
-msgstr ""
+#: src/include/gnunet_common.h:394 src/include/gnunet_common.h:401
+#, 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"
 
-#: src/core/gnunet-service-core.c:2031
-msgid "# encrypted bytes given to transport"
-msgstr ""
+#, fuzzy
+#~ msgid "Target is %d connections per peer."
+#~ msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/core/gnunet-service-core.c:2134
-msgid "# bytes decrypted"
-msgstr "# Bytes entschlüsselt"
+#, 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"
 
-#: src/core/gnunet-service-core.c:2314
-msgid "# transmissions delayed due to corking"
-msgstr ""
+#, fuzzy
+#~ msgid "Copying file with command cp %s %s\n"
+#~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/core/gnunet-service-core.c:2517
-msgid "# messages discarded (expired prior to transmission)"
-msgstr ""
+#, fuzzy
+#~ msgid "Offering Hello of peer %s to peer %s\n"
+#~ msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/core/gnunet-service-core.c:2857
 #, fuzzy
-msgid "# messages discarded (disconnected)"
-msgstr "# defragmentierter Nachrichten"
+#~ msgid "Unknown topology specification, can't connect peers!\n"
+#~ msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/core/gnunet-service-core.c:2909 src/core/gnunet-service-core.c:4644
-msgid "# discarded CORE_SEND requests"
-msgstr ""
+#, fuzzy
+#~ msgid "Could not read hostkeys file!\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/core/gnunet-service-core.c:2924 src/core/gnunet-service-core.c:4648
-msgid "# discarded lower priority CORE_SEND requests"
-msgstr ""
+#, fuzzy
+#~ msgid "`scp' did not complete cleanly.\n"
+#~ msgstr "`%s' ist zu keinem Knoten verbunden.\n"
 
-#: src/core/gnunet-service-core.c:2996
 #, fuzzy
-msgid "# connection requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+#~ msgid "Failed to create pipe for `ssh' process.\n"
+#~ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/core/gnunet-service-core.c:3008
-msgid "# connection requests ignored (already connected)"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
+#~ msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/core/gnunet-service-core.c:3054 src/core/gnunet-service-core.c:3697
-msgid "# SET_KEY messages deferred (need public key)"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to start `ssh' process.\n"
+#~ msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/core/gnunet-service-core.c:3067
-msgid "# Delayed connecting due to lack of public key"
-msgstr ""
+#, fuzzy
+#~ msgid "Error reading from gnunet-peerinfo: %s\n"
+#~ msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
 
-#: src/core/gnunet-service-core.c:3099
-msgid "# Error extracting public key from HELLO"
-msgstr ""
+#, fuzzy
+#~ msgid "`Failed to get hostkey!\n"
+#~ msgstr ""
+#~ "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/core/gnunet-service-core.c:3145
-msgid "# Asking transport to connect (for SET_KEY)"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to start `gnunet-arm' process.\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/core/gnunet-service-core.c:3270
 #, fuzzy
-msgid "# SET_KEY and PING messages created"
-msgstr "# PING Nachrichten erstellt"
+#~ msgid "Starting service %s for peer `%4s'\n"
+#~ msgstr "Collection `%s' begonnen.\n"
 
-#: src/core/gnunet-service-core.c:3349
-#, c-format
-msgid ""
-"Ignoring `%s' message due to lack of public key for peer `%4s' (failed to "
-"obtain one).\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Terminating peer `%4s'\n"
+#~ msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/core/gnunet-service-core.c:3444
 #, fuzzy
-msgid "# PING messages decrypted"
-msgstr "# PING Nachrichten erstellt"
+#~ msgid "Setting d->dead on peer `%4s'\n"
+#~ msgstr "Collection `%s' begonnen.\n"
 
-#: src/core/gnunet-service-core.c:3456
-#, c-format
-msgid ""
-"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
-"%s'\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to write new configuration to disk."
+#~ msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/core/gnunet-service-core.c:3481
 #, fuzzy
-msgid "# PONG messages created"
-msgstr "# PING Nachrichten erstellt"
+#~ 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/core/gnunet-service-core.c:3534
 #, fuzzy
-msgid "# PONG messages decrypted"
-msgstr "# PING Nachrichten erstellt"
+#~ msgid "Failed to copy new configuration to remote machine."
+#~ msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/core/gnunet-service-core.c:3572
 #, fuzzy
-msgid "# Session keys confirmed via PONG"
-msgstr "# Knotenankündigungen empfangen"
+#~ msgid "Peers failed to connect"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/core/gnunet-service-core.c:3706
-#, fuzzy, c-format
-msgid "Received `%s' message that was for `%s', not for me.  Ignoring.\n"
-msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
+#, fuzzy
+#~ msgid "Failed to connect to core service of first peer!\n"
+#~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/core/gnunet-service-core.c:3748
 #, fuzzy
-msgid "# SET_KEY messages decrypted"
-msgstr "# defragmentierter Nachrichten"
+#~ msgid "Could not resolve our FQDN : %s %u\n"
+#~ msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/core/gnunet-service-core.c:3894
-#, fuzzy, c-format
-msgid "# bytes of messages of type %u received"
-msgstr "# Bytes Rauschen empfangen"
+#, fuzzy
+#~ msgid "Failed to start daemon: %s\n"
+#~ msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/core/gnunet-service-core.c:3941
-msgid "# messages not delivered to any client"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to load dhtlog plugin for `%s'\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/core/gnunet-service-core.c:4011 src/core/gnunet-service-core.c:4036
 #, fuzzy
-msgid "# bytes dropped (duplicates)"
-msgstr "# Bytes verworfen von UDP (outgoing)"
+#~ msgid "Failed to get full path for `%s'\n"
+#~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/core/gnunet-service-core.c:4023
 #, fuzzy
-msgid "# bytes dropped (out of sequence)"
-msgstr "# Bytes verworfen von UDP (outgoing)"
+#~ msgid "Failed to create file for dhtlog.\n"
+#~ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/core/gnunet-service-core.c:4060
-#, fuzzy, c-format
-msgid "Message received far too old (%llu ms). Content ignored.\n"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+#, fuzzy
+#~ msgid "Found peer `%s'\n"
+#~ msgstr "Ich bin Peer `%s'.\n"
 
-#: src/core/gnunet-service-core.c:4064
 #, fuzzy
-msgid "# bytes dropped (ancient message)"
-msgstr "# Bytes verworfen von UDP (outgoing)"
+#~ msgid "Failed to initialize MySQL database connection for dhtlog.\n"
+#~ msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/core/gnunet-service-core.c:4094
 #, fuzzy
-msgid "# bytes of payload decrypted"
-msgstr "# Bytes entschlüsselt"
+#~ msgid "Loading udp transport plugin\n"
+#~ msgstr "Teste Transport(e) %s\n"
 
-#: src/core/gnunet-service-core.c:4157
 #, fuzzy
-msgid "# session keys received"
-msgstr "# Sitzungsschlüssel abgelehnt"
+#~ msgid "Failed to load transport plugin for udp\n"
+#~ msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/core/gnunet-service-core.c:4173
-msgid "# failed to decrypt message (no session key)"
-msgstr ""
+#, fuzzy
+#~ msgid "# SET QUOTA messages received"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core.c:4229
-#, fuzzy, c-format
-msgid "Unsupported message of type %u received.\n"
-msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
+#, fuzzy
+#~ msgid "curl failed for `%s' at %s:%d: `%s'\n"
+#~ msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/core/gnunet-service-core.c:4403 src/core/gnunet-service-core.c:4485
 #, fuzzy
-msgid "# peers connected (transport)"
-msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
+#~ msgid "Phase 3: sending messages\n"
+#~ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/core/gnunet-service-core.c:4599
-msgid "Core service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Loading HTTPS transport plugin `%s'\n"
+#~ msgstr "Teste Transport(e) %s\n"
 
-#: src/core/gnunet-service-core.c:4617
-msgid "Core service could not access hostkey.  Exiting.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to load transport plugin for https\n"
+#~ msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/core/gnunet-service-core.c:4656
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Fail! Could not connect peers\n"
+#~ msgstr "`%s': Verbindung konnte nicht hergestellt werden.\n"
 
-#: src/core/core_api.c:832
-msgid "Client was disconnected from core service, trying to reconnect.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Loading tcp transport plugin\n"
+#~ msgstr "Teste Transport(e) %s\n"
 
-#: src/include/gnunet_common.h:296 src/include/gnunet_common.h:301
-#: src/include/gnunet_common.h:307
-#, fuzzy, c-format
-msgid "Assertion failed at %s:%d.\n"
-msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+#, fuzzy
+#~ msgid "Failed to load transport plugin for tcp\n"
+#~ msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/include/gnunet_common.h:317
-#, fuzzy, c-format
-msgid "External protocol violation detected at %s:%d.\n"
-msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+#, fuzzy
+#~ msgid "# HTTP peers active"
+#~ msgstr "# Bytes empfangen über TCP"
 
-#: src/include/gnunet_common.h:331
-#, 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 "Connection: %X: %s failed at %s:%d: `%s'\n"
+#~ msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/include/gnunet_getopt_lib.h:144
-msgid "print this help"
-msgstr "Gibt diese Hilfe aus"
+#, fuzzy
+#~ msgid "Misconfigured address to bind to in configuration!\n"
+#~ msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/include/gnunet_getopt_lib.h:154
-msgid "print the version number"
-msgstr "Versionsnummer ausgeben"
+#, fuzzy
+#~ msgid "Required configuration options missing in section `%s'\n"
+#~ msgstr ""
+#~ "Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in "
+#~ "der Sektion `%s' angegeben werden.\n"
 
-#: src/include/gnunet_getopt_lib.h:163
-msgid "configure logging to write logs to LOGFILE"
-msgstr ""
+#, fuzzy
+#~ msgid "Loading HTTP transport plugin `%s'\n"
+#~ msgstr "Teste Transport(e) %s\n"
 
-#: src/include/gnunet_getopt_lib.h:172
-msgid "configure logging to use LOGLEVEL"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to load transport plugin for http\n"
+#~ msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/include/gnunet_getopt_lib.h:181
-msgid "be verbose"
-msgstr "umfangreiche Meldungen ausgeben"
+#, fuzzy
+#~ msgid "# connection requests received"
+#~ msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/include/gnunet_getopt_lib.h:190
-msgid "use configuration file FILENAME"
-msgstr "Konfigurationsdatei FILENAME verwenden"
+#, fuzzy
+#~ msgid "# PING messages decrypted"
+#~ msgstr "# PING Nachrichten erstellt"
 
 #, fuzzy
 #~ msgid "Failed to connect to core service\n"
@@ -5012,10 +4903,6 @@
 #~ msgstr "Transport %d wird ausgewählten anderen Knoten bekannt gegeben.\n"
 
 #, fuzzy
-#~ msgid "# transmission attempts failed (no address)"
-#~ msgstr "Kein Transport des Typs %d bekannt.\n"
-
-#, fuzzy
 #~ msgid "# peer addresses considered valid"
 #~ msgstr "# Knotenankündigungen empfangen"
 
@@ -5024,18 +4911,10 @@
 #~ msgstr "# PING Nachrichten erstellt"
 
 #, fuzzy
-#~ msgid "# PING messages sent for re-validation"
-#~ msgstr "# PING Nachrichten erstellt"
-
-#, fuzzy
 #~ msgid "# HELLOs received for validation"
 #~ msgstr "# Blöcke migriert"
 
 #, fuzzy
-#~ msgid "# bytes discarded due to disconnect"
-#~ msgstr "# Knotenankündigungen empfangen"
-
-#, fuzzy
 #~ msgid "Received `%s' message from `%s' destined for `%s' which is not me!\n"
 #~ msgstr "Empfangener PING ist nicht an uns gerichtet!\n"
 
@@ -5047,10 +4926,6 @@
 #~ msgid "# HELLO messages received from other peers"
 #~ msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#, fuzzy
-#~ msgid "# HELLOs received from clients"
-#~ msgstr "Empfangene Client-Nachricht ist ungültig.\n"
-
 #~ msgid "Error"
 #~ msgstr "Fehler"
 
@@ -5751,10 +5626,6 @@
 #~ "Formatangabe ungültig. Verwenden Sie 0 für menschen-lesbar, 1 für dot und "
 #~ "2 für vcg.\n"
 
-#, fuzzy
-#~ msgid "`%.*s' connected to `%.*s'.\n"
-#~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
-
 #~ msgid "allows mapping of the network topology"
 #~ msgstr "Erlaubt die Kartographierung der Netzwerktopologie"
 
@@ -5804,9 +5675,6 @@
 #~ msgid "# Peer advertisements not confirmed due to send error"
 #~ msgstr "# Knotenankündigungen empfangen"
 
-#~ msgid "# plaintext PING messages sent"
-#~ msgstr "# Klartext PING Nachrichten gesendet"
-
 #~ msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 #~ msgstr "`%s' registriert Handler %d (Plaintext und Ciphertext)\n"
 
@@ -6284,10 +6152,6 @@
 #~ msgid "# gap content total planned"
 #~ msgstr "# gap Anfragen insgesamt empfangen"
 
-#, fuzzy
-#~ msgid "# gap routes succeeded"
-#~ msgstr "# gap Routing erfolgreich (insgesamt)"
-
 #~ msgid "# gap requests total received"
 #~ msgstr "# gap Anfragen insgesamt empfangen"
 
@@ -6517,16 +6381,10 @@
 #~ msgid "Unable to obtain filesystem information for `%s': %u\n"
 #~ msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#~ msgid "Could not get address of peer `%s'.\n"
-#~ msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
-
 #, fuzzy
 #~ msgid "`%s' message invalid (signature invalid).\n"
 #~ msgstr "Hello Nachricht ist ungültig (Signatur ist ungültig).\n"
 
-#~ msgid "Peer `%s' with trust %8u and address `%s'\n"
-#~ msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
-
 #~ msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 #~ msgstr "`%s' wählte %d von %d Nachrichten aus (MTU: %d).\n"
 
@@ -6593,9 +6451,6 @@
 #~ "\n"
 #~ "Kontaktiere `%s'."
 
-#~ msgid " Connection failed\n"
-#~ msgstr " Verbindung fehlgeschlagen\n"
-
 #~ msgid " Connection failed (bug?)\n"
 #~ msgstr " Verbindung fehlgeschlagen (Bug?)\n"
 
@@ -6649,10 +6504,6 @@
 #~ msgstr "# Bytes verworfen von HTTP"
 
 #, fuzzy
-#~ msgid "# HTTP PUT received"
-#~ msgstr "# Bytes empfangen über TCP"
-
-#, fuzzy
 #~ msgid "# HTTP connect calls"
 #~ msgstr "# verbundener Knoten"
 
@@ -6884,9 +6735,6 @@
 #~ msgid "async RPC reply not received.\n"
 #~ msgstr "async RPC Antwort nicht empfangen.\n"
 
-#~ msgid "GAP received invalid content from `%s'\n"
-#~ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
-
 #~ msgid ""
 #~ "Cover traffic requested but traffic service not loaded.  Rejecting "
 #~ "request.\n"
@@ -7526,9 +7374,6 @@
 #~ msgstr ""
 #~ "Sie müssen einen Spitznamen angeben (verwenden Sie die Option `%s').\n"
 
-#~ msgid "Could not send join message to gnunetd\n"
-#~ msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
-
 #~ msgid "Could not send message to gnunetd\n"
 #~ msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
@@ -7869,9 +7714,6 @@
 #~ "über die TCP6-Verbindung zu einem anderen Knoten wurde eine ungültige "
 #~ "Nachricht empfangen. Verbindung wird geschlossen.\n"
 
-#~ msgid "Network advertisements disabled by configuration!\n"
-#~ msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
-
 #~ msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
 #~ msgstr ""
 #~ "Versionen stimmen nicht überein (`%s' vs. '%*.s'), lassen Sie gnunet-"
@@ -8353,9 +8195,6 @@
 #~ "Bitte geben Sie den Pfad an, wohin die Konfigurationsdateien gespeichert "
 #~ "werden."
 
-#~ msgid "# p2p trace replies sent"
-#~ msgstr "# p2p Trace-Antworten gesendet"
-
 #~ msgid "Session with peer `%s' confirmed, but I cannot connect! (bug?)\n"
 #~ msgstr ""
 #~ "Sitzung mit Knoten `%s' ist bestätigt es kann jedoch nicht verbunden "

Modified: gnunet/po/es.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2011-10-30 18:21:10 UTC (rev 17862)
+++ gnunet/po/es.po     2011-10-30 18:28:26 UTC (rev 17863)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-09-19 13:28+0200\n"
+"POT-Creation-Date: 2011-10-30 19:19+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,2166 +17,2048 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/fragmentation/defragmentation.c:270
-msgid "# acknowledgements sent for fragment"
-msgstr ""
-
-#: src/fragmentation/defragmentation.c:454
-#, fuzzy
-msgid "# fragments received"
-msgstr "# fragmentos descartados"
-
-#: src/fragmentation/defragmentation.c:513
-#, fuzzy
-msgid "# duplicate fragments received"
-msgstr "# bytes recibidos por TCP"
-
-#: src/fragmentation/defragmentation.c:532
-msgid "# messages defragmented"
-msgstr "# mensajes defragmentados"
-
-#: src/fragmentation/fragmentation.c:183
-#, fuzzy
-msgid "# fragments transmitted"
-msgstr "# Auto-anuncios transmitidos"
-
-#: src/fragmentation/fragmentation.c:186
-#, fuzzy
-msgid "# fragments retransmitted"
-msgstr "# Auto-anuncios transmitidos"
-
-#: src/fragmentation/fragmentation.c:248
-msgid "# messages fragmented"
-msgstr "# mensajes fragmentados"
-
-#: src/fragmentation/fragmentation.c:251
-msgid "# total size of fragmented messages"
-msgstr ""
-
-#: src/fragmentation/fragmentation.c:335
-#, fuzzy
-msgid "# fragment acknowledgements received"
-msgstr "# Anuncios de los pares recibidos"
-
-#: src/fragmentation/fragmentation.c:341
-msgid "# bits removed from fragmentation ACKs"
-msgstr ""
-
-#: src/fragmentation/fragmentation.c:365
-#, fuzzy
-msgid "# fragmentation transmissions completed"
-msgstr "# mensajes de texto mandados por PING"
-
-#: src/nat/nat.c:778
-#, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
-msgstr ""
-
-#: src/nat/nat.c:828
-#, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "Falló al comenzar la recolección.\n"
-
-#: src/nat/nat.c:1096
-#, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "Imposible guardar la configuración"
-
-#: src/nat/nat.c:1158 src/nat/nat.c:1168
-#, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
-msgstr ""
-
-#: src/nat/nat.c:1300
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
-msgstr ""
-
-#: src/nat/nat.c:1312
-#, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
-msgstr ""
-
-#: src/nat/gnunet-nat-server.c:289
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
-msgstr ""
-
-#: src/nat/gnunet-nat-server.c:328
-msgid "GNUnet NAT traversal test helper daemon"
-msgstr ""
-
-#: src/nat/nat_test.c:349
-#, fuzzy
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/nat/nat_test.c:419
-#, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
-msgstr ""
-
-#: src/vpn/gnunet-daemon-vpn.c:1279 src/template/gnunet-template.c:68
-#: src/core/test_core_api_send_to_self.c:217
-#, fuzzy
-msgid "help text"
-msgstr "texto de ayuda para -t"
-
-#: src/vpn/gnunet-daemon-exit.c:1493
-msgid "Daemon to run to provide an IP exit node for the VPN"
-msgstr ""
-
-#: src/datacache/datacache.c:108 src/datacache/datacache.c:236
-#: src/datastore/gnunet-service-datastore.c:824
-#, fuzzy
-msgid "# bytes stored"
-msgstr "# bytes en la base de datos"
-
-#: src/datacache/datacache.c:134 src/datacache/datacache.c:142
-#: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486
-#: src/datastore/test_plugin_datastore.c:192
-#: src/datastore/test_plugin_datastore.c:315
-#: src/datastore/perf_plugin_datastore.c:309
-#: src/datastore/perf_plugin_datastore.c:413
-#, fuzzy, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr "¡Ninguna aplicación definida en la configuración!\n"
-
-#: src/datacache/datacache.c:167
-#, c-format
-msgid "Loading `%s' datacache plugin\n"
-msgstr ""
-
-#: src/datacache/datacache.c:176
-#, 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:262
-#, fuzzy
-msgid "# requests received"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/datacache/datacache.c:268
-msgid "# requests filtered by bloom filter"
-msgstr ""
-
-#: src/datacache/plugin_datacache_template.c:121
-msgid "Template datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_sqlite.c:66
-#: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:122
-#: src/datacache/plugin_datacache_sqlite.c:191
-#: src/datacache/plugin_datacache_sqlite.c:232
-#: src/datacache/plugin_datacache_sqlite.c:295
-#: src/datacache/plugin_datacache_sqlite.c:304
-#: src/datacache/plugin_datacache_sqlite.c:315
-#: src/datacache/plugin_datacache_sqlite.c:322
-#: src/datacache/plugin_datacache_sqlite.c:332
-#: src/datacache/plugin_datacache_sqlite.c:340
-#: src/datacache/plugin_datacache_sqlite.c:348
-#: 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/util/crypto_rsa.c:84
-#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:581
-#: src/dht/plugin_dhtlog_mysql.c:590 src/dht/plugin_dhtlog_mysql.c:648
-#: src/dht/plugin_dhtlog_mysql.c:663
 #: 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/include/gnunet_common.h:324
+#: src/datastore/plugin_datastore_mysql.c:685 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:90 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:380
+#: src/include/gnunet_common.h:387
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:413
-msgid "Sqlite datacache running\n"
-msgstr ""
+#: src/datastore/plugin_datastore_sqlite.c:61
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%u with error: %s"
+msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:446
+#: src/datastore/plugin_datastore_sqlite.c:239
+#, fuzzy, c-format
+msgid "Option `%s' in section `%s' missing in configuration!\n"
+msgstr "¡Ninguna aplicación definida en la configuración!\n"
+
+#: src/datastore/plugin_datastore_sqlite.c:266
+#, fuzzy, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "Imposible inicializar SQLite.\n"
+
 #: src/datastore/plugin_datastore_sqlite.c:420
+#: src/datacache/plugin_datacache_sqlite.c:471
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: 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/datastore/plugin_datastore_sqlite.c:677
+#, 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/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "Imposible inicializar SQLite.\n"
+#: src/datastore/plugin_datastore_sqlite.c:1130
+msgid "sqlite version to old to determine size, assuming zero\n"
+msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:500
-msgid "Postgres datacache running\n"
+#: src/datastore/plugin_datastore_sqlite.c:1149
+#, c-format
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:224
+#: src/datastore/plugin_datastore_sqlite.c:1188
+#, fuzzy
+msgid "Sqlite database running\n"
+msgstr "base de datos sqlite"
+
 #: 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/datacache/plugin_datacache_mysql.c:230
 #: src/datastore/plugin_datastore_mysql.c:322
+#: src/datacache/plugin_datacache_mysql.c:230
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/datacache/plugin_datacache_mysql.c:979
-msgid "MySQL datacache running\n"
-msgstr ""
+#: src/datastore/plugin_datastore_mysql.c:529
+#, fuzzy, c-format
+msgid "Failed to prepare statement `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/testing/testing_group.c:1903 src/testing/testing_group.c:1915
-#: src/testing/testing_group.c:2016 src/testing/testing_group.c:2075
-#: src/testing/testing_group.c:2164 src/testing/testing_group.c:2184
-#: src/testing/testing_group.c:2321 src/testing/test_testing_topology.c:1078
-#: src/testing/test_testing_topology_blacklist.c:448
-#: src/testing/testing_peergroup.c:876
-#: src/testing/test_testing_large_topology.c:1022
-#: src/dht/test_dht_multipeer.c:864 src/dht/gnunet-dht-driver.c:3897
-#: src/dv/test_transport_api_dv.c:1132
-#, c-format
-msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
-msgstr ""
-
-#: src/testing/testing_group.c:1925
+#: src/datastore/plugin_datastore_mysql.c:622
 #, fuzzy, c-format
-msgid "Target is %d connections per peer."
-msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
+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/testing/testing_group.c:2172
-#, c-format
-msgid ""
-"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
-"greater than 0\n"
+#: src/datastore/plugin_datastore_mysql.c:1500
+msgid "Mysql database running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2202 src/testing/testing_group.c:2395
-#, c-format
-msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
-msgstr ""
+#: src/datastore/plugin_datastore_postgres.c:93
+#: src/datacache/plugin_datacache_postgres.c:79
+#, 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/testing/testing_group.c:2239
-#, c-format
-msgid "natural log of %d is %d, will run %d iterations\n"
-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/testing/testing_group.c:2242
-#, c-format
-msgid "Total connections added thus far: %u!\n"
+#: src/datastore/plugin_datastore_postgres.c:979
+msgid "Postgres database running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2283
-#, c-format
-msgid "Total connections added for small world: %d!\n"
-msgstr ""
+#: 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/testing/testing_group.c:2335
-#, c-format
-msgid "rand is %f probability is %f\n"
+#: src/datastore/datastore_api.c:372
+msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/testing/testing_group.c:2910 src/testing/testing_group.c:3109
-#, c-format
-msgid ""
-"No `%s' specified in peer configuration in section `%s', cannot copy friends "
-"file!\n"
+#: src/datastore/datastore_api.c:418
+msgid "# queue overflows"
 msgstr ""
 
-#: src/testing/testing_group.c:3011
-msgid "Finished copying all friend files!\n"
+#: src/datastore/datastore_api.c:445
+msgid "# queue entries created"
 msgstr ""
 
-#: src/testing/testing_group.c:3124
-#, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
-msgstr "'%s' falló con el código de error %s: %s"
+#: src/datastore/datastore_api.c:465
+#, fuzzy
+msgid "# Requests dropped from datastore queue"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/testing/testing_group.c:3147
-#, c-format
-msgid "Copying file with command scp %s %s\n"
+#: src/datastore/datastore_api.c:513
+msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/testing/testing_group.c:3164
-#, c-format
-msgid "Checking copy status of file %d\n"
+#: src/datastore/datastore_api.c:540
+msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/testing/testing_group.c:3182
-#, c-format
-msgid "File %d copied\n"
+#: src/datastore/datastore_api.c:605
+msgid "Failed to transmit request to DATASTORE.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3197
-msgid "Finished copying all blacklist files!\n"
-msgstr ""
+#: src/datastore/datastore_api.c:607
+#, fuzzy
+msgid "# transmission request failures"
+msgstr "# mensajes de texto mandados por PING"
 
-#: src/testing/testing_group.c:3580 src/testing/testing_group.c:3717
-#: src/testing/testing_group.c:4925 src/testing/testing_group.c:5066
-msgid "Delaying connect, we have too many outstanding connections!\n"
-msgstr ""
+#: src/datastore/datastore_api.c:630
+#, fuzzy
+msgid "# bytes sent to datastore"
+msgstr "# bytes en la base de datos"
 
-#: src/testing/testing_group.c:3590 src/testing/testing_group.c:4935
-#: src/testing/testing_group.c:5076
-#, c-format
-msgid "Creating connection, outstanding_connections is %d\n"
+#: src/datastore/datastore_api.c:767
+#, fuzzy
+msgid "Failed to receive status response from database."
 msgstr ""
+"\n"
+"Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/testing/testing_group.c:3602
-#, fuzzy, c-format
-msgid "Offering Hello of peer %s to peer %s\n"
-msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
-
-#: src/testing/testing_group.c:3728
-#, c-format
-msgid "Creating connection, outstanding_connections is %d (max %d)\n"
+#: src/datastore/datastore_api.c:780
+msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/testing/testing_group.c:3983
-msgid "Creating clique topology\n"
-msgstr ""
+#: src/datastore/datastore_api.c:792 src/datastore/datastore_api.c:798
+#, fuzzy
+msgid "Invalid error message received from datastore service"
+msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
 
-#: src/testing/testing_group.c:3990
-msgid "Creating small world (ring) topology\n"
-msgstr ""
+#: src/datastore/datastore_api.c:804
+#, fuzzy
+msgid "# status messages received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/testing/testing_group.c:3997
-msgid "Creating small world (2d-torus) topology\n"
-msgstr ""
+#: src/datastore/datastore_api.c:875
+#, fuzzy
+msgid "# PUT requests executed"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/testing/testing_group.c:4003
-msgid "Creating ring topology\n"
+#: src/datastore/datastore_api.c:946
+msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:4009
-msgid "Creating 2d torus topology\n"
+#: src/datastore/datastore_api.c:1011
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:4015
-msgid "Creating Erdos-Renyi topology\n"
-msgstr ""
+#: src/datastore/datastore_api.c:1072
+#, fuzzy
+msgid "# UPDATE requests executed"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/testing/testing_group.c:4021
-msgid "Creating InterNAT topology\n"
-msgstr ""
+#: src/datastore/datastore_api.c:1140
+#, fuzzy
+msgid "# REMOVE requests executed"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/testing/testing_group.c:4027
-msgid "Creating Scale Free topology\n"
+#: src/datastore/datastore_api.c:1185
+#, fuzzy
+msgid "Failed to receive response from database.\n"
 msgstr ""
+"\n"
+"Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/testing/testing_group.c:4034
-msgid "Creating straight line topology\n"
-msgstr ""
+#: src/datastore/datastore_api.c:1245
+#, fuzzy
+msgid "# Results received"
+msgstr "# bytes recibidos por TCP"
 
-#: src/testing/testing_group.c:4040
-msgid "Creating topology from file!\n"
+#: src/datastore/datastore_api.c:1316
+msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:4058
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
+#: src/datastore/datastore_api.c:1383
+msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:4075
-msgid "Failed during friend file copying!\n"
-msgstr ""
+#: src/datastore/datastore_api.c:1447
+#, fuzzy
+msgid "# GET requests executed"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/testing/testing_group.c:4083
-msgid "Friend files created/copied successfully!\n"
+#: src/datastore/plugin_datastore_template.c:241
+msgid "Template database running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4102
-msgid "Blacklisting all but clique topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:52
+#, fuzzy
+msgid "# bytes used in file-sharing datastore"
+msgstr "# bytes en la base de datos"
 
-#: src/testing/testing_group.c:4110
-msgid "Blacklisting all but small world (ring) topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:331
+#, fuzzy
+msgid "# bytes expired"
+msgstr "# bytes recibidos por TCP"
 
-#: src/testing/testing_group.c:4118
-msgid "Blacklisting all but small world (2d-torus) topology\n"
+#: src/datastore/gnunet-service-datastore.c:397
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/testing/testing_group.c:4126
-msgid "Blacklisting all but ring topology\n"
+#: src/datastore/gnunet-service-datastore.c:457
+msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4134
-msgid "Blacklisting all but 2d torus topology\n"
+#: src/datastore/gnunet-service-datastore.c:610
+msgid "# results found"
 msgstr ""
 
-#: src/testing/testing_group.c:4142
-msgid "Blacklisting all but Erdos-Renyi topology\n"
+#: src/datastore/gnunet-service-datastore.c:655
+#, c-format
+msgid ""
+"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4150
-msgid "Blacklisting all but InterNAT topology\n"
+#: src/datastore/gnunet-service-datastore.c:666
+#, c-format
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4187
-msgid "Blacklisting all but Scale Free topology\n"
+#: src/datastore/gnunet-service-datastore.c:670
+msgid ""
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/testing/testing_group.c:4195
-msgid "Blacklisting all but straight line topology\n"
+#: src/datastore/gnunet-service-datastore.c:676
+msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/testing/testing_group.c:4212
-msgid "Failed during blacklist file copying!\n"
+#: src/datastore/gnunet-service-datastore.c:681
+#: src/datastore/gnunet-service-datastore.c:735
+#: src/datastore/gnunet-service-datastore.c:956
+#: src/datastore/gnunet-service-datastore.c:1441
+msgid "# reserved"
 msgstr ""
 
-#: src/testing/testing_group.c:4220
-msgid "Blacklist files created/copied successfully!\n"
+#: src/datastore/gnunet-service-datastore.c:750
+msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/testing/testing_group.c:5301
-msgid "Creating clique CONNECT topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:119
+#: src/datacache/datacache.c:250
+#, fuzzy
+msgid "# bytes stored"
+msgstr "# bytes en la base de datos"
 
-#: src/testing/testing_group.c:5308
-msgid "Creating small world (ring) CONNECT topology\n"
+#: src/datastore/gnunet-service-datastore.c:838
+#, c-format
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5315
-msgid "Creating small world (2d-torus) CONNECT topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1004
+#, fuzzy
+msgid "# GET requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/testing/testing_group.c:5321
-msgid "Creating ring CONNECT topology\n"
+#: src/datastore/gnunet-service-datastore.c:1018
+msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/testing/testing_group.c:5328
-msgid "Creating 2d torus CONNECT topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1046
+#, fuzzy
+msgid "# UPDATE requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/testing/testing_group.c:5335
-msgid "Creating Erdos-Renyi CONNECT topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1080
+#, fuzzy
+msgid "# GET REPLICATION requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/testing/testing_group.c:5342
-msgid "Creating InterNAT CONNECT topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1115
+#, fuzzy
+msgid "# GET ZERO ANONYMITY requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/testing/testing_group.c:5349
-msgid "Creating Scale Free CONNECT topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1142
+#, fuzzy
+msgid "Content not found"
+msgstr "¡Comando '%s' no encontrado!\n"
 
-#: src/testing/testing_group.c:5356
-msgid "Creating straight line CONNECT topology\n"
+#: src/datastore/gnunet-service-datastore.c:1152
+msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/testing/testing_group.c:5362
-msgid "Creating no CONNECT topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1186
+#, fuzzy
+msgid "# REMOVE requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/testing/testing_group.c:5368
-msgid "Unknown topology specification, can't connect peers!\n"
+#: src/datastore/gnunet-service-datastore.c:1230
+#, c-format
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5378
+#: src/datastore/gnunet-service-datastore.c:1295
+#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:145
+#: src/datacache/datacache.c:152
+#, fuzzy, c-format
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr "¡Ninguna aplicación definida en la configuración!\n"
+
+#: src/datastore/gnunet-service-datastore.c:1303
 #, c-format
-msgid "Connecting random subset (%'.2f percent) of possible peers\n"
+msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5386
-#, c-format
-msgid "Connecting a minimum of %u peers each (if possible)\n"
+#: src/datastore/gnunet-service-datastore.c:1312
+#, fuzzy, c-format
+msgid "Failed to load datastore plugin for `%s'\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#: src/datastore/gnunet-service-datastore.c:1491
+msgid "# quota"
 msgstr ""
 
-#: src/testing/testing_group.c:5395
-#, c-format
-msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
+#: src/datastore/gnunet-service-datastore.c:1493
+msgid "# cache size"
 msgstr ""
 
-#: src/testing/testing_group.c:5405
+#: src/datastore/gnunet-service-datastore.c:1503
 #, c-format
-msgid "Finding additional %u closest peers each (if possible)\n"
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6084
+#: src/datastore/gnunet-service-datastore.c:1516
 #, fuzzy
-msgid "Could not read hostkeys file!\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
+msgid "Failed to initialize bloomfilter.\n"
+msgstr "Imposible inicializar SQLite.\n"
 
-#: src/testing/testing_group.c:6154
-#, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
+#: src/core/gnunet-service-core_sessions.c:204
+#: src/core/gnunet-service-core_sessions.c:275
+msgid "# entries in session map"
 msgstr ""
 
-#: src/testing/testing_group.c:6298 src/testing/testing.c:1273
-#, c-format
-msgid "Could not start `%s' process to copy configuration directory.\n"
+#: src/core/gnunet-service-core_sessions.c:236
+msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/testing/testing.c:209
-msgid "`scp' does not seem to terminate (timeout copying config).\n"
-msgstr ""
-
-#: src/testing/testing.c:223 src/testing/testing.c:823
+#: src/core/gnunet-service-core_sessions.c:360
 #, fuzzy
-msgid "`scp' did not complete cleanly.\n"
-msgstr "'%s' no esta conectado a ningún par.\n"
+msgid "# send requests dropped (disconnected)"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/testing/testing.c:246
-msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+#: src/core/gnunet-service-core_sessions.c:427
+msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/testing/testing.c:247
-#, 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/core/gnunet-core-list-connections.c:77
+#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#, fuzzy, c-format
+msgid "Peer `%s'\n"
+msgstr "Yo soy el par '%s'.\n"
 
-#: src/testing/testing.c:303
-#, c-format
-msgid "Could not start `%s' process to create hostkey.\n"
+#: src/core/gnunet-core-list-connections.c:167
+#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#, fuzzy, c-format
+msgid "Invalid command line argument `%s'\n"
+msgstr "Argumentos en la linea de comandos inválidos:\n"
+
+#: src/core/gnunet-core-list-connections.c:188
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+msgid "don't resolve host names"
 msgstr ""
 
-#: src/testing/testing.c:310
+#: src/core/gnunet-core-list-connections.c:195
 #, fuzzy
-msgid "Failed to start `gnunet-peerinfo' process.\n"
-msgstr "Falló al comenzar la recolección.\n"
+msgid "Print information about connected peers."
+msgstr "Imprime información de los pares de GNUnet."
 
-#: src/testing/testing.c:311 src/testing/testing.c:509
+#: src/core/gnunet-service-core_clients.c:452
 #, fuzzy
-msgid "Failed to start `ssh' process.\n"
-msgstr "Falló al comenzar la recolección.\n"
+msgid "# messages discarded (session disconnected)"
+msgstr "# mensajes defragmentados"
 
-#: src/testing/testing.c:373
+#: src/core/gnunet-service-core_clients.c:796
 #, fuzzy, c-format
-msgid "Error reading from gnunet-peerinfo: %s\n"
-msgstr "Se produjo un error leyendo información de gnunetd.\n"
+msgid "# bytes of messages of type %u received"
+msgstr "# bytes de ruido recibidos"
 
-#: src/testing/testing.c:377
-msgid "Malformed output from gnunet-peerinfo!\n"
+#: src/core/gnunet-service-core.c:101
+#, c-format
+msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/testing/testing.c:387
+#: src/core/gnunet-service-core_typemap.c:111
+#: src/core/gnunet-service-core_typemap.c:124
 #, fuzzy
-msgid "`Failed to get hostkey!\n"
-msgstr "Fallo en las estadísticas del tráfico.\n"
+msgid "# type maps received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/testing/testing.c:421
-msgid "`Failed while waiting for topology setup!\n"
+#: src/core/gnunet-service-core_typemap.c:156
+msgid "# updates to my type map"
 msgstr ""
 
-#: src/testing/testing.c:501
-#, c-format
-msgid "Could not start `%s' process to start GNUnet.\n"
-msgstr ""
-
-#: src/testing/testing.c:508
+#: src/core/gnunet-service-core_neighbours.c:162
 #, fuzzy
-msgid "Failed to start `gnunet-arm' process.\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+msgid "# sessions terminated by transport disconnect"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/testing/testing.c:532 src/testing/testing.c:631
-msgid "`gnunet-arm' does not seem to terminate.\n"
+#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:343
+msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/testing/testing.c:533 src/testing/testing.c:632
-#: src/testing/testing.c:652
-msgid "`ssh' does not seem to terminate.\n"
+#: src/core/gnunet-service-core_neighbours.c:251
+msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/testing/testing.c:572 src/testing/testing.c:2074
-#: src/testing/testing.c:2093
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+#: src/core/gnunet-service-core_neighbours.c:432
+#, fuzzy, c-format
+msgid "Unsupported message of type %u received.\n"
+msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/testing/testing.c:601
-msgid "Unable to get HELLO for peer!\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:491
+msgid "# bytes encrypted"
+msgstr "# bytes encriptados"
 
-#: src/testing/testing.c:651
-msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:541
+msgid "# bytes decrypted"
+msgstr "# bytes desencriptados"
 
-#: src/testing/testing.c:674 src/testing/testing.c:708
-msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
+#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3000
+#: src/hostlist/hostlist-server.c:439 src/peerinfo-tool/gnunet-peerinfo.c:157
+#, fuzzy, c-format
+msgid "Error in communication with PEERINFO service\n"
+msgstr "Imprime información de los pares de GNUnet."
+
+#: src/core/gnunet-service-core_kx.c:618
+msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/testing/testing.c:689 src/testing/testing.c:738
-msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
+#: src/core/gnunet-service-core_kx.c:669
+msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/testing/testing.c:811
-msgid "`scp' does not seem to terminate.\n"
+#: src/core/gnunet-service-core_kx.c:693
+msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/testing/testing.c:989
-#, fuzzy, c-format
-msgid "Starting service %s for peer `%4s'\n"
-msgstr "Iniciada colección '%s'.\n"
+#: src/core/gnunet-service-core_kx.c:746
+#, fuzzy
+msgid "# session keys received"
+msgstr "# claves de la sesión rechazadas"
 
-#: src/testing/testing.c:1361 src/testing/testing.c:1444
-#: src/testing/testing.c:1582
+#: src/core/gnunet-service-core_kx.c:764
 #, fuzzy, c-format
-msgid "Terminating peer `%4s'\n"
-msgstr "Permiso denegado para '%s' en %s:%d.\n"
+msgid "`%s' is for `%s', not for me.  Ignoring.\n"
+msgstr "el tamaño del '%s' mensaje es demasiado corto. Ignorandolo.\n"
 
-#: src/testing/testing.c:1534
-#, fuzzy, c-format
-msgid "Setting d->dead on peer `%4s'\n"
-msgstr "Iniciada colección '%s'.\n"
+#: src/core/gnunet-service-core_kx.c:803
+#, fuzzy
+msgid "# SET_KEY messages decrypted"
+msgstr "# mensajes defragmentados"
 
-#: src/testing/testing.c:1669
-msgid "Peer not yet running, can not change configuration at this point."
-msgstr ""
-
-#: src/testing/testing.c:1677
+#: src/core/gnunet-service-core_kx.c:884
+#: src/transport/gnunet-service-transport_validation.c:601
 #, fuzzy
-msgid "Failed to write new configuration to disk."
-msgstr "Imposible guardar la configuración"
+msgid "# PING messages received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/testing/testing.c:1708
+#: src/core/gnunet-service-core_kx.c:918
 #, c-format
-msgid "Could not start `%s' process to copy configuration file.\n"
+msgid ""
+"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
+"%s'\n"
 msgstr ""
 
-#: src/testing/testing.c:1711
+#: src/core/gnunet-service-core_kx.c:941
 #, fuzzy
-msgid "Failed to copy new configuration to remote machine."
-msgstr "Imposible guardar la configuración"
+msgid "# PONG messages created"
+msgstr "# mensajes fragmentados"
 
-#: src/testing/testing.c:1883
+#: src/core/gnunet-service-core_kx.c:1029
 #, fuzzy
-msgid "Peers failed to connect"
-msgstr "Fallo al conectar a gnunetd.\n"
+msgid "# sessions terminated by timeout"
+msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/testing/testing.c:2038
+#: src/core/gnunet-service-core_kx.c:1042
 #, fuzzy
-msgid "Failed to connect to core service of first peer!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+msgid "# keepalive messages sent"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/testing/testing.c:2238
-msgid "Peers are not fully running yet, can not connect!\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1098
+#: src/transport/gnunet-service-transport_validation.c:934
+#, fuzzy
+msgid "# PONG messages received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:136
-#, fuzzy, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Transporte(s) disponible(s): %s\n"
+#: src/core/gnunet-service-core_kx.c:1128
+#, fuzzy
+msgid "# PONG messages decrypted"
+msgstr "# mensajes defragmentados"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:197
-msgid "# peers known"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1161
+#, fuzzy
+msgid "# session keys confirmed via PONG"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:241
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+#: src/core/gnunet-service-core_kx.c:1224
+#, fuzzy
+msgid "# SET_KEY and PING messages created"
+msgstr "# mensajes de texto mandados por PING"
+
+#: src/core/gnunet-service-core_kx.c:1372
+msgid "# failed to decrypt message (no session key)"
 msgstr ""
-"El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
-"Eliminando.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:306
-#, fuzzy, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
+#: src/core/gnunet-service-core_kx.c:1416
+#: src/core/gnunet-service-core_kx.c:1441
+#, fuzzy
+msgid "# bytes dropped (duplicates)"
+msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/peerinfo/peerinfo_api_notify.c:257
-#, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "Imposible conectar con gnunetd.\n"
+#: src/core/gnunet-service-core_kx.c:1428
+#, fuzzy
+msgid "# bytes dropped (out of sequence)"
+msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/peerinfo/test_peerinfo_api.c:109 src/hostlist/hostlist-server.c:437
-#: src/peerinfo-tool/gnunet-peerinfo.c:157 src/dv/gnunet-service-dv.c:2998
-#: src/core/gnunet-service-core.c:3034 src/core/gnunet-service-core.c:3328
+#: src/core/gnunet-service-core_kx.c:1465
 #, fuzzy, c-format
-msgid "Error in communication with PEERINFO service\n"
-msgstr "Imprime información de los pares de GNUnet."
+msgid "Message received far too old (%llu ms). Content ignored.\n"
+msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/peerinfo/peerinfo_api.c:276
-#, 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:432
+#: src/core/gnunet-service-core_kx.c:1469
 #, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
+msgid "# bytes dropped (ancient message)"
+msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
+#: src/core/gnunet-service-core_kx.c:1477
 #, fuzzy
-msgid "Received invalid message from `PEERINFO' service.\n"
-msgstr "Recibido mensaje UDP6 inválido de %s:%d, omitiendo.\n"
+msgid "# bytes of payload decrypted"
+msgstr "# bytes desencriptados"
 
-#: src/peerinfo/peerinfo_api.c:521
+#: src/core/gnunet-service-core_kx.c:1541
 #, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
-msgstr "Falló al inicializar el servicio '%s'.\n"
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "Configuración de GNUnet"
 
-#: src/peerinfo/peerinfo_api.c:555
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+#: src/core/gnunet-service-core_kx.c:1549
+msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:259
-#: src/hostlist/hostlist-client.c:622
-#, c-format
-msgid "# advertised URI `%s' downloaded"
+#: src/core/gnunet-service-core_kx.c:1559
+#: src/transport/gnunet-service-transport.c:542
+#: src/hostlist/hostlist-server.c:558 src/peerinfo-tool/gnunet-peerinfo.c:208
+#, fuzzy, c-format
+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/hostlist/test_gnunet_daemon_hostlist_learning.c:274
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1338
-msgid "# advertised hostlist URIs"
+#: src/vpn/gnunet-daemon-exit.c:1500
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:286
-#: src/hostlist/hostlist-server.c:353
+#: src/vpn/gnunet-daemon-vpn.c:1292
 #, fuzzy
-msgid "# hostlist advertisements send"
-msgstr "# Anuncios a extraños mandados"
+msgid "help text"
+msgstr "texto de ayuda para -t"
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:389
+#: src/util/getopt_helpers.c:84
 #, c-format
-msgid "Hostlist file `%s' was removed\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist.c:253
 msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
+"Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:286
-#: src/topology/gnunet-daemon-topology.c:1315
-#: src/topology/gnunet-daemon-topology.c:1322 src/fs/gnunet-service-fs.c:519
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' service.\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:287
+#, 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/hostlist/gnunet-daemon-hostlist.c:306
-msgid "advertise our hostlist to other peers"
-msgstr ""
+#: src/util/common_logging.c:242 src/util/common_logging.c:838
+msgid "DEBUG"
+msgstr "DEPURACIÓN"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:311
-msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
-msgstr ""
+#: src/util/common_logging.c:244 src/util/common_logging.c:836
+msgid "INFO"
+msgstr "INFORMACIÓN"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:314
-msgid "enable learning about hostlist servers from other peers"
+#: src/util/common_logging.c:246 src/util/common_logging.c:834
+msgid "WARNING"
+msgstr "PELIGRO"
+
+#: src/util/common_logging.c:248 src/util/common_logging.c:832
+msgid "ERROR"
+msgstr "ERROR"
+
+#: src/util/common_logging.c:250 src/util/common_logging.c:840
+msgid "NONE"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:318
-msgid "provide a hostlist server"
+#: src/util/common_logging.c:554
+#, 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"
+
+#: src/util/common_logging.c:672
+#, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:330
-msgid "GNUnet hostlist server and client"
+#: src/util/common_logging.c:841
+msgid "INVALID"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:134
+#: src/util/common_logging.c:923
 #, fuzzy
-msgid "bytes in hostlist"
-msgstr "# bytes en la base de datos"
+msgid "unknown address"
+msgstr "desconocido"
 
-#: src/hostlist/hostlist-server.c:160
-msgid "expired addresses encountered"
-msgstr ""
+#: src/util/common_logging.c:961
+#, fuzzy
+msgid "invalid address"
+msgstr "Argumentos inválidos: "
 
-#: src/hostlist/hostlist-server.c:187
-#: src/topology/gnunet-daemon-topology.c:900
+#: 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/util/plugin.c:146
 #, fuzzy, c-format
-msgid "Error in communication with PEERINFO service: %s\n"
-msgstr "Imprime información de los pares de GNUnet."
+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/hostlist/hostlist-server.c:208
-msgid "HELLOs without addresses encountered (ignored)"
-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/hostlist/hostlist-server.c:224
-msgid "bytes not included in hostlist (size limit)"
+#: src/util/configuration.c:249
+#, 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"
 
-#: src/hostlist/hostlist-server.c:272
+#: src/util/configuration.c:812
 #, c-format
-msgid "Refusing `%s' request to hostlist server\n"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:275
-#, fuzzy
-msgid "hostlist requests refused (not HTTP GET)"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/util/getopt.c:670
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/hostlist/hostlist-server.c:283
-msgid "Sending 100 CONTINUE reply\n"
-msgstr ""
+#: src/util/getopt.c:695
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: la opción '--%s' no permite un argumento\n"
 
-#: src/hostlist/hostlist-server.c:290
+#: src/util/getopt.c:701
 #, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\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/hostlist/hostlist-server.c:294
-#, fuzzy
-msgid "hostlist requests refused (upload data)"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/util/getopt.c:720 src/util/getopt.c:889
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: la opción '%s' requiere un argumento\n"
 
-#: src/hostlist/hostlist-server.c:302
-msgid "Could not handle hostlist request since I do not have a response yet\n"
-msgstr ""
+#: src/util/getopt.c:749
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opción no reconocida '--%s'\n"
 
-#: src/hostlist/hostlist-server.c:305
-#, fuzzy
-msgid "hostlist requests refused (not ready)"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/util/getopt.c:753
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opción no reconocida '%c%s'\n"
 
-#: src/hostlist/hostlist-server.c:309
-msgid "Received request for our hostlist\n"
-msgstr ""
+#: src/util/getopt.c:778
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opción ilegal -- %c\n"
 
-#: src/hostlist/hostlist-server.c:310
-#, fuzzy
-msgid "hostlist requests processed"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/util/getopt.c:780
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opción no válida -- %c\n"
 
-#: src/hostlist/hostlist-server.c:398
-msgid "Advertisement message could not be queued by core\n"
-msgstr ""
+#: src/util/getopt.c:808 src/util/getopt.c:938
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: la opción requiere un argumento --%c\n"
 
-#: src/hostlist/hostlist-server.c:556
-#: src/transport/gnunet-service-transport.c:462
-#: src/peerinfo-tool/gnunet-peerinfo.c:208 src/core/gnunet-service-core.c:4607
-#, fuzzy, c-format
-msgid "Could not access PEERINFO service.  Exiting.\n"
-msgstr "Imposible acceder a la información del espacio.\n"
+#: src/util/getopt.c:856
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: la opción '-W %s' es ambigua\n"
 
-#: src/hostlist/hostlist-server.c:566
-#, fuzzy, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
-msgstr "Argumentos no válidos. Saliendo.\n"
+#: src/util/getopt.c:874
+#, 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/hostlist/hostlist-server.c:575
+#: src/util/getopt.c:1042
 #, c-format
-msgid "Hostlist service starts on %s:%llu\n"
+msgid "Use --help to get a list of options.\n"
+msgstr "Usar --help para obtener una lista de opciones.\n"
+
+#: src/util/scheduler.c:863
+msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:589
+#: src/util/scheduler.c:994
 #, c-format
-msgid "Address to obtain hostlist: `%s'\n"
+msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:627
+#: src/util/connection.c:462
+#, fuzzy, c-format
+msgid "Access denied to `%s'\n"
+msgstr "Permiso denegado para '%s' en %s:%d.\n"
+
+#: src/util/connection.c:477
 #, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:286
-msgid "# bytes downloaded from hostlist servers"
-msgstr ""
+#: src/util/connection.c:646
+#, 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/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/connection.c:858 src/util/connection.c:1034
+#, fuzzy, c-format
+msgid "Trying to connect to `%s' (%p)\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/util/connection.c:869
 #, fuzzy, c-format
-msgid "Invalid `%s' message received from hostlist at `%s'\n"
-msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
+msgid "Failed to connect to `%s' (%p)\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/hostlist/hostlist-client.c:330
-#, fuzzy
-msgid "# valid HELLOs downloaded from hostlist servers"
-msgstr "# saludos descargados vía HTTP"
+#: src/util/connection.c:1024
+#, fuzzy, c-format
+msgid "Attempt to connect to `%s' failed\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#: src/util/connection.c:1540
 #, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
+msgid ""
+"Could not satisfy pending transmission request, socket closed or connect "
+"failed (%p).\n"
 msgstr ""
 
-#: 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/test_plugin_transport_https.c:829
-#: src/transport/test_plugin_transport_https.c:837
-#: src/transport/plugin_transport_http.c:2059
-#: src/transport/plugin_transport_http.c:2067
-#: src/transport/test_plugin_transport_http.c:795
-#: src/transport/test_plugin_transport_http.c:803
+#: src/util/connection.c:1576
 #, fuzzy, c-format
-msgid "%s failed at %s:%d: `%s'\n"
-msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+msgid "Failed to send to `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/hostlist/hostlist-client.c:663
+#: src/util/signal.c:81
+#, fuzzy, c-format
+msgid "signal (%d, %p) returned %d.\n"
+msgstr "La llamada a '%s' devuelve %d.\n"
+
+#: src/util/network.c:1204
 #, c-format
 msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:805
+#: src/util/os_installation.c:295
 #, c-format
-msgid "Timeout trying to download hostlist from `%s'\n"
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\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
+#: src/util/os_installation.c:481
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/hostlist/hostlist-client.c:848
+#: src/util/os_installation.c:486
 #, 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 "stat (%s) failed: %s\n"
+msgstr "'%s' %s falló: %s\n"
 
-#: src/hostlist/hostlist-client.c:856
-#, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
-msgstr ""
+#: src/util/strings.c:144
+msgid "b"
+msgstr "b"
 
-#: src/hostlist/hostlist-client.c:909
-#, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
-msgstr ""
+#: src/util/strings.c:150
+msgid "KiB"
+msgstr "KiB"
 
-#: src/hostlist/hostlist-client.c:917
-msgid "# hostlist downloads initiated"
-msgstr ""
+#: src/util/strings.c:154
+msgid "MiB"
+msgstr "MiB"
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1511
-msgid "# milliseconds between hostlist downloads"
-msgstr ""
+#: src/util/strings.c:158
+msgid "GiB"
+msgstr "GiB"
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/util/strings.c:162
+msgid "TiB"
+msgstr "TiB"
+
+#: src/util/strings.c:198
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
-msgid "Scheduled saving of hostlists\n"
+#: src/util/strings.c:276
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
-#, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
+#: src/util/strings.c:368
+msgid "ms"
+msgstr "ms"
+
+#: src/util/strings.c:373
+msgid "eternity"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1117 src/hostlist/hostlist-client.c:1133
-#, fuzzy
-msgid "# active connections"
-msgstr "Configuración de GNUnet"
+#: src/util/strings.c:377
+msgid "s"
+msgstr "s"
 
-#: src/hostlist/hostlist-client.c:1249
-#, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
-msgstr ""
+#: src/util/strings.c:381
+msgid "m"
+msgstr "m"
 
-#: src/hostlist/hostlist-client.c:1280
-#, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
-msgstr ""
+#: src/util/strings.c:385
+msgid "h"
+msgstr "h"
 
-#: src/hostlist/hostlist-client.c:1286
-#, c-format
-msgid "Loading saved hostlist entries from file `%s' \n"
-msgstr ""
+#: src/util/strings.c:389
+msgid " days"
+msgstr " días"
 
-#: src/hostlist/hostlist-client.c:1290
-#, c-format
-msgid "Hostlist file `%s' is not existing\n"
+#: src/util/strings.c:413
+msgid "end of time"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1301
+#: src/util/server.c:392
 #, fuzzy, c-format
-msgid "Could not open file `%s' for reading to load hostlists: %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/hostlist/hostlist-client.c:1334
-#, c-format
-msgid "%u hostlist URIs loaded from file\n"
+#: src/util/server.c:400
+#, fuzzy, c-format
+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:1336
-msgid "# hostlist URIs read from file"
+#: src/util/server.c:405
+#, 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:1369
+#: src/util/server.c:623
 #, c-format
 msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+"Processing code for message of type %u did not call "
+"GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1383
-#, fuzzy, c-format
-msgid "Could not open file `%s' for writing to save hostlists: %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
+#: src/util/crypto_random.c:240
+#, c-format
+msgid "Starting `%s' process to generate entropy\n"
+msgstr ""
 
-#: src/hostlist/hostlist-client.c:1388
+#: src/util/crypto_random.c:267
 #, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
+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/hostlist/hostlist-client.c:1412 src/hostlist/hostlist-client.c:1429
+#: src/util/disk.c:435
 #, fuzzy, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
-msgstr "Error creando usuario"
+msgid "`%s' failed for drive `%s': %u\n"
+msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/hostlist/hostlist-client.c:1424
-msgid "# hostlist URIs written to file"
-msgstr ""
+#: src/util/disk.c:837
+#, fuzzy, c-format
+msgid "Expected `%s' to be a directory!\n"
+msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/hostlist/hostlist-client.c:1476
-msgid "Learning is enabled on this peer\n"
-msgstr ""
+#: src/util/disk.c:1188 src/util/service.c:1473
+#, fuzzy, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
 
-#: src/hostlist/hostlist-client.c:1479
+#: src/util/disk.c:1496
+#, 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:118 src/util/service.c:144 src/util/service.c:188
+#: src/util/service.c:209 src/util/service.c:216
 #, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
-msgstr ""
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Formato no válido para la IP: '%s'\n"
 
-#: src/hostlist/hostlist-client.c:1488
-msgid "Learning is not enabled on this peer\n"
-msgstr ""
+#: src/util/service.c:171
+#, 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/hostlist/hostlist-client.c:1500
+#: src/util/service.c:265
 #, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\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:1504
+#: src/util/service.c:301
 #, 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 "Wrong format `%s' for netmask\n"
+msgstr "Formato '%s' erróneo para la máscara de red: %s\n"
 
-#: src/topology/gnunet-daemon-topology.c:250
-msgid "# peers blacklisted"
+#: src/util/service.c:332
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Formato '%s' erróneo para la red: %s\n"
+
+#: src/util/service.c:638
+#, c-format
+msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:402
-#, fuzzy
-msgid "# connect requests issued to core"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/util/service.c:643
+#, fuzzy, c-format
+msgid "Unknown address family %d\n"
+msgstr "Operación desconocida '%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:676
-#: src/topology/gnunet-daemon-topology.c:778
-#: src/transport/gnunet-service-transport_neighbours.c:465
-#: src/transport/gnunet-service-transport_neighbours.c:662
-#, fuzzy
-msgid "# peers connected"
-msgstr "# de pares conectados"
-
-#: src/topology/gnunet-daemon-topology.c:697
-#: src/topology/gnunet-daemon-topology.c:783
-#, fuzzy
-msgid "# friends connected"
-msgstr "# de pares conectados"
-
-#: src/topology/gnunet-daemon-topology.c:977
-msgid "Failed to connect to core service, can not manage topology!\n"
+#: src/util/service.c:650
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/util/service.c:694
 #, c-format
-msgid "Option `%s' in section `%s' not specified!\n"
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1021
-#, fuzzy, c-format
-msgid "Could not read friends list `%s'\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
-
-#: src/topology/gnunet-daemon-topology.c:1027
-#, fuzzy, c-format
-msgid "Friends file `%s' is empty.\n"
-msgstr "El formato del fichero '%s' no es válido.\n"
-
-#: src/topology/gnunet-daemon-topology.c:1036
-#, fuzzy, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
-
-#: src/topology/gnunet-daemon-topology.c:1044
+#: src/util/service.c:723
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1064
+#: src/util/service.c:841
 #, c-format
 msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1077
+#: src/util/service.c:862 src/transport/plugin_transport_tcp.c:1939
 #, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
+msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1087
-#, fuzzy, c-format
-msgid "Found friend `%s' in configuration\n"
-msgstr " gconfig\tConfiguración GTK\n"
-
-#: src/topology/gnunet-daemon-topology.c:1093
+#: src/util/service.c:893 src/util/client.c:712
 #, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1103
-#, fuzzy
-msgid "# friends in configuration"
-msgstr " gconfig\tConfiguración GTK\n"
-
-#: src/topology/gnunet-daemon-topology.c:1109
+#: src/util/service.c:913
+#, c-format
 msgid ""
-"Fewer friends specified than required by minimum friend count. Will only "
-"connect to friends.\n"
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1116
-msgid ""
-"More friendly connections required than target total number of connections.\n"
+#: src/util/service.c:930
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1151
-#, fuzzy
-msgid "# HELLO messages received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/util/service.c:960 src/transport/plugin_transport_http.c:903
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1208
-#, fuzzy
-msgid "# HELLO messages gossipped"
-msgstr "# mensajes salientes omitidos"
+#: src/util/service.c:978 src/transport/plugin_transport_http.c:920
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1348
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/util/service.c:1135 src/util/service.c:1153
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:326
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+#: src/util/service.c:1181
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
 
-#: src/statistics/gnunet-statistics.c:89
+#: src/util/service.c:1333
 #, fuzzy, c-format
-msgid "Failed to obtain statistics.\n"
-msgstr "Fallo en las estadísticas del tráfico.\n"
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
+#: src/util/service.c:1366
 #, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Argumento no válido: '%s'\n"
+msgid "Service `%s' runs at %s\n"
+msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: src/statistics/gnunet-statistics.c:155
-msgid "limit output to statistcs for the given NAME"
+#: src/util/service.c:1414
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:158
-msgid "make the value being set persistent"
+#: src/util/service.c:1418
+msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:161
-msgid "limit output to the given SUBSYSTEM"
+#: src/util/service.c:1422
+msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
-msgid "Print statistics about GNUnet operations."
-msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
+#: src/util/service.c:1474
+msgid "No such user"
+msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:208
-#, fuzzy, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
-msgstr "Descarga los ficheros de GNUnet"
+#: src/util/service.c:1488
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
 
-#: src/statistics/gnunet-service-statistics.c:266
-#, fuzzy, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
-msgstr "Descarga los ficheros de GNUnet"
+#: src/util/service.c:1551
+msgid "do daemonize (detach from terminal)"
+msgstr ""
 
-#: src/util/os_priority.c:110
-#, c-format
-msgid "Not installing a handler because $%s=%s\n"
+#: src/util/gnunet-resolver.c:76
+msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/os_installation.c:291
+#: src/util/os_priority.c:117
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/util/os_installation.c:474
+#: src/util/resolver_api.c:202
 #, fuzzy, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
+msgid "Must specify `%s' for `%s' in configuration!\n"
+msgstr "Intentando usar el fichero '%s' para la configuración de MySQL.\n"
 
-#: src/util/os_installation.c:479
+#: src/util/resolver_api.c:221
 #, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "'%s' %s falló: %s\n"
+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"
 
-#: src/util/common_logging.c:154 src/util/common_logging.c:500
-#: src/util/test_common_logging.c:75
-msgid "DEBUG"
-msgstr "DEPURACIÓN"
+#: src/util/resolver_api.c:356
+#, 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/util/common_logging.c:156 src/util/common_logging.c:498
-#: src/util/test_common_logging.c:72
-msgid "INFO"
-msgstr "INFORMACIÓN"
+#: src/util/resolver_api.c:360
+#, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr ""
 
-#: src/util/common_logging.c:158 src/util/common_logging.c:496
-#: src/util/test_common_logging.c:68
-msgid "WARNING"
-msgstr "PELIGRO"
+#: src/util/resolver_api.c:428
+#, c-format
+msgid "Resolver returns `%s' for IP `%s'.\n"
+msgstr ""
 
-#: src/util/common_logging.c:160 src/util/common_logging.c:494
-#: src/util/test_common_logging.c:65
-msgid "ERROR"
-msgstr "ERROR"
+#: src/util/resolver_api.c:793
+#, c-format
+msgid "Resolver returns `%s'.\n"
+msgstr ""
 
-#: src/util/common_logging.c:162
-msgid "NONE"
+#: src/util/resolver_api.c:877
+#, c-format
+msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:214 src/dht/plugin_dhtlog_mysql_dump.c:909
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:669
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:700
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:732
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:764
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:796
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:827
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:858
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:889
+#: src/util/resolver_api.c:882
 #, 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 "Could not resolve our FQDN : %s\n"
+msgstr "Imposible resolver '%s': %s\n"
 
-#: src/util/common_logging.c:331
+#: src/util/resolver_api.c:914
 #, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:501
-msgid "INVALID"
-msgstr ""
-
-#: src/util/common_logging.c:583
-#, fuzzy
-msgid "unknown address"
-msgstr "desconocido"
-
-#: src/util/common_logging.c:621
-#, fuzzy
-msgid "invalid address"
-msgstr "Argumentos inválidos: "
-
-#: src/util/pseudonym.c:263
+#: src/util/pseudonym.c:269
 #, 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:327
+#: src/util/pseudonym.c:333
 #, fuzzy
 msgid "no-name"
 msgstr "Mostrar el nombre"
 
-#: src/util/test_strings.c:42 src/util/strings.c:139
-msgid "b"
-msgstr "b"
-
-#: src/util/test_strings.c:45 src/util/strings.c:145
-msgid "KiB"
-msgstr "KiB"
-
-#: src/util/test_strings.c:48 src/util/strings.c:157
-msgid "TiB"
-msgstr "TiB"
-
-#: src/util/test_strings.c:51 src/util/strings.c:363
-msgid "ms"
-msgstr "ms"
-
-#: src/util/test_strings.c:56 src/util/strings.c:372
-msgid "s"
-msgstr "s"
-
-#: src/util/test_strings.c:61 src/util/strings.c:380
-msgid "h"
-msgstr "h"
-
-#: src/util/connection.c:457
+#: src/util/gnunet-service-resolver.c:262
 #, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "Permiso denegado para '%s' en %s:%d.\n"
+msgid "Could not resolve `%s' (%s): %s\n"
+msgstr "Imposible resolver '%s': %s\n"
 
-#: src/util/connection.c:472
+#: src/util/gnunet-service-resolver.c:318
+#: src/util/gnunet-service-resolver.c:363
 #, c-format
-msgid "Accepting connection from `%s': %p\n"
-msgstr ""
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "Imposible encontrar la IP del host '%s': %s\n"
 
-#: src/util/connection.c:640
-#, 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/util/connection.c:852 src/util/connection.c:1028
-#, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/util/connection.c:863
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/util/connection.c:1018
-#, fuzzy, c-format
-msgid "Attempt to connect to `%s' failed\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/util/connection.c:1534
+#: src/util/gnunet-service-resolver.c:462
 #, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
+msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/connection.c:1570
-#, fuzzy, c-format
-msgid "Failed to send to `%s': %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
-
-#: src/util/plugin.c:87
+#: src/util/gnunet-service-resolver.c:509
 #, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "¡El mecanismo de iniciación de los plugins falló: %s!\n"
+msgid "Resolver asked to look up IP address `%s'.\n"
+msgstr ""
 
-#: src/util/plugin.c:144
+#: src/util/bio.c:137 src/util/bio.c:143
 #, 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:217
-#, 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/bio.c:134 src/util/bio.c:140
-#, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Error creando usuario"
 
-#: src/util/bio.c:141
+#: src/util/bio.c:144
 #, fuzzy
 msgid "End of file"
 msgstr "Cargar un fichero de configuración"
 
-#: src/util/bio.c:193
+#: src/util/bio.c:196
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:203
+#: src/util/bio.c:208
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:248
+#: src/util/bio.c:254
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:262
+#: src/util/bio.c:268
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/crypto_rsa.c:611 src/util/crypto_rsa.c:658
+#: src/util/client.c:303
+#, c-format
+msgid ""
+"Could not determine valid hostname and port for service `%s' from "
+"configuration.\n"
+msgstr ""
+
+#: src/util/client.c:311
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
+msgstr ""
+
+#: src/util/client.c:652
+msgid "Failure to transmit TEST request.\n"
+msgstr ""
+
+#: src/util/client.c:857
 #, fuzzy, c-format
+msgid "Could not connect to service `%s', must not be running.\n"
+msgstr "Imposible conectar con gnunetd.\n"
+
+#: src/util/client.c:874
+#, 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/util/client.c:1143
+msgid "Could not submit request, not expecting to receive a response.\n"
+msgstr ""
+
+#: src/util/crypto_rsa.c:624 src/util/crypto_rsa.c:672
+#, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Imposible escribir PID al fichero '%s': %s.\n"
 
-#: src/util/crypto_rsa.c:616
+#: src/util/crypto_rsa.c:629
 #, 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:634
+#: src/util/crypto_rsa.c:648
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:662 src/util/crypto_rsa.c:698
+#: src/util/crypto_rsa.c:676 src/util/crypto_rsa.c:714
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:693
+#: src/util/crypto_rsa.c:709
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:714
+#: src/util/crypto_rsa.c:730
 #, 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:732
+#: src/util/crypto_rsa.c:748
 #, 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:953
+#: src/util/crypto_rsa.c:970
 #, 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/util/server.c:384
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "'%s' falló para la unidad %s: %u\n"
+#: src/nse/gnunet-nse-profiler.c:650 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:591
+#: src/fs/gnunet-download.c:263
+msgid "be verbose (print progress information)"
+msgstr ""
 
-#: src/util/server.c:392
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
+#: src/nse/gnunet-nse-profiler.c:668
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "Imposible acceder al servicio"
+
+#: src/nse/gnunet-service-nse.c:875
+#, c-format
+msgid "Proof of work invalid: %llu!\n"
 msgstr ""
-"'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:397
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
+#: src/nse/gnunet-service-nse.c:1298 src/nse/gnunet-service-nse.c:1317
+#: src/nse/gnunet-service-nse.c:1338
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
-"'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:612
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+#: src/nse/gnunet-service-nse.c:1305
+#, fuzzy
+msgid "Invalid work requirement for NSE service. Exiting.\n"
+msgstr "Argumentos no válidos. Saliendo.\n"
+
+#: src/nse/gnunet-service-nse.c:1326
+#, 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:136
+#, fuzzy, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Transporte(s) disponible(s): %s\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:197
+msgid "# peers known"
 msgstr ""
 
-#: src/util/network.c:1194
+#: src/peerinfo/gnunet-service-peerinfo.c:241
 #, c-format
 msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+"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/util/crypto_random.c:236
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
-msgstr ""
+#: src/peerinfo/gnunet-service-peerinfo.c:306
+#, fuzzy, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
-#: src/util/crypto_random.c:263
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\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:278
+#, 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:433
+#, fuzzy
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
+
+#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
+#, 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:521
+#, fuzzy
+msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+msgstr "Falló al inicializar el servicio '%s'.\n"
+
+#: src/peerinfo/peerinfo_api.c:555
+msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
-"libgcrypt no está en la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/test_resolver_api.c:53
-#, c-format
-msgid "Got IP address `%s' for our host.\n"
+#: src/datacache/plugin_datacache_sqlite.c:439
+msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:147 src/util/resolver_api.c:873
+#: src/datacache/datacache.c:177
 #, c-format
-msgid "Resolving our FQDN `%s'\n"
+msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:154
+#: src/datacache/datacache.c:185
 #, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s %u\n"
-msgstr "Imposible resolver '%s': %s\n"
+msgid "Failed to load datacache plugin for `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/util/test_resolver_api.c:264
-#, c-format
-msgid "gethostbyname() could not lookup IP address: %s\n"
-msgstr ""
+#: src/datacache/datacache.c:276
+#, fuzzy
+msgid "# requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/test_resolver_api.c:329
-#, c-format
-msgid "gethostbyaddr() could not lookup hostname: %s\n"
+#: src/datacache/datacache.c:287
+msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/util/configuration.c:244
+#: src/datacache/plugin_datacache_postgres.c:149
 #, 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 "Unable to initialize Postgres: %s"
+msgstr "Imposible inicializar SQLite.\n"
 
-#: src/util/configuration.c:801
-#, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
+#: src/datacache/plugin_datacache_postgres.c:500
+msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:76
-msgid "Test GNUnet DNS resolver code."
+#: src/datacache/plugin_datacache_template.c:121
+msgid "Template datacache running\n"
 msgstr ""
 
-#: src/util/client.c:304
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
+#: src/datacache/plugin_datacache_mysql.c:979
+msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/util/client.c:312
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:479
+msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/util/client.c:669
-msgid "Failure to transmit TEST request.\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_neighbours.c:571
+#, fuzzy
+msgid "# FIND PEER messages initiated"
+msgstr "# mensajes fragmentados"
 
-#: src/util/client.c:729 src/util/service.c:880
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_neighbours.c:632
+#: src/dht/gnunet-service-dht_neighbours.c:697
+#, fuzzy
+msgid "# Peers connected"
+msgstr "# de pares conectados"
 
-#: src/util/client.c:871
-#, fuzzy, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
-msgstr "Imposible conectar con gnunetd.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:734
+#, fuzzy
+msgid "# Queued messages discarded (peer disconnected)"
+msgstr "# mensajes defragmentados"
 
-#: src/util/client.c:887
-#, 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/dht/gnunet-service-dht_neighbours.c:787
+#, fuzzy
+msgid "# Bytes transmitted to other peers"
+msgstr "# bytes recibidos por TCP"
 
-#: src/util/client.c:1158
-msgid "Could not submit request, not expecting to receive a response.\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_neighbours.c:824
+#, fuzzy
+msgid "# Bytes of bandwdith requested from core"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/scheduler.c:859
-msgid "Looks like we're busy waiting...\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1051
+#: src/dht/gnunet-service-dht_neighbours.c:1078
+msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/util/scheduler.c:990
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_neighbours.c:1060
+#: src/dht/gnunet-service-dht_neighbours.c:1096
+#, fuzzy
+msgid "# Peer selection failed"
+msgstr "Conexión fallida\n"
 
-#: src/util/strings.c:149
-msgid "MiB"
-msgstr "MiB"
+#: src/dht/gnunet-service-dht_neighbours.c:1238
+#, fuzzy
+msgid "# PUT requests routed"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/strings.c:153
-msgid "GiB"
-msgstr "GiB"
+#: src/dht/gnunet-service-dht_neighbours.c:1267
+#, fuzzy
+msgid "# PUT messages queued for transmission"
+msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/util/strings.c:193
-#, c-format
-msgid "Character set requested was `%s'\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_neighbours.c:1352
+#, fuzzy
+msgid "# GET requests routed"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/strings.c:271
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr ""
+#: src/dht/gnunet-service-dht_neighbours.c:1384
+#, fuzzy
+msgid "# GET messages queued for transmission"
+msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/util/strings.c:368
-msgid "eternity"
+#: src/dht/gnunet-service-dht_neighbours.c:1485
+msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/util/strings.c:376
-msgid "m"
-msgstr "m"
+#: src/dht/gnunet-service-dht_neighbours.c:1574
+#, fuzzy
+msgid "# P2P PUT requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/strings.c:384
-msgid " days"
-msgstr " días"
+#: src/dht/gnunet-service-dht_neighbours.c:1700
+msgid "# FIND PEER requests ignored due to Bloomfilter"
+msgstr ""
 
-#: src/util/strings.c:408
-msgid "end of time"
+#: src/dht/gnunet-service-dht_neighbours.c:1707
+msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/util/disk.c:429
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%s': %u\n"
-msgstr "'%s' falló para la unidad %s: %u\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1800
+#, fuzzy
+msgid "# P2P GET requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/disk.c:829
-#, fuzzy, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1853
+#, fuzzy
+msgid "# P2P FIND PEER requests processed"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/disk.c:1180 src/util/service.c:1456
-#, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1872
+#, fuzzy
+msgid "# P2P GET requests ONLY routed"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/disk.c:1486
-#, fuzzy, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
-msgstr "¡Ninguna aplicación definida en la configuración!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1941
+#, fuzzy
+msgid "# P2P RESULTS received"
+msgstr "# bytes recibidos por TCP"
 
-#: src/util/resolver_api.c:198
-#, 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"
+#: src/dht/dht_api.c:229
+#, fuzzy
+msgid "Failed to connect to the DHT service!\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/resolver_api.c:217
-#, fuzzy, c-format
-msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+#: src/dht/gnunet-service-dht.c:165
+#, 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"
 msgstr ""
-"Debes especificar un número positivo para '%s' en la configuración en la "
-"sección '%s'.\n"
 
-#: src/util/resolver_api.c:354
-#, 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/dht/gnunet-dht-get.c:204
+msgid "how many parallel requests (replicas) to create"
+msgstr ""
 
-#: src/util/resolver_api.c:358
-#, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
+#: src/dht/gnunet-dht-get.c:207
+msgid "the type of data to look for"
 msgstr ""
 
-#: src/util/resolver_api.c:427
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
+msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/util/resolver_api.c:789
-#, c-format
-msgid "Resolver returns `%s'.\n"
+#: src/dht/gnunet-dht-get.c:232
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/util/resolver_api.c:879
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s\n"
-msgstr "Imposible resolver '%s': %s\n"
+#: src/dht/gnunet-service-dht_clients.c:321
+#, fuzzy
+msgid "# GET requests from clients injected"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/resolver_api.c:911
-#, c-format
-msgid "Resolving our hostname `%s'\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_clients.c:413
+#, fuzzy
+msgid "# PUT requests received from clients"
+msgstr "El mensaje recibido del cliente es inválido\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/dht/gnunet-service-dht_clients.c:486
+#, fuzzy
+msgid "# GET requests received from clients"
+msgstr "El mensaje recibido del cliente es inválido\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/dht/gnunet-service-dht_clients.c:585
+#, fuzzy
+msgid "# GET STOP requests received from clients"
+msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/util/gnunet-service-resolver.c:460
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
+#: src/dht/gnunet-service-dht_clients.c:790
+msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:508
-#, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
+#: src/dht/gnunet-service-dht_clients.c:808
+msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/util/getopt.c:668
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: la opción '%s' es ambigua\n"
+#: src/dht/gnunet-service-dht_clients.c:852
+#, fuzzy, c-format
+msgid "Unsupported block type (%u) in request!\n"
+msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/util/getopt.c:692
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: la opción '--%s' no permite un argumento\n"
+#: src/dht/gnunet-service-dht_clients.c:875
+#, fuzzy
+msgid "# RESULTS queued for clients"
+msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/util/getopt.c:697
-#, 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/dht/gnunet-service-dht_clients.c:928
+#: src/dht/gnunet-service-dht_clients.c:971
+msgid "# REPLIES ignored for CLIENTS (no match)"
+msgstr ""
 
-#: src/util/getopt.c:714 src/util/getopt.c:882
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: la opción '%s' requiere un argumento\n"
+#: src/dht/gnunet-service-dht_clients.c:937
+#, fuzzy
+msgid "Could not pass reply to client, message too big!\n"
+msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/util/getopt.c:743
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opción no reconocida '--%s'\n"
+#: src/dht/gnunet-service-dht_nse.c:59
+#, fuzzy
+msgid "# Network size estimates received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/getopt.c:747
+#: src/dht/gnunet-dht-put.c:100
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opción no reconocida '%c%s'\n"
+msgid "PUT request sent!\n"
+msgstr ""
 
-#: src/util/getopt.c:772
+#: src/dht/gnunet-dht-put.c:124
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opción ilegal -- %c\n"
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
 
-#: src/util/getopt.c:774
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: opción no válida -- %c\n"
+#: 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/util/getopt.c:802 src/util/getopt.c:930
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: la opción requiere un argumento --%c\n"
+#: src/dht/gnunet-dht-put.c:137
+#, fuzzy, c-format
+msgid "Connected to %s service!\n"
+msgstr "'%s' conectado a '%s'.\n"
 
-#: src/util/getopt.c:850
+#: src/dht/gnunet-dht-put.c:152
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: la opción '-W %s' es ambigua\n"
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
 
-#: src/util/getopt.c:868
-#, 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/dht/gnunet-dht-put.c:166
+msgid "the data to insert under the key"
+msgstr ""
 
-#: src/util/getopt.c:1034
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Usar --help para obtener una lista de opciones.\n"
+#: src/dht/gnunet-dht-put.c:169
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr ""
 
-#: src/util/signal.c:78
-#, fuzzy, c-format
-msgid "signal (%d, %p) returned %d.\n"
-msgstr "La llamada a '%s' devuelve %d.\n"
+#: src/dht/gnunet-dht-put.c:175
+msgid "how many replicas to create"
+msgstr ""
 
-#: src/util/getopt_helpers.c:82
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
+#: src/dht/gnunet-dht-put.c:178
+msgid "the type to insert data as"
 msgstr ""
 
-#: src/util/getopt_helpers.c:253 src/util/getopt_helpers.c:281
-#, 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/dht/gnunet-dht-put.c:203
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr ""
 
-#: src/util/service.c:112 src/util/service.c:138 src/util/service.c:182
-#: src/util/service.c:202 src/util/service.c:209
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Formato no válido para la IP: '%s'\n"
+#: src/dht/gnunet-service-dht_routing.c:220
+msgid "# Good REPLIES matched against routing table"
+msgstr ""
 
-#: src/util/service.c:165
-#, 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/dht/gnunet-service-dht_routing.c:235
+msgid "# Duplicate REPLIES matched against routing table"
+msgstr ""
 
-#: src/util/service.c:258
-#, 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/dht/gnunet-service-dht_routing.c:240
+msgid "# Invalid REPLIES matched against routing table"
+msgstr ""
 
-#: src/util/service.c:292
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Formato '%s' erróneo para la máscara de red: %s\n"
+#: src/dht/gnunet-service-dht_routing.c:249
+msgid "# Unsupported REPLIES matched against routing table"
+msgstr ""
 
-#: src/util/service.c:323
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Formato '%s' erróneo para la red: %s\n"
+#: src/dht/gnunet-service-dht_routing.c:332
+#: src/dht/gnunet-service-dht_routing.c:390
+msgid "# Entries removed from routing table"
+msgstr ""
 
-#: src/util/service.c:627
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
+#: src/dht/gnunet-service-dht_routing.c:342
+msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/util/service.c:632
+#: src/dht/gnunet-service-dht_datacache.c:92
 #, fuzzy, c-format
-msgid "Unknown address family %d\n"
-msgstr "Operación desconocida '%s'\n"
+msgid "%s request received, but have no datacache!\n"
+msgstr "# bytes recibidos por TCP"
 
-#: src/util/service.c:639
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
+#: src/dht/gnunet-service-dht_datacache.c:103
+msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/util/service.c:683
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+#: src/dht/gnunet-service-dht_datacache.c:215
+msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:712
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+#: src/dht/gnunet-service-dht_datacache.c:229
+msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:829
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+#: src/dht/gnunet-service-dht_datacache.c:234
+msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1927
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+#: src/dht/gnunet-service-dht_datacache.c:245
+msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:900
+#: src/dht/gnunet-service-dht_datacache.c:248
 #, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+msgid "Unsupported block type (%u) in local response!\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/dht/gnunet-service-dht_datacache.c:280
+#, fuzzy
+msgid "# GET requests given to datacache"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/util/service.c:947
+#: src/dht/gnunet-service-dht_hello.c:86
+#, fuzzy
+msgid "# HELLOs obtained from peerinfo"
+msgstr "El mensaje recibido del cliente es inválido\n"
+
+#: src/arm/gnunet-arm.c:161
 #, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
+msgid "Service `%s' has been started.\n"
+msgstr "Servicio eliminado.\n"
+
+#: src/arm/gnunet-arm.c:165
+#, fuzzy, c-format
+msgid "Failed to stop service `%s'!\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/util/service.c:965
+#: src/arm/gnunet-arm.c:171
 #, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+msgid "Service `%s' has been stopped.\n"
+msgstr "Servicio eliminado.\n"
 
-#: src/util/service.c:1121 src/util/service.c:1139
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:175
+#, fuzzy, c-format
+msgid "Failed to start service `%s'!\n"
+msgstr "Falló al comenzar la recolección.\n"
 
-#: src/util/service.c:1166
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:181
+#, fuzzy, c-format
+msgid "Some error communicating with service `%s'.\n"
+msgstr "Imprime información de los pares de GNUnet."
 
-#: src/util/service.c:1315
+#: src/arm/gnunet-arm.c:207
 #, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+msgid "Service `%s' is running.\n"
+msgstr "El espacio '%s' ha sido valorado con un %d.\n"
 
-#: src/util/service.c:1349
+#: src/arm/gnunet-arm.c:212
 #, fuzzy, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
+msgid "Service `%s' is not running.\n"
+msgstr "'%s' no es un fichero.\n"
 
-#: src/util/service.c:1397
-msgid "Service process failed to initialize\n"
+#: src/arm/gnunet-arm.c:238
+#, c-format
+msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/util/service.c:1401
-msgid "Service process could not initialize server function\n"
+#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
+msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/util/service.c:1405
-msgid "Service process failed to report status\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:269
+#, fuzzy, c-format
+msgid "Failed to remove configuration file %s\n"
+msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/util/service.c:1457
-msgid "No such user"
-msgstr ""
+#: src/arm/gnunet-arm.c:275
+#, 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/util/service.c:1471
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
-
-#: src/util/service.c:1534
-msgid "do daemonize (detach from terminal)"
+#: src/arm/gnunet-arm.c:387
+msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/fs/fs_uri.c:214
-#, c-format
-msgid "`%' must be followed by HEX number"
+#: src/arm/gnunet-arm.c:389
+msgid "start a particular service"
 msgstr ""
 
-#: src/fs/fs_uri.c:273
-#, fuzzy
-msgid "Malformed KSK URI (must not begin or end with `+')"
-msgstr "URL invalida '%s' (debe comenzar por '%s')\n"
-
-#: src/fs/fs_uri.c:291
-msgid "`++' not allowed in KSK URI"
+#: src/arm/gnunet-arm.c:391
+msgid "stop a particular service"
 msgstr ""
 
-#: src/fs/fs_uri.c:298
-msgid "Quotes not balanced in KSK URI"
+#: src/arm/gnunet-arm.c:393
+msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
-msgid "Malformed SKS URI"
+#: src/arm/gnunet-arm.c:396
+msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
-msgid "Malformed CHK URI"
+#: src/arm/gnunet-arm.c:399
+msgid "test if a particular service is running"
 msgstr ""
 
-#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
-#: src/fs/fs_uri.c:615
-msgid "SKS URI malformed"
+#: src/arm/gnunet-arm.c:402
+msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
-msgid "SKS URI malformed (could not decode public key)"
+#: src/arm/gnunet-arm.c:404
+msgid "don't print status messages"
 msgstr ""
 
-#: src/fs/fs_uri.c:603
-msgid "SKS URI malformed (could not find signature)"
-msgstr ""
+#: src/arm/gnunet-arm.c:407
+#, fuzzy
+msgid "timeout for completing current operation"
+msgstr "tiempo para esperar hasta completar una iteración (en ms)"
 
-#: src/fs/fs_uri.c:609
-msgid "SKS URI malformed (could not decode signature)"
+#: src/arm/gnunet-arm.c:418
+msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/fs/fs_uri.c:622
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
+#, fuzzy
+msgid "Failed to transmit shutdown ACK.\n"
+msgstr "Falló al comenzar la recolección.\n"
+
+#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
+msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:634
-msgid "SKS URI malformed (signature failed validation)"
+#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
+msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:672
-msgid "Unrecognized URI type"
+#: src/arm/gnunet-service-arm.c:206
+#, c-format
+msgid "Restarting service `%s' due to configuration file change.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:897
+#: src/arm/gnunet-service-arm.c:234
 #, fuzzy
-msgid "Lacking key configuration settings.\n"
-msgstr "Configuración de GNUnet"
+msgid "Could not send status result to client\n"
+msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/fs/fs_uri.c:904
+#: src/arm/gnunet-service-arm.c:268
+msgid "Not sending status result to client: no client known\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:406
 #, fuzzy, c-format
-msgid "Could not access hostkey file `%s'.\n"
-msgstr "Imposible pasar el fichero de configuración '%s'.\n"
+msgid "Failed to start service `%s'\n"
+msgstr "Falló al comenzar la recolección.\n"
 
-#: src/fs/fs_uri.c:1212 src/fs/fs_uri.c:1239
-msgid "No keywords specified!\n"
-msgstr "¡Ninguna clave especificada!\n"
+#: src/arm/gnunet-service-arm.c:409
+#, fuzzy, c-format
+msgid "Starting service `%s'\n"
+msgstr "Iniciada colección '%s'.\n"
 
-#: src/fs/fs_uri.c:1245
-msgid "Number of double-quotes not balanced!\n"
+#: src/arm/gnunet-service-arm.c:435
+#, c-format
+msgid "ARM is shutting down, service `%s' not started.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
+#: src/arm/gnunet-service-arm.c:443
 #, 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 "Service `%s' already running.\n"
+msgstr "¡Esta búsqueda está aún pendiente!\n"
 
-#: src/fs/fs_list_indexed.c:117
+#: src/arm/gnunet-service-arm.c:453
 #, 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"
+msgid "Binary implementing service `%s' not known!\n"
+msgstr "La verificación de la firma falló: el par '%s' no es conocido.\n"
 
-#: src/fs/fs_list_indexed.c:164
+#: src/arm/gnunet-service-arm.c:464
 #, fuzzy, c-format
-msgid "Failed to not connect to `%s' service.\n"
-msgstr "Falló al inicializar el servicio '%s'.\n"
+msgid "Configuration file `%s' for service `%s' not known!\n"
+msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
-#: src/fs/gnunet-service-fs_lc.c:480
-#, fuzzy
-msgid "# client searches active"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/arm/gnunet-service-arm.c:498
+#, fuzzy, c-format
+msgid "Preparing to stop `%s'\n"
+msgstr "Iniciada colección '%s'.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:254
+#: src/arm/gnunet-service-arm.c:666
 #, fuzzy
-msgid "# replies received for local clients"
-msgstr "El mensaje recibido del cliente es inválido\n"
+msgid "Stopping all services\n"
+msgstr "Deteniendo cron\n"
 
-#: src/fs/gnunet-service-fs_lc.c:312
-#, fuzzy
-msgid "# client searches received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/arm/gnunet-service-arm.c:723
+#, fuzzy, c-format
+msgid "Restarting service `%s'.\n"
+msgstr "Iniciada colección '%s'.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:351
-msgid "# client searches updated (merged content seen list)"
+#: src/arm/gnunet-service-arm.c:796
+msgid "exit"
 msgstr ""
 
-#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
-#, fuzzy, c-format
-msgid "Publishing failed: %s"
+#: src/arm/gnunet-service-arm.c:801
+msgid "signal"
 msgstr ""
-"\n"
-"Error subiendo el fichero %s\n"
 
-#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
-#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
+#: src/arm/gnunet-service-arm.c:806
+msgid "unknown"
+msgstr "desconocido"
+
+#: src/arm/gnunet-service-arm.c:813
 #, 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 "Service `%s' stopped\n"
+msgstr "Servicio eliminado.\n"
 
-#: src/fs/fs_publish.c:649
-msgid "timeout on index-start request to `fs' service"
+#: src/arm/gnunet-service-arm.c:827
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:661
-#, fuzzy
-msgid "unknown error"
-msgstr "Error desconocido"
-
-#: src/fs/fs_publish.c:704
-msgid "failed to compute hash"
+#: src/arm/arm_api.c:201
+msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:724
-msgid "filename too long"
+#: src/arm/arm_api.c:389
+#, fuzzy, c-format
+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/fs/fs_publish.c:751
-#, fuzzy
-msgid "could not connect to `fs' service"
-msgstr "Imposible conectar con gnunetd.\n"
-
-#: src/fs/fs_publish.c:775
+#: src/arm/arm_api.c:403
 #, fuzzy, c-format
-msgid "Failed to get file identifiers for `%s'\n"
-msgstr "Falló al actualizar los datos del módulo '%s'\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/fs/fs_publish.c:845
+#: src/arm/arm_api.c:467
 #, fuzzy, c-format
-msgid "Recursive upload failed at `%s': %s"
-msgstr "'%s' falló en %s: %d con error: '%s'.\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/fs/fs_publish.c:851
-#, fuzzy, c-format
-msgid "Recursive upload failed: %s"
+#: src/arm/arm_api.c:536
+#, c-format
+msgid "Requesting start of service `%s'.\n"
 msgstr ""
-"\n"
-"Error subiendo el fichero %s\n"
 
-#: src/fs/fs_publish.c:899
-#, fuzzy
-msgid "needs to be an actual file"
-msgstr "'%s' no es un fichero regular.\n"
+#: src/arm/arm_api.c:537
+#, c-format
+msgid "Requesting termination of service `%s'.\n"
+msgstr ""
 
-#: src/fs/fs_publish.c:1078
+#: src/arm/arm_api.c:559
 #, c-format
-msgid "Insufficient space for publishing: %s"
+msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1149
+#: src/arm/arm_api.c:560
 #, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
+msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1482
-#, fuzzy
-msgid "Could not connect to datastore."
-msgstr "Imposible conectar con gnunetd.\n"
+#: src/arm/arm_api.c:592
+#, 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/fs/fs_publish.c:1518 src/fs/fs_namespace.c:822
-#, fuzzy
-msgid "Internal error."
-msgstr "Error desconocido.\n"
-
-#: src/fs/gnunet-download.c:100
+#: src/arm/arm_api.c:664
 #, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "Iniciada colección '%s'.\n"
+msgid "Stopping service `%s' within %llu ms\n"
+msgstr "No se ha recibido una respuesta en %llums.\n"
 
-#: src/fs/gnunet-download.c:112
+#: src/arm/gnunet-service-arm_interceptor.c:803
 #, c-format
-msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
+msgid "Unable to forward to service `%s': shutdown\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:121
-#, fuzzy, c-format
-msgid "Error downloading: %s.\n"
-msgstr "Error descargando: %s\n"
+#: src/arm/gnunet-service-arm_interceptor.c:812
+#, c-format
+msgid "Unable to forward to service `%s': timeout before connect\n"
+msgstr ""
 
-#: src/fs/gnunet-download.c:129
+#: src/arm/gnunet-service-arm_interceptor.c:868
 #, fuzzy, c-format
-msgid "Downloading `%s' done (%s/s).\n"
-msgstr "¡Subida rechazada!"
+msgid "Unable to start service `%s': %s\n"
+msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/fs/gnunet-download.c:144 src/fs/gnunet-unindex.c:109
-#: src/fs/gnunet-search.c:190 src/fs/gnunet-publish.c:155
+#: src/arm/gnunet-service-arm_interceptor.c:936
 #, fuzzy, c-format
-msgid "Unexpected status: %d\n"
-msgstr "Estado de descarga inesperado."
+msgid "Unable to accept connection for service `%s': %s\n"
+msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/fs/gnunet-download.c:169
+#: src/arm/gnunet-service-arm_interceptor.c:952
 #, fuzzy, c-format
-msgid "You need to specify a URI argument.\n"
-msgstr "¡Debes especificar un receptor!\n"
+msgid "Service `%s' started\n"
+msgstr "Servicio eliminado.\n"
 
-#: src/fs/gnunet-download.c:175 src/fs/gnunet-publish.c:426
+#: src/arm/gnunet-service-arm_interceptor.c:1080
 #, fuzzy, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "El fichero '%s' tiene la URI: '%s'\n"
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/fs/gnunet-download.c:182
+#: src/arm/gnunet-service-arm_interceptor.c:1102
 #, c-format
-msgid "Only CHK or LOC URIs supported.\n"
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
+#: src/arm/gnunet-service-arm_interceptor.c:1116
 #, c-format
-msgid "Target filename must be specified.\n"
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:203 src/fs/gnunet-unindex.c:141
-#: src/fs/gnunet-search.c:241 src/fs/gnunet-publish.c:404
-#, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "Falló al inicializar el servicio '%s'.\n"
+#: src/fragmentation/defragmentation.c:270
+msgid "# acknowledgements sent for fragment"
+msgstr ""
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-search.c:285
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "seleccione el NIVEL deseado de anonimidad-del-receptor"
+#: src/fragmentation/defragmentation.c:454
+#, fuzzy
+msgid "# fragments received"
+msgstr "# fragmentos descartados"
 
-#: src/fs/gnunet-download.c:243
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
-msgstr ""
+#: src/fragmentation/defragmentation.c:513
+#, fuzzy
+msgid "# duplicate fragments received"
+msgstr "# bytes recibidos por TCP"
 
-#: src/fs/gnunet-download.c:246 src/fs/gnunet-search.c:288
-msgid "only search the local peer (no P2P network search)"
-msgstr ""
+#: src/fragmentation/defragmentation.c:526
+msgid "# messages defragmented"
+msgstr "# mensajes defragmentados"
 
-#: src/fs/gnunet-download.c:249
-msgid "write the file to FILENAME"
-msgstr "escribe el fichero al FICHERO"
+#: src/fragmentation/fragmentation.c:183
+#, fuzzy
+msgid "# fragments transmitted"
+msgstr "# Auto-anuncios transmitidos"
 
-#: src/fs/gnunet-download.c:253
-msgid "set the maximum number of parallel downloads that is allowed"
+#: src/fragmentation/fragmentation.c:186
+#, fuzzy
+msgid "# fragments retransmitted"
+msgstr "# Auto-anuncios transmitidos"
+
+#: src/fragmentation/fragmentation.c:248
+msgid "# messages fragmented"
+msgstr "# mensajes fragmentados"
+
+#: src/fragmentation/fragmentation.c:251
+msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
-msgid "set the maximum number of parallel requests for blocks that is allowed"
+#: src/fragmentation/fragmentation.c:335
+#, fuzzy
+msgid "# fragment acknowledgements received"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/fragmentation/fragmentation.c:341
+msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fs/gnunet-download.c:260
-msgid "download a GNUnet directory recursively"
-msgstr "descarga un directorio de GNUnet recursivamente"
+#: src/fragmentation/fragmentation.c:365
+#, fuzzy
+msgid "# fragmentation transmissions completed"
+msgstr "# mensajes de texto mandados por PING"
 
-#: src/fs/gnunet-download.c:263 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:585
-#: src/mesh/test_mesh_small.c:676 src/dht/gnunet-dht-get-peer.c:190
-#: src/dht/gnunet-dht-put.c:176 src/dht/gnunet-dht-get.c:204
-#: src/nse/gnunet-nse-profiler.c:655
-msgid "be verbose (print progress information)"
+#: src/statistics/gnunet-service-statistics.c:208
+#, fuzzy, c-format
+msgid "Loading %llu bytes of statistics from `%s'\n"
+msgstr "Descarga los ficheros de GNUnet"
+
+#: src/statistics/gnunet-service-statistics.c:266
+#, fuzzy, c-format
+msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgstr "Descarga los ficheros de GNUnet"
+
+#: src/statistics/statistics_api.c:325
+#, fuzzy
+msgid "Failed to connect to statistics service!\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/statistics/gnunet-statistics.c:89
+#, fuzzy, c-format
+msgid "Failed to obtain statistics.\n"
+msgstr "Fallo en las estadísticas del tráfico.\n"
+
+#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Argumento no válido: '%s'\n"
+
+#: src/statistics/gnunet-statistics.c:155
+msgid "limit output to statistcs for the given NAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:270
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+#: src/statistics/gnunet-statistics.c:158
+msgid "make the value being set persistent"
 msgstr ""
 
+#: src/statistics/gnunet-statistics.c:161
+msgid "limit output to the given SUBSYSTEM"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:168
+msgid "Print statistics about GNUnet operations."
+msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
+
 #: src/fs/gnunet-unindex.c:89
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
@@ -2194,11 +2076,23 @@
 msgid "Unindexing done.\n"
 msgstr "Desindexar los ficheros."
 
+#: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
+#: src/fs/gnunet-publish.c:158 src/fs/gnunet-download.c:144
+#, fuzzy, c-format
+msgid "Unexpected status: %d\n"
+msgstr "Estado de descarga inesperado."
+
 #: 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:141 src/fs/gnunet-search.c:241
+#: src/fs/gnunet-publish.c:412 src/fs/gnunet-download.c:203
+#, fuzzy, c-format
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "Falló al inicializar el servicio '%s'.\n"
+
 #: src/fs/gnunet-unindex.c:148
 #, fuzzy, c-format
 msgid "Could not start unindex operation.\n"
@@ -2208,53 +2102,6 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
-#, 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:107
-#, fuzzy, c-format
-msgid "Failed to open `%s' for writing: %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
-
-#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
-#, fuzzy, c-format
-msgid "Failed to write `%s': %s\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/fs/fs_namespace.c:323
-#, fuzzy
-msgid "Unknown error"
-msgstr "Error desconocido"
-
-#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
-#, fuzzy
-msgid "Failed to serialize meta data"
-msgstr "Imposible inicializar SQLite.\n"
-
-#: src/fs/fs_namespace.c:452
-#, fuzzy
-msgid "Failed to connect to datastore service"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/fs/fs_namespace.c:495
-#, 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:597
-#, 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:866
-#, fuzzy
-msgid "Failed to connect to datastore."
-msgstr "Fallo al conectarse a gnunetd"
-
 #: src/fs/gnunet-pseudonym.c:165
 #, fuzzy, c-format
 msgid "Namespace `%s' unknown.\n"
@@ -2266,7 +2113,7 @@
 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:532
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:538
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimato al enviar"
 
@@ -2287,7 +2134,7 @@
 "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:551
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:557
 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"
 
@@ -2304,7 +2151,7 @@
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:570
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:576
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2322,6 +2169,58 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
+#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
+#, 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:107
+#, fuzzy, c-format
+msgid "Failed to open `%s' for writing: %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
+#, fuzzy, c-format
+msgid "Failed to write `%s': %s\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/fs/fs_namespace.c:323
+#, fuzzy
+msgid "Unknown error"
+msgstr "Error desconocido"
+
+#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+#, fuzzy
+msgid "Failed to serialize meta data"
+msgstr "Imposible inicializar SQLite.\n"
+
+#: src/fs/fs_namespace.c:452
+#, fuzzy
+msgid "Failed to connect to datastore service"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/fs/fs_namespace.c:495
+#, 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:597
+#, 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:822 src/fs/fs_publish.c:1518
+#, fuzzy
+msgid "Internal error."
+msgstr "Error desconocido.\n"
+
+#: src/fs/fs_namespace.c:866
+#, 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"
@@ -2342,6 +2241,14 @@
 msgid "Could not start searching.\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\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/gnunet-search.c:288 src/fs/gnunet-download.c:246
+msgid "only search the local peer (no P2P network search)"
+msgstr ""
+
 #: src/fs/gnunet-search.c:291
 msgid "write search results to file starting with PREFIX"
 msgstr ""
@@ -2358,214 +2265,174 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/fs_unindex.c:58
-msgid "Failed to find given position in file"
+#: src/fs/fs_uri.c:214
+#, c-format
+msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_uri.c:273
 #, fuzzy
-msgid "Failed to read file"
-msgstr "Falló al entregar el mensaje '%s'.\n"
+msgid "Malformed KSK URI (must not begin or end with `+')"
+msgstr "URL invalida '%s' (debe comenzar por '%s')\n"
 
-#: src/fs/fs_unindex.c:235
-msgid "Unexpected time for a response from `fs' service."
+#: src/fs/fs_uri.c:291
+msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_unindex.c:243
-msgid "Timeout waiting for `fs' service."
+#: src/fs/fs_uri.c:298
+msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_unindex.c:251
-#, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "Respuesta inválida a '%s'.\n"
+#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
+msgid "Malformed SKS URI"
+msgstr ""
 
-#: src/fs/fs_unindex.c:296
-#, fuzzy
-msgid "Failed to connect to FS service for unindexing."
-msgstr "Fallo al conectarse a gnunetd"
+#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
+msgid "Malformed CHK URI"
+msgstr ""
 
-#: src/fs/fs_unindex.c:331
-#, fuzzy
-msgid "Failed to connect to `datastore' service."
-msgstr "Falló al inicializar el servicio '%s'.\n"
+#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
+#: src/fs/fs_uri.c:615
+msgid "SKS URI malformed"
+msgstr ""
 
-#: src/fs/fs_unindex.c:344
-#, fuzzy
-msgid "Failed to open file for unindexing."
-msgstr "Fallo al conectarse a gnunetd"
+#: src/fs/fs_uri.c:597
+msgid "SKS URI malformed (could not decode public key)"
+msgstr ""
 
-#: src/fs/fs_unindex.c:378
-#, fuzzy
-msgid "Failed to compute hash of file."
-msgstr "Fallo al conectarse a gnunetd"
+#: src/fs/fs_uri.c:603
+msgid "SKS URI malformed (could not find signature)"
+msgstr ""
 
-#: src/fs/gnunet-directory.c:49
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
+#: src/fs/fs_uri.c:609
+msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
-#, fuzzy, c-format
-msgid "Directory `%s' meta data:\n"
-msgstr "==> Directorio '%s':\n"
+#: src/fs/fs_uri.c:622
+msgid "SKS URI malformed (could not parse expiration time)"
+msgstr ""
 
-#: 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, c-format
-msgid "You must specify a filename to inspect."
-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:176
-#, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
-
-#: src/fs/fs_file_information.c:349
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s': %s"
-msgstr "'%s' falló para la unidad %s: %u\n"
-
-#: 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/gnunet-service-fs_pe.c:228
-msgid "# average retransmission delay (ms)"
+#: src/fs/fs_uri.c:634
+msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:334
-msgid "# queries messages sent to other peers"
+#: src/fs/fs_uri.c:672
+msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:457
+#: src/fs/fs_uri.c:897
 #, fuzzy
-msgid "# requests merged"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "Lacking key configuration settings.\n"
+msgstr "Configuración de GNUnet"
 
-#: src/fs/gnunet-service-fs_pe.c:463
-#, fuzzy
-msgid "# requests refreshed"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/fs/fs_uri.c:904
+#, fuzzy, c-format
+msgid "Could not access hostkey file `%s'.\n"
+msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:511 src/fs/gnunet-service-fs_pe.c:586
-#: src/fs/gnunet-service-fs_pe.c:622
-msgid "# query plan entries"
-msgstr ""
+#: src/fs/fs_uri.c:1238 src/fs/fs_uri.c:1265
+msgid "No keywords specified!\n"
+msgstr "¡Ninguna clave especificada!\n"
 
-#: src/fs/fs_getopt.c:191
-#, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+#: src/fs/fs_uri.c:1271
+msgid "Number of double-quotes not balanced!\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_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-publish.c:115
+#: src/fs/gnunet-publish.c:118
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:123
+#: src/fs/gnunet-publish.c:126
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Error descargando: %s\n"
 
-#: src/fs/gnunet-publish.c:134
+#: src/fs/gnunet-publish.c:137
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:138
+#: src/fs/gnunet-publish.c:141
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/fs/gnunet-publish.c:265
+#: src/fs/gnunet-publish.c:267
 #, 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:267
+#: src/fs/gnunet-publish.c:269
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Claves para los ficheros '%s':\n"
 
-#: src/fs/gnunet-publish.c:312
+#: src/fs/gnunet-publish.c:320
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:354
+#: src/fs/gnunet-publish.c:362
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:361
+#: src/fs/gnunet-publish.c:369
 #, 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:367
+#: src/fs/gnunet-publish.c:375
 #, 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:375
+#: src/fs/gnunet-publish.c:383
 #, 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:385 src/fs/gnunet-publish.c:392
+#: src/fs/gnunet-publish.c:393 src/fs/gnunet-publish.c:400
+#: src/transport/gnunet-transport.c:328
 #, 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:414
+#: src/fs/gnunet-publish.c:422
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:459
+#: src/fs/gnunet-publish.c:434 src/fs/gnunet-download.c:175
 #, fuzzy, c-format
+msgid "Failed to parse URI: %s\n"
+msgstr "El fichero '%s' tiene la URI: '%s'\n"
+
+#: src/fs/gnunet-publish.c:467
+#, fuzzy, c-format
 msgid "Could not access file: %s\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/fs/gnunet-publish.c:484
+#: src/fs/gnunet-publish.c:492
 #, fuzzy, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/fs/gnunet-publish.c:507
+#: src/fs/gnunet-publish.c:515
 #, fuzzy, c-format
 msgid "Could not start publishing.\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/fs/gnunet-publish.c:536
+#: src/fs/gnunet-publish.c:542
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:539
+#: src/fs/gnunet-publish.c:545
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:543
+#: src/fs/gnunet-publish.c:549
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2573,7 +2440,7 @@
 "imprime la lista de las claves extraidas que podrían ser usadas, pero no "
 "realiza la subida"
 
-#: src/fs/gnunet-publish.c:547
+#: src/fs/gnunet-publish.c:553
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2581,7 +2448,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:554
+#: src/fs/gnunet-publish.c:560
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2589,7 +2456,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:559
+#: src/fs/gnunet-publish.c:565
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2597,172 +2464,347 @@
 "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:563
+#: src/fs/gnunet-publish.c:569
 msgid "specify the priority of the content"
 msgstr "especifica la prioridad del contenido"
 
-#: src/fs/gnunet-publish.c:567
+#: src/fs/gnunet-publish.c:573
 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:573
+#: src/fs/gnunet-publish.c:579
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:577
+#: src/fs/gnunet-publish.c:583
 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:581
+#: src/fs/gnunet-publish.c:587
 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:594
+#: src/fs/gnunet-publish.c:600
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
+#: src/fs/fs_search.c:798
+#, c-format
+msgid "Got result with unknown block type `%d', ignoring"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
+#: src/fs/gnunet-service-fs_lc.c:480
+#, fuzzy
+msgid "# client searches active"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_lc.c:254
+#, fuzzy
+msgid "# replies received for local clients"
+msgstr "El mensaje recibido del cliente es inválido\n"
+
+#: src/fs/gnunet-service-fs_lc.c:312
+#, fuzzy
+msgid "# client searches received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_lc.c:351
+msgid "# client searches updated (merged content seen list)"
+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 "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/gnunet-service-fs_cp.c:694
+#: 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-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, c-format
+msgid "You must specify a filename to inspect."
+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:176
+#, 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-service-fs_pr.c:272
+#, fuzzy
+msgid "# Pending requests created"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_pr.c:352 src/fs/gnunet-service-fs_pr.c:607
+#, fuzzy
+msgid "# Pending requests active"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_pr.c:771
+#, fuzzy
+msgid "# replies received and matched"
+msgstr "# bytes recibidos por TCP"
+
+#: src/fs/gnunet-service-fs_pr.c:798
+msgid "# duplicate replies discarded (bloomfilter)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:814
+#, c-format
+msgid "Unsupported block type %u\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:829
+msgid "# results found locally"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:921
+msgid "# Datastore `PUT' failures"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:948
+#, fuzzy
+msgid "# storage requests dropped due to high load"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/fs/gnunet-service-fs_pr.c:983
+#, fuzzy
+msgid "# Replies received from DHT"
+msgstr "# bytes recibidos vía HTTP"
+
+#: src/fs/gnunet-service-fs_pr.c:1074
+#, c-format
+msgid "Datastore lookup already took %llu ms!\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1095
+#, c-format
+msgid "On-demand lookup already took %llu ms!\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1142
+msgid "# Datastore lookups concluded (no results)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1156
+msgid "# Datastore lookups concluded (seen all)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1165
+msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1181
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1198
+msgid "# on-demand blocks matched requests"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1211
+msgid "# on-demand lookups performed successfully"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1216
+msgid "# on-demand lookups failed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1242 src/fs/gnunet-service-fs_pr.c:1281
+#: src/fs/gnunet-service-fs_pr.c:1416
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1299
+msgid "# Datastore lookups concluded (found last result)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1312
+msgid "# Datastore lookups concluded (load too high)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1394
+msgid "# Datastore lookups initiated"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1474
+#, fuzzy
+msgid "# GAP PUT messages received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_pr.c:1565 src/fs/gnunet-service-fs_pr.c:1576
+#, 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:259
+msgid "# average retransmission delay (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:354
+msgid "# transmission failed (core has no bandwidth)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:385
+#, fuzzy
+msgid "# query messages sent to other peers"
+msgstr "# bytes de mensajes salientes omitidos"
+
+#: src/fs/gnunet-service-fs_pe.c:440
+msgid "# delay heap timeout"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:450
+#, fuzzy
+msgid "# query plans executed"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_pe.c:516
+#, fuzzy
+msgid "# requests merged"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_pe.c:522
+#, fuzzy
+msgid "# requests refreshed"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_pe.c:576 src/fs/gnunet-service-fs_pe.c:665
+#: src/fs/gnunet-service-fs_pe.c:706
+msgid "# query plan entries"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1552
+#: src/transport/gnunet-service-transport_neighbours.c:858
+#: src/transport/gnunet-service-transport_neighbours.c:1972
+#: src/transport/gnunet-service-transport_neighbours.c:2058
+#: src/topology/gnunet-daemon-topology.c:653
+#: src/topology/gnunet-daemon-topology.c:755
+#, fuzzy
+msgid "# peers connected"
+msgstr "# de pares conectados"
+
+#: src/fs/gnunet-service-fs_cp.c:701
+#, fuzzy
+msgid "# migration stop messages received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_cp.c:705
+#, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:729
+#: src/fs/gnunet-service-fs_cp.c:740
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:735
+#: src/fs/gnunet-service-fs_cp.c:746
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:764 src/fs/gnunet-service-fs_cp.c:880
-#: src/fs/gnunet-service-fs_cp.c:1290 src/fs/gnunet-service-fs_cp.c:1327
+#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:891
+#: src/fs/gnunet-service-fs_cp.c:1301 src/fs/gnunet-service-fs_cp.c:1340
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:837
+#: src/fs/gnunet-service-fs_cp.c:848
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:900
+#: src/fs/gnunet-service-fs_cp.c:911
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:914
+#: src/fs/gnunet-service-fs_cp.c:925
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:952
+#: src/fs/gnunet-service-fs_cp.c:963
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1019
+#: src/fs/gnunet-service-fs_cp.c:1030
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1043
+#: src/fs/gnunet-service-fs_cp.c:1054
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1053
+#: src/fs/gnunet-service-fs_cp.c:1064
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1132
+#: src/fs/gnunet-service-fs_cp.c:1143
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1166
+#: src/fs/gnunet-service-fs_cp.c:1177
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1190
+#: src/fs/gnunet-service-fs_cp.c:1201
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1256
+#: src/fs/gnunet-service-fs_cp.c:1267
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1284
+#: src/fs/gnunet-service-fs_cp.c:1295
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1325
+#: src/fs/gnunet-service-fs_cp.c:1338
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/fs_download.c:309
-msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
-msgstr ""
-
-#: src/fs/fs_download.c:329
-msgid "Directory too large for system address space\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/fs/fs_download.c:872
-#, 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"
-
-#: src/fs/fs_download.c:958
+#: src/fs/gnunet-service-fs_push.c:642
 #, c-format
 msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+"Invalid value specified for option `%s' in section `%s', content pushing "
+"disabled\n"
 msgstr ""
 
-#: src/fs/fs_download.c:985
-msgid "internal error decrypting content"
-msgstr ""
-
-#: src/fs/fs_download.c:1008
-#, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
-
-#: src/fs/fs_download.c:1020
-#, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
-msgstr "Fichero almacenado en '%s'.\n"
-
-#: src/fs/fs_download.c:1029
-#, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr ""
-
-#: src/fs/fs_download.c:1826
-#, fuzzy
-msgid "Invalid URI"
-msgstr "Argumento no válido: '%s'\n"
-
 #: src/fs/gnunet-service-fs_indexing.c:113
 #: src/fs/gnunet-service-fs_indexing.c:163
 #, fuzzy, c-format
@@ -2812,118 +2854,205 @@
 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/fs_search.c:798
-#, c-format
-msgid "Got result with unknown block type `%d', ignoring"
-msgstr ""
+#: 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-service-fs_pr.c:300
-#, fuzzy
-msgid "# Pending requests created"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/fs/fs_list_indexed.c:117
+#, 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-service-fs_pr.c:379 src/fs/gnunet-service-fs_pr.c:638
-#, fuzzy
-msgid "# Pending requests active"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/fs/fs_list_indexed.c:164
+#, fuzzy, c-format
+msgid "Failed to not connect to `%s' service.\n"
+msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/fs/gnunet-service-fs_pr.c:802
+#: src/fs/fs_unindex.c:58
+msgid "Failed to find given position in file"
+msgstr ""
+
+#: src/fs/fs_unindex.c:63
 #, fuzzy
-msgid "# replies received and matched"
-msgstr "# bytes recibidos por TCP"
+msgid "Failed to read file"
+msgstr "Falló al entregar el mensaje '%s'.\n"
 
-#: src/fs/gnunet-service-fs_pr.c:829
-msgid "# duplicate replies discarded (bloomfilter)"
+#: src/fs/fs_unindex.c:235
+msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:845
-#, c-format
-msgid "Unsupported block type %u\n"
+#: src/fs/fs_unindex.c:243
+msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:860
-msgid "# results found locally"
-msgstr ""
+#: src/fs/fs_unindex.c:251
+#, fuzzy
+msgid "Invalid response from `fs' service."
+msgstr "Respuesta inválida a '%s'.\n"
 
-#: src/fs/gnunet-service-fs_pr.c:952
-msgid "# Datastore `PUT' failures"
-msgstr ""
+#: src/fs/fs_unindex.c:296
+#, fuzzy
+msgid "Failed to connect to FS service for unindexing."
+msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/gnunet-service-fs_pr.c:979
+#: src/fs/fs_unindex.c:331
 #, fuzzy
-msgid "# storage requests dropped due to high load"
-msgstr "# Anuncios de los pares recibidos"
+msgid "Failed to connect to `datastore' service."
+msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1012
+#: src/fs/fs_unindex.c:344
 #, fuzzy
-msgid "# Replies received from DHT"
-msgstr "# bytes recibidos vía HTTP"
+msgid "Failed to open file for unindexing."
+msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/gnunet-service-fs_pr.c:1102
+#: src/fs/fs_unindex.c:378
+#, fuzzy
+msgid "Failed to compute hash of file."
+msgstr "Fallo al conectarse a gnunetd"
+
+#: 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:112
 #, c-format
-msgid "Datastore lookup already took %llu ms!\n"
+msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1123
+#: src/fs/gnunet-download.c:121
+#, fuzzy, c-format
+msgid "Error downloading: %s.\n"
+msgstr "Error descargando: %s\n"
+
+#: src/fs/gnunet-download.c:129
+#, fuzzy, c-format
+msgid "Downloading `%s' done (%s/s).\n"
+msgstr "¡Subida rechazada!"
+
+#: src/fs/gnunet-download.c:169
+#, fuzzy, c-format
+msgid "You need to specify a URI argument.\n"
+msgstr "¡Debes especificar un receptor!\n"
+
+#: src/fs/gnunet-download.c:182
 #, c-format
-msgid "On-demand lookup already took %llu ms!\n"
+msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1170
-msgid "# Datastore lookups concluded (no results)"
+#: src/fs/gnunet-download.c:189
+#, c-format
+msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1184
-msgid "# Datastore lookups concluded (seen all)"
+#: src/fs/gnunet-download.c:243
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1193
-msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
-msgstr ""
+#: src/fs/gnunet-download.c:249
+msgid "write the file to FILENAME"
+msgstr "escribe el fichero al FICHERO"
 
-#: src/fs/gnunet-service-fs_pr.c:1209
-msgid "# requested DBLOCK or IBLOCK not found"
+#: src/fs/gnunet-download.c:253
+msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1226
-msgid "# on-demand blocks matched requests"
+#: src/fs/gnunet-download.c:257
+msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1239
-msgid "# on-demand lookups performed successfully"
+#: src/fs/gnunet-download.c:260
+msgid "download a GNUnet directory recursively"
+msgstr "descarga un directorio de GNUnet recursivamente"
+
+#: src/fs/gnunet-download.c:270
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
-msgid "# on-demand lookups failed"
+#: src/fs/fs_getopt.c:191
+#, c-format
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\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/gnunet-service-fs_pr.c:1270 src/fs/gnunet-service-fs_pr.c:1311
-#: src/fs/gnunet-service-fs_pr.c:1426
-msgid "# Datastore lookups concluded (error queueing)"
+#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
+#, fuzzy, c-format
+msgid "Publishing failed: %s"
 msgstr ""
+"\n"
+"Error subiendo el fichero %s\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1329
-msgid "# Datastore lookups concluded (found ultimate result)"
+#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
+#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
+#, 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"
+
+#: src/fs/fs_publish.c:649
+msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1342
-msgid "# Datastore lookups concluded (load too high)"
+#: src/fs/fs_publish.c:661
+#, fuzzy
+msgid "unknown error"
+msgstr "Error desconocido"
+
+#: src/fs/fs_publish.c:704
+msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1404
-msgid "# Datastore lookups initiated"
+#: src/fs/fs_publish.c:724
+msgid "filename too long"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1487
+#: src/fs/fs_publish.c:751
 #, fuzzy
-msgid "# GAP PUT messages received"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "could not connect to `fs' service"
+msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1576
+#: src/fs/fs_publish.c:775
 #, fuzzy, c-format
-msgid "Configuration fails to specify `%s', assuming default value."
-msgstr "Fichero de configuración '%s' creado.\n"
+msgid "Failed to get file identifiers for `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
+#: src/fs/fs_publish.c:845
+#, 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:851
+#, fuzzy, c-format
+msgid "Recursive upload failed: %s"
+msgstr ""
+"\n"
+"Error subiendo el fichero %s\n"
+
+#: src/fs/fs_publish.c:899
+#, fuzzy
+msgid "needs to be an actual file"
+msgstr "'%s' no es un fichero regular.\n"
+
+#: src/fs/fs_publish.c:1078
+#, c-format
+msgid "Insufficient space for publishing: %s"
+msgstr ""
+
+#: src/fs/fs_publish.c:1149
+#, c-format
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
+msgstr ""
+
+#: src/fs/fs_publish.c:1482
+#, fuzzy
+msgid "Could not connect to datastore."
+msgstr "Imposible conectar con gnunetd.\n"
+
 #: src/fs/fs.c:284
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
@@ -2998,546 +3127,436 @@
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:642
-#, c-format
+#: src/fs/fs_download.c:309
 msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:128
-msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+#: src/fs/fs_download.c:329
+msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:99
-#, c-format
-msgid "Block not of type %u\n"
-msgstr ""
-
-#: src/block/plugin_block_dht.c:106
-msgid "Size mismatch for block\n"
-msgstr ""
-
-#: src/block/plugin_block_dht.c:115
-#, c-format
-msgid "Block of type %u is malformed\n"
-msgstr ""
-
-#: src/block/block.c:108
+#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
 #, fuzzy, c-format
-msgid "Loading block plugins `%s'\n"
-msgstr "Probando transporte(s) %s\n"
+msgid "Failed to open file `%s' for writing"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/block/block.c:118
+#: src/fs/fs_download.c:872
 #, fuzzy, c-format
-msgid "Failed to load block plugin `%s'\n"
-msgstr "Imposible inicializar la aplicación '%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/mesh/test_mesh_small.c:689
-msgid "Test mesh in a small network."
+#: src/fs/fs_download.c:958
+#, 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/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
-#, fuzzy
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr "Falló al comenzar la recolección.\n"
-
-#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
-msgid "Transmitting shutdown ACK.\n"
+#: src/fs/fs_download.c:985
+msgid "internal error decrypting content"
 msgstr ""
 
-#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
-msgid "Initiating shutdown as requested by client.\n"
-msgstr ""
+#: src/fs/fs_download.c:1008
+#, fuzzy, c-format
+msgid "Download failed: could not open file `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:206
+#: src/fs/fs_download.c:1020
+#, fuzzy, c-format
+msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/fs/fs_download.c:1029
 #, c-format
-msgid "Restarting service `%s' due to configuration file change.\n"
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:234
+#: src/fs/fs_download.c:1826
 #, fuzzy
-msgid "Could not send status result to client\n"
-msgstr "Imposible mandar el mensaje a gnunetd\n"
+msgid "Invalid URI"
+msgstr "Argumento no válido: '%s'\n"
 
-#: src/arm/gnunet-service-arm.c:268
-msgid "Not sending status result to client: no client known\n"
+#: src/fs/gnunet-service-fs.c:268 src/fs/gnunet-service-fs.c:448
+msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:406
+#: src/fs/gnunet-service-fs.c:542 src/topology/gnunet-daemon-topology.c:1292
+#: src/topology/gnunet-daemon-topology.c:1299
+#: src/hostlist/gnunet-daemon-hostlist.c:290
 #, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "Falló al comenzar la recolección.\n"
+msgid "Failed to connect to `%s' service.\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/arm/gnunet-service-arm.c:409
+#: src/fs/fs_file_information.c:350
 #, fuzzy, c-format
-msgid "Starting service `%s'\n"
-msgstr "Iniciada colección '%s'.\n"
+msgid "`%s' failed on file `%s': %s"
+msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/arm/gnunet-service-arm.c:435
-#, c-format
-msgid "ARM is shutting down, service `%s' not started.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:435
+msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:443
-#, fuzzy, c-format
-msgid "Service `%s' already running.\n"
-msgstr "¡Esta búsqueda está aún pendiente!\n"
+#: src/transport/gnunet-service-transport_neighbours.c:807
+#, fuzzy
+msgid "# peers disconnected due to external request"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/arm/gnunet-service-arm.c:453
-#, fuzzy, c-format
-msgid "Binary implementing service `%s' not known!\n"
-msgstr "La verificación de la firma falló: el par '%s' no es conocido.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:913
+#, fuzzy
+msgid "# peers disconnected due to timeout"
+msgstr "# de pares conectados"
 
-#: src/arm/gnunet-service-arm.c:464
-#, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not known!\n"
-msgstr "Fichero de configuración '%s' creado.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:937
+#, fuzzy
+msgid "# keepalives sent"
+msgstr "# claves de la sesión mandadas"
 
-#: src/arm/gnunet-service-arm.c:498
-#, fuzzy, c-format
-msgid "Preparing to stop `%s'\n"
-msgstr "Iniciada colección '%s'.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:969
+#, fuzzy
+msgid "# peers disconnected due to global disconnect"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/arm/gnunet-service-arm.c:666
+#: src/transport/gnunet-service-transport_neighbours.c:1499
+#: src/transport/gnunet-service-transport_neighbours.c:1520
 #, fuzzy
-msgid "Stopping all services\n"
-msgstr "Deteniendo cron\n"
+msgid "# messages not sent (no such peer or not connected)"
+msgstr "# mensajes defragmentados"
 
-#: src/arm/gnunet-service-arm.c:723
-#, fuzzy, c-format
-msgid "Restarting service `%s'.\n"
-msgstr "Iniciada colección '%s'.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1536
+#, fuzzy
+msgid "# bytes in message queue for other peers"
+msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/arm/gnunet-service-arm.c:796
-msgid "exit"
+#: src/transport/gnunet-service-transport_neighbours.c:1584
+#, fuzzy
+msgid "# messages discarded due to lack of neighbour record"
+msgstr "# mensajes defragmentados"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1620
+msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:801
-msgid "signal"
+#: src/transport/gnunet-service-transport_neighbours.c:1638
+msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:806
-msgid "unknown"
-msgstr "desconocido"
+#: src/transport/gnunet-service-transport_neighbours.c:1663
+#, fuzzy
+msgid "# KEEPALIVE messages discarded (not connected)"
+msgstr "# mensajes defragmentados"
 
-#: src/arm/gnunet-service-arm.c:813
-#, fuzzy, c-format
-msgid "Service `%s' stopped\n"
-msgstr "Servicio eliminado.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1693
+msgid "# SET QUOTA messages ignored (no such peer)"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:827
-#, c-format
-msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1706
+msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:161
-#, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "Servicio eliminado.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1820
+msgid "# disconnect messages ignored (old format)"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:165
-#, fuzzy, c-format
-msgid "Failed to stop service `%s'!\n"
-msgstr "Fichero almacenado en '%s'.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1832
+msgid "# disconnect messages ignored (timestamp)"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:171
+#: src/transport/gnunet-service-transport_blacklist.c:247
 #, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "Servicio eliminado.\n"
+msgid "Could not read blacklist file `%s'\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/arm/gnunet-arm.c:175
-#, fuzzy, c-format
-msgid "Failed to start service `%s'!\n"
-msgstr "Falló al comenzar la recolección.\n"
-
-#: src/arm/gnunet-arm.c:181
-#, fuzzy, c-format
-msgid "Some error communicating with service `%s'.\n"
-msgstr "Imprime información de los pares de GNUnet."
-
-#: src/arm/gnunet-arm.c:207
-#, fuzzy, c-format
-msgid "Service `%s' is running.\n"
-msgstr "El espacio '%s' ha sido valorado con un %d.\n"
-
-#: src/arm/gnunet-arm.c:212
-#, fuzzy, c-format
-msgid "Service `%s' is not running.\n"
-msgstr "'%s' no es un fichero.\n"
-
-#: src/arm/gnunet-arm.c:238
+#: src/transport/gnunet-service-transport_blacklist.c:254
 #, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
+msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
-msgid "Fatal error initializing ARM API.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:269
+#: src/transport/gnunet-service-transport_blacklist.c:266
 #, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "Imposible guardar el fichero de configuración '%s':"
+msgid "Failed to read blacklist from `%s'\n"
+msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:275
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
 #, 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:387
-msgid "stop all GNUnet services"
+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/arm/gnunet-arm.c:389
-msgid "start a particular service"
+#: 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/arm/gnunet-arm.c:391
-msgid "stop a particular service"
+#: 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 ""
+"Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/arm/gnunet-arm.c:393
-msgid "start all GNUnet default services"
+#: src/transport/gnunet-service-transport_blacklist.c:364
+#, c-format
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:396
-msgid "stop and start all GNUnet default services"
+#: src/transport/gnunet-service-transport_blacklist.c:522
+#: src/transport/gnunet-service-transport_blacklist.c:760
+msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:399
-msgid "test if a particular service is running"
+#: src/transport/plugin_transport_http_server.c:184
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:402
-msgid "delete config file and directory on exit"
+#: src/transport/plugin_transport_http_server.c:208
+msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:404
-msgid "don't print status messages"
+#: src/transport/gnunet-service-transport_hello.c:177
+msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:407
+#: src/transport/plugin_transport_udp.c:1428
+#: src/transport/plugin_transport_udp.c:2132
 #, fuzzy
-msgid "timeout for completing current operation"
-msgstr "tiempo para esperar hasta completar una iteración (en ms)"
+msgid "# HELLO beacons received via udp"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/arm/gnunet-arm.c:418
-msgid "Control services and the Automated Restart Manager (ARM)"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:803
+#: src/transport/plugin_transport_udp.c:1900
+#: src/transport/plugin_transport_udp_new.c:1209
 #, c-format
-msgid "Unable to forward to service `%s': shutdown\n"
+msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:812
-#, c-format
-msgid "Unable to forward to service `%s': timeout before connect\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:868
+#: src/transport/plugin_transport_udp.c:1953
+#: src/transport/plugin_transport_udp_new.c:1259
 #, fuzzy, c-format
-msgid "Unable to start service `%s': %s\n"
-msgstr "Imposible guardar el fichero de configuración '%s':"
+msgid "Invalid IPv6 address: `%s'\n"
+msgstr "Argumento no válido: '%s'\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:936
-#, fuzzy, c-format
-msgid "Unable to accept connection for service `%s': %s\n"
-msgstr "Imposible guardar el fichero de configuración '%s':"
+#: src/transport/plugin_transport_udp.c:2146
+#: src/transport/plugin_transport_udp_new.c:1388
+#, fuzzy
+msgid "Failed to open UDP sockets\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:952
+#: src/transport/plugin_transport_http_client.c:107
+#: src/transport/plugin_transport_http_client.c:122
+#: 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 "Service `%s' started\n"
-msgstr "Servicio eliminado.\n"
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1080
-#, 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_interceptor.c:1102
+#: src/transport/plugin_transport_http_client.c:617
 #, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1116
+#: src/transport/plugin_transport_tcp.c:504
 #, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/arm/arm_api.c:201 src/arm/test_exponential_backoff.c:192
-msgid "Failed to transmit shutdown request to client.\n"
-msgstr ""
+#: src/transport/plugin_transport_tcp.c:590
+#: src/transport/plugin_transport_tcp.c:679
+#: src/transport/plugin_transport_tcp.c:732
+#: src/transport/plugin_transport_tcp.c:821
+#: src/transport/plugin_transport_tcp.c:1160
+#, fuzzy
+msgid "# bytes currently in TCP buffers"
+msgstr "# bytes enviados por TCP"
 
-#: src/arm/arm_api.c:390
-#, fuzzy, c-format
-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/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:847
+#: src/transport/plugin_transport_tcp.c:1548
+#, fuzzy
+msgid "# TCP sessions active"
+msgstr "# claves de la sesión aceptadas"
 
-#: src/arm/arm_api.c:405
-#, fuzzy, c-format
-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/transport/plugin_transport_tcp.c:683
+#, fuzzy
+msgid "# bytes discarded by TCP (timeout)"
+msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/arm/arm_api.c:469
-#, 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/transport/plugin_transport_tcp.c:735
+#, fuzzy
+msgid "# bytes transmitted via TCP"
+msgstr "# bytes desencriptados"
 
-#: src/arm/arm_api.c:539
-#, c-format
-msgid "Requesting start of service `%s'.\n"
-msgstr ""
+#: src/transport/plugin_transport_tcp.c:825
+#, fuzzy
+msgid "# bytes discarded by TCP (disconnect)"
+msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/arm/arm_api.c:540
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
-msgstr ""
+#: src/transport/plugin_transport_tcp.c:946
+#, fuzzy
+msgid "# bytes TCP was asked to transmit"
+msgstr "# bytes desencriptados"
 
-#: src/arm/arm_api.c:563
-#, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
+#: src/transport/plugin_transport_tcp.c:997
+msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/arm/arm_api.c:566
+#: src/transport/plugin_transport_tcp.c:1040
 #, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
+msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/arm/arm_api.c:598 src/arm/arm_api.c:602
-#, 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:675
-#, fuzzy, c-format
-msgid "Stopping service `%s' within %llu ms\n"
-msgstr "No se ha recibido una respuesta en %llums.\n"
-
-#: src/dht/dhtlog.c:56
-#, c-format
-msgid "Loading `%s' dhtlog plugin\n"
+#: src/transport/plugin_transport_tcp.c:1057
+msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/dht/dhtlog.c:65
-#, fuzzy, c-format
-msgid "Failed to load dhtlog plugin for `%s'\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
-
-#: src/dht/plugin_dhtlog_mysql_dump.c:895
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:655
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:686
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:718
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:750
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:782
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:813
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:844
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:875
-#, fuzzy, c-format
-msgid "Failed to get full path for `%s'\n"
-msgstr "Falló al actualizar los datos del módulo '%s'\n"
-
-#: src/dht/plugin_dhtlog_mysql_dump.c:924
+#: src/transport/plugin_transport_tcp.c:1108
 #, fuzzy
-msgid "Failed to create file for dhtlog.\n"
-msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+msgid "# bytes discarded by TCP (failed to connect)"
+msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/dht/gnunet-dht-get-peer.c:84
-#, c-format
-msgid "Found %u peers\n"
+#: src/transport/plugin_transport_tcp.c:1228
+msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:115
-#, fuzzy, c-format
-msgid "Found peer `%s'\n"
-msgstr "Yo soy el par '%s'.\n"
+#: src/transport/plugin_transport_tcp.c:1591
+#, fuzzy
+msgid "# TCP WELCOME messages received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-dht-get-peer.c:184 src/dht/gnunet-dht-put.c:161
-#: src/dht/gnunet-dht-get.c:195
-msgid "the query key"
-msgstr ""
+#: src/transport/plugin_transport_tcp.c:1736
+msgid "# bytes received via TCP"
+msgstr "# bytes recibidos por TCP"
 
-#: src/dht/gnunet-dht-get-peer.c:187 src/dht/gnunet-dht-put.c:170
-#: src/dht/gnunet-dht-get.c:201
-msgid "how long to execute this query before giving up?"
+#: src/transport/plugin_transport_tcp.c:1800
+msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:209
-msgid "Issue a GET PEER request to the GNUnet DHT, print results."
-msgstr ""
+#: src/transport/plugin_transport_tcp.c:1953
+#, fuzzy
+msgid "Failed to start service.\n"
+msgstr "Falló al comenzar la recolección.\n"
 
-#: src/dht/gnunet-dht-put.c:95
-#, c-format
-msgid "PUT request sent!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:119
-#, c-format
-msgid "Must provide KEY and DATA for DHT put!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:127
+#: src/transport/plugin_transport_tcp.c:2013
 #, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
-msgstr "Imposible conectar con gnunetd.\n"
+msgid "Failed to find option %s in section %s!\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/dht/gnunet-dht-put.c:132
-#, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "'%s' conectado a '%s'.\n"
-
-#: src/dht/gnunet-dht-put.c:147
+#: src/transport/plugin_transport_tcp.c:2036
 #, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:164
-msgid "the data to insert under the key"
+#: src/transport/plugin_transport_tcp.c:2040
+msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:167
-msgid "the type to insert data as"
+#: src/transport/plugin_transport_tcp.c:2044
+#, c-format
+msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:173
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/transport/plugin_transport_http.c:829
+msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr ""
+#: src/transport/plugin_transport_http.c:878
+#, fuzzy
+msgid "Require valid port number for service in configuration!\n"
+msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/dht/gnunet-dht-get.c:198
-msgid "the type of data to look for"
+#: src/transport/plugin_transport_http.c:1025
+#, c-format
+msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:223
-msgid "Issue a GET request to the GNUnet DHT, prints results."
+#: src/transport/plugin_transport_http.c:1040
+#, c-format
+msgid "FREEING %s\n"
 msgstr ""
 
-#: src/dht/dht_api.c:235
+#: src/transport/plugin_transport_http.c:1115
 #, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
+msgstr "¡Advertencias de la red desconectadas por configuración!\n"
 
-#: src/dht/plugin_dhtlog_mysql.c:1550
+#: src/transport/plugin_transport_http.c:1128
 #, fuzzy
-msgid "Failed to initialize MySQL database connection for dhtlog.\n"
-msgstr "Imposible inicializar SQLite.\n"
+msgid "Port is required! Fix in configuration\n"
+msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/transport/test_plugin_transport_udp.c:185
-#: src/transport/test_plugin_transport_https.c:1271
-#: src/transport/test_plugin_transport.c:202
-#: src/transport/gnunet-service-transport.c:439
-#: src/transport/test_plugin_transport_http.c:1232
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+#: src/transport/plugin_transport_http.c:1139
+msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:195
-#: src/transport/test_plugin_transport_https.c:1335
-#: src/transport/test_plugin_transport.c:212
-#: src/transport/gnunet-service-transport.c:448
-#: src/transport/test_plugin_transport_http.c:1255
-msgid "Transport service could not access hostkey.  Exiting.\n"
+#: src/transport/plugin_transport_http.c:1155
+#, c-format
+msgid ""
+"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:205
-#, fuzzy
-msgid "Loading udp transport plugin\n"
-msgstr "Probando transporte(s) %s\n"
+#: src/transport/plugin_transport_http.c:1181
+#, c-format
+msgid ""
+"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
+msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:213
+#: src/transport/plugin_transport_unix.c:1088
 #, fuzzy
-msgid "Failed to load transport plugin for udp\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
+msgid "Failed to open UNIX sockets\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/plugin_transport_wlan.c:1436
-#: src/transport/plugin_transport_wlan.c:1631
-#: src/transport/plugin_transport_wlan.c:1750
-#, c-format
-msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
-msgstr ""
+#: src/transport/plugin_transport_smtp.c:367
+#, fuzzy, c-format
+msgid "Received malformed message via %s. Ignored.\n"
+msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/transport/plugin_transport_wlan.c:1868
-#, c-format
-msgid "Wlan Address len %d is wrong\n"
+#: src/transport/plugin_transport_smtp.c:454
+msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2728
+#: src/transport/plugin_transport_smtp.c:463
 #, c-format
-msgid "Finished reading from wlan-helper stdout with code: %d\n"
+msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:246
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
-msgstr ""
+#: src/transport/plugin_transport_smtp.c:558
+#: src/transport/plugin_transport_smtp.c:568
+#: src/transport/plugin_transport_smtp.c:581
+#: src/transport/plugin_transport_smtp.c:600
+#: src/transport/plugin_transport_smtp.c:623
+#: src/transport/plugin_transport_smtp.c:631
+#: src/transport/plugin_transport_smtp.c:644
+#: src/transport/plugin_transport_smtp.c:655
+#, fuzzy, c-format
+msgid "SMTP: `%s' failed: %s.\n"
+msgstr "'%s' %s falló: %s\n"
 
-#: src/transport/gnunet-service-transport_clients.c:251
-#, fuzzy
-msgid "# messages dropped due to slow client"
-msgstr "# Anuncios de los pares recibidos"
-
-#: src/transport/gnunet-service-transport_clients.c:394
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
+#: src/transport/plugin_transport_smtp.c:798
+msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:511
+#: src/transport/plugin_transport_smtp.c:810
 #, fuzzy
-msgid "# bytes payload received for other peers"
+msgid "# bytes received via SMTP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/gnunet-service-transport_clients.c:528
-msgid "# bytes payload dropped (other peer was not connected)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:579
+#: src/transport/plugin_transport_smtp.c:811
 #, fuzzy
-msgid "# REQUEST CONNECT messages received"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "# bytes sent via SMTP"
+msgstr "# bytes enviados por TCP"
 
-#: src/transport/gnunet-service-transport_clients.c:607
+#: src/transport/plugin_transport_smtp.c:813
 #, fuzzy
-msgid "# SET QUOTA messages received"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "# bytes dropped by SMTP (outgoing)"
+msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:811
-#, fuzzy
-msgid "# messages not sent (no such peer or not connected)"
-msgstr "# mensajes defragmentados"
-
-#: src/transport/gnunet-service-transport_neighbours.c:831
-#, fuzzy
-msgid "# bytes in message queue for other peers"
-msgstr "# bytes de mensajes salientes omitidos"
-
-#: src/transport/gnunet-service-transport_neighbours.c:899
-msgid "# bandwidth quota violations by other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:917
-msgid "# ms throttling suggested"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:942
-#, fuzzy
-msgid "# KEEPALIVE messages discarded (not connected)"
-msgstr "# mensajes defragmentados"
-
-#: src/transport/gnunet-service-transport_neighbours.c:972
-msgid "# SET QUOTA messages ignored (no such peer)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:984
-msgid "# disconnects due to quota of 0"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_plugins.c:108
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
@@ -3557,529 +3576,378 @@
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/transport/test_plugin_transport_https.c:409
-msgid "Phase 0: Test plugin functions failed\n"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:877
+#, fuzzy
+msgid "# wlan session timeouts"
+msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/test_plugin_transport_https.c:418
-msgid "Phase 1: Test connect with wrong data failed\n"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:902
+#, fuzzy
+msgid "# wlan session created"
+msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/test_plugin_transport_https.c:427
-msgid "Phase 2: Test session selection failed\n"
+#: src/transport/plugin_transport_wlan.c:985
+#: src/transport/plugin_transport_wlan.c:1143
+#: src/transport/plugin_transport_wlan.c:1163
+#: src/transport/plugin_transport_wlan.c:1193
+#: src/transport/plugin_transport_wlan.c:2361
+#: src/transport/plugin_transport_wlan.c:3192
+msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:435
-msgid "Phase 3: Test sending with plugin failed\n"
+#: src/transport/plugin_transport_wlan.c:1455
+#, c-format
+msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:726
-#: src/transport/test_plugin_transport_http.c:692
-#, fuzzy, c-format
-msgid "curl failed for `%s' at %s:%d: `%s'\n"
-msgstr "'%s' falló en %s: %d con error: '%s'.\n"
-
-#: src/transport/test_plugin_transport_https.c:746
-#: src/transport/test_plugin_transport_http.c:712
-msgid "Connecting to peer without any peer identification: test failed\n"
+#: src/transport/plugin_transport_wlan.c:1771
+msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:759
-#: src/transport/test_plugin_transport_http.c:725
-msgid "Connecting to peer with too short peer identification: test failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:772
-#: src/transport/test_plugin_transport_http.c:738
-msgid "Connecting to peer with too long peer identification: test failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:785
-msgid "Connecting to peer with valid peer identification: test failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:924
-#: src/transport/test_plugin_transport_http.c:887
+#: src/transport/plugin_transport_wlan.c:1803
+#: src/transport/plugin_transport_wlan.c:2016
+#: src/transport/plugin_transport_wlan.c:2109
 #, c-format
-msgid "Unknown address size: ipv6 has %u ipv4 has %u but this has %u\n"
+msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:930
-#: src/transport/test_plugin_transport_http.c:893
-#, c-format
-msgid "Transport plugin notification for address: `%s':%u\n"
+#: src/transport/plugin_transport_wlan.c:2003
+msgid "# wlan acks send"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1038
-#: src/transport/test_plugin_transport_http.c:1002
-msgid "Connecting to peer without any peer identification.\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1053
-#: src/transport/test_plugin_transport_http.c:1017
-msgid "Connecting to peer with too short peer identification.\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1069
-#: src/transport/test_plugin_transport_http.c:1033
-msgid "Connecting to peer with too long peer identification.\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1083
-#: src/transport/test_plugin_transport_http.c:1047
-msgid "Connecting to peer with valid peer identification.\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1093
-msgid ""
-"\n"
-"Phase 1: transmit data to all suggested addresses\n"
-"\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1151
-msgid ""
-"\n"
-"Phase 2: session selection\n"
-"\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1187
-msgid ""
-"\n"
-"Phase 3: send multiple or big messages after disconnect\n"
-"\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1193
+#: src/transport/plugin_transport_wlan.c:2072
 #, fuzzy
-msgid "Phase 3: sending messages\n"
-msgstr "Falló al entregar el mensaje '%s'.\n"
+msgid "# wlan fragments send"
+msgstr "# fragmentos descartados"
 
-#: src/transport/test_plugin_transport_https.c:1284
-#: src/transport/plugin_transport_http.c:3323
-#: src/transport/test_plugin_transport_http.c:1245
+#: src/transport/plugin_transport_wlan.c:2231
 #, c-format
-msgid "Require valid port number for transport plugin `%s' in configuration!\n"
+msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1352
-#, fuzzy, c-format
-msgid "Loading HTTPS transport plugin `%s'\n"
-msgstr "Probando transporte(s) %s\n"
-
-#: src/transport/test_plugin_transport_https.c:1358
+#: src/transport/plugin_transport_wlan.c:2236
 #, fuzzy
-msgid "Failed to load transport plugin for https\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
+msgid "# wlan messages queued"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/test_plugin_transport_https.c:1368
-#, c-format
-msgid "Transport plugin returned %u addresses to connect to\n"
+#: src/transport/plugin_transport_wlan.c:2323
+#: src/transport/plugin_transport_wlan.c:2959
+#: src/transport/plugin_transport_wlan.c:3194
+msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1444
-msgid ""
-"\n"
-"Phase 0\n"
-"\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1507
-#: src/transport/test_plugin_transport_https.c:1510
-msgid ""
-"\n"
-"delete\n"
-"\n"
-msgstr ""
-
-#: src/transport/test_transport_api.c:120
+#: src/transport/plugin_transport_wlan.c:2543
 #, fuzzy
-msgid "Fail! Could not connect peers\n"
-msgstr "'%s': Imposible conectar.\n"
+msgid "# wlan whole messages received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/gnunet-transport-list-connections.c:91
-#: src/peerinfo-tool/gnunet-peerinfo.c:200
-#: src/core/gnunet-core-list-connections.c:166
-#, fuzzy, c-format
-msgid "Invalid command line argument `%s'\n"
-msgstr "Argumentos en la linea de comandos inválidos:\n"
-
-#: src/transport/gnunet-transport-list-connections.c:112
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
-#: src/core/gnunet-core-list-connections.c:187
-msgid "don't resolve host names"
-msgstr ""
-
-#: src/transport/gnunet-transport-list-connections.c:119
-#: src/core/gnunet-core-list-connections.c:194
+#: src/transport/plugin_transport_wlan.c:2741
 #, fuzzy
-msgid "Print information about connected peers."
-msgstr "Imprime información de los pares de GNUnet."
+msgid "# wlan hello messages received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/test_plugin_transport.c:224
+#: src/transport/plugin_transport_wlan.c:2775
 #, fuzzy
-msgid "Loading tcp transport plugin\n"
-msgstr "Probando transporte(s) %s\n"
+msgid "# wlan fragments received"
+msgstr "# fragmentos descartados"
 
-#: src/transport/test_plugin_transport.c:232
+#: src/transport/plugin_transport_wlan.c:2827
 #, fuzzy
-msgid "Failed to load transport plugin for tcp\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
+msgid "# wlan acks received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/gnunet-service-transport_hello.c:176
-msgid "# refreshed my HELLO"
+#: src/transport/plugin_transport_wlan.c:2920
+msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:698
-#: src/transport/plugin_transport_http.c:1231
-#: src/transport/plugin_transport_http.c:2551
+#: src/transport/plugin_transport_wlan.c:2943
 #, fuzzy
-msgid "# HTTP peers active"
-msgstr "# bytes recibidos por TCP"
+msgid "# wlan mac endpoints created"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_http.c:993
-#: src/transport/plugin_transport_http.c:1306
-msgid "# HTTP inbound sessions for peers active"
+#: src/transport/plugin_transport_wlan.c:2999
+msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1889
-#, c-format
-msgid "Connection %X: HTTP PUT to peer `%s' (`%s') failed: `%s' `%s'\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1915
-#, c-format
-msgid "Connection %X: HTTP GET to peer `%s' (`%s') failed: `%s' `%s'\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:2193
-#: src/transport/plugin_transport_http.c:2305
-#, fuzzy, c-format
-msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
-msgstr "'%s' falló en %s: %d con error: '%s'.\n"
-
-#: src/transport/plugin_transport_http.c:2592
-msgid "# HTTP outbound sessions for peers active"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:3351
-#: src/transport/plugin_transport_http.c:3380
+#: src/transport/plugin_transport_wlan.c:3050
 #, fuzzy
-msgid "Misconfigured address to bind to in configuration!\n"
-msgstr "¡Ninguna aplicación definida en la configuración!\n"
+msgid "# wlan messaged for this client received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_http.c:3406
-#, c-format
-msgid "Required configuration options missing in section `%s'\n"
+#: src/transport/plugin_transport_wlan.c:3058
+msgid "# wlan messaged inside WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3444
-msgid ""
-"Could not create a new TLS certificate, program `gnunet-transport-"
-"certificate-creation' could not be started!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:3460
-msgid "No usable TLS certificate found and creating one failed!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:3612
+#: src/transport/gnunet-transport.c:128
 #, c-format
-msgid ""
-"HTTP Server with %s could not be started on port %u! %s plugin failed!\n"
+msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3628
+#: src/transport/gnunet-transport.c:137
 #, 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:504
+#: src/transport/gnunet-transport.c:176
 #, c-format
-msgid "Unexpected address length: %u bytes\n"
+msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:590
-#: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:728
-#: src/transport/plugin_transport_tcp.c:817
-#: src/transport/plugin_transport_tcp.c:1142
-#, fuzzy
-msgid "# bytes currently in TCP buffers"
-msgstr "# bytes enviados por TCP"
+#: src/transport/gnunet-transport.c:202
+#, fuzzy, c-format
+msgid "Connected to %s\n"
+msgstr "'%s' conectado a '%s'.\n"
 
-#: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:843
-#: src/transport/plugin_transport_tcp.c:1531
-#, fuzzy
-msgid "# TCP sessions active"
-msgstr "# claves de la sesión aceptadas"
+#: src/transport/gnunet-transport.c:243
+#, fuzzy, c-format
+msgid "Disconnected from %s\n"
+msgstr "'%s' conectado a '%s'.\n"
 
-#: src/transport/plugin_transport_tcp.c:683
-#, fuzzy
-msgid "# bytes discarded by TCP (timeout)"
-msgstr "# bytes omitidos por TCP (salientes)"
+#: src/transport/gnunet-transport.c:283
+#, 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:731
-#, fuzzy
-msgid "# bytes transmitted via TCP"
-msgstr "# bytes desencriptados"
+#: src/transport/gnunet-transport.c:305
+#, fuzzy, c-format
+msgid "Peer `%s' plugin: `%s' address `%s'\n"
+msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: src/transport/plugin_transport_tcp.c:821
-#, fuzzy
-msgid "# bytes discarded by TCP (disconnect)"
-msgstr "# bytes omitidos por TCP (salientes)"
+#: src/transport/gnunet-transport.c:339
+#, 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:942
-#, fuzzy
-msgid "# bytes TCP was asked to transmit"
-msgstr "# bytes desencriptados"
-
-#: src/transport/plugin_transport_tcp.c:993
-msgid "# bytes discarded by TCP (no address and no connection)"
+#: src/transport/gnunet-transport.c:377
+msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1034
-#, c-format
-msgid "Address of unexpected length: %u\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1051
-msgid "Found valid IPv4 NAT address (creating session)!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1103
+#: src/transport/gnunet-transport.c:380
 #, fuzzy
-msgid "# bytes discarded by TCP (failed to connect)"
-msgstr "# bytes omitidos por TCP (salientes)"
+msgid "try to connect to the given peer"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/plugin_transport_tcp.c:1211
-msgid "# transport-service disconnect requests for TCP"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1574
+#: src/transport/gnunet-transport.c:383
 #, fuzzy
-msgid "# TCP WELCOME messages received"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "provide information about all current connections (once)"
+msgstr "Imprime información de los pares de GNUnet."
 
-#: src/transport/plugin_transport_tcp.c:1722
-msgid "# bytes received via TCP"
-msgstr "# bytes recibidos por TCP"
-
-#: src/transport/plugin_transport_tcp.c:1788
-msgid "# network-level TCP disconnect events"
+#: src/transport/gnunet-transport.c:386
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1941
+#: src/transport/gnunet-transport.c:393
 #, fuzzy
-msgid "Failed to start service.\n"
-msgstr "Falló al comenzar la recolección.\n"
-
-#: src/transport/plugin_transport_tcp.c:2001
-#, 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:2024
-#, c-format
-msgid "TCP transport listening on port %llu\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2028
-msgid "TCP transport not listening on any port (client only)\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2032
-#, c-format
-msgid "TCP transport advertises itself as being on port %llu\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:518
+#: src/transport/gnunet-service-transport_validation.c:515
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:604
-#: src/core/gnunet-service-core.c:4187
-#, fuzzy
-msgid "# PING messages received"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/transport/gnunet-service-transport_validation.c:626
+#: src/transport/gnunet-service-transport_validation.c:628
 #, 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:683
+#: src/transport/gnunet-service-transport_validation.c:696
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:692
+#: src/transport/gnunet-service-transport_validation.c:705
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:756
+#: src/transport/gnunet-service-transport_validation.c:769
 #, 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:790
+#: src/transport/gnunet-service-transport_validation.c:803
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/transport/gnunet-service-transport_validation.c:862
+#: src/transport/gnunet-service-transport_validation.c:875
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:921
-#: src/core/gnunet-service-core.c:4210
-#, fuzzy
-msgid "# PONG messages received"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/transport/gnunet-service-transport_validation.c:943
+#: src/transport/gnunet-service-transport_validation.c:956
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:959
+#: src/transport/gnunet-service-transport_validation.c:972
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:367
+#: src/transport/gnunet-service-transport_validation.c:1050
 #, fuzzy, c-format
-msgid "Received malformed message via %s. Ignored.\n"
-msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
+msgid "Adding `%s' without addresses for peer `%s'\n"
+msgstr "Imposible obtener la dirección del par '%s'.\n"
 
-#: src/transport/plugin_transport_smtp.c:454
-msgid "SMTP filter string to invalid, lacks ': '\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:463
+#: src/transport/gnunet-service-transport_clients.c:250
 #, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:558
-#: src/transport/plugin_transport_smtp.c:568
-#: src/transport/plugin_transport_smtp.c:581
-#: src/transport/plugin_transport_smtp.c:600
-#: src/transport/plugin_transport_smtp.c:623
-#: src/transport/plugin_transport_smtp.c:631
-#: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:655
-#, fuzzy, c-format
-msgid "SMTP: `%s' failed: %s.\n"
-msgstr "'%s' %s falló: %s\n"
+#: src/transport/gnunet-service-transport_clients.c:255
+#, fuzzy
+msgid "# messages dropped due to slow client"
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/plugin_transport_smtp.c:798
-msgid "No email-address specified, can not start SMTP transport.\n"
+#: src/transport/gnunet-service-transport_clients.c:405
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:810
+#: src/transport/gnunet-service-transport_clients.c:522
 #, fuzzy
-msgid "# bytes received via SMTP"
+msgid "# bytes payload received for other peers"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_smtp.c:811
-#, fuzzy
-msgid "# bytes sent via SMTP"
-msgstr "# bytes enviados por TCP"
+#: src/transport/gnunet-service-transport_clients.c:539
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:813
+#: src/transport/gnunet-service-transport_clients.c:590
 #, fuzzy
-msgid "# bytes dropped by SMTP (outgoing)"
-msgstr "# bytes omitidos por TCP (salientes)"
+msgid "# REQUEST CONNECT messages received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/test_plugin_transport_http.c:1271
+#: src/transport/transport_api.c:588
 #, fuzzy, c-format
-msgid "Loading HTTP transport plugin `%s'\n"
-msgstr "Probando transporte(s) %s\n"
+msgid "Received unexpected message of type %u in %s:%u\n"
+msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
 
-#: src/transport/test_plugin_transport_http.c:1278
+#: src/transport/gnunet-service-transport.c:162
 #, fuzzy
-msgid "Failed to load transport plugin for http\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
+msgid "# bytes payload discarded due to not connected peer "
+msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/test_plugin_transport_http.c:1364
-msgid ""
-"Phase 0\n"
-"\n"
+#: src/transport/gnunet-service-transport.c:519
+msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1280
-#, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+#: src/transport/gnunet-service-transport.c:528
+msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1330
+#: src/dv/plugin_transport_dv.c:159
 #, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "Argumento no válido: '%s'\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/transport/plugin_transport_udp.c:1456
+#: src/dv/dv_api.c:179
 #, fuzzy
-msgid "Failed to open UDP sockets\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Failed to connect to the dv service!\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/transport_api.c:570
-#, 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/topology/gnunet-daemon-topology.c:244
+msgid "# peers blacklisted"
+msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1092
+#: src/topology/gnunet-daemon-topology.c:379
 #, fuzzy
-msgid "Failed to open UNIX sockets\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "# connect requests issued to transport"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
+#: src/topology/gnunet-daemon-topology.c:674
+#: src/topology/gnunet-daemon-topology.c:760
+#, fuzzy
+msgid "# friends connected"
+msgstr "# de pares conectados"
+
+#: src/topology/gnunet-daemon-topology.c:877
+#: src/hostlist/hostlist-server.c:187
 #, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
+msgid "Error in communication with PEERINFO service: %s\n"
+msgstr "Imprime información de los pares de GNUnet."
 
-#: src/transport/gnunet-service-transport_blacklist.c:254
+#: src/topology/gnunet-daemon-topology.c:952
+msgid "Failed to connect to core service, can not manage topology!\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:984
 #, c-format
-msgid "Blacklist file `%s' is empty.\n"
+msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/topology/gnunet-daemon-topology.c:996
 #, 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 "Could not read friends list `%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
+#: src/topology/gnunet-daemon-topology.c:1002
 #, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgid "Friends file `%s' is empty.\n"
+msgstr "El formato del fichero '%s' no es válido.\n"
+
+#: src/topology/gnunet-daemon-topology.c:1011
+#, fuzzy, c-format
+msgid "Failed to read friends list from `%s': out of memory\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#: src/topology/gnunet-daemon-topology.c:1019
+#, c-format
+msgid "Failed to read friends list from `%s'\n"
 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/topology/gnunet-daemon-topology.c:1039
 #, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes.\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/topology/gnunet-daemon-topology.c:1052
+#, c-format
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 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/topology/gnunet-daemon-topology.c:1062
+#, fuzzy, c-format
+msgid "Found friend `%s' in configuration\n"
+msgstr " gconfig\tConfiguración GTK\n"
+
+#: src/topology/gnunet-daemon-topology.c:1068
 #, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:754
-msgid "# disconnects due to blacklist"
+#: src/topology/gnunet-daemon-topology.c:1078
+#, fuzzy
+msgid "# friends in configuration"
+msgstr " gconfig\tConfiguración GTK\n"
+
+#: src/topology/gnunet-daemon-topology.c:1084
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
 msgstr ""
 
+#: src/topology/gnunet-daemon-topology.c:1091
+msgid ""
+"More friendly connections required than target total number of connections.\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:1128
+#, fuzzy
+msgid "# HELLO messages received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/topology/gnunet-daemon-topology.c:1185
+#, fuzzy
+msgid "# HELLO messages gossipped"
+msgstr "# mensajes salientes omitidos"
+
+#: src/topology/gnunet-daemon-topology.c:1325
+msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+msgstr ""
+
 #: src/chat/chat.c:175
 #, fuzzy
 msgid "Could not transmit confirmation receipt\n"
@@ -4131,6 +3999,26 @@
 msgid "Undefined mandatory parameter: memberCallback\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
 #, c-format
 msgid "Joined\n"
@@ -4325,652 +4213,633 @@
 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/nat/gnunet-nat-server.c:289
+#, c-format
+msgid "Please pass valid port number as the first argument! (got `%s')\n"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:546
-#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "Imposible guardar la configuración"
+#: src/nat/gnunet-nat-server.c:328
+msgid "GNUnet NAT traversal test helper daemon"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:729
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "Imposible guardar la configuración"
+#: src/nat/nat.c:776
+#, c-format
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:907
-#, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "Imposible guardar la configuración"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
-#: src/core/gnunet-core-list-connections.c:77
+#: src/nat/nat.c:825
 #, fuzzy, c-format
-msgid "Peer `%s'\n"
-msgstr "Yo soy el par '%s'.\n"
+msgid "Failed to start %s\n"
+msgstr "Falló al comenzar la recolección.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:222
+#: src/nat/nat.c:1094
 #, 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 "Malformed %s `%s' given in configuration!\n"
+msgstr "Imposible guardar la configuración"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
-#, 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:241
+#: src/nat/nat.c:1156 src/nat/nat.c:1166
 #, c-format
-msgid "I am peer `%s'.\n"
-msgstr "Yo soy el par '%s'.\n"
+msgid ""
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\n"
+msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
-msgid "output only the identity strings"
+#: src/nat/nat.c:1298
+msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
-msgid "output our own identity only"
+#: src/nat/nat.c:1310
+#, c-format
+msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:270
+#: src/nat/nat_test.c:348
 #, fuzzy
-msgid "Print information about peers."
-msgstr "Imprime información de los pares de GNUnet."
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:61
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%u with error: %s"
-msgstr "'%s' falló en %s: %d con el error: %s\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/datastore/plugin_datastore_sqlite.c:239
+#: src/block/plugin_block_dht.c:122
+#, c-format
+msgid "Block not of type %u\n"
+msgstr ""
+
+#: src/block/plugin_block_dht.c:129
+msgid "Size mismatch for block\n"
+msgstr ""
+
+#: src/block/plugin_block_dht.c:138
+#, c-format
+msgid "Block of type %u is malformed\n"
+msgstr ""
+
+#: src/block/plugin_block_fs.c:131
+msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+msgstr ""
+
+#: src/block/block.c:109
 #, fuzzy, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
-msgstr "¡Ninguna aplicación definida en la configuración!\n"
+msgid "Loading block plugins `%s'\n"
+msgstr "Probando transporte(s) %s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:266
+#: src/block/block.c:119
 #, fuzzy, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "Imposible inicializar SQLite.\n"
+msgid "Failed to load block plugin `%s'\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:677
+#: src/mesh/gnunet-service-mesh.c:4121
+msgid "MESH: Wrong CORE service\n"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:4324
 #, fuzzy
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "Datos no válidos en %s.  Intentando fijar (por borrado).\n"
+msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
+msgstr "Configuración de GNUnet"
 
-#: src/datastore/plugin_datastore_sqlite.c:1130
-msgid "sqlite version to old to determine size, assuming zero\n"
-msgstr ""
+#: src/mesh/gnunet-service-mesh.c:4333
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1149
-#, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+#: src/hostlist/hostlist-client.c:286
+msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1188
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
 #, fuzzy
-msgid "Sqlite database running\n"
-msgstr "base de datos sqlite"
+msgid "# invalid HELLOs downloaded from hostlist servers"
+msgstr "# saludos descargados vía HTTP"
 
-#: src/datastore/gnunet-service-datastore.c:52
-#, fuzzy
-msgid "# bytes used in file-sharing datastore"
-msgstr "# bytes en la base de datos"
+#: 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/datastore/gnunet-service-datastore.c:331
+#: src/hostlist/hostlist-client.c:330
 #, fuzzy
-msgid "# bytes expired"
-msgstr "# bytes recibidos por TCP"
+msgid "# valid HELLOs downloaded from hostlist servers"
+msgstr "# saludos descargados vía HTTP"
 
-#: src/datastore/gnunet-service-datastore.c:397
-msgid "# bytes purged (low-priority)"
+#: 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/datastore/gnunet-service-datastore.c:457
-msgid "Transmission to client failed!\n"
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:610
-msgid "# results found"
+#: src/hostlist/hostlist-client.c:622
+#, c-format
+msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:655
+#: src/hostlist/hostlist-client.c:663
 #, c-format
 msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
-"%llu bytes\n"
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:666
+#: src/hostlist/hostlist-client.c:805
 #, c-format
-msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:670
-msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+#: src/hostlist/hostlist-client.c:822
+#, c-format
+msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:676
-msgid "Insufficient space to satisfy request"
-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/datastore/gnunet-service-datastore.c:681
-#: src/datastore/gnunet-service-datastore.c:735
-#: src/datastore/gnunet-service-datastore.c:956
-#: src/datastore/gnunet-service-datastore.c:1441
-msgid "# reserved"
+#: 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/datastore/gnunet-service-datastore.c:750
-msgid "Could not find matching reservation"
+#: src/hostlist/hostlist-client.c:856
+#, c-format
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/hostlist/hostlist-client.c:909
 #, c-format
-msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
+msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1004
-#, fuzzy
-msgid "# GET requests received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/hostlist/hostlist-client.c:917
+msgid "# hostlist downloads initiated"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1018
-msgid "# requests filtered by bloomfilter"
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1046
-#, fuzzy
-msgid "# UPDATE requests received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/hostlist/hostlist-client.c:1054
+#, c-format
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1080
-#, fuzzy
-msgid "# GET REPLICATION requests received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/hostlist/hostlist-client.c:1092
+msgid "Scheduled saving of hostlists\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1115
-#, fuzzy
-msgid "# GET ZERO ANONYMITY requests received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/hostlist/hostlist-client.c:1096
+#, c-format
+msgid "Hostlists will be saved to file again in %llums\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1142
+#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
 #, fuzzy
-msgid "Content not found"
-msgstr "¡Comando '%s' no encontrado!\n"
+msgid "# active connections"
+msgstr "Configuración de GNUnet"
 
-#: src/datastore/gnunet-service-datastore.c:1152
-msgid "# bytes removed (explicit request)"
+#: src/hostlist/hostlist-client.c:1253
+#, c-format
+msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1186
-#, fuzzy
-msgid "# REMOVE requests received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/hostlist/hostlist-client.c:1284
+#, c-format
+msgid ""
+"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1230
+#: src/hostlist/hostlist-client.c:1290
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1303
-#: src/datastore/test_plugin_datastore.c:322
-#: src/datastore/perf_plugin_datastore.c:420
+#: src/hostlist/hostlist-client.c:1294
 #, c-format
-msgid "Loading `%s' datastore plugin\n"
+msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1312
+#: src/hostlist/hostlist-client.c:1305
 #, fuzzy, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
+msgid "Could not open file `%s' for reading to load hostlists: %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1491
-msgid "# quota"
+#: src/hostlist/hostlist-client.c:1338
+#, c-format
+msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1493
-msgid "# cache size"
+#: src/hostlist/hostlist-client.c:1340
+msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/hostlist/hostlist-client.c:1373
 #, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+msgid ""
+"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1516
-#, fuzzy
-msgid "Failed to initialize bloomfilter.\n"
-msgstr "Imposible inicializar SQLite.\n"
+#: 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/datastore/plugin_datastore_template.c:241
-msgid "Template database running\n"
+#: src/hostlist/hostlist-client.c:1392
+#, c-format
+msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:287
-#, fuzzy
-msgid "Failed to transmit request to drop database.\n"
-msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
+#: 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/datastore/datastore_api.c:370
-msgid "# queue entry timeouts"
+#: src/hostlist/hostlist-client.c:1428
+msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/datastore/datastore_api.c:417
-msgid "# queue overflows"
+#: src/hostlist/hostlist-client.c:1480
+msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:444
-msgid "# queue entries created"
+#: src/hostlist/hostlist-client.c:1483
+#, c-format
+msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:465
-#, fuzzy
-msgid "# Requests dropped from datastore queue"
-msgstr "# Anuncios de los pares recibidos"
+#: src/hostlist/hostlist-client.c:1492
+msgid "Learning is not enabled on this peer\n"
+msgstr ""
 
-#: src/datastore/datastore_api.c:514
-msgid "# datastore connections (re)created"
+#: 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/datastore/datastore_api.c:541
-msgid "# reconnected to DATASTORE"
+#: 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/gnunet-daemon-hostlist.c:257
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:606
-msgid "Failed to transmit request to DATASTORE.\n"
+#: src/hostlist/gnunet-daemon-hostlist.c:310
+msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
-#, fuzzy
-msgid "# transmission request failures"
-msgstr "# mensajes de texto mandados por PING"
+#: src/hostlist/gnunet-daemon-hostlist.c:315
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
+msgstr ""
 
-#: src/datastore/datastore_api.c:631
+#: src/hostlist/gnunet-daemon-hostlist.c:318
+msgid "enable learning about hostlist servers from other peers"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:322
+msgid "provide a hostlist server"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:334
+msgid "GNUnet hostlist server and client"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:134
 #, fuzzy
-msgid "# bytes sent to datastore"
+msgid "bytes in hostlist"
 msgstr "# bytes en la base de datos"
 
-#: src/datastore/datastore_api.c:768
-#, fuzzy
-msgid "Failed to receive status response from database."
+#: src/hostlist/hostlist-server.c:160
+msgid "expired addresses encountered"
 msgstr ""
-"\n"
-"Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/datastore/datastore_api.c:781
-msgid "Error reading response from datastore service"
+#: src/hostlist/hostlist-server.c:208
+msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
-#, fuzzy
-msgid "Invalid error message received from datastore service"
-msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
+#: src/hostlist/hostlist-server.c:224
+msgid "bytes not included in hostlist (size limit)"
+msgstr ""
 
-#: src/datastore/datastore_api.c:806
-#, fuzzy
-msgid "# status messages received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/hostlist/hostlist-server.c:272
+#, c-format
+msgid "Refusing `%s' request to hostlist server\n"
+msgstr ""
 
-#: src/datastore/datastore_api.c:878
+#: src/hostlist/hostlist-server.c:275
 #, fuzzy
-msgid "# PUT requests executed"
+msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:950
-msgid "# RESERVE requests executed"
+#: src/hostlist/hostlist-server.c:283
+msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1015
-msgid "# RELEASE RESERVE requests executed"
+#: src/hostlist/hostlist-server.c:290
+#, c-format
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1078
+#: src/hostlist/hostlist-server.c:294
 #, fuzzy
-msgid "# UPDATE requests executed"
+msgid "hostlist requests refused (upload data)"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: 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"
+#: src/hostlist/hostlist-server.c:302
+msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
-"\n"
-"Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1254
+#: src/hostlist/hostlist-server.c:305
 #, fuzzy
-msgid "# Results received"
-msgstr "# bytes recibidos por TCP"
+msgid "hostlist requests refused (not ready)"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:1326
-msgid "# GET REPLICATION requests executed"
+#: src/hostlist/hostlist-server.c:309
+msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1393
-msgid "# GET ZERO ANONYMITY requests executed"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1457
+#: src/hostlist/hostlist-server.c:310
 #, fuzzy
-msgid "# GET requests executed"
+msgid "hostlist requests processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "Falló al actualizar los datos del módulo '%s'\n"
+#: src/hostlist/hostlist-server.c:353
+#, fuzzy
+msgid "# hostlist advertisements send"
+msgstr "# Anuncios a extraños mandados"
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#, 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/datastore/plugin_datastore_mysql.c:1500
-msgid "Mysql database running\n"
+#: src/hostlist/hostlist-server.c:400
+msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:173
+#: src/hostlist/hostlist-server.c:568
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "Imposible guardar el fichero de configuración '%s':"
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr "Argumentos no válidos. Saliendo.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:979
-msgid "Postgres database running\n"
+#: src/hostlist/hostlist-server.c:577
+#, c-format
+msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:159
-#, 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"
-
-#: src/dv/dv_api.c:178
-#, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/nse/gnunet-service-nse.c:866
+#: src/hostlist/hostlist-server.c:591
 #, c-format
-msgid "Proof of work invalid: %llu!\n"
+msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1288 src/nse/gnunet-service-nse.c:1307
-#: src/nse/gnunet-service-nse.c:1328
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+#: src/hostlist/hostlist-server.c:629
+#, c-format
+msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1295
-#, fuzzy
-msgid "Invalid work requirement for NSE service. Exiting.\n"
-msgstr "Argumentos no válidos. Saliendo.\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:222
+#, 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/nse/gnunet-service-nse.c:1316
-#, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "Imposible acceder a la información del espacio.\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#, fuzzy, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr "Analizando saludo de '%s' se produjo un fallo.\n"
 
-#: src/nse/gnunet-nse-profiler.c:673
-#, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "Imposible acceder al servicio"
+#: src/peerinfo-tool/gnunet-peerinfo.c:241
+#, c-format
+msgid "I am peer `%s'.\n"
+msgstr "Yo soy el par '%s'.\n"
 
-#: src/core/gnunet-service-core.c:920
-msgid "# total peer preference"
+#: src/peerinfo-tool/gnunet-peerinfo.c:261
+msgid "output only the identity strings"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1040
-msgid "# peer status changes"
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
+msgid "output our own identity only"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1236
+#: src/peerinfo-tool/gnunet-peerinfo.c:270
 #, fuzzy
-msgid "# send requests dropped (disconnected)"
-msgstr "# Anuncios de los pares recibidos"
+msgid "Print information about peers."
+msgstr "Imprime información de los pares de GNUnet."
 
-#: src/core/gnunet-service-core.c:1712
-#, c-format
-msgid ""
-"Client asked for preference change with peer `%s', which is not connected!\n"
-msgstr ""
+#: src/include/gnunet_getopt_lib.h:144
+msgid "print this help"
+msgstr "imprime esta ayuda"
 
-#: src/core/gnunet-service-core.c:1793 src/core/gnunet-service-core.c:4240
-#: src/core/gnunet-service-core.c:4456
-msgid "# established sessions"
+#: 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"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1838
-msgid "# bytes encrypted"
-msgstr "# bytes encriptados"
-
-#: src/core/gnunet-service-core.c:1964 src/core/gnunet-service-core.c:2793
-#: src/core/gnunet-service-core.c:4532
-msgid "# neighbour entries allocated"
+#: src/include/gnunet_getopt_lib.h:172
+msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2031
-msgid "# encrypted bytes given to transport"
+#: src/include/gnunet_getopt_lib.h:181
+msgid "be verbose"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2134
-msgid "# bytes decrypted"
-msgstr "# bytes desencriptados"
+#: src/include/gnunet_getopt_lib.h:190
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr "usa el fichero de configuración FILENAME"
 
-#: src/core/gnunet-service-core.c:2314
-msgid "# transmissions delayed due to corking"
-msgstr ""
+#: src/include/gnunet_common.h:352 src/include/gnunet_common.h:357
+#: src/include/gnunet_common.h:363
+#, 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/core/gnunet-service-core.c:2517
-msgid "# messages discarded (expired prior to transmission)"
-msgstr ""
+#: src/include/gnunet_common.h:373
+#, 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/core/gnunet-service-core.c:2857
+#: src/include/gnunet_common.h:394 src/include/gnunet_common.h:401
+#, 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 "# messages discarded (disconnected)"
-msgstr "# mensajes defragmentados"
+#~ msgid "Target is %d connections per peer."
+#~ msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
 
-#: src/core/gnunet-service-core.c:2909 src/core/gnunet-service-core.c:4644
-msgid "# discarded CORE_SEND requests"
-msgstr ""
+#, fuzzy
+#~ msgid "Copying file with command cp %s %s\n"
+#~ msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/core/gnunet-service-core.c:2924 src/core/gnunet-service-core.c:4648
-msgid "# discarded lower priority CORE_SEND requests"
-msgstr ""
+#, fuzzy
+#~ msgid "Offering Hello of peer %s to peer %s\n"
+#~ msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/core/gnunet-service-core.c:2996
 #, fuzzy
-msgid "# connection requests received"
-msgstr "# mensajes PONG encriptados recibidos"
+#~ msgid "Could not read hostkeys file!\n"
+#~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/core/gnunet-service-core.c:3008
-msgid "# connection requests ignored (already connected)"
-msgstr ""
+#, fuzzy
+#~ msgid "`scp' did not complete cleanly.\n"
+#~ msgstr "'%s' no esta conectado a ningún par.\n"
 
-#: src/core/gnunet-service-core.c:3054 src/core/gnunet-service-core.c:3697
-msgid "# SET_KEY messages deferred (need public key)"
-msgstr ""
+#, 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/core/gnunet-service-core.c:3067
-msgid "# Delayed connecting due to lack of public key"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
+#~ msgstr "Falló al comenzar la recolección.\n"
 
-#: src/core/gnunet-service-core.c:3099
-msgid "# Error extracting public key from HELLO"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to start `ssh' process.\n"
+#~ msgstr "Falló al comenzar la recolección.\n"
 
-#: src/core/gnunet-service-core.c:3145
-msgid "# Asking transport to connect (for SET_KEY)"
-msgstr ""
+#, fuzzy
+#~ msgid "Error reading from gnunet-peerinfo: %s\n"
+#~ msgstr "Se produjo un error leyendo información de gnunetd.\n"
 
-#: src/core/gnunet-service-core.c:3270
 #, fuzzy
-msgid "# SET_KEY and PING messages created"
-msgstr "# mensajes de texto mandados por PING"
+#~ msgid "`Failed to get hostkey!\n"
+#~ msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/core/gnunet-service-core.c:3349
-#, c-format
-msgid ""
-"Ignoring `%s' message due to lack of public key for peer `%4s' (failed to "
-"obtain one).\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to start `gnunet-arm' process.\n"
+#~ msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/core/gnunet-service-core.c:3444
 #, fuzzy
-msgid "# PING messages decrypted"
-msgstr "# mensajes defragmentados"
+#~ msgid "Starting service %s for peer `%4s'\n"
+#~ msgstr "Iniciada colección '%s'.\n"
 
-#: src/core/gnunet-service-core.c:3456
-#, c-format
-msgid ""
-"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
-"%s'\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Terminating peer `%4s'\n"
+#~ msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/core/gnunet-service-core.c:3481
 #, fuzzy
-msgid "# PONG messages created"
-msgstr "# mensajes fragmentados"
+#~ msgid "Setting d->dead on peer `%4s'\n"
+#~ msgstr "Iniciada colección '%s'.\n"
 
-#: src/core/gnunet-service-core.c:3534
 #, fuzzy
-msgid "# PONG messages decrypted"
-msgstr "# mensajes defragmentados"
+#~ msgid "Failed to write new configuration to disk."
+#~ msgstr "Imposible guardar la configuración"
 
-#: src/core/gnunet-service-core.c:3572
 #, fuzzy
-msgid "# Session keys confirmed via PONG"
-msgstr "# Anuncios de los pares recibidos"
+#~ msgid "Failed to copy new configuration to remote machine."
+#~ msgstr "Imposible guardar la configuración"
 
-#: src/core/gnunet-service-core.c:3706
-#, fuzzy, c-format
-msgid "Received `%s' message that was for `%s', not for me.  Ignoring.\n"
-msgstr "el tamaño del '%s' mensaje es demasiado corto. Ignorandolo.\n"
+#, fuzzy
+#~ msgid "Peers failed to connect"
+#~ msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/core/gnunet-service-core.c:3748
 #, fuzzy
-msgid "# SET_KEY messages decrypted"
-msgstr "# mensajes defragmentados"
+#~ msgid "Failed to connect to core service of first peer!\n"
+#~ msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/core/gnunet-service-core.c:3894
-#, fuzzy, c-format
-msgid "# bytes of messages of type %u received"
-msgstr "# bytes de ruido recibidos"
+#, fuzzy
+#~ msgid "Could not resolve our FQDN : %s %u\n"
+#~ msgstr "Imposible resolver '%s': %s\n"
 
-#: src/core/gnunet-service-core.c:3941
-msgid "# messages not delivered to any client"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to start daemon: %s\n"
+#~ msgstr "Falló al comenzar la recolección.\n"
 
-#: src/core/gnunet-service-core.c:4011 src/core/gnunet-service-core.c:4036
 #, fuzzy
-msgid "# bytes dropped (duplicates)"
-msgstr "# bytes omitidos por UDP (salientes)"
+#~ msgid "Failed to load dhtlog plugin for `%s'\n"
+#~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/core/gnunet-service-core.c:4023
 #, fuzzy
-msgid "# bytes dropped (out of sequence)"
-msgstr "# bytes omitidos por UDP (salientes)"
+#~ msgid "Failed to get full path for `%s'\n"
+#~ msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/core/gnunet-service-core.c:4060
-#, fuzzy, c-format
-msgid "Message received far too old (%llu ms). Content ignored.\n"
-msgstr "El mensaje recibido del cliente es inválido\n"
+#, fuzzy
+#~ msgid "Failed to create file for dhtlog.\n"
+#~ msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/core/gnunet-service-core.c:4064
 #, fuzzy
-msgid "# bytes dropped (ancient message)"
-msgstr "# bytes omitidos por UDP (salientes)"
+#~ msgid "Found peer `%s'\n"
+#~ msgstr "Yo soy el par '%s'.\n"
 
-#: src/core/gnunet-service-core.c:4094
 #, fuzzy
-msgid "# bytes of payload decrypted"
-msgstr "# bytes desencriptados"
+#~ msgid "Failed to initialize MySQL database connection for dhtlog.\n"
+#~ msgstr "Imposible inicializar SQLite.\n"
 
-#: src/core/gnunet-service-core.c:4157
 #, fuzzy
-msgid "# session keys received"
-msgstr "# claves de la sesión rechazadas"
+#~ msgid "Loading udp transport plugin\n"
+#~ msgstr "Probando transporte(s) %s\n"
 
-#: src/core/gnunet-service-core.c:4173
-msgid "# failed to decrypt message (no session key)"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to load transport plugin for udp\n"
+#~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/core/gnunet-service-core.c:4229
-#, fuzzy, c-format
-msgid "Unsupported message of type %u received.\n"
-msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
+#, fuzzy
+#~ msgid "# SET QUOTA messages received"
+#~ msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/core/gnunet-service-core.c:4403 src/core/gnunet-service-core.c:4485
 #, fuzzy
-msgid "# peers connected (transport)"
-msgstr "# de pares conectados"
+#~ msgid "curl failed for `%s' at %s:%d: `%s'\n"
+#~ msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/core/gnunet-service-core.c:4599
-msgid "Core service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Phase 3: sending messages\n"
+#~ msgstr "Falló al entregar el mensaje '%s'.\n"
 
-#: src/core/gnunet-service-core.c:4617
-msgid "Core service could not access hostkey.  Exiting.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Loading HTTPS transport plugin `%s'\n"
+#~ msgstr "Probando transporte(s) %s\n"
 
-#: src/core/gnunet-service-core.c:4656
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to load transport plugin for https\n"
+#~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/core/core_api.c:832
-msgid "Client was disconnected from core service, trying to reconnect.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Fail! Could not connect peers\n"
+#~ msgstr "'%s': Imposible conectar.\n"
 
-#: src/include/gnunet_common.h:296 src/include/gnunet_common.h:301
-#: src/include/gnunet_common.h:307
-#, fuzzy, c-format
-msgid "Assertion failed at %s:%d.\n"
-msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
+#, fuzzy
+#~ msgid "Loading tcp transport plugin\n"
+#~ msgstr "Probando transporte(s) %s\n"
 
-#: src/include/gnunet_common.h:317
-#, 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"
+#, fuzzy
+#~ msgid "Failed to load transport plugin for tcp\n"
+#~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/include/gnunet_common.h:331
-#, 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 "# HTTP peers active"
+#~ msgstr "# bytes recibidos por TCP"
 
-#: src/include/gnunet_getopt_lib.h:144
-msgid "print this help"
-msgstr "imprime esta ayuda"
+#, fuzzy
+#~ msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
+#~ msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/include/gnunet_getopt_lib.h:154
-msgid "print the version number"
-msgstr "imprime el número de versión"
+#, fuzzy
+#~ msgid "Misconfigured address to bind to in configuration!\n"
+#~ msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/include/gnunet_getopt_lib.h:163
-msgid "configure logging to write logs to LOGFILE"
-msgstr ""
+#, fuzzy
+#~ msgid "Loading HTTP transport plugin `%s'\n"
+#~ msgstr "Probando transporte(s) %s\n"
 
-#: src/include/gnunet_getopt_lib.h:172
-msgid "configure logging to use LOGLEVEL"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to load transport plugin for http\n"
+#~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/include/gnunet_getopt_lib.h:181
-msgid "be verbose"
-msgstr ""
+#, fuzzy
+#~ msgid "# connection requests received"
+#~ msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/include/gnunet_getopt_lib.h:190
 #, fuzzy
-msgid "use configuration file FILENAME"
-msgstr "usa el fichero de configuración FILENAME"
+#~ msgid "# PING messages decrypted"
+#~ msgstr "# mensajes defragmentados"
 
 #, fuzzy
 #~ msgid "Failed to connect to core service\n"
@@ -5001,10 +4870,6 @@
 #~ msgstr "# blocks migrados"
 
 #, fuzzy
-#~ msgid "# bytes discarded due to disconnect"
-#~ msgstr "# Anuncios de los pares recibidos"
-
-#, fuzzy
 #~ msgid "Received `%s' message from `%s' destined for `%s' which is not me!\n"
 #~ msgstr "¡Recibido PING no destinado a nosotros!\n"
 
@@ -5016,10 +4881,6 @@
 #~ msgid "# HELLO messages received from other peers"
 #~ msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
 
-#, fuzzy
-#~ msgid "# HELLOs received from clients"
-#~ msgstr "El mensaje recibido del cliente es inválido\n"
-
 #~ msgid "Error"
 #~ msgstr "Error"
 
@@ -5638,10 +5499,6 @@
 #~ msgstr "especifica la prioridad del contenido"
 
 #, fuzzy
-#~ msgid "`%.*s' connected to `%.*s'.\n"
-#~ msgstr "'%s' conectado a '%s'.\n"
-
-#, fuzzy
 #~ msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
 #~ msgstr "mensaje de saludo de '%s' inválido (firma inválida). Omitiendo.\n"
 
@@ -5747,10 +5604,6 @@
 #~ msgstr "Comando inesperado '%s'.   Abortando.\n"
 
 #, fuzzy
-#~ msgid "# dht discovery messages sent"
-#~ msgstr "# mensajes PONG encriptados recibidos"
-
-#, fuzzy
 #~ msgid "# dht put requests received"
 #~ msgstr "# bytes recibidos por TCP"
 
@@ -5824,9 +5677,6 @@
 #~ msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 #~ msgstr "Tipo desconocido en el mensaje embebido: %u (tamaño: %u)\n"
 
-#~ msgid "# session keys sent"
-#~ msgstr "# claves de la sesión mandadas"
-
 #~ msgid "# sessions established"
 #~ msgstr "# sesiones establecidas"
 
@@ -6323,16 +6173,10 @@
 #~ msgid "Unable to obtain filesystem information for `%s': %u\n"
 #~ msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
 
-#~ msgid "Could not get address of peer `%s'.\n"
-#~ msgstr "Imposible obtener la dirección del par '%s'.\n"
-
 #, fuzzy
 #~ msgid "`%s' message invalid (signature invalid).\n"
 #~ msgstr "mensaje de saludo inválido (firma no válida).\n"
 
-#~ msgid "Peer `%s' with trust %8u and address `%s'\n"
-#~ msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
-
 #~ msgid "Message details: %u: length %d, priority: %d\n"
 #~ msgstr "Detalles del mensaje: %u: longitud %d, prioridad: %d\n"
 
@@ -6391,9 +6235,6 @@
 #~ "\n"
 #~ "Contactando '%s'."
 
-#~ msgid " Connection failed\n"
-#~ msgstr "Conexión fallida\n"
-
 #~ msgid " Connection failed (bug?)\n"
 #~ msgstr "Conexión fallida (¿bug?)\n"
 
@@ -6424,10 +6265,6 @@
 #~ msgstr "#bytes omitidos vía HTTP (salientes)"
 
 #, fuzzy
-#~ msgid "# HTTP PUT received"
-#~ msgstr "# bytes recibidos por TCP"
-
-#, fuzzy
 #~ msgid "# HTTP curl receive callbacks"
 #~ msgstr "# bytes recibidos por TCP"
 
@@ -7008,9 +6845,6 @@
 #~ msgid "Message received from peer is invalid.\n"
 #~ msgstr "El mensaje recibido del par es inválido.\n"
 
-#~ msgid "GAP received invalid content from `%s'\n"
-#~ msgstr "GAP recibido contenido no válido de '%s'\n"
-
 #~ msgid "myself"
 #~ msgstr "yo"
 
@@ -7200,9 +7034,6 @@
 #~ msgid "You must specify a nickname (use option `%s').\n"
 #~ msgstr "Debes especificar un apodo (use la opción '%s').\n"
 
-#~ msgid "Could not send join message to gnunetd\n"
-#~ msgstr "Imposible mandar el mensaje a gnunetd\n"
-
 #~ msgid "mysql datastore"
 #~ msgstr "base de datos mysql"
 
@@ -7450,9 +7281,6 @@
 #~ msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
 #~ msgstr "Recibido mensaje UDP no válido del %u.%u.%u.%u:%u, omitiendo.\n"
 
-#~ msgid "Network advertisements disabled by configuration!\n"
-#~ msgstr "¡Advertencias de la red desconectadas por configuración!\n"
-
 #~ msgid ""
 #~ "Configuration file must specify directory for storing FS data in section `"
 #~ "%s' under `%s'.\n"

Modified: gnunet/po/gnunet.pot
===================================================================
--- gnunet/po/gnunet.pot        2011-10-30 18:21:10 UTC (rev 17862)
+++ gnunet/po/gnunet.pot        2011-10-30 18:28:26 UTC (rev 17863)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-09-19 13:28+0200\n"
+"POT-Creation-Date: 2011-10-30 19:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -17,2164 +17,1976 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/fragmentation/defragmentation.c:270
-msgid "# acknowledgements sent for fragment"
-msgstr ""
-
-#: src/fragmentation/defragmentation.c:454
-msgid "# fragments received"
-msgstr ""
-
-#: src/fragmentation/defragmentation.c:513
-msgid "# duplicate fragments received"
-msgstr ""
-
-#: src/fragmentation/defragmentation.c:532
-msgid "# messages defragmented"
-msgstr ""
-
-#: src/fragmentation/fragmentation.c:183
-msgid "# fragments transmitted"
-msgstr ""
-
-#: src/fragmentation/fragmentation.c:186
-msgid "# fragments retransmitted"
-msgstr ""
-
-#: src/fragmentation/fragmentation.c:248
-msgid "# messages fragmented"
-msgstr ""
-
-#: src/fragmentation/fragmentation.c:251
-msgid "# total size of fragmented messages"
-msgstr ""
-
-#: src/fragmentation/fragmentation.c:335
-msgid "# fragment acknowledgements received"
-msgstr ""
-
-#: src/fragmentation/fragmentation.c:341
-msgid "# bits removed from fragmentation ACKs"
-msgstr ""
-
-#: src/fragmentation/fragmentation.c:365
-msgid "# fragmentation transmissions completed"
-msgstr ""
-
-#: src/nat/nat.c:778
+#: 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/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:90 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:380
+#: src/include/gnunet_common.h:387
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/nat/nat.c:828
+#: src/datastore/plugin_datastore_sqlite.c:61
 #, c-format
-msgid "Failed to start %s\n"
+msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
 
-#: src/nat/nat.c:1096
+#: src/datastore/plugin_datastore_sqlite.c:239
 #, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
+msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 
-#: src/nat/nat.c:1158 src/nat/nat.c:1168
+#: src/datastore/plugin_datastore_sqlite.c:266
 #, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
+msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/nat/nat.c:1300
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+#: src/datastore/plugin_datastore_sqlite.c:420
+#: src/datacache/plugin_datacache_sqlite.c:471
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/nat/nat.c:1312
-#, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
+#: src/datastore/plugin_datastore_sqlite.c:677
+msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:289
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
+#: src/datastore/plugin_datastore_sqlite.c:1130
+msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:328
-msgid "GNUnet NAT traversal test helper daemon"
-msgstr ""
-
-#: src/nat/nat_test.c:349
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr ""
-
-#: src/nat/nat_test.c:419
+#: src/datastore/plugin_datastore_sqlite.c:1149
 #, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1279 src/template/gnunet-template.c:68
-#: src/core/test_core_api_send_to_self.c:217
-msgid "help text"
+#: src/datastore/plugin_datastore_sqlite.c:1188
+msgid "Sqlite database running\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-exit.c:1493
-msgid "Daemon to run to provide an IP exit node for the VPN"
-msgstr ""
-
-#: src/datacache/datacache.c:108 src/datacache/datacache.c:236
-#: src/datastore/gnunet-service-datastore.c:824
-msgid "# bytes stored"
-msgstr ""
-
-#: src/datacache/datacache.c:134 src/datacache/datacache.c:142
-#: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486
-#: src/datastore/test_plugin_datastore.c:192
-#: src/datastore/test_plugin_datastore.c:315
-#: src/datastore/perf_plugin_datastore.c:309
-#: src/datastore/perf_plugin_datastore.c:413
-#, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr ""
-
-#: src/datacache/datacache.c:167
-#, c-format
-msgid "Loading `%s' datacache plugin\n"
-msgstr ""
-
-#: src/datacache/datacache.c:176
-#, c-format
-msgid "Failed to load datacache plugin for `%s'\n"
-msgstr ""
-
-#: src/datacache/datacache.c:262
-msgid "# requests received"
-msgstr ""
-
-#: src/datacache/datacache.c:268
-msgid "# requests filtered by bloom filter"
-msgstr ""
-
-#: src/datacache/plugin_datacache_template.c:121
-msgid "Template datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_sqlite.c:66
-#: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:122
-#: src/datacache/plugin_datacache_sqlite.c:191
-#: src/datacache/plugin_datacache_sqlite.c:232
-#: src/datacache/plugin_datacache_sqlite.c:295
-#: src/datacache/plugin_datacache_sqlite.c:304
-#: src/datacache/plugin_datacache_sqlite.c:315
-#: src/datacache/plugin_datacache_sqlite.c:322
-#: src/datacache/plugin_datacache_sqlite.c:332
-#: src/datacache/plugin_datacache_sqlite.c:340
-#: src/datacache/plugin_datacache_sqlite.c:348
-#: 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/util/crypto_rsa.c:84
-#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:581
-#: src/dht/plugin_dhtlog_mysql.c:590 src/dht/plugin_dhtlog_mysql.c:648
-#: src/dht/plugin_dhtlog_mysql.c:663
-#: 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/include/gnunet_common.h:324
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_sqlite.c:413
-msgid "Sqlite datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_sqlite.c:446
-#: src/datastore/plugin_datastore_sqlite.c:420
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_postgres.c:79
-#: src/datastore/plugin_datastore_postgres.c:93
-#, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr ""
-
-#: src/datacache/plugin_datacache_postgres.c:149
-#, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr ""
-
-#: src/datacache/plugin_datacache_postgres.c:500
-msgid "Postgres datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_mysql.c:224
 #: 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 ""
 
-#: src/datacache/plugin_datacache_mysql.c:230
 #: src/datastore/plugin_datastore_mysql.c:322
+#: src/datacache/plugin_datacache_mysql.c:230
 #, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:979
-msgid "MySQL datacache running\n"
-msgstr ""
-
-#: src/testing/testing_group.c:1903 src/testing/testing_group.c:1915
-#: src/testing/testing_group.c:2016 src/testing/testing_group.c:2075
-#: src/testing/testing_group.c:2164 src/testing/testing_group.c:2184
-#: src/testing/testing_group.c:2321 src/testing/test_testing_topology.c:1078
-#: src/testing/test_testing_topology_blacklist.c:448
-#: src/testing/testing_peergroup.c:876
-#: src/testing/test_testing_large_topology.c:1022
-#: src/dht/test_dht_multipeer.c:864 src/dht/gnunet-dht-driver.c:3897
-#: src/dv/test_transport_api_dv.c:1132
+#: src/datastore/plugin_datastore_mysql.c:529
 #, c-format
-msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+msgid "Failed to prepare statement `%s'\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1925
+#: src/datastore/plugin_datastore_mysql.c:622
 #, c-format
-msgid "Target is %d connections per peer."
+msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2172
-#, c-format
-msgid ""
-"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
-"greater than 0\n"
+#: src/datastore/plugin_datastore_mysql.c:1500
+msgid "Mysql database running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2202 src/testing/testing_group.c:2395
+#: src/datastore/plugin_datastore_postgres.c:93
+#: src/datacache/plugin_datacache_postgres.c:79
 #, c-format
-msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
+msgid "`%s:%s' failed at %s:%d with error: %s"
 msgstr ""
 
-#: src/testing/testing_group.c:2239
+#: src/datastore/plugin_datastore_postgres.c:173
 #, c-format
-msgid "natural log of %d is %d, will run %d iterations\n"
+msgid "Unable to initialize Postgres with configuration `%s': %s"
 msgstr ""
 
-#: src/testing/testing_group.c:2242
-#, c-format
-msgid "Total connections added thus far: %u!\n"
+#: src/datastore/plugin_datastore_postgres.c:979
+msgid "Postgres database running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2283
-#, c-format
-msgid "Total connections added for small world: %d!\n"
+#: src/datastore/datastore_api.c:289
+msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2335
-#, c-format
-msgid "rand is %f probability is %f\n"
+#: src/datastore/datastore_api.c:372
+msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/testing/testing_group.c:2910 src/testing/testing_group.c:3109
-#, c-format
-msgid ""
-"No `%s' specified in peer configuration in section `%s', cannot copy friends "
-"file!\n"
+#: src/datastore/datastore_api.c:418
+msgid "# queue overflows"
 msgstr ""
 
-#: src/testing/testing_group.c:3011
-msgid "Finished copying all friend files!\n"
+#: src/datastore/datastore_api.c:445
+msgid "# queue entries created"
 msgstr ""
 
-#: src/testing/testing_group.c:3124
-#, c-format
-msgid "Copying file with command cp %s %s\n"
+#: src/datastore/datastore_api.c:465
+msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/testing/testing_group.c:3147
-#, c-format
-msgid "Copying file with command scp %s %s\n"
+#: src/datastore/datastore_api.c:513
+msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/testing/testing_group.c:3164
-#, c-format
-msgid "Checking copy status of file %d\n"
+#: src/datastore/datastore_api.c:540
+msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/testing/testing_group.c:3182
-#, c-format
-msgid "File %d copied\n"
+#: src/datastore/datastore_api.c:605
+msgid "Failed to transmit request to DATASTORE.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3197
-msgid "Finished copying all blacklist files!\n"
+#: src/datastore/datastore_api.c:607
+msgid "# transmission request failures"
 msgstr ""
 
-#: src/testing/testing_group.c:3580 src/testing/testing_group.c:3717
-#: src/testing/testing_group.c:4925 src/testing/testing_group.c:5066
-msgid "Delaying connect, we have too many outstanding connections!\n"
+#: src/datastore/datastore_api.c:630
+msgid "# bytes sent to datastore"
 msgstr ""
 
-#: src/testing/testing_group.c:3590 src/testing/testing_group.c:4935
-#: src/testing/testing_group.c:5076
-#, c-format
-msgid "Creating connection, outstanding_connections is %d\n"
+#: src/datastore/datastore_api.c:767
+msgid "Failed to receive status response from database."
 msgstr ""
 
-#: src/testing/testing_group.c:3602
-#, c-format
-msgid "Offering Hello of peer %s to peer %s\n"
+#: src/datastore/datastore_api.c:780
+msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/testing/testing_group.c:3728
-#, c-format
-msgid "Creating connection, outstanding_connections is %d (max %d)\n"
+#: src/datastore/datastore_api.c:792 src/datastore/datastore_api.c:798
+msgid "Invalid error message received from datastore service"
 msgstr ""
 
-#: src/testing/testing_group.c:3983
-msgid "Creating clique topology\n"
+#: src/datastore/datastore_api.c:804
+msgid "# status messages received"
 msgstr ""
 
-#: src/testing/testing_group.c:3990
-msgid "Creating small world (ring) topology\n"
+#: src/datastore/datastore_api.c:875
+msgid "# PUT requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:3997
-msgid "Creating small world (2d-torus) topology\n"
+#: src/datastore/datastore_api.c:946
+msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:4003
-msgid "Creating ring topology\n"
+#: src/datastore/datastore_api.c:1011
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:4009
-msgid "Creating 2d torus topology\n"
+#: src/datastore/datastore_api.c:1072
+msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:4015
-msgid "Creating Erdos-Renyi topology\n"
+#: src/datastore/datastore_api.c:1140
+msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:4021
-msgid "Creating InterNAT topology\n"
+#: src/datastore/datastore_api.c:1185
+msgid "Failed to receive response from database.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4027
-msgid "Creating Scale Free topology\n"
+#: src/datastore/datastore_api.c:1245
+msgid "# Results received"
 msgstr ""
 
-#: src/testing/testing_group.c:4034
-msgid "Creating straight line topology\n"
+#: src/datastore/datastore_api.c:1316
+msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:4040
-msgid "Creating topology from file!\n"
+#: src/datastore/datastore_api.c:1383
+msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:4058
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
+#: src/datastore/datastore_api.c:1447
+msgid "# GET requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:4075
-msgid "Failed during friend file copying!\n"
+#: src/datastore/plugin_datastore_template.c:241
+msgid "Template database running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4083
-msgid "Friend files created/copied successfully!\n"
+#: src/datastore/gnunet-service-datastore.c:52
+msgid "# bytes used in file-sharing datastore"
 msgstr ""
 
-#: src/testing/testing_group.c:4102
-msgid "Blacklisting all but clique topology\n"
+#: src/datastore/gnunet-service-datastore.c:331
+msgid "# bytes expired"
 msgstr ""
 
-#: src/testing/testing_group.c:4110
-msgid "Blacklisting all but small world (ring) topology\n"
+#: src/datastore/gnunet-service-datastore.c:397
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/testing/testing_group.c:4118
-msgid "Blacklisting all but small world (2d-torus) topology\n"
+#: src/datastore/gnunet-service-datastore.c:457
+msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4126
-msgid "Blacklisting all but ring topology\n"
+#: src/datastore/gnunet-service-datastore.c:610
+msgid "# results found"
 msgstr ""
 
-#: src/testing/testing_group.c:4134
-msgid "Blacklisting all but 2d torus topology\n"
+#: src/datastore/gnunet-service-datastore.c:655
+#, c-format
+msgid ""
+"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4142
-msgid "Blacklisting all but Erdos-Renyi topology\n"
+#: src/datastore/gnunet-service-datastore.c:666
+#, c-format
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4150
-msgid "Blacklisting all but InterNAT topology\n"
+#: src/datastore/gnunet-service-datastore.c:670
+msgid ""
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/testing/testing_group.c:4187
-msgid "Blacklisting all but Scale Free topology\n"
+#: src/datastore/gnunet-service-datastore.c:676
+msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/testing/testing_group.c:4195
-msgid "Blacklisting all but straight line topology\n"
+#: src/datastore/gnunet-service-datastore.c:681
+#: src/datastore/gnunet-service-datastore.c:735
+#: src/datastore/gnunet-service-datastore.c:956
+#: src/datastore/gnunet-service-datastore.c:1441
+msgid "# reserved"
 msgstr ""
 
-#: src/testing/testing_group.c:4212
-msgid "Failed during blacklist file copying!\n"
+#: src/datastore/gnunet-service-datastore.c:750
+msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/testing/testing_group.c:4220
-msgid "Blacklist files created/copied successfully!\n"
+#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:119
+#: src/datacache/datacache.c:250
+msgid "# bytes stored"
 msgstr ""
 
-#: src/testing/testing_group.c:5301
-msgid "Creating clique CONNECT topology\n"
+#: src/datastore/gnunet-service-datastore.c:838
+#, c-format
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5308
-msgid "Creating small world (ring) CONNECT topology\n"
+#: src/datastore/gnunet-service-datastore.c:1004
+msgid "# GET requests received"
 msgstr ""
 
-#: src/testing/testing_group.c:5315
-msgid "Creating small world (2d-torus) CONNECT topology\n"
+#: src/datastore/gnunet-service-datastore.c:1018
+msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/testing/testing_group.c:5321
-msgid "Creating ring CONNECT topology\n"
+#: src/datastore/gnunet-service-datastore.c:1046
+msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/testing/testing_group.c:5328
-msgid "Creating 2d torus CONNECT topology\n"
+#: src/datastore/gnunet-service-datastore.c:1080
+msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/testing/testing_group.c:5335
-msgid "Creating Erdos-Renyi CONNECT topology\n"
+#: src/datastore/gnunet-service-datastore.c:1115
+msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/testing/testing_group.c:5342
-msgid "Creating InterNAT CONNECT topology\n"
+#: src/datastore/gnunet-service-datastore.c:1142
+msgid "Content not found"
 msgstr ""
 
-#: src/testing/testing_group.c:5349
-msgid "Creating Scale Free CONNECT topology\n"
+#: src/datastore/gnunet-service-datastore.c:1152
+msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/testing/testing_group.c:5356
-msgid "Creating straight line CONNECT topology\n"
+#: src/datastore/gnunet-service-datastore.c:1186
+msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/testing/testing_group.c:5362
-msgid "Creating no CONNECT topology\n"
+#: src/datastore/gnunet-service-datastore.c:1230
+#, c-format
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5368
-msgid "Unknown topology specification, can't connect peers!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5378
+#: src/datastore/gnunet-service-datastore.c:1295
+#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:145
+#: src/datacache/datacache.c:152
 #, c-format
-msgid "Connecting random subset (%'.2f percent) of possible peers\n"
+msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5386
+#: src/datastore/gnunet-service-datastore.c:1303
 #, c-format
-msgid "Connecting a minimum of %u peers each (if possible)\n"
+msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5395
+#: src/datastore/gnunet-service-datastore.c:1312
 #, c-format
-msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
+msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5405
-#, c-format
-msgid "Finding additional %u closest peers each (if possible)\n"
+#: src/datastore/gnunet-service-datastore.c:1491
+msgid "# quota"
 msgstr ""
 
-#: src/testing/testing_group.c:6084
-msgid "Could not read hostkeys file!\n"
+#: src/datastore/gnunet-service-datastore.c:1493
+msgid "# cache size"
 msgstr ""
 
-#: src/testing/testing_group.c:6154
+#: src/datastore/gnunet-service-datastore.c:1503
 #, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6298 src/testing/testing.c:1273
-#, c-format
-msgid "Could not start `%s' process to copy configuration directory.\n"
+#: src/datastore/gnunet-service-datastore.c:1516
+msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
-#: src/testing/testing.c:209
-msgid "`scp' does not seem to terminate (timeout copying config).\n"
+#: src/core/gnunet-service-core_sessions.c:204
+#: src/core/gnunet-service-core_sessions.c:275
+msgid "# entries in session map"
 msgstr ""
 
-#: src/testing/testing.c:223 src/testing/testing.c:823
-msgid "`scp' did not complete cleanly.\n"
+#: src/core/gnunet-service-core_sessions.c:236
+msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/testing/testing.c:246
-msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+#: src/core/gnunet-service-core_sessions.c:360
+msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/testing/testing.c:247
-msgid "Failed to create pipe for `ssh' process.\n"
+#: src/core/gnunet-service-core_sessions.c:427
+msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/testing/testing.c:303
+#: src/core/gnunet-core-list-connections.c:77
+#: src/peerinfo-tool/gnunet-peerinfo.c:60
 #, c-format
-msgid "Could not start `%s' process to create hostkey.\n"
+msgid "Peer `%s'\n"
 msgstr ""
 
-#: src/testing/testing.c:310
-msgid "Failed to start `gnunet-peerinfo' process.\n"
-msgstr ""
-
-#: src/testing/testing.c:311 src/testing/testing.c:509
-msgid "Failed to start `ssh' process.\n"
-msgstr ""
-
-#: src/testing/testing.c:373
+#: src/core/gnunet-core-list-connections.c:167
+#: src/peerinfo-tool/gnunet-peerinfo.c:200
 #, c-format
-msgid "Error reading from gnunet-peerinfo: %s\n"
+msgid "Invalid command line argument `%s'\n"
 msgstr ""
 
-#: src/testing/testing.c:377
-msgid "Malformed output from gnunet-peerinfo!\n"
+#: src/core/gnunet-core-list-connections.c:188
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+msgid "don't resolve host names"
 msgstr ""
 
-#: src/testing/testing.c:387
-msgid "`Failed to get hostkey!\n"
+#: src/core/gnunet-core-list-connections.c:195
+msgid "Print information about connected peers."
 msgstr ""
 
-#: src/testing/testing.c:421
-msgid "`Failed while waiting for topology setup!\n"
+#: src/core/gnunet-service-core_clients.c:452
+msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/testing/testing.c:501
+#: src/core/gnunet-service-core_clients.c:796
 #, c-format
-msgid "Could not start `%s' process to start GNUnet.\n"
+msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/testing/testing.c:508
-msgid "Failed to start `gnunet-arm' process.\n"
+#: src/core/gnunet-service-core.c:101
+#, c-format
+msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/testing/testing.c:532 src/testing/testing.c:631
-msgid "`gnunet-arm' does not seem to terminate.\n"
+#: src/core/gnunet-service-core_typemap.c:111
+#: src/core/gnunet-service-core_typemap.c:124
+msgid "# type maps received"
 msgstr ""
 
-#: src/testing/testing.c:533 src/testing/testing.c:632
-#: src/testing/testing.c:652
-msgid "`ssh' does not seem to terminate.\n"
+#: src/core/gnunet-service-core_typemap.c:156
+msgid "# updates to my type map"
 msgstr ""
 
-#: src/testing/testing.c:572 src/testing/testing.c:2074
-#: src/testing/testing.c:2093
-msgid "Failed to connect to transport service!\n"
+#: src/core/gnunet-service-core_neighbours.c:162
+msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
-#: src/testing/testing.c:601
-msgid "Unable to get HELLO for peer!\n"
+#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:343
+msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/testing/testing.c:651
-msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
+#: src/core/gnunet-service-core_neighbours.c:251
+msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/testing/testing.c:674 src/testing/testing.c:708
-msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
+#: src/core/gnunet-service-core_neighbours.c:432
+#, c-format
+msgid "Unsupported message of type %u received.\n"
 msgstr ""
 
-#: src/testing/testing.c:689 src/testing/testing.c:738
-msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
+#: src/core/gnunet-service-core_kx.c:491
+msgid "# bytes encrypted"
 msgstr ""
 
-#: src/testing/testing.c:811
-msgid "`scp' does not seem to terminate.\n"
+#: src/core/gnunet-service-core_kx.c:541
+msgid "# bytes decrypted"
 msgstr ""
 
-#: src/testing/testing.c:989
+#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3000
+#: src/hostlist/hostlist-server.c:439 src/peerinfo-tool/gnunet-peerinfo.c:157
 #, c-format
-msgid "Starting service %s for peer `%4s'\n"
+msgid "Error in communication with PEERINFO service\n"
 msgstr ""
 
-#: src/testing/testing.c:1361 src/testing/testing.c:1444
-#: src/testing/testing.c:1582
-#, c-format
-msgid "Terminating peer `%4s'\n"
+#: src/core/gnunet-service-core_kx.c:618
+msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/testing/testing.c:1534
-#, c-format
-msgid "Setting d->dead on peer `%4s'\n"
+#: src/core/gnunet-service-core_kx.c:669
+msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/testing/testing.c:1669
-msgid "Peer not yet running, can not change configuration at this point."
+#: src/core/gnunet-service-core_kx.c:693
+msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/testing/testing.c:1677
-msgid "Failed to write new configuration to disk."
+#: src/core/gnunet-service-core_kx.c:746
+msgid "# session keys received"
 msgstr ""
 
-#: src/testing/testing.c:1708
+#: src/core/gnunet-service-core_kx.c:764
 #, c-format
-msgid "Could not start `%s' process to copy configuration file.\n"
+msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/testing/testing.c:1711
-msgid "Failed to copy new configuration to remote machine."
+#: src/core/gnunet-service-core_kx.c:803
+msgid "# SET_KEY messages decrypted"
 msgstr ""
 
-#: src/testing/testing.c:1883
-msgid "Peers failed to connect"
+#: src/core/gnunet-service-core_kx.c:884
+#: src/transport/gnunet-service-transport_validation.c:601
+msgid "# PING messages received"
 msgstr ""
 
-#: src/testing/testing.c:2038
-msgid "Failed to connect to core service of first peer!\n"
-msgstr ""
-
-#: src/testing/testing.c:2238
-msgid "Peers are not fully running yet, can not connect!\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:136
+#: src/core/gnunet-service-core_kx.c:918
 #, c-format
-msgid "Removing expired address of transport `%s'\n"
+msgid ""
+"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
+"%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:197
-msgid "# peers known"
+#: src/core/gnunet-service-core_kx.c:941
+msgid "# PONG messages created"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:241
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+#: src/core/gnunet-service-core_kx.c:1029
+msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:306
-#, c-format
-msgid "Still no peers found in `%s'!\n"
+#: src/core/gnunet-service-core_kx.c:1042
+msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:257
-#, c-format
-msgid "Could not connect to `%s' service.\n"
+#: src/core/gnunet-service-core_kx.c:1098
+#: src/transport/gnunet-service-transport_validation.c:934
+msgid "# PONG messages received"
 msgstr ""
 
-#: src/peerinfo/test_peerinfo_api.c:109 src/hostlist/hostlist-server.c:437
-#: src/peerinfo-tool/gnunet-peerinfo.c:157 src/dv/gnunet-service-dv.c:2998
-#: src/core/gnunet-service-core.c:3034 src/core/gnunet-service-core.c:3328
-#, c-format
-msgid "Error in communication with PEERINFO service\n"
+#: src/core/gnunet-service-core_kx.c:1128
+msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:276
-#, c-format
-msgid "Failed to transmit message to `%s' service.\n"
+#: src/core/gnunet-service-core_kx.c:1161
+msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:432
-msgid "Failed to receive response from `PEERINFO' service."
+#: src/core/gnunet-service-core_kx.c:1224
+msgid "# SET_KEY and PING messages created"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
-msgid "Received invalid message from `PEERINFO' service.\n"
+#: src/core/gnunet-service-core_kx.c:1372
+msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:521
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+#: src/core/gnunet-service-core_kx.c:1416
+#: src/core/gnunet-service-core_kx.c:1441
+msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:555
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+#: src/core/gnunet-service-core_kx.c:1428
+msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:259
-#: src/hostlist/hostlist-client.c:622
+#: src/core/gnunet-service-core_kx.c:1465
 #, c-format
-msgid "# advertised URI `%s' downloaded"
+msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:274
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1338
-msgid "# advertised hostlist URIs"
+#: src/core/gnunet-service-core_kx.c:1469
+msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:286
-#: src/hostlist/hostlist-server.c:353
-msgid "# hostlist advertisements send"
+#: src/core/gnunet-service-core_kx.c:1477
+msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:389
-#, c-format
-msgid "Hostlist file `%s' was removed\n"
+#: src/core/gnunet-service-core_kx.c:1541
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:253
-msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
+#: src/core/gnunet-service-core_kx.c:1549
+msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:286
-#: src/topology/gnunet-daemon-topology.c:1315
-#: src/topology/gnunet-daemon-topology.c:1322 src/fs/gnunet-service-fs.c:519
+#: src/core/gnunet-service-core_kx.c:1559
+#: src/transport/gnunet-service-transport.c:542
+#: src/hostlist/hostlist-server.c:558 src/peerinfo-tool/gnunet-peerinfo.c:208
 #, c-format
-msgid "Failed to connect to `%s' service.\n"
+msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:306
-msgid "advertise our hostlist to other peers"
+#: src/core/core_api.c:798
+msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:311
-msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
+#: src/vpn/gnunet-daemon-exit.c:1500
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:314
-msgid "enable learning about hostlist servers from other peers"
+#: src/vpn/gnunet-daemon-vpn.c:1292
+msgid "help text"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:318
-msgid "provide a hostlist server"
+#: src/util/getopt_helpers.c:84
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:330
-msgid "GNUnet hostlist server and client"
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:287
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:134
-msgid "bytes in hostlist"
+#: src/util/common_logging.c:242 src/util/common_logging.c:838
+msgid "DEBUG"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:160
-msgid "expired addresses encountered"
+#: src/util/common_logging.c:244 src/util/common_logging.c:836
+msgid "INFO"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:187
-#: src/topology/gnunet-daemon-topology.c:900
-#, c-format
-msgid "Error in communication with PEERINFO service: %s\n"
+#: src/util/common_logging.c:246 src/util/common_logging.c:834
+msgid "WARNING"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:208
-msgid "HELLOs without addresses encountered (ignored)"
+#: src/util/common_logging.c:248 src/util/common_logging.c:832
+msgid "ERROR"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
-msgid "bytes not included in hostlist (size limit)"
+#: src/util/common_logging.c:250 src/util/common_logging.c:840
+msgid "NONE"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
+#: src/util/common_logging.c:554
 #, c-format
-msgid "Refusing `%s' request to hostlist server\n"
+msgid "Failed to create or access directory for log file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:275
-msgid "hostlist requests refused (not HTTP GET)"
-msgstr ""
-
-#: src/hostlist/hostlist-server.c:283
-msgid "Sending 100 CONTINUE reply\n"
-msgstr ""
-
-#: src/hostlist/hostlist-server.c:290
+#: src/util/common_logging.c:672
 #, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\n"
+msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:294
-msgid "hostlist requests refused (upload data)"
+#: src/util/common_logging.c:841
+msgid "INVALID"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
-msgid "Could not handle hostlist request since I do not have a response yet\n"
+#: src/util/common_logging.c:923
+msgid "unknown address"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:305
-msgid "hostlist requests refused (not ready)"
+#: src/util/common_logging.c:961
+msgid "invalid address"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:309
-msgid "Received request for our hostlist\n"
+#: src/util/plugin.c:89
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:310
-msgid "hostlist requests processed"
+#: src/util/plugin.c:146
+#, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:398
-msgid "Advertisement message could not be queued by core\n"
-msgstr ""
-
-#: src/hostlist/hostlist-server.c:556
-#: src/transport/gnunet-service-transport.c:462
-#: src/peerinfo-tool/gnunet-peerinfo.c:208 src/core/gnunet-service-core.c:4607
+#: src/util/plugin.c:219
 #, c-format
-msgid "Could not access PEERINFO service.  Exiting.\n"
+msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:566
+#: src/util/configuration.c:249
 #, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:575
+#: src/util/configuration.c:812
 #, c-format
-msgid "Hostlist service starts on %s:%llu\n"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:589
+#: src/util/getopt.c:670
 #, c-format
-msgid "Address to obtain hostlist: `%s'\n"
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:627
+#: src/util/getopt.c:695
 #, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
+msgid "%s: option `--%s' does not allow an argument\n"
 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
+#: src/util/getopt.c:701
 #, c-format
-msgid "Invalid `%s' message received from hostlist at `%s'\n"
+msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr ""
 
-#: 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
+#: src/util/getopt.c:720 src/util/getopt.c:889
 #, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: 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/test_plugin_transport_https.c:829
-#: src/transport/test_plugin_transport_https.c:837
-#: src/transport/plugin_transport_http.c:2059
-#: src/transport/plugin_transport_http.c:2067
-#: src/transport/test_plugin_transport_http.c:795
-#: src/transport/test_plugin_transport_http.c:803
+#: src/util/getopt.c:749
 #, c-format
-msgid "%s failed at %s:%d: `%s'\n"
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:663
+#: src/util/getopt.c:753
 #, c-format
-msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:805
+#: src/util/getopt.c:778
 #, c-format
-msgid "Timeout trying to download hostlist from `%s'\n"
+msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:822
+#: src/util/getopt.c:780
 #, c-format
-msgid "Download limit of %u bytes exceeded, stopping download\n"
+msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/util/getopt.c:808 src/util/getopt.c:938
 #, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:848
+#: src/util/getopt.c:856
 #, c-format
-msgid "Download of hostlist `%s' completed.\n"
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:856
+#: src/util/getopt.c:874
 #, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
+msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:909
+#: src/util/getopt.c:1042
 #, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
+msgid "Use --help to get a list of options.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
-msgid "# hostlist downloads initiated"
+#: src/util/scheduler.c:863
+msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1511
-msgid "# milliseconds between hostlist downloads"
+#: src/util/scheduler.c:994
+#, c-format
+msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/util/connection.c:462
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Access denied to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
-msgid "Scheduled saving of hostlists\n"
+#: src/util/connection.c:477
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/util/connection.c:646
 #, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
+msgid ""
+"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1117 src/hostlist/hostlist-client.c:1133
-msgid "# active connections"
+#: src/util/connection.c:858 src/util/connection.c:1034
+#, c-format
+msgid "Trying to connect to `%s' (%p)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1249
+#: src/util/connection.c:869
 #, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
+msgid "Failed to connect to `%s' (%p)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/util/connection.c:1024
 #, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
+msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1286
+#: src/util/connection.c:1540
 #, c-format
-msgid "Loading saved hostlist entries from file `%s' \n"
+msgid ""
+"Could not satisfy pending transmission request, socket closed or connect "
+"failed (%p).\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/util/connection.c:1576
 #, c-format
-msgid "Hostlist file `%s' is not existing\n"
+msgid "Failed to send to `%s': %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1301
+#: src/util/signal.c:81
 #, c-format
-msgid "Could not open file `%s' for reading to load hostlists: %s\n"
+msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1334
+#: src/util/network.c:1204
 #, c-format
-msgid "%u hostlist URIs loaded from file\n"
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1336
-msgid "# hostlist URIs read from file"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1369
+#: src/util/os_installation.c:295
 #, c-format
 msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1383
+#: src/util/os_installation.c:481
 #, c-format
-msgid "Could not open file `%s' for writing to save hostlists: %s\n"
+msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1388
+#: src/util/os_installation.c:486
 #, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
+msgid "stat (%s) failed: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1412 src/hostlist/hostlist-client.c:1429
-#, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
+#: src/util/strings.c:144
+msgid "b"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1424
-msgid "# hostlist URIs written to file"
+#: src/util/strings.c:150
+msgid "KiB"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1476
-msgid "Learning is enabled on this peer\n"
+#: src/util/strings.c:154
+msgid "MiB"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1479
-#, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
+#: src/util/strings.c:158
+msgid "GiB"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1488
-msgid "Learning is not enabled on this peer\n"
+#: src/util/strings.c:162
+msgid "TiB"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1500
+#: src/util/strings.c:198
 #, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1504
-#, c-format
-msgid "Hostlist file `%s' could not be removed\n"
+#: src/util/strings.c:276
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:250
-msgid "# peers blacklisted"
+#: src/util/strings.c:368
+msgid "ms"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:402
-msgid "# connect requests issued to core"
+#: src/util/strings.c:373
+msgid "eternity"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:676
-#: src/topology/gnunet-daemon-topology.c:778
-#: src/transport/gnunet-service-transport_neighbours.c:465
-#: src/transport/gnunet-service-transport_neighbours.c:662
-msgid "# peers connected"
+#: src/util/strings.c:377
+msgid "s"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:697
-#: src/topology/gnunet-daemon-topology.c:783
-msgid "# friends connected"
+#: src/util/strings.c:381
+msgid "m"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:977
-msgid "Failed to connect to core service, can not manage topology!\n"
+#: src/util/strings.c:385
+msgid "h"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1009
-#, c-format
-msgid "Option `%s' in section `%s' not specified!\n"
+#: src/util/strings.c:389
+msgid " days"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1021
-#, c-format
-msgid "Could not read friends list `%s'\n"
+#: src/util/strings.c:413
+msgid "end of time"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1027
+#: src/util/server.c:392
 #, c-format
-msgid "Friends file `%s' is empty.\n"
+msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1036
+#: src/util/server.c:400
 #, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
+msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1044
+#: src/util/server.c:405
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
+msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1064
+#: src/util/server.c:623
 #, c-format
 msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
+"Processing code for message of type %u did not call "
+"GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1077
+#: src/util/crypto_random.c:240
 #, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
+msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1087
+#: src/util/crypto_random.c:267
 #, c-format
-msgid "Found friend `%s' in configuration\n"
+msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1093
+#: src/util/disk.c:435
 #, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
+msgid "`%s' failed for drive `%s': %u\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1103
-msgid "# friends in configuration"
+#: src/util/disk.c:837
+#, c-format
+msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1109
-msgid ""
-"Fewer friends specified than required by minimum friend count. Will only "
-"connect to friends.\n"
+#: src/util/disk.c:1188 src/util/service.c:1473
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1116
-msgid ""
-"More friendly connections required than target total number of connections.\n"
+#: src/util/disk.c:1496
+#, c-format
+msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1151
-msgid "# HELLO messages received"
+#: src/util/service.c:118 src/util/service.c:144 src/util/service.c:188
+#: src/util/service.c:209 src/util/service.c:216
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1208
-msgid "# HELLO messages gossipped"
+#: src/util/service.c:171
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1348
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/util/service.c:265
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:326
-msgid "Failed to connect to statistics service!\n"
+#: src/util/service.c:301
+#, c-format
+msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:89
+#: src/util/service.c:332
 #, c-format
-msgid "Failed to obtain statistics.\n"
+msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
+#: src/util/service.c:638
 #, c-format
-msgid "Invalid argument `%s'\n"
+msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:155
-msgid "limit output to statistcs for the given NAME"
+#: src/util/service.c:643
+#, c-format
+msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:158
-msgid "make the value being set persistent"
+#: src/util/service.c:650
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:161
-msgid "limit output to the given SUBSYSTEM"
+#: src/util/service.c:694
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
-msgid "Print statistics about GNUnet operations."
+#: src/util/service.c:723
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:208
+#: src/util/service.c:841
 #, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:266
+#: src/util/service.c:862 src/transport/plugin_transport_tcp.c:1939
 #, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/os_priority.c:110
+#: src/util/service.c:893 src/util/client.c:712
 #, c-format
-msgid "Not installing a handler because $%s=%s\n"
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/os_installation.c:291
+#: src/util/service.c:913
 #, c-format
 msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
 msgstr ""
 
-#: src/util/os_installation.c:474
+#: src/util/service.c:930
 #, c-format
-msgid "Could not find binary `%s' in PATH!\n"
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/os_installation.c:479
+#: src/util/service.c:960 src/transport/plugin_transport_http.c:903
 #, c-format
-msgid "stat (%s) failed: %s\n"
+msgid "Failed to resolve `%s': %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:154 src/util/common_logging.c:500
-#: src/util/test_common_logging.c:75
-msgid "DEBUG"
+#: src/util/service.c:978 src/transport/plugin_transport_http.c:920
+#, c-format
+msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:156 src/util/common_logging.c:498
-#: src/util/test_common_logging.c:72
-msgid "INFO"
+#: src/util/service.c:1135 src/util/service.c:1153
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/common_logging.c:158 src/util/common_logging.c:496
-#: src/util/test_common_logging.c:68
-msgid "WARNING"
+#: src/util/service.c:1181
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/common_logging.c:160 src/util/common_logging.c:494
-#: src/util/test_common_logging.c:65
-msgid "ERROR"
+#: src/util/service.c:1333
+#, c-format
+msgid "Failed to start `%s' at `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:162
-msgid "NONE"
-msgstr ""
-
-#: src/util/common_logging.c:214 src/dht/plugin_dhtlog_mysql_dump.c:909
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:669
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:700
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:732
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:764
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:796
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:827
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:858
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:889
+#: src/util/service.c:1366
 #, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
+msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:331
-#, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
+#: src/util/service.c:1414
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/common_logging.c:501
-msgid "INVALID"
+#: src/util/service.c:1418
+msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/common_logging.c:583
-msgid "unknown address"
+#: src/util/service.c:1422
+msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/common_logging.c:621
-msgid "invalid address"
+#: src/util/service.c:1474
+msgid "No such user"
 msgstr ""
 
-#: src/util/pseudonym.c:263
+#: src/util/service.c:1488
 #, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/util/pseudonym.c:327
-msgid "no-name"
+#: src/util/service.c:1551
+msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/util/test_strings.c:42 src/util/strings.c:139
-msgid "b"
+#: src/util/gnunet-resolver.c:76
+msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/test_strings.c:45 src/util/strings.c:145
-msgid "KiB"
+#: src/util/os_priority.c:117
+#, c-format
+msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/util/test_strings.c:48 src/util/strings.c:157
-msgid "TiB"
+#: src/util/resolver_api.c:202
+#, c-format
+msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/test_strings.c:51 src/util/strings.c:363
-msgid "ms"
+#: 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/util/test_strings.c:56 src/util/strings.c:372
-msgid "s"
+#: src/util/resolver_api.c:356
+#, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/test_strings.c:61 src/util/strings.c:380
-msgid "h"
+#: src/util/resolver_api.c:360
+#, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/connection.c:457
+#: src/util/resolver_api.c:428
 #, c-format
-msgid "Access denied to `%s'\n"
+msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/connection.c:472
+#: src/util/resolver_api.c:793
 #, c-format
-msgid "Accepting connection from `%s': %p\n"
+msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/connection.c:640
+#: src/util/resolver_api.c:877
 #, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
+msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/connection.c:852 src/util/connection.c:1028
+#: src/util/resolver_api.c:882
 #, c-format
-msgid "Trying to connect to `%s' (%p)\n"
+msgid "Could not resolve our FQDN : %s\n"
 msgstr ""
 
-#: src/util/connection.c:863
+#: src/util/resolver_api.c:914
 #, c-format
-msgid "Failed to connect to `%s' (%p)\n"
+msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/connection.c:1018
+#: src/util/pseudonym.c:269
 #, c-format
-msgid "Attempt to connect to `%s' failed\n"
+msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr ""
 
-#: src/util/connection.c:1534
-#, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
+#: src/util/pseudonym.c:333
+msgid "no-name"
 msgstr ""
 
-#: src/util/connection.c:1570
+#: src/util/gnunet-service-resolver.c:262
 #, c-format
-msgid "Failed to send to `%s': %s\n"
+msgid "Could not resolve `%s' (%s): %s\n"
 msgstr ""
 
-#: src/util/plugin.c:87
+#: src/util/gnunet-service-resolver.c:318
+#: src/util/gnunet-service-resolver.c:363
 #, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
+msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/plugin.c:144
+#: src/util/gnunet-service-resolver.c:462
 #, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/plugin.c:217
+#: src/util/gnunet-service-resolver.c:509
 #, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
+msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
 
-#: src/util/bio.c:134 src/util/bio.c:140
+#: src/util/bio.c:137 src/util/bio.c:143
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr ""
 
-#: src/util/bio.c:141
+#: src/util/bio.c:144
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:193
+#: src/util/bio.c:196
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:203
+#: src/util/bio.c:208
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:248
+#: src/util/bio.c:254
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:262
+#: src/util/bio.c:268
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/crypto_rsa.c:611 src/util/crypto_rsa.c:658
+#: src/util/client.c:303
 #, c-format
+msgid ""
+"Could not determine valid hostname and port for service `%s' from "
+"configuration.\n"
+msgstr ""
+
+#: src/util/client.c:311
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
+msgstr ""
+
+#: src/util/client.c:652
+msgid "Failure to transmit TEST request.\n"
+msgstr ""
+
+#: src/util/client.c:857
+#, c-format
+msgid "Could not connect to service `%s', must not be running.\n"
+msgstr ""
+
+#: src/util/client.c:874
+#, c-format
+msgid "Failure to transmit request to service `%s'\n"
+msgstr ""
+
+#: src/util/client.c:1143
+msgid "Could not submit request, not expecting to receive a response.\n"
+msgstr ""
+
+#: src/util/crypto_rsa.c:624 src/util/crypto_rsa.c:672
+#, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:616
+#: src/util/crypto_rsa.c:629
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:634
+#: src/util/crypto_rsa.c:648
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:662 src/util/crypto_rsa.c:698
+#: src/util/crypto_rsa.c:676 src/util/crypto_rsa.c:714
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:693
+#: src/util/crypto_rsa.c:709
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:714
+#: src/util/crypto_rsa.c:730
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:732
+#: src/util/crypto_rsa.c:748
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:953
+#: src/util/crypto_rsa.c:970
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/server.c:384
-#, c-format
-msgid "`%s' failed for port %d (%s).\n"
+#: src/nse/gnunet-nse-profiler.c:650 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:591
+#: src/fs/gnunet-download.c:263
+msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/util/server.c:392
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
+#: src/nse/gnunet-nse-profiler.c:668
+msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/util/server.c:397
+#: src/nse/gnunet-service-nse.c:875
 #, c-format
-msgid "`%s' failed for `%s': address already in use\n"
+msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/util/server.c:612
+#: src/nse/gnunet-service-nse.c:1298 src/nse/gnunet-service-nse.c:1317
+#: src/nse/gnunet-service-nse.c:1338
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+msgstr ""
+
+#: src/nse/gnunet-service-nse.c:1305
+msgid "Invalid work requirement for NSE service. Exiting.\n"
+msgstr ""
+
+#: src/nse/gnunet-service-nse.c:1326
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:136
 #, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/util/network.c:1194
+#: src/peerinfo/gnunet-service-peerinfo.c:197
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:241
 #, c-format
 msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/util/crypto_random.c:236
+#: src/peerinfo/gnunet-service-peerinfo.c:306
 #, c-format
-msgid "Starting `%s' process to generate entropy\n"
+msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/util/crypto_random.c:263
+#: src/peerinfo/peerinfo_api_notify.c:258
 #, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgid "Could not connect to `%s' service.\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:53
+#: src/peerinfo/peerinfo_api.c:278
 #, c-format
-msgid "Got IP address `%s' for our host.\n"
+msgid "Failed to transmit message to `%s' service.\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:147 src/util/resolver_api.c:873
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
+#: src/peerinfo/peerinfo_api.c:433
+msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/util/test_resolver_api.c:154
-#, c-format
-msgid "Could not resolve our FQDN : %s %u\n"
+#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
+msgid "Received invalid message from `PEERINFO' service.\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:264
-#, c-format
-msgid "gethostbyname() could not lookup IP address: %s\n"
+#: src/peerinfo/peerinfo_api.c:521
+msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:329
-#, c-format
-msgid "gethostbyaddr() could not lookup hostname: %s\n"
+#: src/peerinfo/peerinfo_api.c:555
+msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/util/configuration.c:244
+#: src/datacache/plugin_datacache_sqlite.c:439
+msgid "Sqlite datacache running\n"
+msgstr ""
+
+#: src/datacache/datacache.c:177
 #, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
+msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/util/configuration.c:801
+#: src/datacache/datacache.c:185
 #, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
+msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:76
-msgid "Test GNUnet DNS resolver code."
+#: src/datacache/datacache.c:276
+msgid "# requests received"
 msgstr ""
 
-#: src/util/client.c:304
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
+#: src/datacache/datacache.c:287
+msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/util/client.c:312
+#: src/datacache/plugin_datacache_postgres.c:149
 #, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+msgid "Unable to initialize Postgres: %s"
 msgstr ""
 
-#: src/util/client.c:669
-msgid "Failure to transmit TEST request.\n"
+#: src/datacache/plugin_datacache_postgres.c:500
+msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/util/client.c:729 src/util/service.c:880
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+#: src/datacache/plugin_datacache_template.c:121
+msgid "Template datacache running\n"
 msgstr ""
 
-#: src/util/client.c:871
-#, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
+#: src/datacache/plugin_datacache_mysql.c:979
+msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/util/client.c:887
-#, c-format
-msgid "Failure to transmit request to service `%s'\n"
+#: src/dht/gnunet-service-dht_neighbours.c:479
+msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/util/client.c:1158
-msgid "Could not submit request, not expecting to receive a response.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:571
+msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/util/scheduler.c:859
-msgid "Looks like we're busy waiting...\n"
+#: src/dht/gnunet-service-dht_neighbours.c:632
+#: src/dht/gnunet-service-dht_neighbours.c:697
+msgid "# Peers connected"
 msgstr ""
 
-#: src/util/scheduler.c:990
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:734
+msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/util/strings.c:149
-msgid "MiB"
+#: src/dht/gnunet-service-dht_neighbours.c:787
+msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/util/strings.c:153
-msgid "GiB"
+#: src/dht/gnunet-service-dht_neighbours.c:824
+msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
-#: src/util/strings.c:193
-#, c-format
-msgid "Character set requested was `%s'\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1051
+#: src/dht/gnunet-service-dht_neighbours.c:1078
+msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/util/strings.c:271
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+#: src/dht/gnunet-service-dht_neighbours.c:1060
+#: src/dht/gnunet-service-dht_neighbours.c:1096
+msgid "# Peer selection failed"
 msgstr ""
 
-#: src/util/strings.c:368
-msgid "eternity"
+#: src/dht/gnunet-service-dht_neighbours.c:1238
+msgid "# PUT requests routed"
 msgstr ""
 
-#: src/util/strings.c:376
-msgid "m"
+#: src/dht/gnunet-service-dht_neighbours.c:1267
+msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/util/strings.c:384
-msgid " days"
+#: src/dht/gnunet-service-dht_neighbours.c:1352
+msgid "# GET requests routed"
 msgstr ""
 
-#: src/util/strings.c:408
-msgid "end of time"
+#: src/dht/gnunet-service-dht_neighbours.c:1384
+msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/util/disk.c:429
-#, c-format
-msgid "`%s' failed for drive `%s': %u\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1485
+msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/util/disk.c:829
-#, c-format
-msgid "Expected `%s' to be a directory!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1574
+msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/util/disk.c:1180 src/util/service.c:1456
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1700
+msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/util/disk.c:1486
-#, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1707
+msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/util/resolver_api.c:198
-#, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1800
+msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/util/resolver_api.c:217
-#, c-format
-msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1853
+msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/util/resolver_api.c:354
-#, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1872
+msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/util/resolver_api.c:358
-#, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1941
+msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/util/resolver_api.c:427
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
+#: src/dht/dht_api.c:229
+msgid "Failed to connect to the DHT service!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:789
-#, c-format
-msgid "Resolver returns `%s'.\n"
+#: src/dht/gnunet-service-dht.c:165
+msgid "Failed to connect to transport service!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:879
-#, c-format
-msgid "Could not resolve our FQDN : %s\n"
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
+msgid "the query key"
 msgstr ""
 
-#: src/util/resolver_api.c:911
-#, c-format
-msgid "Resolving our hostname `%s'\n"
+#: src/dht/gnunet-dht-get.c:204
+msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:261
-#, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
+#: src/dht/gnunet-dht-get.c:207
+msgid "the type of data to look for"
 msgstr ""
 
-#: 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/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
+msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:460
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
+#: src/dht/gnunet-dht-get.c:232
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:508
-#, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
+#: src/dht/gnunet-service-dht_clients.c:321
+msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/util/getopt.c:668
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: src/dht/gnunet-service-dht_clients.c:413
+msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/util/getopt.c:692
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
+#: src/dht/gnunet-service-dht_clients.c:486
+msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/util/getopt.c:697
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
+#: src/dht/gnunet-service-dht_clients.c:585
+msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/util/getopt.c:714 src/util/getopt.c:882
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: src/dht/gnunet-service-dht_clients.c:790
+msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/util/getopt.c:743
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: src/dht/gnunet-service-dht_clients.c:808
+msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/util/getopt.c:747
+#: src/dht/gnunet-service-dht_clients.c:852
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/util/getopt.c:772
-#, c-format
-msgid "%s: illegal option -- %c\n"
+#: src/dht/gnunet-service-dht_clients.c:875
+msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/util/getopt.c:774
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: src/dht/gnunet-service-dht_clients.c:928
+#: src/dht/gnunet-service-dht_clients.c:971
+msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/util/getopt.c:802 src/util/getopt.c:930
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: src/dht/gnunet-service-dht_clients.c:937
+msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
-#: src/util/getopt.c:850
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: src/dht/gnunet-service-dht_nse.c:59
+msgid "# Network size estimates received"
 msgstr ""
 
-#: src/util/getopt.c:868
+#: src/dht/gnunet-dht-put.c:100
 #, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
+msgid "PUT request sent!\n"
 msgstr ""
 
-#: src/util/getopt.c:1034
+#: src/dht/gnunet-dht-put.c:124
 #, c-format
-msgid "Use --help to get a list of options.\n"
+msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/util/signal.c:78
+#: src/dht/gnunet-dht-put.c:132
 #, c-format
-msgid "signal (%d, %p) returned %d.\n"
+msgid "Could not connect to %s service!\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:82
+#: src/dht/gnunet-dht-put.c:137
 #, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
+msgid "Connected to %s service!\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:253 src/util/getopt_helpers.c:281
+#: src/dht/gnunet-dht-put.c:152
 #, c-format
-msgid "You must pass a number to the `%s' option.\n"
+msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/util/service.c:112 src/util/service.c:138 src/util/service.c:182
-#: src/util/service.c:202 src/util/service.c:209
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
+#: src/dht/gnunet-dht-put.c:166
+msgid "the data to insert under the key"
 msgstr ""
 
-#: src/util/service.c:165
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+#: src/dht/gnunet-dht-put.c:169
+msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/util/service.c:258
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
+#: src/dht/gnunet-dht-put.c:175
+msgid "how many replicas to create"
 msgstr ""
 
-#: src/util/service.c:292
-#, c-format
-msgid "Wrong format `%s' for netmask\n"
+#: src/dht/gnunet-dht-put.c:178
+msgid "the type to insert data as"
 msgstr ""
 
-#: src/util/service.c:323
-#, c-format
-msgid "Wrong format `%s' for network\n"
+#: src/dht/gnunet-dht-put.c:203
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/util/service.c:627
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
+#: src/dht/gnunet-service-dht_routing.c:220
+msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/util/service.c:632
-#, c-format
-msgid "Unknown address family %d\n"
+#: src/dht/gnunet-service-dht_routing.c:235
+msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/util/service.c:639
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
+#: src/dht/gnunet-service-dht_routing.c:240
+msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/util/service.c:683
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+#: src/dht/gnunet-service-dht_routing.c:249
+msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/util/service.c:712
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+#: src/dht/gnunet-service-dht_routing.c:332
+#: src/dht/gnunet-service-dht_routing.c:390
+msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/util/service.c:829
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+#: src/dht/gnunet-service-dht_routing.c:342
+msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1927
+#: src/dht/gnunet-service-dht_datacache.c:92
 #, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+msgid "%s request received, but have no datacache!\n"
 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/dht/gnunet-service-dht_datacache.c:103
+msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/util/service.c:917
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+#: src/dht/gnunet-service-dht_datacache.c:215
+msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:947
-#, c-format
-msgid "Failed to resolve `%s': %s\n"
+#: src/dht/gnunet-service-dht_datacache.c:229
+msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:965
-#, c-format
-msgid "Failed to find %saddress for `%s'.\n"
+#: src/dht/gnunet-service-dht_datacache.c:234
+msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:1121 src/util/service.c:1139
+#: src/dht/gnunet-service-dht_datacache.c:245
+msgid "# Unsupported RESULTS found in datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:248
 #, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/util/service.c:1166
+#: src/dht/gnunet-service-dht_datacache.c:280
+msgid "# GET requests given to datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_hello.c:86
+msgid "# HELLOs obtained from peerinfo"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:161
 #, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgid "Service `%s' has been started.\n"
 msgstr ""
 
-#: src/util/service.c:1315
+#: src/arm/gnunet-arm.c:165
 #, c-format
-msgid "Failed to start `%s' at `%s'\n"
+msgid "Failed to stop service `%s'!\n"
 msgstr ""
 
-#: src/util/service.c:1349
+#: src/arm/gnunet-arm.c:171
 #, c-format
-msgid "Service `%s' runs at %s\n"
+msgid "Service `%s' has been stopped.\n"
 msgstr ""
 
-#: src/util/service.c:1397
-msgid "Service process failed to initialize\n"
+#: src/arm/gnunet-arm.c:175
+#, c-format
+msgid "Failed to start service `%s'!\n"
 msgstr ""
 
-#: src/util/service.c:1401
-msgid "Service process could not initialize server function\n"
+#: src/arm/gnunet-arm.c:181
+#, c-format
+msgid "Some error communicating with service `%s'.\n"
 msgstr ""
 
-#: src/util/service.c:1405
-msgid "Service process failed to report status\n"
+#: src/arm/gnunet-arm.c:207
+#, c-format
+msgid "Service `%s' is running.\n"
 msgstr ""
 
-#: src/util/service.c:1457
-msgid "No such user"
+#: src/arm/gnunet-arm.c:212
+#, c-format
+msgid "Service `%s' is not running.\n"
 msgstr ""
 
-#: src/util/service.c:1471
+#: src/arm/gnunet-arm.c:238
 #, c-format
-msgid "Cannot change user/group to `%s': %s\n"
+msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/util/service.c:1534
-msgid "do daemonize (detach from terminal)"
+#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
+msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:214
+#: src/arm/gnunet-arm.c:269
 #, c-format
-msgid "`%' must be followed by HEX number"
+msgid "Failed to remove configuration file %s\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:273
-msgid "Malformed KSK URI (must not begin or end with `+')"
+#: src/arm/gnunet-arm.c:275
+#, c-format
+msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:291
-msgid "`++' not allowed in KSK URI"
+#: src/arm/gnunet-arm.c:387
+msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/fs/fs_uri.c:298
-msgid "Quotes not balanced in KSK URI"
+#: src/arm/gnunet-arm.c:389
+msgid "start a particular service"
 msgstr ""
 
-#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
-msgid "Malformed SKS URI"
+#: src/arm/gnunet-arm.c:391
+msgid "stop a particular service"
 msgstr ""
 
-#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
-msgid "Malformed CHK URI"
+#: src/arm/gnunet-arm.c:393
+msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
-#: src/fs/fs_uri.c:615
-msgid "SKS URI malformed"
+#: src/arm/gnunet-arm.c:396
+msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
-msgid "SKS URI malformed (could not decode public key)"
+#: src/arm/gnunet-arm.c:399
+msgid "test if a particular service is running"
 msgstr ""
 
-#: src/fs/fs_uri.c:603
-msgid "SKS URI malformed (could not find signature)"
+#: src/arm/gnunet-arm.c:402
+msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/fs/fs_uri.c:609
-msgid "SKS URI malformed (could not decode signature)"
+#: src/arm/gnunet-arm.c:404
+msgid "don't print status messages"
 msgstr ""
 
-#: src/fs/fs_uri.c:622
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/arm/gnunet-arm.c:407
+msgid "timeout for completing current operation"
 msgstr ""
 
-#: src/fs/fs_uri.c:634
-msgid "SKS URI malformed (signature failed validation)"
+#: src/arm/gnunet-arm.c:418
+msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/fs/fs_uri.c:672
-msgid "Unrecognized URI type"
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
+msgid "Failed to transmit shutdown ACK.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:897
-msgid "Lacking key configuration settings.\n"
+#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
+msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:904
+#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
+msgid "Initiating shutdown as requested by client.\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:206
 #, c-format
-msgid "Could not access hostkey file `%s'.\n"
+msgid "Restarting service `%s' due to configuration file change.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1212 src/fs/fs_uri.c:1239
-msgid "No keywords specified!\n"
+#: src/arm/gnunet-service-arm.c:234
+msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1245
-msgid "Number of double-quotes not balanced!\n"
+#: src/arm/gnunet-service-arm.c:268
+msgid "Not sending status result to client: no client known\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
+#: src/arm/gnunet-service-arm.c:406
 #, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
+msgid "Failed to start service `%s'\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:117
+#: src/arm/gnunet-service-arm.c:409
 #, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
+msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:164
+#: src/arm/gnunet-service-arm.c:435
 #, c-format
-msgid "Failed to not connect to `%s' service.\n"
+msgid "ARM is shutting down, service `%s' not started.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
-#: src/fs/gnunet-service-fs_lc.c:480
-msgid "# client searches active"
+#: src/arm/gnunet-service-arm.c:443
+#, c-format
+msgid "Service `%s' already running.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:254
-msgid "# replies received for local clients"
+#: src/arm/gnunet-service-arm.c:453
+#, c-format
+msgid "Binary implementing service `%s' not known!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:312
-msgid "# client searches received"
+#: src/arm/gnunet-service-arm.c:464
+#, c-format
+msgid "Configuration file `%s' for service `%s' not known!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:351
-msgid "# client searches updated (merged content seen list)"
+#: src/arm/gnunet-service-arm.c:498
+#, c-format
+msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
-#, c-format
-msgid "Publishing failed: %s"
+#: src/arm/gnunet-service-arm.c:666
+msgid "Stopping all services\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
-#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
+#: src/arm/gnunet-service-arm.c:723
 #, c-format
-msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:649
-msgid "timeout on index-start request to `fs' service"
+#: src/arm/gnunet-service-arm.c:796
+msgid "exit"
 msgstr ""
 
-#: src/fs/fs_publish.c:661
-msgid "unknown error"
+#: src/arm/gnunet-service-arm.c:801
+msgid "signal"
 msgstr ""
 
-#: src/fs/fs_publish.c:704
-msgid "failed to compute hash"
+#: src/arm/gnunet-service-arm.c:806
+msgid "unknown"
 msgstr ""
 
-#: src/fs/fs_publish.c:724
-msgid "filename too long"
+#: src/arm/gnunet-service-arm.c:813
+#, c-format
+msgid "Service `%s' stopped\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:751
-msgid "could not connect to `fs' service"
+#: src/arm/gnunet-service-arm.c:827
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:775
-#, c-format
-msgid "Failed to get file identifiers for `%s'\n"
+#: src/arm/arm_api.c:201
+msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:845
+#: src/arm/arm_api.c:389
 #, c-format
-msgid "Recursive upload failed at `%s': %s"
+msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:851
+#: src/arm/arm_api.c:403
 #, c-format
-msgid "Recursive upload failed: %s"
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:899
-msgid "needs to be an actual file"
+#: src/arm/arm_api.c:467
+#, c-format
+msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1078
+#: src/arm/arm_api.c:536
 #, c-format
-msgid "Insufficient space for publishing: %s"
+msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1149
+#: src/arm/arm_api.c:537
 #, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
+msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1482
-msgid "Could not connect to datastore."
+#: src/arm/arm_api.c:559
+#, c-format
+msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1518 src/fs/fs_namespace.c:822
-msgid "Internal error."
+#: src/arm/arm_api.c:560
+#, c-format
+msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:100
+#: src/arm/arm_api.c:592
 #, c-format
-msgid "Starting download `%s'.\n"
+msgid "Asked to start service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:112
+#: src/arm/arm_api.c:664
 #, c-format
-msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
+msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:121
+#: src/arm/gnunet-service-arm_interceptor.c:803
 #, c-format
-msgid "Error downloading: %s.\n"
+msgid "Unable to forward to service `%s': shutdown\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:129
+#: src/arm/gnunet-service-arm_interceptor.c:812
 #, c-format
-msgid "Downloading `%s' done (%s/s).\n"
+msgid "Unable to forward to service `%s': timeout before connect\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:144 src/fs/gnunet-unindex.c:109
-#: src/fs/gnunet-search.c:190 src/fs/gnunet-publish.c:155
+#: src/arm/gnunet-service-arm_interceptor.c:868
 #, c-format
-msgid "Unexpected status: %d\n"
+msgid "Unable to start service `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:169
+#: src/arm/gnunet-service-arm_interceptor.c:936
 #, c-format
-msgid "You need to specify a URI argument.\n"
+msgid "Unable to accept connection for service `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:175 src/fs/gnunet-publish.c:426
+#: src/arm/gnunet-service-arm_interceptor.c:952
 #, c-format
-msgid "Failed to parse URI: %s\n"
+msgid "Service `%s' started\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:182
+#: src/arm/gnunet-service-arm_interceptor.c:1080
 #, c-format
-msgid "Only CHK or LOC URIs supported.\n"
+msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
+#: src/arm/gnunet-service-arm_interceptor.c:1102
 #, c-format
-msgid "Target filename must be specified.\n"
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:203 src/fs/gnunet-unindex.c:141
-#: src/fs/gnunet-search.c:241 src/fs/gnunet-publish.c:404
+#: src/arm/gnunet-service-arm_interceptor.c:1116
 #, c-format
-msgid "Could not initialize `%s' subsystem.\n"
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-search.c:285
-msgid "set the desired LEVEL of receiver-anonymity"
+#: src/fragmentation/defragmentation.c:270
+msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fs/gnunet-download.c:243
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
+#: src/fragmentation/defragmentation.c:454
+msgid "# fragments received"
 msgstr ""
 
-#: src/fs/gnunet-download.c:246 src/fs/gnunet-search.c:288
-msgid "only search the local peer (no P2P network search)"
+#: src/fragmentation/defragmentation.c:513
+msgid "# duplicate fragments received"
 msgstr ""
 
-#: src/fs/gnunet-download.c:249
-msgid "write the file to FILENAME"
+#: src/fragmentation/defragmentation.c:526
+msgid "# messages defragmented"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
-msgid "set the maximum number of parallel downloads that is allowed"
+#: src/fragmentation/fragmentation.c:183
+msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
-msgid "set the maximum number of parallel requests for blocks that is allowed"
+#: src/fragmentation/fragmentation.c:186
+msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fs/gnunet-download.c:260
-msgid "download a GNUnet directory recursively"
+#: src/fragmentation/fragmentation.c:248
+msgid "# messages fragmented"
 msgstr ""
 
-#: src/fs/gnunet-download.c:263 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:585
-#: src/mesh/test_mesh_small.c:676 src/dht/gnunet-dht-get-peer.c:190
-#: src/dht/gnunet-dht-put.c:176 src/dht/gnunet-dht-get.c:204
-#: src/nse/gnunet-nse-profiler.c:655
-msgid "be verbose (print progress information)"
+#: src/fragmentation/fragmentation.c:251
+msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fs/gnunet-download.c:270
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+#: src/fragmentation/fragmentation.c:335
+msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:89
-#, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
+#: src/fragmentation/fragmentation.c:341
+msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:96
+#: src/fragmentation/fragmentation.c:365
+msgid "# fragmentation transmissions completed"
+msgstr ""
+
+#: src/statistics/gnunet-service-statistics.c:208
 #, c-format
-msgid "Error unindexing: %s.\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:101
+#: src/statistics/gnunet-service-statistics.c:266
 #, c-format
-msgid "Unindexing done.\n"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:131
+#: src/statistics/statistics_api.c:325
+msgid "Failed to connect to statistics service!\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:89
 #, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
+msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:148
+#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
 #, c-format
-msgid "Could not start unindex operation.\n"
+msgid "Invalid argument `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:176
-msgid "Unindex a file that was previously indexed with gnunet-publish."
+#: src/statistics/gnunet-statistics.c:155
+msgid "limit output to statistcs for the given NAME"
 msgstr ""
 
-#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
-#, c-format
-msgid "Configuration fails to specify `%s' in section `%s'\n"
+#: src/statistics/gnunet-statistics.c:158
+msgid "make the value being set persistent"
 msgstr ""
 
-#: src/fs/fs_namespace.c:107
+#: src/statistics/gnunet-statistics.c:161
+msgid "limit output to the given SUBSYSTEM"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:168
+msgid "Print statistics about GNUnet operations."
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:89
 #, c-format
-msgid "Failed to open `%s' for writing: %s\n"
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
+#: src/fs/gnunet-unindex.c:96
 #, c-format
-msgid "Failed to write `%s': %s\n"
+msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:323
-msgid "Unknown error"
+#: src/fs/gnunet-unindex.c:101
+#, c-format
+msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
-msgid "Failed to serialize meta data"
+#: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
+#: src/fs/gnunet-publish.c:158 src/fs/gnunet-download.c:144
+#, c-format
+msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:452
-msgid "Failed to connect to datastore service"
+#: src/fs/gnunet-unindex.c:131
+#, c-format
+msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:495
+#: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
+#: src/fs/gnunet-publish.c:412 src/fs/gnunet-download.c:203
 #, c-format
-msgid "Failed to create or read private key for namespace `%s'\n"
+msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:597
+#: src/fs/gnunet-unindex.c:148
 #, c-format
-msgid "Failed to read namespace private key file `%s', deleting it!\n"
+msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:866
-msgid "Failed to connect to datastore."
+#: src/fs/gnunet-unindex.c:176
+msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
 #: src/fs/gnunet-pseudonym.c:165
@@ -2188,7 +2000,7 @@
 msgid "Option `%s' ignored\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:532
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:538
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
@@ -2206,7 +2018,7 @@
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:551
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:557
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
@@ -2222,7 +2034,7 @@
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:570
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:576
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2238,6 +2050,51 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
+#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
+#, c-format
+msgid "Configuration fails to specify `%s' in section `%s'\n"
+msgstr ""
+
+#: src/fs/fs_namespace.c:107
+#, c-format
+msgid "Failed to open `%s' for writing: %s\n"
+msgstr ""
+
+#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
+#, c-format
+msgid "Failed to write `%s': %s\n"
+msgstr ""
+
+#: src/fs/fs_namespace.c:323
+msgid "Unknown error"
+msgstr ""
+
+#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+msgid "Failed to serialize meta data"
+msgstr ""
+
+#: src/fs/fs_namespace.c:452
+msgid "Failed to connect to datastore service"
+msgstr ""
+
+#: src/fs/fs_namespace.c:495
+#, c-format
+msgid "Failed to create or read private key for namespace `%s'\n"
+msgstr ""
+
+#: src/fs/fs_namespace.c:597
+#, c-format
+msgid "Failed to read namespace private key file `%s', deleting it!\n"
+msgstr ""
+
+#: src/fs/fs_namespace.c:822 src/fs/fs_publish.c:1518
+msgid "Internal error."
+msgstr ""
+
+#: src/fs/fs_namespace.c:866
+msgid "Failed to connect to datastore."
+msgstr ""
+
 #: src/fs/gnunet-search.c:111
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
@@ -2258,6 +2115,14 @@
 msgid "Could not start searching.\n"
 msgstr ""
 
+#: src/fs/gnunet-search.c:285 src/fs/gnunet-download.c:240
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr ""
+
+#: src/fs/gnunet-search.c:288 src/fs/gnunet-download.c:246
+msgid "only search the local peer (no P2P network search)"
+msgstr ""
+
 #: src/fs/gnunet-search.c:291
 msgid "write search results to file starting with PREFIX"
 msgstr ""
@@ -2274,1641 +2139,1581 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/fs_unindex.c:58
-msgid "Failed to find given position in file"
+#: src/fs/fs_uri.c:214
+#, c-format
+msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
-msgid "Failed to read file"
+#: src/fs/fs_uri.c:273
+msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_unindex.c:235
-msgid "Unexpected time for a response from `fs' service."
+#: src/fs/fs_uri.c:291
+msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_unindex.c:243
-msgid "Timeout waiting for `fs' service."
+#: src/fs/fs_uri.c:298
+msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_unindex.c:251
-msgid "Invalid response from `fs' service."
+#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
+msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_unindex.c:296
-msgid "Failed to connect to FS service for unindexing."
+#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
+msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_unindex.c:331
-msgid "Failed to connect to `datastore' service."
+#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
+#: src/fs/fs_uri.c:615
+msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_unindex.c:344
-msgid "Failed to open file for unindexing."
+#: src/fs/fs_uri.c:597
+msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_unindex.c:378
-msgid "Failed to compute hash of file."
+#: src/fs/fs_uri.c:603
+msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:49
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
+#: src/fs/fs_uri.c:609
+msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
-#, c-format
-msgid "Directory `%s' meta data:\n"
+#: src/fs/fs_uri.c:622
+msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:97
-#, c-format
-msgid "Directory `%s' contents:\n"
+#: src/fs/fs_uri.c:634
+msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:132
-#, c-format
-msgid "You must specify a filename to inspect."
+#: src/fs/fs_uri.c:672
+msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:145
-#, c-format
-msgid "Failed to read directory `%s'\n"
+#: src/fs/fs_uri.c:897
+msgid "Lacking key configuration settings.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:176
-msgid "Display contents of a GNUnet directory"
-msgstr ""
-
-#: src/fs/fs_file_information.c:349
+#: src/fs/fs_uri.c:904
 #, c-format
-msgid "`%s' failed on file `%s': %s"
+msgid "Could not access hostkey file `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_test_lib.c:269
-#, c-format
-msgid "Failed to start daemon: %s\n"
+#: src/fs/fs_uri.c:1238 src/fs/fs_uri.c:1265
+msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:228
-msgid "# average retransmission delay (ms)"
+#: src/fs/fs_uri.c:1271
+msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:334
-msgid "# queries messages sent to other peers"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:457
-msgid "# requests merged"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:463
-msgid "# requests refreshed"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:511 src/fs/gnunet-service-fs_pe.c:586
-#: src/fs/gnunet-service-fs_pe.c:622
-msgid "# query plan entries"
-msgstr ""
-
-#: src/fs/fs_getopt.c:191
+#: src/fs/gnunet-publish.c:118
 #, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
-msgstr ""
-
-#: src/fs/fs_misc.c:126
-#, c-format
-msgid "Did not find mime type `%s' in extension list.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:115
-#, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:123
+#: src/fs/gnunet-publish.c:126
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:134
+#: src/fs/gnunet-publish.c:137
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:138
+#: src/fs/gnunet-publish.c:141
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:265
+#: src/fs/gnunet-publish.c:267
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:267
+#: src/fs/gnunet-publish.c:269
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:312
+#: src/fs/gnunet-publish.c:320
 #, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:354
+#: src/fs/gnunet-publish.c:362
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:361
+#: src/fs/gnunet-publish.c:369
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:367
+#: src/fs/gnunet-publish.c:375
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:375
+#: src/fs/gnunet-publish.c:383
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:385 src/fs/gnunet-publish.c:392
+#: src/fs/gnunet-publish.c:393 src/fs/gnunet-publish.c:400
+#: src/transport/gnunet-transport.c:328
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:414
+#: src/fs/gnunet-publish.c:422
 #, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:459
+#: src/fs/gnunet-publish.c:434 src/fs/gnunet-download.c:175
 #, c-format
+msgid "Failed to parse URI: %s\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:467
+#, c-format
 msgid "Could not access file: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:484
+#: src/fs/gnunet-publish.c:492
 #, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:507
+#: src/fs/gnunet-publish.c:515
 #, c-format
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:536
+#: src/fs/gnunet-publish.c:542
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:539
+#: src/fs/gnunet-publish.c:545
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:543
+#: src/fs/gnunet-publish.c:549
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:547
+#: src/fs/gnunet-publish.c:553
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:554
+#: src/fs/gnunet-publish.c:560
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:565
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:563
+#: src/fs/gnunet-publish.c:569
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:567
+#: src/fs/gnunet-publish.c:573
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:573
+#: src/fs/gnunet-publish.c:579
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:577
+#: src/fs/gnunet-publish.c:583
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:581
+#: src/fs/gnunet-publish.c:587
 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:594
+#: src/fs/gnunet-publish.c:600
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
-msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:694
+#: src/fs/fs_search.c:798
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %llu ms\n"
+msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:729
-msgid "# replies transmitted to other peers"
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
+#: src/fs/gnunet-service-fs_lc.c:480
+msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:735
-msgid "# replies dropped"
+#: src/fs/gnunet-service-fs_lc.c:254
+msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:764 src/fs/gnunet-service-fs_cp.c:880
-#: src/fs/gnunet-service-fs_cp.c:1290 src/fs/gnunet-service-fs_cp.c:1327
-msgid "# P2P searches active"
+#: src/fs/gnunet-service-fs_lc.c:312
+msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:837
-msgid "# artificial delays introduced (ms)"
+#: src/fs/gnunet-service-fs_lc.c:351
+msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:900
-msgid "# replies received for other peers"
+#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:914
-msgid "# replies dropped due to insufficient cover traffic"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:952
-msgid "# P2P searches destroyed due to ultimate reply"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1019
-msgid "# requests done for free (low load)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1043
-msgid "# request dropped, priority insufficient"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1053
-msgid "# requests done for a price (normal load)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1132
-msgid "# GET requests received (from other peers)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1166
-msgid "# requests dropped due to initiator not being connected"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1190
-msgid "# requests dropped due to missing reverse route"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1256
-msgid "# requests dropped due TTL underflow"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1284
-msgid "# requests dropped due to higher-TTL request"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1325
-msgid "# P2P query messages received and processed"
-msgstr ""
-
-#: src/fs/fs_download.c:309
-msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
-msgstr ""
-
-#: src/fs/fs_download.c:329
-msgid "Directory too large for system address space\n"
-msgstr ""
-
-#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
+#: src/fs/fs_misc.c:126
 #, c-format
-msgid "Failed to open file `%s' for writing"
+msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:872
+#: src/fs/gnunet-directory.c:49
 #, c-format
-msgid "Failed to create directory for recursive download of `%s'\n"
+msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/fs_download.c:958
+#: src/fs/gnunet-directory.c:94
 #, c-format
-msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/fs/fs_download.c:985
-msgid "internal error decrypting content"
-msgstr ""
-
-#: src/fs/fs_download.c:1008
+#: src/fs/gnunet-directory.c:97
 #, c-format
-msgid "Download failed: could not open file `%s': %s\n"
+msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1020
+#: src/fs/gnunet-directory.c:132
 #, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgid "You must specify a filename to inspect."
 msgstr ""
 
-#: src/fs/fs_download.c:1029
+#: src/fs/gnunet-directory.c:145
 #, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
+msgid "Failed to read directory `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1826
-msgid "Invalid URI"
+#: src/fs/gnunet-directory.c:176
+msgid "Display contents of a GNUnet directory"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:113
-#: src/fs/gnunet-service-fs_indexing.c:163
-#, c-format
-msgid "Configuration option `%s' in section `%s' missing.\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:121
-#: src/fs/gnunet-service-fs_indexing.c:177
-#, c-format
-msgid "Could not open `%s'.\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:137
-#, c-format
-msgid "Error writing `%s'.\n"
-msgstr ""
-
-#: 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:487
-#, c-format
-msgid "Failed to delete bogus block: %s\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:552
-#, c-format
-msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:554
-msgid "not indexed"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:569
-#, c-format
-msgid "Indexed file `%s' changed at offset %llu\n"
-msgstr ""
-
-#: src/fs/fs_search.c:798
-#, c-format
-msgid "Got result with unknown block type `%d', ignoring"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:300
+#: src/fs/gnunet-service-fs_pr.c:272
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:379 src/fs/gnunet-service-fs_pr.c:638
+#: src/fs/gnunet-service-fs_pr.c:352 src/fs/gnunet-service-fs_pr.c:607
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:802
+#: src/fs/gnunet-service-fs_pr.c:771
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:798
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:845
+#: src/fs/gnunet-service-fs_pr.c:814
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:860
+#: src/fs/gnunet-service-fs_pr.c:829
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:952
+#: src/fs/gnunet-service-fs_pr.c:921
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:979
+#: src/fs/gnunet-service-fs_pr.c:948
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1012
+#: src/fs/gnunet-service-fs_pr.c:983
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1102
+#: src/fs/gnunet-service-fs_pr.c:1074
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1123
+#: src/fs/gnunet-service-fs_pr.c:1095
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1170
+#: src/fs/gnunet-service-fs_pr.c:1142
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1184
+#: src/fs/gnunet-service-fs_pr.c:1156
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1193
+#: src/fs/gnunet-service-fs_pr.c:1165
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1209
+#: src/fs/gnunet-service-fs_pr.c:1181
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1226
+#: src/fs/gnunet-service-fs_pr.c:1198
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1239
+#: src/fs/gnunet-service-fs_pr.c:1211
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1216
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1270 src/fs/gnunet-service-fs_pr.c:1311
-#: src/fs/gnunet-service-fs_pr.c:1426
+#: src/fs/gnunet-service-fs_pr.c:1242 src/fs/gnunet-service-fs_pr.c:1281
+#: src/fs/gnunet-service-fs_pr.c:1416
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1329
-msgid "# Datastore lookups concluded (found ultimate result)"
+#: src/fs/gnunet-service-fs_pr.c:1299
+msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1342
+#: src/fs/gnunet-service-fs_pr.c:1312
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1404
+#: src/fs/gnunet-service-fs_pr.c:1394
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1487
+#: src/fs/gnunet-service-fs_pr.c:1474
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1576
+#: src/fs/gnunet-service-fs_pr.c:1565 src/fs/gnunet-service-fs_pr.c:1576
 #, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr ""
 
-#: src/fs/fs.c:284
-#, c-format
-msgid "Could not open file `%s': %s"
+#: src/fs/gnunet-service-fs_pe.c:259
+msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/fs.c:293
-#, c-format
-msgid "Could not read file `%s': %s"
+#: src/fs/gnunet-service-fs_pe.c:354
+msgid "# transmission failed (core has no bandwidth)"
 msgstr ""
 
-#: src/fs/fs.c:299
-#, c-format
-msgid "Short read reading from file `%s'!"
+#: src/fs/gnunet-service-fs_pe.c:385
+msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/fs.c:877
-#, c-format
-msgid "Failed to resume publishing information `%s': %s\n"
+#: src/fs/gnunet-service-fs_pe.c:440
+msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/fs.c:1323
-#, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
+#: src/fs/gnunet-service-fs_pe.c:450
+msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/fs.c:1364
-#, c-format
-msgid "Failure while resuming publishing operation `%s': %s\n"
+#: src/fs/gnunet-service-fs_pe.c:516
+msgid "# requests merged"
 msgstr ""
 
-#: src/fs/fs.c:1380
-#, c-format
-msgid "Failed to resume publishing operation `%s': %s\n"
+#: src/fs/gnunet-service-fs_pe.c:522
+msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/fs.c:1984
-#, c-format
-msgid "Failure while resuming unindexing operation `%s': %s\n"
+#: src/fs/gnunet-service-fs_pe.c:576 src/fs/gnunet-service-fs_pe.c:665
+#: src/fs/gnunet-service-fs_pe.c:706
+msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/fs.c:1994
-#, c-format
-msgid "Failed to resume unindexing operation `%s': %s\n"
+#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1552
+#: src/transport/gnunet-service-transport_neighbours.c:858
+#: src/transport/gnunet-service-transport_neighbours.c:1972
+#: src/transport/gnunet-service-transport_neighbours.c:2058
+#: src/topology/gnunet-daemon-topology.c:653
+#: src/topology/gnunet-daemon-topology.c:755
+msgid "# peers connected"
 msgstr ""
 
-#: src/fs/fs.c:2107 src/fs/fs.c:2346
-#, c-format
-msgid "Failed to resume sub-download `%s': %s\n"
+#: src/fs/gnunet-service-fs_cp.c:701
+msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/fs.c:2124
+#: src/fs/gnunet-service-fs_cp.c:705
 #, c-format
-msgid "Failed to resume sub-search `%s': %s\n"
+msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
-#, c-format
-msgid "Failure while resuming search operation `%s': %s\n"
+#: src/fs/gnunet-service-fs_cp.c:740
+msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/fs.c:2337
-#, c-format
-msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
+#: src/fs/gnunet-service-fs_cp.c:746
+msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/fs.c:2583
-msgid "Could not resume running search, will resume as paused search\n"
+#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:891
+#: src/fs/gnunet-service-fs_cp.c:1301 src/fs/gnunet-service-fs_cp.c:1340
+msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/fs.c:2669
-#, c-format
-msgid "Failure while resuming download operation `%s': %s\n"
+#: src/fs/gnunet-service-fs_cp.c:848
+msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:642
-#, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
+#: src/fs/gnunet-service-fs_cp.c:911
+msgid "# replies received for other peers"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:128
-msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+#: src/fs/gnunet-service-fs_cp.c:925
+msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:99
-#, c-format
-msgid "Block not of type %u\n"
+#: src/fs/gnunet-service-fs_cp.c:963
+msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:106
-msgid "Size mismatch for block\n"
+#: src/fs/gnunet-service-fs_cp.c:1030
+msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:115
-#, c-format
-msgid "Block of type %u is malformed\n"
+#: src/fs/gnunet-service-fs_cp.c:1054
+msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/block/block.c:108
-#, c-format
-msgid "Loading block plugins `%s'\n"
+#: src/fs/gnunet-service-fs_cp.c:1064
+msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/block/block.c:118
-#, c-format
-msgid "Failed to load block plugin `%s'\n"
+#: src/fs/gnunet-service-fs_cp.c:1143
+msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/mesh/test_mesh_small.c:689
-msgid "Test mesh in a small network."
+#: src/fs/gnunet-service-fs_cp.c:1177
+msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
-msgid "Failed to transmit shutdown ACK.\n"
+#: src/fs/gnunet-service-fs_cp.c:1201
+msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
-msgid "Transmitting shutdown ACK.\n"
+#: src/fs/gnunet-service-fs_cp.c:1267
+msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
-msgid "Initiating shutdown as requested by client.\n"
+#: src/fs/gnunet-service-fs_cp.c:1295
+msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:206
+#: src/fs/gnunet-service-fs_cp.c:1338
+msgid "# P2P query messages received and processed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_push.c:642
 #, c-format
-msgid "Restarting service `%s' due to configuration file change.\n"
+msgid ""
+"Invalid value specified for option `%s' in section `%s', content pushing "
+"disabled\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:234
-msgid "Could not send status result to client\n"
+#: src/fs/gnunet-service-fs_indexing.c:113
+#: src/fs/gnunet-service-fs_indexing.c:163
+#, c-format
+msgid "Configuration option `%s' in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:268
-msgid "Not sending status result to client: no client known\n"
+#: src/fs/gnunet-service-fs_indexing.c:121
+#: src/fs/gnunet-service-fs_indexing.c:177
+#, c-format
+msgid "Could not open `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:406
+#: src/fs/gnunet-service-fs_indexing.c:137
 #, c-format
-msgid "Failed to start service `%s'\n"
+msgid "Error writing `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:409
+#: src/fs/gnunet-service-fs_indexing.c:228
 #, c-format
-msgid "Starting service `%s'\n"
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:435
+#: src/fs/gnunet-service-fs_indexing.c:266
 #, c-format
-msgid "ARM is shutting down, service `%s' not started.\n"
+msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:443
+#: src/fs/gnunet-service-fs_indexing.c:487
 #, c-format
-msgid "Service `%s' already running.\n"
+msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:453
+#: src/fs/gnunet-service-fs_indexing.c:552
 #, c-format
-msgid "Binary implementing service `%s' not known!\n"
+msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:464
+#: src/fs/gnunet-service-fs_indexing.c:554
+msgid "not indexed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:569
 #, c-format
-msgid "Configuration file `%s' for service `%s' not known!\n"
+msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:498
+#: src/fs/fs_list_indexed.c:90
 #, c-format
-msgid "Preparing to stop `%s'\n"
+msgid "Failed to receive response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:666
-msgid "Stopping all services\n"
+#: src/fs/fs_list_indexed.c:117
+#, c-format
+msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:723
+#: src/fs/fs_list_indexed.c:164
 #, c-format
-msgid "Restarting service `%s'.\n"
+msgid "Failed to not connect to `%s' service.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:796
-msgid "exit"
+#: src/fs/fs_unindex.c:58
+msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:801
-msgid "signal"
+#: src/fs/fs_unindex.c:63
+msgid "Failed to read file"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:806
-msgid "unknown"
+#: src/fs/fs_unindex.c:235
+msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:813
-#, c-format
-msgid "Service `%s' stopped\n"
+#: src/fs/fs_unindex.c:243
+msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:827
-#, c-format
-msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
+#: src/fs/fs_unindex.c:251
+msgid "Invalid response from `fs' service."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:161
-#, c-format
-msgid "Service `%s' has been started.\n"
+#: src/fs/fs_unindex.c:296
+msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:165
+#: src/fs/fs_unindex.c:331
+msgid "Failed to connect to `datastore' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:344
+msgid "Failed to open file for unindexing."
+msgstr ""
+
+#: src/fs/fs_unindex.c:378
+msgid "Failed to compute hash of file."
+msgstr ""
+
+#: src/fs/gnunet-download.c:100
 #, c-format
-msgid "Failed to stop service `%s'!\n"
+msgid "Starting download `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:171
+#: src/fs/gnunet-download.c:112
 #, c-format
-msgid "Service `%s' has been stopped.\n"
+msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:175
+#: src/fs/gnunet-download.c:121
 #, c-format
-msgid "Failed to start service `%s'!\n"
+msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:181
+#: src/fs/gnunet-download.c:129
 #, c-format
-msgid "Some error communicating with service `%s'.\n"
+msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:207
+#: src/fs/gnunet-download.c:169
 #, c-format
-msgid "Service `%s' is running.\n"
+msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:212
+#: src/fs/gnunet-download.c:182
 #, c-format
-msgid "Service `%s' is not running.\n"
+msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:238
+#: src/fs/gnunet-download.c:189
 #, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
+msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
-msgid "Fatal error initializing ARM API.\n"
+#: src/fs/gnunet-download.c:243
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:269
-#, c-format
-msgid "Failed to remove configuration file %s\n"
+#: src/fs/gnunet-download.c:249
+msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:275
-#, c-format
-msgid "Failed to remove servicehome directory %s\n"
+#: src/fs/gnunet-download.c:253
+msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:387
-msgid "stop all GNUnet services"
+#: src/fs/gnunet-download.c:257
+msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:389
-msgid "start a particular service"
+#: src/fs/gnunet-download.c:260
+msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
-msgid "stop a particular service"
+#: src/fs/gnunet-download.c:270
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:393
-msgid "start all GNUnet default services"
+#: src/fs/fs_getopt.c:191
+#, c-format
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:396
-msgid "stop and start all GNUnet default services"
+#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
+#, c-format
+msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:399
-msgid "test if a particular service is running"
+#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
+#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
+#, c-format
+msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:402
-msgid "delete config file and directory on exit"
+#: src/fs/fs_publish.c:649
+msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:404
-msgid "don't print status messages"
+#: src/fs/fs_publish.c:661
+msgid "unknown error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:407
-msgid "timeout for completing current operation"
+#: src/fs/fs_publish.c:704
+msgid "failed to compute hash"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:418
-msgid "Control services and the Automated Restart Manager (ARM)"
+#: src/fs/fs_publish.c:724
+msgid "filename too long"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:803
-#, c-format
-msgid "Unable to forward to service `%s': shutdown\n"
+#: src/fs/fs_publish.c:751
+msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:812
+#: src/fs/fs_publish.c:775
 #, c-format
-msgid "Unable to forward to service `%s': timeout before connect\n"
+msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:868
+#: src/fs/fs_publish.c:845
 #, c-format
-msgid "Unable to start service `%s': %s\n"
+msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:936
+#: src/fs/fs_publish.c:851
 #, c-format
-msgid "Unable to accept connection for service `%s': %s\n"
+msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:952
-#, c-format
-msgid "Service `%s' started\n"
+#: src/fs/fs_publish.c:899
+msgid "needs to be an actual file"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1080
+#: src/fs/fs_publish.c:1078
 #, c-format
-msgid "Unable to create socket for service `%s': %s\n"
+msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1102
+#: src/fs/fs_publish.c:1149
 #, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1116
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+#: src/fs/fs_publish.c:1482
+msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/arm/arm_api.c:201 src/arm/test_exponential_backoff.c:192
-msgid "Failed to transmit shutdown request to client.\n"
+#: src/fs/fs.c:284
+#, c-format
+msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/arm/arm_api.c:390
+#: src/fs/fs.c:293
 #, c-format
-msgid "Configuration failes to specify option `%s' in section `%s'!\n"
+msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/arm/arm_api.c:405
+#: src/fs/fs.c:299
 #, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/arm/arm_api.c:469
+#: src/fs/fs.c:877
 #, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
+msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/arm/arm_api.c:539
+#: src/fs/fs.c:1323
 #, c-format
-msgid "Requesting start of service `%s'.\n"
+msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:540
+#: src/fs/fs.c:1364
 #, c-format
-msgid "Requesting termination of service `%s'.\n"
+msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/arm/arm_api.c:563
+#: src/fs/fs.c:1380
 #, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
+msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/arm/arm_api.c:566
+#: src/fs/fs.c:1984
 #, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
+msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/arm/arm_api.c:598 src/arm/arm_api.c:602
+#: src/fs/fs.c:1994
 #, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
+msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/arm/arm_api.c:675
+#: src/fs/fs.c:2107 src/fs/fs.c:2346
 #, c-format
-msgid "Stopping service `%s' within %llu ms\n"
+msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/dht/dhtlog.c:56
+#: src/fs/fs.c:2124
 #, c-format
-msgid "Loading `%s' dhtlog plugin\n"
+msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/dht/dhtlog.c:65
+#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
 #, c-format
-msgid "Failed to load dhtlog plugin for `%s'\n"
+msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:895
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:655
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:686
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:718
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:750
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:782
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:813
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:844
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:875
+#: src/fs/fs.c:2337
 #, c-format
-msgid "Failed to get full path for `%s'\n"
+msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:924
-msgid "Failed to create file for dhtlog.\n"
+#: src/fs/fs.c:2583
+msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:84
+#: src/fs/fs.c:2669
 #, c-format
-msgid "Found %u peers\n"
+msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:115
+#: src/fs/fs_download.c:309
+msgid ""
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
+msgstr ""
+
+#: src/fs/fs_download.c:329
+msgid "Directory too large for system address space\n"
+msgstr ""
+
+#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
 #, c-format
-msgid "Found peer `%s'\n"
+msgid "Failed to open file `%s' for writing"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:184 src/dht/gnunet-dht-put.c:161
-#: src/dht/gnunet-dht-get.c:195
-msgid "the query key"
+#: src/fs/fs_download.c:872
+#, c-format
+msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:187 src/dht/gnunet-dht-put.c:170
-#: src/dht/gnunet-dht-get.c:201
-msgid "how long to execute this query before giving up?"
+#: src/fs/fs_download.c:958
+#, 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/dht/gnunet-dht-get-peer.c:209
-msgid "Issue a GET PEER request to the GNUnet DHT, print results."
+#: src/fs/fs_download.c:985
+msgid "internal error decrypting content"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:95
+#: src/fs/fs_download.c:1008
 #, c-format
-msgid "PUT request sent!\n"
+msgid "Download failed: could not open file `%s': %s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:119
+#: src/fs/fs_download.c:1020
 #, c-format
-msgid "Must provide KEY and DATA for DHT put!\n"
+msgid "Failed to seek to offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:127
+#: src/fs/fs_download.c:1029
 #, c-format
-msgid "Could not connect to %s service!\n"
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:132
+#: src/fs/fs_download.c:1826
+msgid "Invalid URI"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:268 src/fs/gnunet-service-fs.c:448
+msgid "# Loopback routes suppressed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:542 src/topology/gnunet-daemon-topology.c:1292
+#: src/topology/gnunet-daemon-topology.c:1299
+#: src/hostlist/gnunet-daemon-hostlist.c:290
 #, c-format
-msgid "Connected to %s service!\n"
+msgid "Failed to connect to `%s' service.\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:147
+#: src/fs/fs_file_information.c:350
 #, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+msgid "`%s' failed on file `%s': %s"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:164
-msgid "the data to insert under the key"
+#: src/transport/gnunet-service-transport_neighbours.c:435
+msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:167
-msgid "the type to insert data as"
+#: src/transport/gnunet-service-transport_neighbours.c:807
+msgid "# peers disconnected due to external request"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:173
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/transport/gnunet-service-transport_neighbours.c:913
+msgid "# peers disconnected due to timeout"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+#: src/transport/gnunet-service-transport_neighbours.c:937
+msgid "# keepalives sent"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198
-msgid "the type of data to look for"
+#: src/transport/gnunet-service-transport_neighbours.c:969
+msgid "# peers disconnected due to global disconnect"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:223
-msgid "Issue a GET request to the GNUnet DHT, prints results."
+#: src/transport/gnunet-service-transport_neighbours.c:1499
+#: src/transport/gnunet-service-transport_neighbours.c:1520
+msgid "# messages not sent (no such peer or not connected)"
 msgstr ""
 
-#: src/dht/dht_api.c:235
-msgid "Failed to connect to the DHT service!\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1536
+msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/dht/plugin_dhtlog_mysql.c:1550
-msgid "Failed to initialize MySQL database connection for dhtlog.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1584
+msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:185
-#: src/transport/test_plugin_transport_https.c:1271
-#: src/transport/test_plugin_transport.c:202
-#: src/transport/gnunet-service-transport.c:439
-#: src/transport/test_plugin_transport_http.c:1232
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1620
+msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:195
-#: src/transport/test_plugin_transport_https.c:1335
-#: src/transport/test_plugin_transport.c:212
-#: src/transport/gnunet-service-transport.c:448
-#: src/transport/test_plugin_transport_http.c:1255
-msgid "Transport service could not access hostkey.  Exiting.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1638
+msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:205
-msgid "Loading udp transport plugin\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1663
+msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:213
-msgid "Failed to load transport plugin for udp\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1693
+msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1436
-#: src/transport/plugin_transport_wlan.c:1631
-#: src/transport/plugin_transport_wlan.c:1750
-#, c-format
-msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1706
+msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1868
-#, c-format
-msgid "Wlan Address len %d is wrong\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1820
+msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2728
-#, c-format
-msgid "Finished reading from wlan-helper stdout with code: %d\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1832
+msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:246
+#: src/transport/gnunet-service-transport_blacklist.c:247
 #, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgid "Could not read blacklist file `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:251
-msgid "# messages dropped due to slow client"
+#: src/transport/gnunet-service-transport_blacklist.c:254
+#, c-format
+msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:394
+#: src/transport/gnunet-service-transport_blacklist.c:266
 #, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgid "Failed to read blacklist from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:511
-msgid "# bytes payload received for other peers"
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
+#, c-format
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:528
-msgid "# bytes payload dropped (other peer was not connected)"
+#: 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_clients.c:579
-msgid "# REQUEST CONNECT messages received"
+#: src/transport/gnunet-service-transport_blacklist.c:350
+#, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:607
-msgid "# SET QUOTA messages received"
+#: 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_neighbours.c:811
-msgid "# messages not sent (no such peer or not connected)"
+#: src/transport/gnunet-service-transport_blacklist.c:522
+#: src/transport/gnunet-service-transport_blacklist.c:760
+msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:831
-msgid "# bytes in message queue for other peers"
+#: src/transport/plugin_transport_http_server.c:184
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:899
-msgid "# bandwidth quota violations by other peers"
+#: src/transport/plugin_transport_http_server.c:208
+msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:917
-msgid "# ms throttling suggested"
+#: src/transport/gnunet-service-transport_hello.c:177
+msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:942
-msgid "# KEEPALIVE messages discarded (not connected)"
+#: src/transport/plugin_transport_udp.c:1428
+#: src/transport/plugin_transport_udp.c:2132
+msgid "# HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:972
-msgid "# SET QUOTA messages ignored (no such peer)"
+#: src/transport/plugin_transport_udp.c:1900
+#: src/transport/plugin_transport_udp_new.c:1209
+#, c-format
+msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:984
-msgid "# disconnects due to quota of 0"
+#: src/transport/plugin_transport_udp.c:1953
+#: src/transport/plugin_transport_udp_new.c:1259
+#, c-format
+msgid "Invalid IPv6 address: `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:108
-msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+#: src/transport/plugin_transport_udp.c:2146
+#: src/transport/plugin_transport_udp_new.c:1388
+msgid "Failed to open UDP sockets\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:115
+#: src/transport/plugin_transport_http_client.c:107
+#: src/transport/plugin_transport_http_client.c:122
+#: 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 "Starting transport plugins `%s'\n"
+msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:119
+#: src/transport/plugin_transport_http_client.c:617
 #, c-format
-msgid "Loading `%s' transport plugin\n"
+msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:139
+#: src/transport/plugin_transport_tcp.c:504
 #, c-format
-msgid "Failed to load transport plugin for `%s'\n"
+msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:409
-msgid "Phase 0: Test plugin functions failed\n"
+#: src/transport/plugin_transport_tcp.c:590
+#: src/transport/plugin_transport_tcp.c:679
+#: src/transport/plugin_transport_tcp.c:732
+#: src/transport/plugin_transport_tcp.c:821
+#: src/transport/plugin_transport_tcp.c:1160
+msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:418
-msgid "Phase 1: Test connect with wrong data failed\n"
+#: src/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:847
+#: src/transport/plugin_transport_tcp.c:1548
+msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:427
-msgid "Phase 2: Test session selection failed\n"
+#: src/transport/plugin_transport_tcp.c:683
+msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:435
-msgid "Phase 3: Test sending with plugin failed\n"
+#: src/transport/plugin_transport_tcp.c:735
+msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:726
-#: src/transport/test_plugin_transport_http.c:692
-#, c-format
-msgid "curl failed for `%s' at %s:%d: `%s'\n"
+#: src/transport/plugin_transport_tcp.c:825
+msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:746
-#: src/transport/test_plugin_transport_http.c:712
-msgid "Connecting to peer without any peer identification: test failed\n"
+#: src/transport/plugin_transport_tcp.c:946
+msgid "# bytes TCP was asked to transmit"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:759
-#: src/transport/test_plugin_transport_http.c:725
-msgid "Connecting to peer with too short peer identification: test failed\n"
+#: src/transport/plugin_transport_tcp.c:997
+msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:772
-#: src/transport/test_plugin_transport_http.c:738
-msgid "Connecting to peer with too long peer identification: test failed\n"
+#: src/transport/plugin_transport_tcp.c:1040
+#, c-format
+msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:785
-msgid "Connecting to peer with valid peer identification: test failed\n"
+#: src/transport/plugin_transport_tcp.c:1057
+msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:924
-#: src/transport/test_plugin_transport_http.c:887
-#, c-format
-msgid "Unknown address size: ipv6 has %u ipv4 has %u but this has %u\n"
+#: src/transport/plugin_transport_tcp.c:1108
+msgid "# bytes discarded by TCP (failed to connect)"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:930
-#: src/transport/test_plugin_transport_http.c:893
-#, c-format
-msgid "Transport plugin notification for address: `%s':%u\n"
+#: src/transport/plugin_transport_tcp.c:1228
+msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1038
-#: src/transport/test_plugin_transport_http.c:1002
-msgid "Connecting to peer without any peer identification.\n"
+#: src/transport/plugin_transport_tcp.c:1591
+msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1053
-#: src/transport/test_plugin_transport_http.c:1017
-msgid "Connecting to peer with too short peer identification.\n"
+#: src/transport/plugin_transport_tcp.c:1736
+msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1069
-#: src/transport/test_plugin_transport_http.c:1033
-msgid "Connecting to peer with too long peer identification.\n"
+#: src/transport/plugin_transport_tcp.c:1800
+msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1083
-#: src/transport/test_plugin_transport_http.c:1047
-msgid "Connecting to peer with valid peer identification.\n"
+#: src/transport/plugin_transport_tcp.c:1953
+msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1093
-msgid ""
-"\n"
-"Phase 1: transmit data to all suggested addresses\n"
-"\n"
+#: src/transport/plugin_transport_tcp.c:2013
+#, c-format
+msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1151
-msgid ""
-"\n"
-"Phase 2: session selection\n"
-"\n"
+#: src/transport/plugin_transport_tcp.c:2036
+#, c-format
+msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1187
-msgid ""
-"\n"
-"Phase 3: send multiple or big messages after disconnect\n"
-"\n"
+#: src/transport/plugin_transport_tcp.c:2040
+msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1193
-msgid "Phase 3: sending messages\n"
+#: src/transport/plugin_transport_tcp.c:2044
+#, c-format
+msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1284
-#: src/transport/plugin_transport_http.c:3323
-#: src/transport/test_plugin_transport_http.c:1245
+#: src/transport/plugin_transport_http.c:829
+msgid "Disabling IPv6 since it is not supported on this system!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:878
+msgid "Require valid port number for service in configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:1025
 #, c-format
-msgid "Require valid port number for transport plugin `%s' in configuration!\n"
+msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1352
+#: src/transport/plugin_transport_http.c:1040
 #, c-format
-msgid "Loading HTTPS transport plugin `%s'\n"
+msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1358
-msgid "Failed to load transport plugin for https\n"
+#: src/transport/plugin_transport_http.c:1115
+msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1368
-#, c-format
-msgid "Transport plugin returned %u addresses to connect to\n"
+#: src/transport/plugin_transport_http.c:1128
+msgid "Port is required! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1444
+#: src/transport/plugin_transport_http.c:1139
+msgid "Port 0, client only mode\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:1155
+#, c-format
 msgid ""
-"\n"
-"Phase 0\n"
-"\n"
+"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1507
-#: src/transport/test_plugin_transport_https.c:1510
+#: src/transport/plugin_transport_http.c:1181
+#, c-format
 msgid ""
-"\n"
-"delete\n"
-"\n"
+"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/test_transport_api.c:120
-msgid "Fail! Could not connect peers\n"
+#: src/transport/plugin_transport_unix.c:1088
+msgid "Failed to open UNIX sockets\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-list-connections.c:91
-#: src/peerinfo-tool/gnunet-peerinfo.c:200
-#: src/core/gnunet-core-list-connections.c:166
+#: src/transport/plugin_transport_smtp.c:367
 #, c-format
-msgid "Invalid command line argument `%s'\n"
+msgid "Received malformed message via %s. Ignored.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-list-connections.c:112
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
-#: src/core/gnunet-core-list-connections.c:187
-msgid "don't resolve host names"
+#: src/transport/plugin_transport_smtp.c:454
+msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-list-connections.c:119
-#: src/core/gnunet-core-list-connections.c:194
-msgid "Print information about connected peers."
+#: src/transport/plugin_transport_smtp.c:463
+#, c-format
+msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport.c:224
-msgid "Loading tcp transport plugin\n"
+#: src/transport/plugin_transport_smtp.c:558
+#: src/transport/plugin_transport_smtp.c:568
+#: src/transport/plugin_transport_smtp.c:581
+#: src/transport/plugin_transport_smtp.c:600
+#: src/transport/plugin_transport_smtp.c:623
+#: src/transport/plugin_transport_smtp.c:631
+#: src/transport/plugin_transport_smtp.c:644
+#: src/transport/plugin_transport_smtp.c:655
+#, c-format
+msgid "SMTP: `%s' failed: %s.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport.c:232
-msgid "Failed to load transport plugin for tcp\n"
+#: src/transport/plugin_transport_smtp.c:798
+msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:176
-msgid "# refreshed my HELLO"
+#: src/transport/plugin_transport_smtp.c:810
+msgid "# bytes received via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:698
-#: src/transport/plugin_transport_http.c:1231
-#: src/transport/plugin_transport_http.c:2551
-msgid "# HTTP peers active"
+#: src/transport/plugin_transport_smtp.c:811
+msgid "# bytes sent via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:993
-#: src/transport/plugin_transport_http.c:1306
-msgid "# HTTP inbound sessions for peers active"
+#: src/transport/plugin_transport_smtp.c:813
+msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1889
+#: src/transport/gnunet-service-transport_plugins.c:108
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:115
 #, c-format
-msgid "Connection %X: HTTP PUT to peer `%s' (`%s') failed: `%s' `%s'\n"
+msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1915
+#: src/transport/gnunet-service-transport_plugins.c:119
 #, c-format
-msgid "Connection %X: HTTP GET to peer `%s' (`%s') failed: `%s' `%s'\n"
+msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:2193
-#: src/transport/plugin_transport_http.c:2305
+#: src/transport/gnunet-service-transport_plugins.c:139
 #, c-format
-msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
+msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:2592
-msgid "# HTTP outbound sessions for peers active"
+#: src/transport/plugin_transport_wlan.c:877
+msgid "# wlan session timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3351
-#: src/transport/plugin_transport_http.c:3380
-msgid "Misconfigured address to bind to in configuration!\n"
+#: src/transport/plugin_transport_wlan.c:902
+msgid "# wlan session created"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3406
-#, c-format
-msgid "Required configuration options missing in section `%s'\n"
+#: src/transport/plugin_transport_wlan.c:985
+#: src/transport/plugin_transport_wlan.c:1143
+#: src/transport/plugin_transport_wlan.c:1163
+#: src/transport/plugin_transport_wlan.c:1193
+#: src/transport/plugin_transport_wlan.c:2361
+#: src/transport/plugin_transport_wlan.c:3192
+msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3444
-msgid ""
-"Could not create a new TLS certificate, program `gnunet-transport-"
-"certificate-creation' could not be started!\n"
+#: src/transport/plugin_transport_wlan.c:1455
+#, c-format
+msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3460
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/transport/plugin_transport_wlan.c:1771
+msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3612
+#: src/transport/plugin_transport_wlan.c:1803
+#: src/transport/plugin_transport_wlan.c:2016
+#: src/transport/plugin_transport_wlan.c:2109
 #, c-format
-msgid ""
-"HTTP Server with %s could not be started on port %u! %s plugin failed!\n"
+msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3628
-#, c-format
-msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
+#: src/transport/plugin_transport_wlan.c:2003
+msgid "# wlan acks send"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:504
+#: src/transport/plugin_transport_wlan.c:2072
+msgid "# wlan fragments send"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:2231
 #, c-format
-msgid "Unexpected address length: %u bytes\n"
+msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:590
-#: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:728
-#: src/transport/plugin_transport_tcp.c:817
-#: src/transport/plugin_transport_tcp.c:1142
-msgid "# bytes currently in TCP buffers"
+#: src/transport/plugin_transport_wlan.c:2236
+msgid "# wlan messages queued"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:843
-#: src/transport/plugin_transport_tcp.c:1531
-msgid "# TCP sessions active"
+#: src/transport/plugin_transport_wlan.c:2323
+#: src/transport/plugin_transport_wlan.c:2959
+#: src/transport/plugin_transport_wlan.c:3194
+msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:683
-msgid "# bytes discarded by TCP (timeout)"
+#: src/transport/plugin_transport_wlan.c:2543
+msgid "# wlan whole messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:731
-msgid "# bytes transmitted via TCP"
+#: src/transport/plugin_transport_wlan.c:2741
+msgid "# wlan hello messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:821
-msgid "# bytes discarded by TCP (disconnect)"
+#: src/transport/plugin_transport_wlan.c:2775
+msgid "# wlan fragments received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:942
-msgid "# bytes TCP was asked to transmit"
+#: src/transport/plugin_transport_wlan.c:2827
+msgid "# wlan acks received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:993
-msgid "# bytes discarded by TCP (no address and no connection)"
+#: src/transport/plugin_transport_wlan.c:2920
+msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1034
-#, c-format
-msgid "Address of unexpected length: %u\n"
+#: src/transport/plugin_transport_wlan.c:2943
+msgid "# wlan mac endpoints created"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1051
-msgid "Found valid IPv4 NAT address (creating session)!\n"
+#: src/transport/plugin_transport_wlan.c:2999
+msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1103
-msgid "# bytes discarded by TCP (failed to connect)"
+#: src/transport/plugin_transport_wlan.c:3050
+msgid "# wlan messaged for this client received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1211
-msgid "# transport-service disconnect requests for TCP"
+#: src/transport/plugin_transport_wlan.c:3058
+msgid "# wlan messaged inside WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1574
-msgid "# TCP WELCOME messages received"
+#: src/transport/gnunet-transport.c:128
+#, c-format
+msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1722
-msgid "# bytes received via TCP"
+#: src/transport/gnunet-transport.c:137
+#, c-format
+msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1788
-msgid "# network-level TCP disconnect events"
+#: src/transport/gnunet-transport.c:176
+#, c-format
+msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1941
-msgid "Failed to start service.\n"
+#: src/transport/gnunet-transport.c:202
+#, c-format
+msgid "Connected to %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2001
+#: src/transport/gnunet-transport.c:243
 #, c-format
-msgid "Failed to find option %s in section %s!\n"
+msgid "Disconnected from %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2024
+#: src/transport/gnunet-transport.c:283
 #, c-format
-msgid "TCP transport listening on port %llu\n"
+msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2028
-msgid "TCP transport not listening on any port (client only)\n"
+#: src/transport/gnunet-transport.c:305
+#, c-format
+msgid "Peer `%s' plugin: `%s' address `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/gnunet-transport.c:339
 #, c-format
-msgid "TCP transport advertises itself as being on port %llu\n"
+msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:518
-msgid "# address records discarded"
+#: src/transport/gnunet-transport.c:377
+msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:604
-#: src/core/gnunet-service-core.c:4187
-msgid "# PING messages received"
+#: src/transport/gnunet-transport.c:380
+msgid "try to connect to the given peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:626
+#: src/transport/gnunet-transport.c:383
+msgid "provide information about all current connections (once)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:386
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:393
+msgid "Direct access to transport service."
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:515
+msgid "# address records discarded"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:628
 #, 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:683
+#: src/transport/gnunet-service-transport_validation.c:696
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:692
+#: src/transport/gnunet-service-transport_validation.c:705
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:756
+#: src/transport/gnunet-service-transport_validation.c:769
 #, 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:790
+#: src/transport/gnunet-service-transport_validation.c:803
 msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:862
+#: src/transport/gnunet-service-transport_validation.c:875
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:921
-#: src/core/gnunet-service-core.c:4210
-msgid "# PONG messages received"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:943
+#: src/transport/gnunet-service-transport_validation.c:956
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:959
+#: src/transport/gnunet-service-transport_validation.c:972
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:367
+#: src/transport/gnunet-service-transport_validation.c:1050
 #, c-format
-msgid "Received malformed message via %s. Ignored.\n"
+msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:454
-msgid "SMTP filter string to invalid, lacks ': '\n"
+#: src/transport/gnunet-service-transport_clients.c:250
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:463
-#, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
+#: src/transport/gnunet-service-transport_clients.c:255
+msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:558
-#: src/transport/plugin_transport_smtp.c:568
-#: src/transport/plugin_transport_smtp.c:581
-#: src/transport/plugin_transport_smtp.c:600
-#: src/transport/plugin_transport_smtp.c:623
-#: src/transport/plugin_transport_smtp.c:631
-#: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:655
+#: src/transport/gnunet-service-transport_clients.c:405
 #, c-format
-msgid "SMTP: `%s' failed: %s.\n"
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:798
-msgid "No email-address specified, can not start SMTP transport.\n"
+#: src/transport/gnunet-service-transport_clients.c:522
+msgid "# bytes payload received for other peers"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:810
-msgid "# bytes received via SMTP"
+#: src/transport/gnunet-service-transport_clients.c:539
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:811
-msgid "# bytes sent via SMTP"
+#: src/transport/gnunet-service-transport_clients.c:590
+msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:813
-msgid "# bytes dropped by SMTP (outgoing)"
+#: src/transport/transport_api.c:588
+#, c-format
+msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_http.c:1271
-#, c-format
-msgid "Loading HTTP transport plugin `%s'\n"
+#: src/transport/gnunet-service-transport.c:162
+msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/transport/test_plugin_transport_http.c:1278
-msgid "Failed to load transport plugin for http\n"
+#: src/transport/gnunet-service-transport.c:519
+msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_http.c:1364
-msgid ""
-"Phase 0\n"
-"\n"
+#: src/transport/gnunet-service-transport.c:528
+msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1280
+#: src/dv/plugin_transport_dv.c:159
 #, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+msgid "%s Received message from %s of type %d, distance %u!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1330
+#: src/dv/dv_api.c:179
+msgid "Failed to connect to the dv service!\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:244
+msgid "# peers blacklisted"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:379
+msgid "# connect requests issued to transport"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:674
+#: src/topology/gnunet-daemon-topology.c:760
+msgid "# friends connected"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:877
+#: src/hostlist/hostlist-server.c:187
 #, c-format
-msgid "Invalid IPv6 address: `%s'\n"
+msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1456
-msgid "Failed to open UDP sockets\n"
+#: src/topology/gnunet-daemon-topology.c:952
+msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/transport/transport_api.c:570
+#: src/topology/gnunet-daemon-topology.c:984
 #, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
+msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1092
-msgid "Failed to open UNIX sockets\n"
+#: src/topology/gnunet-daemon-topology.c:996
+#, c-format
+msgid "Could not read friends list `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
+#: src/topology/gnunet-daemon-topology.c:1002
 #, c-format
-msgid "Could not read blacklist file `%s'\n"
+msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:254
+#: src/topology/gnunet-daemon-topology.c:1011
 #, c-format
-msgid "Blacklist file `%s' is empty.\n"
+msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/topology/gnunet-daemon-topology.c:1019
 #, c-format
-msgid "Failed to read blacklist from `%s'\n"
+msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
+#: src/topology/gnunet-daemon-topology.c:1039
 #, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/topology/gnunet-daemon-topology.c:1052
 #, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
+#: src/topology/gnunet-daemon-topology.c:1062
 #, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/topology/gnunet-daemon-topology.c:1068
 #, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:754
-msgid "# disconnects due to blacklist"
+#: src/topology/gnunet-daemon-topology.c:1078
+msgid "# friends in configuration"
 msgstr ""
 
+#: src/topology/gnunet-daemon-topology.c:1084
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:1091
+msgid ""
+"More friendly connections required than target total number of connections.\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:1128
+msgid "# HELLO messages received"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:1185
+msgid "# HELLO messages gossipped"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:1325
+msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+msgstr ""
+
 #: src/chat/chat.c:175
 msgid "Could not transmit confirmation receipt\n"
 msgstr ""
@@ -3957,6 +3762,22 @@
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
+#: src/chat/gnunet-service-chat.c:267
+msgid "Failed to queue a message notification\n"
+msgstr ""
+
+#: src/chat/gnunet-service-chat.c:546
+msgid "Failed to queue a join notification\n"
+msgstr ""
+
+#: src/chat/gnunet-service-chat.c:729
+msgid "Failed to queue a confirmation receipt\n"
+msgstr ""
+
+#: src/chat/gnunet-service-chat.c:907
+msgid "Failed to queue a leave notification\n"
+msgstr ""
+
 #: src/chat/gnunet-chat.c:92
 #, c-format
 msgid "Joined\n"
@@ -4151,576 +3972,410 @@
 msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:267
-msgid "Failed to queue a message notification\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/chat/gnunet-service-chat.c:546
-msgid "Failed to queue a join notification\n"
+#: src/nat/gnunet-nat-server.c:328
+msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:729
-msgid "Failed to queue a confirmation receipt\n"
-msgstr ""
-
-#: src/chat/gnunet-service-chat.c:907
-msgid "Failed to queue a leave notification\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
-#: src/core/gnunet-core-list-connections.c:77
+#: src/nat/nat.c:776
 #, c-format
-msgid "Peer `%s'\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:222
+#: src/nat/nat.c:825
 #, c-format
-msgid "Could not find option `%s:%s' in configuration.\n"
+msgid "Failed to start %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#: src/nat/nat.c:1094
 #, c-format
-msgid "Loading hostkey from `%s' failed.\n"
+msgid "Malformed %s `%s' given in configuration!\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:241
+#: src/nat/nat.c:1156 src/nat/nat.c:1166
 #, c-format
-msgid "I am peer `%s'.\n"
+msgid ""
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
-msgid "output only the identity strings"
+#: src/nat/nat.c:1298
+msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
-msgid "output our own identity only"
+#: src/nat/nat.c:1310
+#, c-format
+msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:270
-msgid "Print information about peers."
+#: src/nat/nat_test.c:348
+msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/nat/nat_test.c:418
 #, c-format
-msgid "`%s' failed at %s:%u with error: %s"
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:239
+#: src/block/plugin_block_dht.c:122
 #, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
+msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:266
-#, c-format
-msgid "Unable to initialize SQLite: %s.\n"
+#: src/block/plugin_block_dht.c:129
+msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:677
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+#: src/block/plugin_block_dht.c:138
+#, c-format
+msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1130
-msgid "sqlite version to old to determine size, assuming zero\n"
+#: src/block/plugin_block_fs.c:131
+msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1149
+#: src/block/block.c:109
 #, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+msgid "Loading block plugins `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1188
-msgid "Sqlite database running\n"
+#: src/block/block.c:119
+#, c-format
+msgid "Failed to load block plugin `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:52
-msgid "# bytes used in file-sharing datastore"
+#: src/mesh/gnunet-service-mesh.c:4121
+msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:331
-msgid "# bytes expired"
+#: src/mesh/gnunet-service-mesh.c:4324
+msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:397
-msgid "# bytes purged (low-priority)"
+#: src/mesh/gnunet-service-mesh.c:4333
+msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:457
-msgid "Transmission to client failed!\n"
+#: src/hostlist/hostlist-client.c:286
+msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:610
-msgid "# results found"
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
+msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:655
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
 #, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
-"%llu bytes\n"
+msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:666
-#, c-format
-msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+#: src/hostlist/hostlist-client.c:330
+msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:670
-msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+#: 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/datastore/gnunet-service-datastore.c:676
-msgid "Insufficient space to satisfy request"
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:681
-#: src/datastore/gnunet-service-datastore.c:735
-#: src/datastore/gnunet-service-datastore.c:956
-#: src/datastore/gnunet-service-datastore.c:1441
-msgid "# reserved"
+#: src/hostlist/hostlist-client.c:622
+#, c-format
+msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:750
-msgid "Could not find matching reservation"
+#: 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/datastore/gnunet-service-datastore.c:838
+#: src/hostlist/hostlist-client.c:805
 #, c-format
-msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
+msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1004
-msgid "# GET requests received"
+#: src/hostlist/hostlist-client.c:822
+#, c-format
+msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1018
-msgid "# requests filtered by bloomfilter"
+#: src/hostlist/hostlist-client.c:842
+#, c-format
+msgid "%s failed for `%s' at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1046
-msgid "# UPDATE requests received"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1080
-msgid "# GET REPLICATION requests received"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1115
-msgid "# GET ZERO ANONYMITY requests received"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1142
-msgid "Content not found"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1152
-msgid "# bytes removed (explicit request)"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1186
-msgid "# REMOVE requests received"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1230
+#: src/hostlist/hostlist-client.c:848
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1303
-#: src/datastore/test_plugin_datastore.c:322
-#: src/datastore/perf_plugin_datastore.c:420
+#: src/hostlist/hostlist-client.c:856
 #, c-format
-msgid "Loading `%s' datastore plugin\n"
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1312
+#: src/hostlist/hostlist-client.c:909
 #, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
+msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1491
-msgid "# quota"
+#: src/hostlist/hostlist-client.c:917
+msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1493
-msgid "# cache size"
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/hostlist/hostlist-client.c:1054
 #, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1516
-msgid "Failed to initialize bloomfilter.\n"
+#: src/hostlist/hostlist-client.c:1092
+msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:241
-msgid "Template database running\n"
+#: src/hostlist/hostlist-client.c:1096
+#, c-format
+msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:287
-msgid "Failed to transmit request to drop database.\n"
+#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
+msgid "# active connections"
 msgstr ""
 
-#: src/datastore/datastore_api.c:370
-msgid "# queue entry timeouts"
+#: src/hostlist/hostlist-client.c:1253
+#, c-format
+msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:417
-msgid "# queue overflows"
+#: src/hostlist/hostlist-client.c:1284
+#, c-format
+msgid ""
+"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:444
-msgid "# queue entries created"
+#: src/hostlist/hostlist-client.c:1290
+#, c-format
+msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:465
-msgid "# Requests dropped from datastore queue"
+#: src/hostlist/hostlist-client.c:1294
+#, c-format
+msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:514
-msgid "# datastore connections (re)created"
-msgstr ""
-
-#: src/datastore/datastore_api.c:541
-msgid "# reconnected to DATASTORE"
-msgstr ""
-
-#: src/datastore/datastore_api.c:606
-msgid "Failed to transmit request to DATASTORE.\n"
-msgstr ""
-
-#: src/datastore/datastore_api.c:608
-msgid "# transmission request failures"
-msgstr ""
-
-#: src/datastore/datastore_api.c:631
-msgid "# bytes sent to datastore"
-msgstr ""
-
-#: src/datastore/datastore_api.c:768
-msgid "Failed to receive status response from database."
-msgstr ""
-
-#: src/datastore/datastore_api.c:781
-msgid "Error reading response from datastore service"
-msgstr ""
-
-#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
-msgid "Invalid error message received from datastore service"
-msgstr ""
-
-#: src/datastore/datastore_api.c:806
-msgid "# status messages received"
-msgstr ""
-
-#: src/datastore/datastore_api.c:878
-msgid "# PUT requests executed"
-msgstr ""
-
-#: src/datastore/datastore_api.c:950
-msgid "# RESERVE requests executed"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1015
-msgid "# RELEASE RESERVE requests executed"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1078
-msgid "# UPDATE requests executed"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1148
-msgid "# REMOVE requests executed"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1193
-msgid "Failed to receive response from database.\n"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1254
-msgid "# Results received"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1326
-msgid "# GET REPLICATION requests executed"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1393
-msgid "# GET ZERO ANONYMITY requests executed"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1457
-msgid "# GET requests executed"
-msgstr ""
-
-#: src/datastore/plugin_datastore_mysql.c:529
+#: src/hostlist/hostlist-client.c:1305
 #, c-format
-msgid "Failed to prepare statement `%s'\n"
+msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:622
+#: src/hostlist/hostlist-client.c:1338
 #, c-format
-msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
+msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1500
-msgid "Mysql database running\n"
+#: src/hostlist/hostlist-client.c:1340
+msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:173
+#: src/hostlist/hostlist-client.c:1373
 #, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
+msgid ""
+"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:979
-msgid "Postgres database running\n"
+#: src/hostlist/hostlist-client.c:1387
+#, c-format
+msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:159
+#: src/hostlist/hostlist-client.c:1392
 #, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
+msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/dv/dv_api.c:178
-msgid "Failed to connect to the dv service!\n"
-msgstr ""
-
-#: src/nse/gnunet-service-nse.c:866
+#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
 #, c-format
-msgid "Proof of work invalid: %llu!\n"
+msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1288 src/nse/gnunet-service-nse.c:1307
-#: src/nse/gnunet-service-nse.c:1328
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+#: src/hostlist/hostlist-client.c:1428
+msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1295
-msgid "Invalid work requirement for NSE service. Exiting.\n"
+#: src/hostlist/hostlist-client.c:1480
+msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1316
-msgid "NSE service could not access hostkey.  Exiting.\n"
+#: src/hostlist/hostlist-client.c:1483
+#, c-format
+msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:673
-msgid "Measure quality and performance of the NSE service."
+#: src/hostlist/hostlist-client.c:1492
+msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:920
-msgid "# total peer preference"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:1040
-msgid "# peer status changes"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:1236
-msgid "# send requests dropped (disconnected)"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:1712
+#: src/hostlist/hostlist-client.c:1504
 #, c-format
 msgid ""
-"Client asked for preference change with peer `%s', which is not connected!\n"
+"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1793 src/core/gnunet-service-core.c:4240
-#: src/core/gnunet-service-core.c:4456
-msgid "# established sessions"
+#: src/hostlist/hostlist-client.c:1508
+#, c-format
+msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1838
-msgid "# bytes encrypted"
+#: src/hostlist/gnunet-daemon-hostlist.c:257
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1964 src/core/gnunet-service-core.c:2793
-#: src/core/gnunet-service-core.c:4532
-msgid "# neighbour entries allocated"
+#: src/hostlist/gnunet-daemon-hostlist.c:310
+msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2031
-msgid "# encrypted bytes given to transport"
+#: src/hostlist/gnunet-daemon-hostlist.c:315
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2134
-msgid "# bytes decrypted"
+#: src/hostlist/gnunet-daemon-hostlist.c:318
+msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2314
-msgid "# transmissions delayed due to corking"
+#: src/hostlist/gnunet-daemon-hostlist.c:322
+msgid "provide a hostlist server"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2517
-msgid "# messages discarded (expired prior to transmission)"
+#: src/hostlist/gnunet-daemon-hostlist.c:334
+msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2857
-msgid "# messages discarded (disconnected)"
+#: src/hostlist/hostlist-server.c:134
+msgid "bytes in hostlist"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2909 src/core/gnunet-service-core.c:4644
-msgid "# discarded CORE_SEND requests"
+#: src/hostlist/hostlist-server.c:160
+msgid "expired addresses encountered"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2924 src/core/gnunet-service-core.c:4648
-msgid "# discarded lower priority CORE_SEND requests"
+#: src/hostlist/hostlist-server.c:208
+msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2996
-msgid "# connection requests received"
+#: src/hostlist/hostlist-server.c:224
+msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3008
-msgid "# connection requests ignored (already connected)"
+#: src/hostlist/hostlist-server.c:272
+#, c-format
+msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3054 src/core/gnunet-service-core.c:3697
-msgid "# SET_KEY messages deferred (need public key)"
+#: src/hostlist/hostlist-server.c:275
+msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3067
-msgid "# Delayed connecting due to lack of public key"
+#: src/hostlist/hostlist-server.c:283
+msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3099
-msgid "# Error extracting public key from HELLO"
+#: src/hostlist/hostlist-server.c:290
+#, c-format
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3145
-msgid "# Asking transport to connect (for SET_KEY)"
+#: src/hostlist/hostlist-server.c:294
+msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3270
-msgid "# SET_KEY and PING messages created"
+#: src/hostlist/hostlist-server.c:302
+msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3349
-#, c-format
-msgid ""
-"Ignoring `%s' message due to lack of public key for peer `%4s' (failed to "
-"obtain one).\n"
+#: src/hostlist/hostlist-server.c:305
+msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3444
-msgid "# PING messages decrypted"
+#: src/hostlist/hostlist-server.c:309
+msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3456
-#, c-format
-msgid ""
-"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
-"%s'\n"
+#: src/hostlist/hostlist-server.c:310
+msgid "hostlist requests processed"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3481
-msgid "# PONG messages created"
+#: src/hostlist/hostlist-server.c:353
+msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3534
-msgid "# PONG messages decrypted"
+#: src/hostlist/hostlist-server.c:400
+msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3572
-msgid "# Session keys confirmed via PONG"
+#: src/hostlist/hostlist-server.c:568
+#, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3706
+#: src/hostlist/hostlist-server.c:577
 #, c-format
-msgid "Received `%s' message that was for `%s', not for me.  Ignoring.\n"
+msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3748
-msgid "# SET_KEY messages decrypted"
+#: src/hostlist/hostlist-server.c:591
+#, c-format
+msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3894
+#: src/hostlist/hostlist-server.c:629
 #, c-format
-msgid "# bytes of messages of type %u received"
+msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3941
-msgid "# messages not delivered to any client"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:4011 src/core/gnunet-service-core.c:4036
-msgid "# bytes dropped (duplicates)"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:4023
-msgid "# bytes dropped (out of sequence)"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:4060
+#: src/peerinfo-tool/gnunet-peerinfo.c:222
 #, c-format
-msgid "Message received far too old (%llu ms). Content ignored.\n"
+msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4064
-msgid "# bytes dropped (ancient message)"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:4094
-msgid "# bytes of payload decrypted"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:4157
-msgid "# session keys received"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:4173
-msgid "# failed to decrypt message (no session key)"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:4229
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
 #, c-format
-msgid "Unsupported message of type %u received.\n"
+msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4403 src/core/gnunet-service-core.c:4485
-msgid "# peers connected (transport)"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:4599
-msgid "Core service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:4617
-msgid "Core service could not access hostkey.  Exiting.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:4656
+#: src/peerinfo-tool/gnunet-peerinfo.c:241
 #, c-format
-msgid "Core service of `%4s' ready.\n"
+msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/core/core_api.c:832
-msgid "Client was disconnected from core service, trying to reconnect.\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:261
+msgid "output only the identity strings"
 msgstr ""
 
-#: src/include/gnunet_common.h:296 src/include/gnunet_common.h:301
-#: src/include/gnunet_common.h:307
-#, c-format
-msgid "Assertion failed at %s:%d.\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
+msgid "output our own identity only"
 msgstr ""
 
-#: src/include/gnunet_common.h:317
-#, c-format
-msgid "External protocol violation detected at %s:%d.\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:270
+msgid "Print information about peers."
 msgstr ""
 
-#: src/include/gnunet_common.h:331
-#, c-format
-msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
-msgstr ""
-
 #: src/include/gnunet_getopt_lib.h:144
 msgid "print this help"
 msgstr ""
@@ -4744,3 +4399,19 @@
 #: src/include/gnunet_getopt_lib.h:190
 msgid "use configuration file FILENAME"
 msgstr ""
+
+#: src/include/gnunet_common.h:352 src/include/gnunet_common.h:357
+#: src/include/gnunet_common.h:363
+#, c-format
+msgid "Assertion failed at %s:%d.\n"
+msgstr ""
+
+#: src/include/gnunet_common.h:373
+#, c-format
+msgid "External protocol violation detected at %s:%d.\n"
+msgstr ""
+
+#: src/include/gnunet_common.h:394 src/include/gnunet_common.h:401
+#, c-format
+msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
+msgstr ""

Modified: gnunet/po/sv.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2011-10-30 18:21:10 UTC (rev 17862)
+++ gnunet/po/sv.po     2011-10-30 18:28:26 UTC (rev 17863)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-09-19 13:28+0200\n"
+"POT-Creation-Date: 2011-10-30 19:19+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,2150 +16,2025 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/fragmentation/defragmentation.c:270
-msgid "# acknowledgements sent for fragment"
-msgstr ""
+#: 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/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:90 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:380
+#: src/include/gnunet_common.h:387
+#, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/fragmentation/defragmentation.c:454
-#, fuzzy
-msgid "# fragments received"
-msgstr "# byte mottogs via TCP"
+#: src/datastore/plugin_datastore_sqlite.c:61
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%u with error: %s"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/fragmentation/defragmentation.c:513
-#, fuzzy
-msgid "# duplicate fragments received"
-msgstr "# byte mottogs via TCP"
+#: src/datastore/plugin_datastore_sqlite.c:239
+#, fuzzy, c-format
+msgid "Option `%s' in section `%s' missing in configuration!\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/fragmentation/defragmentation.c:532
-msgid "# messages defragmented"
+#: 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:420
+#: src/datacache/plugin_datacache_sqlite.c:471
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:183
-#, fuzzy
-msgid "# fragments transmitted"
-msgstr "# byte skickade av typen %d"
-
-#: src/fragmentation/fragmentation.c:186
-#, fuzzy
-msgid "# fragments retransmitted"
-msgstr "# byte skickade av typen %d"
-
-#: src/fragmentation/fragmentation.c:248
-msgid "# messages fragmented"
+#: src/datastore/plugin_datastore_sqlite.c:677
+msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:251
-msgid "# total size of fragmented messages"
+#: src/datastore/plugin_datastore_sqlite.c:1130
+msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:335
-msgid "# fragment acknowledgements received"
+#: src/datastore/plugin_datastore_sqlite.c:1149
+#, c-format
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:341
-msgid "# bits removed from fragmentation ACKs"
+#: src/datastore/plugin_datastore_sqlite.c:1188
+msgid "Sqlite database running\n"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:365
-#, fuzzy
-msgid "# fragmentation transmissions completed"
-msgstr "# klartext PONG-meddelanden mottagna"
-
-#: src/nat/nat.c:778
+#: src/datastore/plugin_datastore_mysql.c:316
+#: src/datacache/plugin_datacache_mysql.c:224
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
-msgstr ""
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 
-#: src/nat/nat.c:828
+#: src/datastore/plugin_datastore_mysql.c:322
+#: src/datacache/plugin_datacache_mysql.c:230
 #, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "Misslyckades att starta samling.\n"
+msgid "Could not access file `%s': %s\n"
+msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/nat/nat.c:1096
+#: src/datastore/plugin_datastore_mysql.c:529
 #, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "Kunde inte spara konfiguration!"
+msgid "Failed to prepare statement `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/nat/nat.c:1158 src/nat/nat.c:1168
-#, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
-msgstr ""
+#: src/datastore/plugin_datastore_mysql.c:622
+#, 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/nat/nat.c:1300
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+#: src/datastore/plugin_datastore_mysql.c:1500
+msgid "Mysql database running\n"
 msgstr ""
 
-#: src/nat/nat.c:1312
-#, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
-msgstr ""
+#: src/datastore/plugin_datastore_postgres.c:93
+#: src/datacache/plugin_datacache_postgres.c:79
+#, fuzzy, c-format
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\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/datastore/plugin_datastore_postgres.c:173
+#, fuzzy, c-format
+msgid "Unable to initialize Postgres with configuration `%s': %s"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/nat/gnunet-nat-server.c:328
-msgid "GNUnet NAT traversal test helper daemon"
+#: src/datastore/plugin_datastore_postgres.c:979
+msgid "Postgres database running\n"
 msgstr ""
 
-#: src/nat/nat_test.c:349
+#: src/datastore/datastore_api.c:289
 #, fuzzy
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "Failed to transmit request to drop database.\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/nat/nat_test.c:419
-#, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+#: src/datastore/datastore_api.c:372
+msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1279 src/template/gnunet-template.c:68
-#: src/core/test_core_api_send_to_self.c:217
-#, fuzzy
-msgid "help text"
-msgstr "hjälptext för -t"
-
-#: src/vpn/gnunet-daemon-exit.c:1493
-msgid "Daemon to run to provide an IP exit node for the VPN"
+#: src/datastore/datastore_api.c:418
+msgid "# queue overflows"
 msgstr ""
 
-#: src/datacache/datacache.c:108 src/datacache/datacache.c:236
-#: src/datastore/gnunet-service-datastore.c:824
+#: src/datastore/datastore_api.c:445
 #, fuzzy
-msgid "# bytes stored"
-msgstr "# byte krypterade"
+msgid "# queue entries created"
+msgstr "# PING-meddelanden skapade"
 
-#: src/datacache/datacache.c:134 src/datacache/datacache.c:142
-#: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486
-#: src/datastore/test_plugin_datastore.c:192
-#: src/datastore/test_plugin_datastore.c:315
-#: src/datastore/perf_plugin_datastore.c:309
-#: src/datastore/perf_plugin_datastore.c:413
-#, fuzzy, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
-
-#: src/datacache/datacache.c:167
-#, c-format
-msgid "Loading `%s' datacache plugin\n"
+#: src/datastore/datastore_api.c:465
+msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/datacache/datacache.c:176
-#, 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:262
+#: src/datastore/datastore_api.c:513
 #, fuzzy
-msgid "# requests received"
-msgstr "# byte mottogs via TCP"
+msgid "# datastore connections (re)created"
+msgstr "Nätverksanslutning"
 
-#: src/datacache/datacache.c:268
-msgid "# requests filtered by bloom filter"
+#: src/datastore/datastore_api.c:540
+msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/datacache/plugin_datacache_template.c:121
-msgid "Template datacache running\n"
+#: src/datastore/datastore_api.c:605
+msgid "Failed to transmit request to DATASTORE.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:66
-#: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:122
-#: src/datacache/plugin_datacache_sqlite.c:191
-#: src/datacache/plugin_datacache_sqlite.c:232
-#: src/datacache/plugin_datacache_sqlite.c:295
-#: src/datacache/plugin_datacache_sqlite.c:304
-#: src/datacache/plugin_datacache_sqlite.c:315
-#: src/datacache/plugin_datacache_sqlite.c:322
-#: src/datacache/plugin_datacache_sqlite.c:332
-#: src/datacache/plugin_datacache_sqlite.c:340
-#: src/datacache/plugin_datacache_sqlite.c:348
-#: 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/util/crypto_rsa.c:84
-#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:581
-#: src/dht/plugin_dhtlog_mysql.c:590 src/dht/plugin_dhtlog_mysql.c:648
-#: src/dht/plugin_dhtlog_mysql.c:663
-#: 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/include/gnunet_common.h:324
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+#: src/datastore/datastore_api.c:607
+#, fuzzy
+msgid "# transmission request failures"
+msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/datacache/plugin_datacache_sqlite.c:413
-msgid "Sqlite datacache running\n"
-msgstr ""
+#: src/datastore/datastore_api.c:630
+#, fuzzy
+msgid "# bytes sent to datastore"
+msgstr "# byte krypterade"
 
-#: src/datacache/plugin_datacache_sqlite.c:446
-#: src/datastore/plugin_datastore_sqlite.c:420
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
-msgstr ""
+#: src/datastore/datastore_api.c:767
+#, fuzzy
+msgid "Failed to receive status response from database."
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\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/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"
+#: src/datastore/datastore_api.c:780
+msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:224
-#: src/datastore/plugin_datastore_mysql.c:316
-#, 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/datastore/datastore_api.c:792 src/datastore/datastore_api.c:798
+#, fuzzy
+msgid "Invalid error message received from datastore service"
+msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: 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/datastore/datastore_api.c:804
+#, fuzzy
+msgid "# status messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/datacache/plugin_datacache_mysql.c:979
-msgid "MySQL datacache running\n"
+#: src/datastore/datastore_api.c:875
+msgid "# PUT requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:1903 src/testing/testing_group.c:1915
-#: src/testing/testing_group.c:2016 src/testing/testing_group.c:2075
-#: src/testing/testing_group.c:2164 src/testing/testing_group.c:2184
-#: src/testing/testing_group.c:2321 src/testing/test_testing_topology.c:1078
-#: src/testing/test_testing_topology_blacklist.c:448
-#: src/testing/testing_peergroup.c:876
-#: src/testing/test_testing_large_topology.c:1022
-#: src/dht/test_dht_multipeer.c:864 src/dht/gnunet-dht-driver.c:3897
-#: src/dv/test_transport_api_dv.c:1132
-#, c-format
-msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+#: src/datastore/datastore_api.c:946
+msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:1925
-#, fuzzy, c-format
-msgid "Target is %d connections per peer."
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/testing/testing_group.c:2172
-#, c-format
-msgid ""
-"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
-"greater than 0\n"
+#: src/datastore/datastore_api.c:1011
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:2202 src/testing/testing_group.c:2395
-#, c-format
-msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
+#: src/datastore/datastore_api.c:1072
+msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:2239
-#, c-format
-msgid "natural log of %d is %d, will run %d iterations\n"
+#: src/datastore/datastore_api.c:1140
+msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:2242
-#, c-format
-msgid "Total connections added thus far: %u!\n"
-msgstr ""
+#: src/datastore/datastore_api.c:1185
+#, fuzzy
+msgid "Failed to receive response from database.\n"
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/testing/testing_group.c:2283
-#, c-format
-msgid "Total connections added for small world: %d!\n"
-msgstr ""
+#: src/datastore/datastore_api.c:1245
+#, fuzzy
+msgid "# Results received"
+msgstr "# byte mottogs via TCP"
 
-#: src/testing/testing_group.c:2335
-#, c-format
-msgid "rand is %f probability is %f\n"
+#: src/datastore/datastore_api.c:1316
+msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:2910 src/testing/testing_group.c:3109
-#, c-format
-msgid ""
-"No `%s' specified in peer configuration in section `%s', cannot copy friends "
-"file!\n"
+#: src/datastore/datastore_api.c:1383
+msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:3011
-msgid "Finished copying all friend files!\n"
+#: src/datastore/datastore_api.c:1447
+msgid "# GET requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:3124
-#, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/testing/testing_group.c:3147
-#, c-format
-msgid "Copying file with command scp %s %s\n"
+#: src/datastore/plugin_datastore_template.c:241
+msgid "Template database running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3164
-#, c-format
-msgid "Checking copy status of file %d\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:52
+#, fuzzy
+msgid "# bytes used in file-sharing datastore"
+msgstr "# byte krypterade"
 
-#: src/testing/testing_group.c:3182
-#, c-format
-msgid "File %d copied\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:331
+#, fuzzy
+msgid "# bytes expired"
+msgstr "# byte mottogs via TCP"
 
-#: src/testing/testing_group.c:3197
-msgid "Finished copying all blacklist files!\n"
+#: src/datastore/gnunet-service-datastore.c:397
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/testing/testing_group.c:3580 src/testing/testing_group.c:3717
-#: src/testing/testing_group.c:4925 src/testing/testing_group.c:5066
-msgid "Delaying connect, we have too many outstanding connections!\n"
+#: src/datastore/gnunet-service-datastore.c:457
+msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3590 src/testing/testing_group.c:4935
-#: src/testing/testing_group.c:5076
-#, c-format
-msgid "Creating connection, outstanding_connections is %d\n"
+#: src/datastore/gnunet-service-datastore.c:610
+msgid "# results found"
 msgstr ""
 
-#: src/testing/testing_group.c:3602
+#: src/datastore/gnunet-service-datastore.c:655
 #, c-format
-msgid "Offering Hello of peer %s to peer %s\n"
+msgid ""
+"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3728
+#: src/datastore/gnunet-service-datastore.c:666
 #, c-format
-msgid "Creating connection, outstanding_connections is %d (max %d)\n"
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3983
-msgid "Creating clique topology\n"
+#: src/datastore/gnunet-service-datastore.c:670
+msgid ""
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/testing/testing_group.c:3990
-msgid "Creating small world (ring) topology\n"
+#: src/datastore/gnunet-service-datastore.c:676
+msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/testing/testing_group.c:3997
-msgid "Creating small world (2d-torus) topology\n"
+#: src/datastore/gnunet-service-datastore.c:681
+#: src/datastore/gnunet-service-datastore.c:735
+#: src/datastore/gnunet-service-datastore.c:956
+#: src/datastore/gnunet-service-datastore.c:1441
+msgid "# reserved"
 msgstr ""
 
-#: src/testing/testing_group.c:4003
-msgid "Creating ring topology\n"
+#: src/datastore/gnunet-service-datastore.c:750
+msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/testing/testing_group.c:4009
-msgid "Creating 2d torus topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:119
+#: src/datacache/datacache.c:250
+#, fuzzy
+msgid "# bytes stored"
+msgstr "# byte krypterade"
 
-#: src/testing/testing_group.c:4015
-msgid "Creating Erdos-Renyi topology\n"
+#: src/datastore/gnunet-service-datastore.c:838
+#, c-format
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4021
-msgid "Creating InterNAT topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1004
+#, fuzzy
+msgid "# GET requests received"
+msgstr "# byte mottogs via TCP"
 
-#: src/testing/testing_group.c:4027
-msgid "Creating Scale Free topology\n"
+#: src/datastore/gnunet-service-datastore.c:1018
+msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/testing/testing_group.c:4034
-msgid "Creating straight line topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1046
+#, fuzzy
+msgid "# UPDATE requests received"
+msgstr "# byte mottogs via TCP"
 
-#: src/testing/testing_group.c:4040
-msgid "Creating topology from file!\n"
+#: src/datastore/gnunet-service-datastore.c:1080
+msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/testing/testing_group.c:4058
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
+#: src/datastore/gnunet-service-datastore.c:1115
+msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/testing/testing_group.c:4075
-msgid "Failed during friend file copying!\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1142
+#, fuzzy
+msgid "Content not found"
+msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/testing/testing_group.c:4083
-msgid "Friend files created/copied successfully!\n"
+#: src/datastore/gnunet-service-datastore.c:1152
+msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/testing/testing_group.c:4102
-msgid "Blacklisting all but clique topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1186
+#, fuzzy
+msgid "# REMOVE requests received"
+msgstr "# byte mottogs via TCP"
 
-#: src/testing/testing_group.c:4110
-msgid "Blacklisting all but small world (ring) topology\n"
+#: src/datastore/gnunet-service-datastore.c:1230
+#, c-format
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4118
-msgid "Blacklisting all but small world (2d-torus) topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1295
+#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:145
+#: src/datacache/datacache.c:152
+#, fuzzy, c-format
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/testing/testing_group.c:4126
-msgid "Blacklisting all but ring topology\n"
+#: src/datastore/gnunet-service-datastore.c:1303
+#, c-format
+msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4134
-msgid "Blacklisting all but 2d torus topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1312
+#, fuzzy, c-format
+msgid "Failed to load datastore plugin for `%s'\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/testing/testing_group.c:4142
-msgid "Blacklisting all but Erdos-Renyi topology\n"
+#: src/datastore/gnunet-service-datastore.c:1491
+msgid "# quota"
 msgstr ""
 
-#: src/testing/testing_group.c:4150
-msgid "Blacklisting all but InterNAT topology\n"
+#: src/datastore/gnunet-service-datastore.c:1493
+msgid "# cache size"
 msgstr ""
 
-#: src/testing/testing_group.c:4187
-msgid "Blacklisting all but Scale Free topology\n"
+#: src/datastore/gnunet-service-datastore.c:1503
+#, c-format
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4195
-msgid "Blacklisting all but straight line topology\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1516
+#, fuzzy
+msgid "Failed to initialize bloomfilter.\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/testing/testing_group.c:4212
-msgid "Failed during blacklist file copying!\n"
+#: src/core/gnunet-service-core_sessions.c:204
+#: src/core/gnunet-service-core_sessions.c:275
+msgid "# entries in session map"
 msgstr ""
 
-#: src/testing/testing_group.c:4220
-msgid "Blacklist files created/copied successfully!\n"
+#: src/core/gnunet-service-core_sessions.c:236
+msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/testing/testing_group.c:5301
-msgid "Creating clique CONNECT topology\n"
+#: src/core/gnunet-service-core_sessions.c:360
+msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/testing/testing_group.c:5308
-msgid "Creating small world (ring) CONNECT topology\n"
+#: src/core/gnunet-service-core_sessions.c:427
+msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/testing/testing_group.c:5315
-msgid "Creating small world (2d-torus) CONNECT topology\n"
-msgstr ""
+#: src/core/gnunet-core-list-connections.c:77
+#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#, fuzzy, c-format
+msgid "Peer `%s'\n"
+msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/testing/testing_group.c:5321
-msgid "Creating ring CONNECT topology\n"
-msgstr ""
+#: src/core/gnunet-core-list-connections.c:167
+#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#, fuzzy, c-format
+msgid "Invalid command line argument `%s'\n"
+msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/testing/testing_group.c:5328
-msgid "Creating 2d torus CONNECT topology\n"
+#: src/core/gnunet-core-list-connections.c:188
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+msgid "don't resolve host names"
 msgstr ""
 
-#: src/testing/testing_group.c:5335
-msgid "Creating Erdos-Renyi CONNECT topology\n"
-msgstr ""
+#: src/core/gnunet-core-list-connections.c:195
+#, fuzzy
+msgid "Print information about connected peers."
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/testing/testing_group.c:5342
-msgid "Creating InterNAT CONNECT topology\n"
-msgstr ""
+#: src/core/gnunet-service-core_clients.c:452
+#, fuzzy
+msgid "# messages discarded (session disconnected)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/testing/testing_group.c:5349
-msgid "Creating Scale Free CONNECT topology\n"
-msgstr ""
+#: src/core/gnunet-service-core_clients.c:796
+#, fuzzy, c-format
+msgid "# bytes of messages of type %u received"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/testing/testing_group.c:5356
-msgid "Creating straight line CONNECT topology\n"
+#: src/core/gnunet-service-core.c:101
+#, c-format
+msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5362
-msgid "Creating no CONNECT topology\n"
-msgstr ""
+#: src/core/gnunet-service-core_typemap.c:111
+#: src/core/gnunet-service-core_typemap.c:124
+#, fuzzy
+msgid "# type maps received"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/testing/testing_group.c:5368
-msgid "Unknown topology specification, can't connect peers!\n"
+#: src/core/gnunet-service-core_typemap.c:156
+msgid "# updates to my type map"
 msgstr ""
 
-#: src/testing/testing_group.c:5378
-#, c-format
-msgid "Connecting random subset (%'.2f percent) of possible peers\n"
-msgstr ""
+#: src/core/gnunet-service-core_neighbours.c:162
+#, fuzzy
+msgid "# sessions terminated by transport disconnect"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/testing/testing_group.c:5386
-#, c-format
-msgid "Connecting a minimum of %u peers each (if possible)\n"
+#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:343
+msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/testing/testing_group.c:5395
-#, c-format
-msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
+#: src/core/gnunet-service-core_neighbours.c:251
+msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/testing/testing_group.c:5405
+#: src/core/gnunet-service-core_neighbours.c:432
 #, c-format
-msgid "Finding additional %u closest peers each (if possible)\n"
+msgid "Unsupported message of type %u received.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6084
-#, fuzzy
-msgid "Could not read hostkeys file!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
+#: src/core/gnunet-service-core_kx.c:491
+msgid "# bytes encrypted"
+msgstr "# byte krypterade"
 
-#: src/testing/testing_group.c:6154
-#, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:541
+msgid "# bytes decrypted"
+msgstr "# byte dekrypterade"
 
-#: src/testing/testing_group.c:6298 src/testing/testing.c:1273
-#, c-format
-msgid "Could not start `%s' process to copy configuration directory.\n"
+#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3000
+#: src/hostlist/hostlist-server.c:439 src/peerinfo-tool/gnunet-peerinfo.c:157
+#, fuzzy, c-format
+msgid "Error in communication with PEERINFO service\n"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/core/gnunet-service-core_kx.c:618
+msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/testing/testing.c:209
-msgid "`scp' does not seem to terminate (timeout copying config).\n"
+#: src/core/gnunet-service-core_kx.c:669
+msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/testing/testing.c:223 src/testing/testing.c:823
-#, fuzzy
-msgid "`scp' did not complete cleanly.\n"
-msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
-
-#: src/testing/testing.c:246
-msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+#: src/core/gnunet-service-core_kx.c:693
+msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/testing/testing.c:247
+#: src/core/gnunet-service-core_kx.c:746
 #, fuzzy
-msgid "Failed to create pipe for `ssh' process.\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "# session keys received"
+msgstr "# sessionnycklar vägrade"
 
-#: src/testing/testing.c:303
+#: src/core/gnunet-service-core_kx.c:764
 #, fuzzy, c-format
-msgid "Could not start `%s' process to create hostkey.\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
+msgid "`%s' is for `%s', not for me.  Ignoring.\n"
+msgstr "storlek på \"%s\" meddelande är för litet. Ignorerar.\n"
 
-#: src/testing/testing.c:310
+#: src/core/gnunet-service-core_kx.c:803
 #, fuzzy
-msgid "Failed to start `gnunet-peerinfo' process.\n"
-msgstr "Misslyckades att starta samling.\n"
+msgid "# SET_KEY messages decrypted"
+msgstr "# PING-meddelanden skapade"
 
-#: src/testing/testing.c:311 src/testing/testing.c:509
+#: src/core/gnunet-service-core_kx.c:884
+#: src/transport/gnunet-service-transport_validation.c:601
 #, fuzzy
-msgid "Failed to start `ssh' process.\n"
-msgstr "Misslyckades att starta samling.\n"
+msgid "# PING messages received"
+msgstr "# PING-meddelanden skapade"
 
-#: src/testing/testing.c:373
+#: src/core/gnunet-service-core_kx.c:918
 #, c-format
-msgid "Error reading from gnunet-peerinfo: %s\n"
+msgid ""
+"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
+"%s'\n"
 msgstr ""
 
-#: src/testing/testing.c:377
-msgid "Malformed output from gnunet-peerinfo!\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:941
+#, fuzzy
+msgid "# PONG messages created"
+msgstr "# PING-meddelanden skapade"
 
-#: src/testing/testing.c:387
+#: src/core/gnunet-service-core_kx.c:1029
 #, fuzzy
-msgid "`Failed to get hostkey!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
+msgid "# sessions terminated by timeout"
+msgstr "# byte kastade via TCP (utgående)"
 
-#: src/testing/testing.c:421
-msgid "`Failed while waiting for topology setup!\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1042
+#, fuzzy
+msgid "# keepalive messages sent"
+msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/testing/testing.c:501
-#, c-format
-msgid "Could not start `%s' process to start GNUnet.\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1098
+#: src/transport/gnunet-service-transport_validation.c:934
+#, fuzzy
+msgid "# PONG messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/testing/testing.c:508
+#: src/core/gnunet-service-core_kx.c:1128
 #, fuzzy
-msgid "Failed to start `gnunet-arm' process.\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "# PONG messages decrypted"
+msgstr "# PING-meddelanden skapade"
 
-#: src/testing/testing.c:532 src/testing/testing.c:631
-msgid "`gnunet-arm' does not seem to terminate.\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1161
+#, fuzzy
+msgid "# session keys confirmed via PONG"
+msgstr "# sessionnycklar vägrade"
 
-#: src/testing/testing.c:533 src/testing/testing.c:632
-#: src/testing/testing.c:652
-msgid "`ssh' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing/testing.c:572 src/testing/testing.c:2074
-#: src/testing/testing.c:2093
+#: src/core/gnunet-service-core_kx.c:1224
 #, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "# SET_KEY and PING messages created"
+msgstr "# PING-meddelanden skapade"
 
-#: src/testing/testing.c:601
-msgid "Unable to get HELLO for peer!\n"
+#: src/core/gnunet-service-core_kx.c:1372
+msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/testing/testing.c:651
-msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1416
+#: src/core/gnunet-service-core_kx.c:1441
+#, fuzzy
+msgid "# bytes dropped (duplicates)"
+msgstr "# byte kastade via UDP (utgående)"
 
-#: src/testing/testing.c:674 src/testing/testing.c:708
-msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1428
+#, fuzzy
+msgid "# bytes dropped (out of sequence)"
+msgstr "# byte kastade via UDP (utgående)"
 
-#: src/testing/testing.c:689 src/testing/testing.c:738
-msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
-msgstr ""
-
-#: src/testing/testing.c:811
-msgid "`scp' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing/testing.c:989
+#: src/core/gnunet-service-core_kx.c:1465
 #, fuzzy, c-format
-msgid "Starting service %s for peer `%4s'\n"
-msgstr "Startade samling \"%s\".\n"
+msgid "Message received far too old (%llu ms). Content ignored.\n"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/testing/testing.c:1361 src/testing/testing.c:1444
-#: src/testing/testing.c:1582
-#, fuzzy, c-format
-msgid "Terminating peer `%4s'\n"
-msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
-
-#: src/testing/testing.c:1534
-#, fuzzy, c-format
-msgid "Setting d->dead on peer `%4s'\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/testing/testing.c:1669
-msgid "Peer not yet running, can not change configuration at this point."
-msgstr ""
-
-#: src/testing/testing.c:1677
+#: src/core/gnunet-service-core_kx.c:1469
 #, fuzzy
-msgid "Failed to write new configuration to disk."
-msgstr "Kunde inte spara konfiguration!"
+msgid "# bytes dropped (ancient message)"
+msgstr "# byte kastade via UDP (utgående)"
 
-#: src/testing/testing.c:1708
-#, c-format
-msgid "Could not start `%s' process to copy configuration file.\n"
-msgstr ""
-
-#: src/testing/testing.c:1711
+#: src/core/gnunet-service-core_kx.c:1477
 #, fuzzy
-msgid "Failed to copy new configuration to remote machine."
-msgstr "Kunde inte spara konfiguration!"
+msgid "# bytes of payload decrypted"
+msgstr "# byte dekrypterade"
 
-#: src/testing/testing.c:1883
+#: src/core/gnunet-service-core_kx.c:1541
 #, fuzzy
-msgid "Peers failed to connect"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "GNUnet-konfiguration"
 
-#: src/testing/testing.c:2038
-#, fuzzy
-msgid "Failed to connect to core service of first peer!\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/testing/testing.c:2238
-msgid "Peers are not fully running yet, can not connect!\n"
+#: src/core/gnunet-service-core_kx.c:1549
+msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:136
+#: src/core/gnunet-service-core_kx.c:1559
+#: src/transport/gnunet-service-transport.c:542
+#: src/hostlist/hostlist-server.c:558 src/peerinfo-tool/gnunet-peerinfo.c:208
 #, fuzzy, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Tillgängliga transport(er): %s\n"
+msgid "Could not access PEERINFO service.  Exiting.\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:197
-msgid "# peers known"
+#: src/core/core_api.c:798
+msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:241
+#: src/vpn/gnunet-daemon-exit.c:1500
+msgid "Daemon to run to provide an IP exit node for the VPN"
+msgstr ""
+
+#: src/vpn/gnunet-daemon-vpn.c:1292
+#, fuzzy
+msgid "help text"
+msgstr "hjälptext för -t"
+
+#: src/util/getopt_helpers.c:84
 #, c-format
 msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+"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/peerinfo/gnunet-service-peerinfo.c:306
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:287
 #, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr ""
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:257
-#, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
+#: src/util/common_logging.c:242 src/util/common_logging.c:838
+msgid "DEBUG"
+msgstr "FELSÖKNING"
 
-#: src/peerinfo/test_peerinfo_api.c:109 src/hostlist/hostlist-server.c:437
-#: src/peerinfo-tool/gnunet-peerinfo.c:157 src/dv/gnunet-service-dv.c:2998
-#: src/core/gnunet-service-core.c:3034 src/core/gnunet-service-core.c:3328
-#, fuzzy, c-format
-msgid "Error in communication with PEERINFO service\n"
-msgstr "Skriv ut information om GNUnets motparter."
+#: src/util/common_logging.c:244 src/util/common_logging.c:836
+msgid "INFO"
+msgstr "INFO"
 
-#: src/peerinfo/peerinfo_api.c:276
-#, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+#: src/util/common_logging.c:246 src/util/common_logging.c:834
+msgid "WARNING"
+msgstr "VARNING"
 
-#: src/peerinfo/peerinfo_api.c:432
-#, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+#: src/util/common_logging.c:248 src/util/common_logging.c:832
+msgid "ERROR"
+msgstr "FEL"
 
-#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
-#, fuzzy
-msgid "Received invalid message from `PEERINFO' service.\n"
-msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
+#: src/util/common_logging.c:250 src/util/common_logging.c:840
+msgid "NONE"
+msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:521
-#, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+#: src/util/common_logging.c:554
+#, fuzzy, c-format
+msgid "Failed to create or access directory for log file `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/peerinfo/peerinfo_api.c:555
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+#: src/util/common_logging.c:672
+#, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:259
-#: src/hostlist/hostlist-client.c:622
-#, c-format
-msgid "# advertised URI `%s' downloaded"
+#: src/util/common_logging.c:841
+msgid "INVALID"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:274
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1338
-msgid "# advertised hostlist URIs"
+#: src/util/common_logging.c:923
+msgid "unknown address"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:286
-#: src/hostlist/hostlist-server.c:353
-msgid "# hostlist advertisements send"
+#: src/util/common_logging.c:961
+msgid "invalid address"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:389
+#: src/util/plugin.c:89
 #, c-format
-msgid "Hostlist file `%s' was removed\n"
-msgstr ""
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:253
-msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
-msgstr ""
+#: 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/hostlist/gnunet-daemon-hostlist.c:286
-#: src/topology/gnunet-daemon-topology.c:1315
-#: src/topology/gnunet-daemon-topology.c:1322 src/fs/gnunet-service-fs.c:519
+#: src/util/plugin.c:219
 #, fuzzy, c-format
-msgid "Failed to connect to `%s' service.\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:306
-msgid "advertise our hostlist to other peers"
-msgstr ""
+#: src/util/configuration.c:249
+#, 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/gnunet-daemon-hostlist.c:311
+#: src/util/configuration.c:812
+#, c-format
 msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:314
-msgid "enable learning about hostlist servers from other peers"
-msgstr ""
+#: src/util/getopt.c:670
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:318
-msgid "provide a hostlist server"
-msgstr ""
+#: src/util/getopt.c:695
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:330
-msgid "GNUnet hostlist server and client"
-msgstr ""
+#: 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/hostlist/hostlist-server.c:134
-#, fuzzy
-msgid "bytes in hostlist"
-msgstr "# byte krypterade"
+#: src/util/getopt.c:720 src/util/getopt.c:889
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: flagga \"%s\" kräver ett argument\n"
 
-#: src/hostlist/hostlist-server.c:160
-msgid "expired addresses encountered"
-msgstr ""
+#: src/util/getopt.c:749
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: src/hostlist/hostlist-server.c:187
-#: src/topology/gnunet-daemon-topology.c:900
-#, fuzzy, c-format
-msgid "Error in communication with PEERINFO service: %s\n"
-msgstr "Skriv ut information om GNUnets motparter."
+#: src/util/getopt.c:753
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: src/hostlist/hostlist-server.c:208
-msgid "HELLOs without addresses encountered (ignored)"
-msgstr ""
+#: src/util/getopt.c:778
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: otillåten flagga -- %c\n"
 
-#: src/hostlist/hostlist-server.c:224
-msgid "bytes not included in hostlist (size limit)"
-msgstr ""
+#: src/util/getopt.c:780
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ogiltig flagga -- %c\n"
 
-#: src/hostlist/hostlist-server.c:272
+#: src/util/getopt.c:808 src/util/getopt.c:938
 #, c-format
-msgid "Refusing `%s' request to hostlist server\n"
-msgstr ""
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flagga kräver ett argument -- %c\n"
 
-#: src/hostlist/hostlist-server.c:275
-msgid "hostlist requests refused (not HTTP GET)"
-msgstr ""
+#: src/util/getopt.c:856
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: flagga \"-W %s\" är tvetydig\n"
 
-#: src/hostlist/hostlist-server.c:283
-msgid "Sending 100 CONTINUE reply\n"
-msgstr ""
+#: src/util/getopt.c:874
+#, 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/hostlist/hostlist-server.c:290
+#: src/util/getopt.c:1042
 #, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\n"
-msgstr ""
+msgid "Use --help to get a list of options.\n"
+msgstr "Använd --help för att få en lista på flaggor.\n"
 
-#: src/hostlist/hostlist-server.c:294
-msgid "hostlist requests refused (upload data)"
+#: src/util/scheduler.c:863
+msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
-msgid "Could not handle hostlist request since I do not have a response yet\n"
+#: src/util/scheduler.c:994
+#, c-format
+msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:305
-msgid "hostlist requests refused (not ready)"
-msgstr ""
+#: src/util/connection.c:462
+#, fuzzy, c-format
+msgid "Access denied to `%s'\n"
+msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/hostlist/hostlist-server.c:309
-msgid "Received request for our hostlist\n"
+#: src/util/connection.c:477
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:310
-msgid "hostlist requests processed"
-msgstr ""
+#: src/util/connection.c:646
+#, 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/hostlist/hostlist-server.c:398
-msgid "Advertisement message could not be queued by core\n"
-msgstr ""
-
-#: src/hostlist/hostlist-server.c:556
-#: src/transport/gnunet-service-transport.c:462
-#: src/peerinfo-tool/gnunet-peerinfo.c:208 src/core/gnunet-service-core.c:4607
+#: src/util/connection.c:858 src/util/connection.c:1034
 #, fuzzy, c-format
-msgid "Could not access PEERINFO service.  Exiting.\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+msgid "Trying to connect to `%s' (%p)\n"
+msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/hostlist/hostlist-server.c:566
+#: src/util/connection.c:869
 #, fuzzy, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
-msgstr "Ogiltiga argument. Avslutar.\n"
+msgid "Failed to connect to `%s' (%p)\n"
+msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/hostlist/hostlist-server.c:575
-#, c-format
-msgid "Hostlist service starts on %s:%llu\n"
-msgstr ""
-
-#: src/hostlist/hostlist-server.c:589
+#: src/util/connection.c:1024
 #, fuzzy, c-format
-msgid "Address to obtain hostlist: `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Attempt to connect to `%s' failed\n"
+msgstr " Anslutning misslyckades\n"
 
-#: src/hostlist/hostlist-server.c:627
+#: src/util/connection.c:1540
 #, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
+msgid ""
+"Could not satisfy pending transmission request, socket closed or connect "
+"failed (%p).\n"
 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
+#: src/util/connection.c:1576
 #, fuzzy, c-format
-msgid "Invalid `%s' message received from hostlist at `%s'\n"
-msgstr "Ogiltigt meddelande mottogs den %s:%d."
+msgid "Failed to send to `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: 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 "No `%s' specified in `%s' configuration, will not bootstrap.\n"
-msgstr ""
-
-#: 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/test_plugin_transport_https.c:829
-#: src/transport/test_plugin_transport_https.c:837
-#: src/transport/plugin_transport_http.c:2059
-#: src/transport/plugin_transport_http.c:2067
-#: src/transport/test_plugin_transport_http.c:795
-#: src/transport/test_plugin_transport_http.c:803
+#: src/util/signal.c:81
 #, fuzzy, c-format
-msgid "%s failed at %s:%d: `%s'\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+msgid "signal (%d, %p) returned %d.\n"
+msgstr "Anrop till \"%s\" returnerade %d.\n"
 
-#: src/hostlist/hostlist-client.c:663
+#: src/util/network.c:1204
 #, c-format
 msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\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/hostlist/hostlist-client.c:822
+#: src/util/os_installation.c:295
 #, c-format
-msgid "Download limit of %u bytes exceeded, stopping download\n"
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/util/os_installation.c:481
 #, 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 find binary `%s' in PATH!\n"
+msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/hostlist/hostlist-client.c:848
+#: src/util/os_installation.c:486
 #, fuzzy, c-format
-msgid "Download of hostlist `%s' completed.\n"
-msgstr ""
-"Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
+msgid "stat (%s) failed: %s\n"
+msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/hostlist/hostlist-client.c:856
-#, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
+#: src/util/strings.c:144
+msgid "b"
+msgstr "b"
+
+#: src/util/strings.c:150
+msgid "KiB"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:909
-#, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
+#: src/util/strings.c:154
+msgid "MiB"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
-msgid "# hostlist downloads initiated"
+#: src/util/strings.c:158
+msgid "GiB"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1511
-msgid "# milliseconds between hostlist downloads"
+#: src/util/strings.c:162
+msgid "TiB"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/util/strings.c:198
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
-msgid "Scheduled saving of hostlists\n"
+#: src/util/strings.c:276
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
-#, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
+#: src/util/strings.c:368
+msgid "ms"
+msgstr "ms"
+
+#: src/util/strings.c:373
+msgid "eternity"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1117 src/hostlist/hostlist-client.c:1133
-#, fuzzy
-msgid "# active connections"
-msgstr "Nätverksanslutning"
+#: src/util/strings.c:377
+msgid "s"
+msgstr "s"
 
-#: src/hostlist/hostlist-client.c:1249
-#, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
-msgstr ""
+#: src/util/strings.c:381
+msgid "m"
+msgstr "m"
 
-#: src/hostlist/hostlist-client.c:1280
-#, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
+#: src/util/strings.c:385
+msgid "h"
+msgstr "h"
+
+#: src/util/strings.c:389
+msgid " days"
+msgstr " dagar"
+
+#: src/util/strings.c:413
+msgid "end of time"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1286
+# drive = hard drive ?
+#: src/util/server.c:392
 #, fuzzy, c-format
-msgid "Loading saved hostlist entries from file `%s' \n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/hostlist/hostlist-client.c:1290
-#, c-format
-msgid "Hostlist file `%s' is not existing\n"
-msgstr ""
+#: src/util/server.c:400
+#, 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/hostlist/hostlist-client.c:1301
+#: src/util/server.c:405
 #, fuzzy, c-format
-msgid "Could not open file `%s' for reading to load hostlists: %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/hostlist/hostlist-client.c:1334
+#: src/util/server.c:623
 #, c-format
-msgid "%u hostlist URIs loaded from file\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:1336
-msgid "# hostlist URIs read from file"
+#: src/util/crypto_random.c:240
+#, c-format
+msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1369
+#: src/util/crypto_random.c:267
 #, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
-msgstr ""
+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/hostlist/hostlist-client.c:1383
+# drive = hard drive ?
+#: src/util/disk.c:435
 #, 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 "`%s' failed for drive `%s': %u\n"
+msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/hostlist/hostlist-client.c:1388
+#: src/util/disk.c:837
 #, fuzzy, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Expected `%s' to be a directory!\n"
+msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/hostlist/hostlist-client.c:1412 src/hostlist/hostlist-client.c:1429
-#, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
-msgstr ""
+#: src/util/disk.c:1188 src/util/service.c:1473
+#, fuzzy, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/hostlist/hostlist-client.c:1424
-msgid "# hostlist URIs written to file"
-msgstr ""
+#: src/util/disk.c:1496
+#, fuzzy, c-format
+msgid "No `%s' specified for service `%s' in configuration.\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/hostlist/hostlist-client.c:1476
-msgid "Learning is enabled on this peer\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1479
+#: src/util/service.c:118 src/util/service.c:144 src/util/service.c:188
+#: src/util/service.c:209 src/util/service.c:216
 #, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
-msgstr ""
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1488
-msgid "Learning is not enabled on this peer\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1500
+#: src/util/service.c:171
 #, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
-msgstr ""
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
 
-#: src/hostlist/hostlist-client.c:1504
+#: src/util/service.c:265
 #, c-format
-msgid "Hostlist file `%s' could not be removed\n"
-msgstr ""
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/topology/gnunet-daemon-topology.c:250
-msgid "# peers blacklisted"
-msgstr ""
+#: src/util/service.c:301
+#, fuzzy, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/topology/gnunet-daemon-topology.c:402
-msgid "# connect requests issued to core"
-msgstr ""
+#: src/util/service.c:332
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Fel format \"%s\" för nätverk: %s\n"
 
-#: src/topology/gnunet-daemon-topology.c:676
-#: src/topology/gnunet-daemon-topology.c:778
-#: src/transport/gnunet-service-transport_neighbours.c:465
-#: src/transport/gnunet-service-transport_neighbours.c:662
-#, fuzzy
-msgid "# peers connected"
-msgstr "# av anslutna parter"
-
-#: src/topology/gnunet-daemon-topology.c:697
-#: src/topology/gnunet-daemon-topology.c:783
-#, fuzzy
-msgid "# friends connected"
-msgstr "# av anslutna parter"
-
-#: src/topology/gnunet-daemon-topology.c:977
-msgid "Failed to connect to core service, can not manage topology!\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/util/service.c:638
 #, c-format
-msgid "Option `%s' in section `%s' not specified!\n"
+msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1021
+#: src/util/service.c:643
 #, fuzzy, c-format
-msgid "Could not read friends list `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Unknown address family %d\n"
+msgstr "Okänd operation \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1027
+#: src/util/service.c:650
 #, c-format
-msgid "Friends file `%s' is empty.\n"
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1036
-#, fuzzy, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/util/service.c:694
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1044
+#: src/util/service.c:723
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1064
+#: src/util/service.c:841
 #, c-format
 msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1077
+#: src/util/service.c:862 src/transport/plugin_transport_tcp.c:1939
 #, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
+msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1087
-#, fuzzy, c-format
-msgid "Found friend `%s' in configuration\n"
-msgstr " gconfig\tGTK-konfiguration\n"
-
-#: src/topology/gnunet-daemon-topology.c:1093
+#: src/util/service.c:893 src/util/client.c:712
 #, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1103
-#, fuzzy
-msgid "# friends in configuration"
-msgstr " gconfig\tGTK-konfiguration\n"
-
-#: src/topology/gnunet-daemon-topology.c:1109
+#: src/util/service.c:913
+#, c-format
 msgid ""
-"Fewer friends specified than required by minimum friend count. Will only "
-"connect to friends.\n"
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1116
-msgid ""
-"More friendly connections required than target total number of connections.\n"
+#: src/util/service.c:930
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1151
-#, fuzzy
-msgid "# HELLO messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+#: src/util/service.c:960 src/transport/plugin_transport_http.c:903
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1208
-msgid "# HELLO messages gossipped"
+#: src/util/service.c:978 src/transport/plugin_transport_http.c:920
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
+
+#: src/util/service.c:1135 src/util/service.c:1153
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1348
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/util/service.c:1181
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:326
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/statistics/gnunet-statistics.c:89
+#: src/util/service.c:1333
 #, fuzzy, c-format
-msgid "Failed to obtain statistics.\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "Fel vid %s:%d.\n"
 
-#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
+#: src/util/service.c:1366
 #, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
+msgid "Service `%s' runs at %s\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/statistics/gnunet-statistics.c:155
-msgid "limit output to statistcs for the given NAME"
+#: src/util/service.c:1414
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:158
-msgid "make the value being set persistent"
+#: src/util/service.c:1418
+msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:161
-msgid "limit output to the given SUBSYSTEM"
+#: src/util/service.c:1422
+msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
-msgid "Print statistics about GNUnet operations."
-msgstr "Skriv ut statistik om GNUnet-operationer."
+#: src/util/service.c:1474
+msgid "No such user"
+msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:208
-#, fuzzy, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
-msgstr "Ladda ner filer från GNUnet."
+#: src/util/service.c:1488
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/statistics/gnunet-service-statistics.c:266
-#, fuzzy, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
-msgstr "Ladda ner filer från GNUnet."
+#: src/util/service.c:1551
+msgid "do daemonize (detach from terminal)"
+msgstr ""
 
-#: src/util/os_priority.c:110
-#, c-format
-msgid "Not installing a handler because $%s=%s\n"
+#: src/util/gnunet-resolver.c:76
+msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/os_installation.c:291
+#: src/util/os_priority.c:117
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/util/os_installation.c:474
+#: src/util/resolver_api.c:202
 #, fuzzy, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+msgid "Must specify `%s' for `%s' in configuration!\n"
+msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 
-#: src/util/os_installation.c:479
+#: src/util/resolver_api.c:221
 #, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "\"%s\" %s misslyckades: %s\n"
+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/util/common_logging.c:154 src/util/common_logging.c:500
-#: src/util/test_common_logging.c:75
-msgid "DEBUG"
-msgstr "FELSÖKNING"
-
-#: src/util/common_logging.c:156 src/util/common_logging.c:498
-#: src/util/test_common_logging.c:72
-msgid "INFO"
-msgstr "INFO"
-
-#: src/util/common_logging.c:158 src/util/common_logging.c:496
-#: src/util/test_common_logging.c:68
-msgid "WARNING"
-msgstr "VARNING"
-
-#: src/util/common_logging.c:160 src/util/common_logging.c:494
-#: src/util/test_common_logging.c:65
-msgid "ERROR"
-msgstr "FEL"
-
-#: src/util/common_logging.c:162
-msgid "NONE"
+#: src/util/resolver_api.c:356
+#, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:214 src/dht/plugin_dhtlog_mysql_dump.c:909
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:669
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:700
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:732
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:764
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:796
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:827
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:858
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:889
+#: src/util/resolver_api.c:360
 #, fuzzy, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/common_logging.c:331
+#: src/util/resolver_api.c:428
 #, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:501
-msgid "INVALID"
+#: src/util/resolver_api.c:793
+#, c-format
+msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:583
-msgid "unknown address"
+#: src/util/resolver_api.c:877
+#, c-format
+msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:621
-msgid "invalid address"
+#: src/util/resolver_api.c:882
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN : %s\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/util/resolver_api.c:914
+#, c-format
+msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/pseudonym.c:263
+#: src/util/pseudonym.c:269
 #, 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:327
+#: src/util/pseudonym.c:333
 #, fuzzy
 msgid "no-name"
 msgstr "Visa namn"
 
-#: src/util/test_strings.c:42 src/util/strings.c:139
-msgid "b"
-msgstr "b"
-
-#: src/util/test_strings.c:45 src/util/strings.c:145
-msgid "KiB"
-msgstr ""
-
-#: src/util/test_strings.c:48 src/util/strings.c:157
-msgid "TiB"
-msgstr ""
-
-#: src/util/test_strings.c:51 src/util/strings.c:363
-msgid "ms"
-msgstr "ms"
-
-#: src/util/test_strings.c:56 src/util/strings.c:372
-msgid "s"
-msgstr "s"
-
-#: src/util/test_strings.c:61 src/util/strings.c:380
-msgid "h"
-msgstr "h"
-
-#: src/util/connection.c:457
+#: src/util/gnunet-service-resolver.c:262
 #, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
+msgid "Could not resolve `%s' (%s): %s\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/connection.c:472
+#: src/util/gnunet-service-resolver.c:318
+#: src/util/gnunet-service-resolver.c:363
 #, c-format
-msgid "Accepting connection from `%s': %p\n"
+msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/connection.c:640
-#, 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:1028
-#, 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:863
-#, 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:1018
-#, fuzzy, c-format
-msgid "Attempt to connect to `%s' failed\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/util/connection.c:1534
+#: src/util/gnunet-service-resolver.c:462
 #, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
+msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/connection.c:1570
-#, fuzzy, c-format
-msgid "Failed to send to `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/util/plugin.c:87
+#: src/util/gnunet-service-resolver.c:509
 #, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
+msgid "Resolver asked to look up IP address `%s'.\n"
+msgstr ""
 
-#: src/util/plugin.c:144
+#: src/util/bio.c:137 src/util/bio.c:143
 #, 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:217
-#, 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/bio.c:134 src/util/bio.c:140
-#, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/bio.c:141
+#: src/util/bio.c:144
 #, fuzzy
 msgid "End of file"
 msgstr "Läs in en konfigurationsfil"
 
-#: src/util/bio.c:193
+#: src/util/bio.c:196
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:203
+#: src/util/bio.c:208
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:248
+#: src/util/bio.c:254
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:262
+#: src/util/bio.c:268
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/crypto_rsa.c:611 src/util/crypto_rsa.c:658
+#: src/util/client.c:303
+#, c-format
+msgid ""
+"Could not determine valid hostname and port for service `%s' from "
+"configuration.\n"
+msgstr ""
+
+#: src/util/client.c:311
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
+msgstr ""
+
+#: src/util/client.c:652
+msgid "Failure to transmit TEST request.\n"
+msgstr ""
+
+#: src/util/client.c:857
 #, fuzzy, c-format
+msgid "Could not connect to service `%s', must not be running.\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/util/client.c:874
+#, 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"
+
+#: src/util/client.c:1143
+msgid "Could not submit request, not expecting to receive a response.\n"
+msgstr ""
+
+#: src/util/crypto_rsa.c:624 src/util/crypto_rsa.c:672
+#, 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:616
+#: src/util/crypto_rsa.c:629
 #, 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:634
+#: src/util/crypto_rsa.c:648
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:662 src/util/crypto_rsa.c:698
+#: src/util/crypto_rsa.c:676 src/util/crypto_rsa.c:714
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:693
+#: src/util/crypto_rsa.c:709
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:714
+#: src/util/crypto_rsa.c:730
 #, 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:732
+#: src/util/crypto_rsa.c:748
 #, 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:953
+#: src/util/crypto_rsa.c:970
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-# drive = hard drive ?
-#: src/util/server.c:384
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+#: src/nse/gnunet-nse-profiler.c:650 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:591
+#: src/fs/gnunet-download.c:263
+msgid "be verbose (print progress information)"
+msgstr ""
 
-#: src/util/server.c:392
-#, 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/nse/gnunet-nse-profiler.c:668
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "Kan inte tillgå tjänsten"
 
-#: src/util/server.c:397
-#, 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:612
+#: src/nse/gnunet-service-nse.c:875
 #, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/util/network.c:1194
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+#: src/nse/gnunet-service-nse.c:1298 src/nse/gnunet-service-nse.c:1317
+#: src/nse/gnunet-service-nse.c:1338
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/util/crypto_random.c:236
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
-msgstr ""
+#: src/nse/gnunet-service-nse.c:1305
+#, fuzzy
+msgid "Invalid work requirement for NSE service. Exiting.\n"
+msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/util/crypto_random.c:263
-#, 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/nse/gnunet-service-nse.c:1326
+#, fuzzy
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/util/test_resolver_api.c:53
-#, c-format
-msgid "Got IP address `%s' for our host.\n"
-msgstr ""
+#: src/peerinfo/gnunet-service-peerinfo.c:136
+#, fuzzy, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/util/test_resolver_api.c:147 src/util/resolver_api.c:873
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:197
+msgid "# peers known"
 msgstr ""
 
-#: src/util/test_resolver_api.c:154
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s %u\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/util/test_resolver_api.c:264
+#: src/peerinfo/gnunet-service-peerinfo.c:241
 #, c-format
-msgid "gethostbyname() could not lookup IP address: %s\n"
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:329
+#: src/peerinfo/gnunet-service-peerinfo.c:306
 #, c-format
-msgid "gethostbyaddr() could not lookup hostname: %s\n"
+msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/util/configuration.c:244
+#: src/peerinfo/peerinfo_api_notify.c:258
 #, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
-msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
+msgid "Could not connect to `%s' service.\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/util/configuration.c:801
-#, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
-msgstr ""
+#: src/peerinfo/peerinfo_api.c:278
+#, fuzzy, c-format
+msgid "Failed to transmit message to `%s' service.\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/util/gnunet-resolver.c:76
-msgid "Test GNUnet DNS resolver code."
-msgstr ""
+#: src/peerinfo/peerinfo_api.c:433
+#, fuzzy
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/util/client.c:304
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
-msgstr ""
+#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
+#, fuzzy
+msgid "Received invalid message from `PEERINFO' service.\n"
+msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
 
-#: src/util/client.c:312
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+#: src/peerinfo/peerinfo_api.c:521
+#, fuzzy
+msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/peerinfo/peerinfo_api.c:555
+msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/util/client.c:669
-msgid "Failure to transmit TEST request.\n"
+#: src/datacache/plugin_datacache_sqlite.c:439
+msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/util/client.c:729 src/util/service.c:880
+#: src/datacache/datacache.c:177
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/util/client.c:871
+#: src/datacache/datacache.c:185
 #, fuzzy, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
+msgid "Failed to load datacache plugin for `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/client.c:887
-#, 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"
+#: src/datacache/datacache.c:276
+#, fuzzy
+msgid "# requests received"
+msgstr "# byte mottogs via TCP"
 
-#: src/util/client.c:1158
-msgid "Could not submit request, not expecting to receive a response.\n"
+#: src/datacache/datacache.c:287
+msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/util/scheduler.c:859
-msgid "Looks like we're busy waiting...\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/util/scheduler.c:990
-#, 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/strings.c:149
-msgid "MiB"
+#: src/datacache/plugin_datacache_mysql.c:979
+msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/util/strings.c:153
-msgid "GiB"
+#: src/dht/gnunet-service-dht_neighbours.c:479
+msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/util/strings.c:193
-#, c-format
-msgid "Character set requested was `%s'\n"
+#: src/dht/gnunet-service-dht_neighbours.c:571
+#, fuzzy
+msgid "# FIND PEER messages initiated"
+msgstr "# PING-meddelanden skapade"
+
+#: src/dht/gnunet-service-dht_neighbours.c:632
+#: src/dht/gnunet-service-dht_neighbours.c:697
+#, fuzzy
+msgid "# Peers connected"
+msgstr "# av anslutna parter"
+
+#: src/dht/gnunet-service-dht_neighbours.c:734
+#, fuzzy
+msgid "# Queued messages discarded (peer disconnected)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/dht/gnunet-service-dht_neighbours.c:787
+#, fuzzy
+msgid "# Bytes transmitted to other peers"
+msgstr "# byte skickade av typen %d"
+
+#: src/dht/gnunet-service-dht_neighbours.c:824
+msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
-#: src/util/strings.c:271
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+#: src/dht/gnunet-service-dht_neighbours.c:1051
+#: src/dht/gnunet-service-dht_neighbours.c:1078
+msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/util/strings.c:368
-msgid "eternity"
+#: src/dht/gnunet-service-dht_neighbours.c:1060
+#: src/dht/gnunet-service-dht_neighbours.c:1096
+msgid "# Peer selection failed"
 msgstr ""
 
-#: src/util/strings.c:376
-msgid "m"
-msgstr "m"
+#: src/dht/gnunet-service-dht_neighbours.c:1238
+#, fuzzy
+msgid "# PUT requests routed"
+msgstr "# byte mottogs via TCP"
 
-#: src/util/strings.c:384
-msgid " days"
-msgstr " dagar"
+#: src/dht/gnunet-service-dht_neighbours.c:1267
+#, fuzzy
+msgid "# PUT messages queued for transmission"
+msgstr "# PING-meddelanden skapade"
 
-#: src/util/strings.c:408
-msgid "end of time"
+#: src/dht/gnunet-service-dht_neighbours.c:1352
+#, fuzzy
+msgid "# GET requests routed"
+msgstr "# byte mottogs via TCP"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1384
+#, fuzzy
+msgid "# GET messages queued for transmission"
+msgstr "# PING-meddelanden skapade"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1485
+#, fuzzy
+msgid "# RESULT messages queued for transmission"
+msgstr "# PING-meddelanden skapade"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1574
+#, fuzzy
+msgid "# P2P PUT requests received"
+msgstr "# byte mottogs via TCP"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1700
+msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-# drive = hard drive ?
-#: src/util/disk.c:429
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%s': %u\n"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1707
+msgid "# FIND PEER requests ignored due to lack of HELLO"
+msgstr ""
 
-#: src/util/disk.c:829
-#, fuzzy, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1800
+#, fuzzy
+msgid "# P2P GET requests received"
+msgstr "# byte mottogs via TCP"
 
-#: src/util/disk.c:1180 src/util/service.c:1456
-#, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1853
+#, fuzzy
+msgid "# P2P FIND PEER requests processed"
+msgstr "# byte mottogs via TCP"
 
-#: src/util/disk.c:1486
-#, fuzzy, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1872
+#, fuzzy
+msgid "# P2P GET requests ONLY routed"
+msgstr "# byte mottogs via TCP"
 
-#: src/util/resolver_api.c:198
-#, 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/dht/gnunet-service-dht_neighbours.c:1941
+#, fuzzy
+msgid "# P2P RESULTS received"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/util/resolver_api.c:217
-#, fuzzy, c-format
-msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+#: src/dht/dht_api.c:229
+#, fuzzy
+msgid "Failed to connect to the DHT service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/dht/gnunet-service-dht.c:165
+#, fuzzy
+msgid "Failed to connect to transport service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
+msgid "the query key"
 msgstr ""
-"Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
-"\".\n"
 
-#: src/util/resolver_api.c:354
-#, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
+#: src/dht/gnunet-dht-get.c:204
+msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/util/resolver_api.c:358
-#, fuzzy, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/dht/gnunet-dht-get.c:207
+msgid "the type of data to look for"
+msgstr ""
 
-#: src/util/resolver_api.c:427
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
+msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/util/resolver_api.c:789
-#, c-format
-msgid "Resolver returns `%s'.\n"
+#: src/dht/gnunet-dht-get.c:232
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/util/resolver_api.c:879
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+#: src/dht/gnunet-service-dht_clients.c:321
+#, fuzzy
+msgid "# GET requests from clients injected"
+msgstr "# byte mottogs via TCP"
 
-#: src/util/resolver_api.c:911
-#, c-format
-msgid "Resolving our hostname `%s'\n"
-msgstr ""
+#: src/dht/gnunet-service-dht_clients.c:413
+#, fuzzy
+msgid "# PUT requests received from clients"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/util/gnunet-service-resolver.c:261
-#, fuzzy, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+#: src/dht/gnunet-service-dht_clients.c:486
+#, fuzzy
+msgid "# GET requests received from clients"
+msgstr "Meddelande mottaget från klient är ogiltig.\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/dht/gnunet-service-dht_clients.c:585
+#, fuzzy
+msgid "# GET STOP requests received from clients"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#: src/dht/gnunet-service-dht_clients.c:790
+msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:460
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
+#: src/dht/gnunet-service-dht_clients.c:808
+msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:508
+#: src/dht/gnunet-service-dht_clients.c:852
 #, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
+msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/util/getopt.c:668
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
+#: src/dht/gnunet-service-dht_clients.c:875
+#, fuzzy
+msgid "# RESULTS queued for clients"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/util/getopt.c:692
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
+#: src/dht/gnunet-service-dht_clients.c:928
+#: src/dht/gnunet-service-dht_clients.c:971
+msgid "# REPLIES ignored for CLIENTS (no match)"
+msgstr ""
 
-#: src/util/getopt.c:697
-#, 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/dht/gnunet-service-dht_clients.c:937
+#, fuzzy
+msgid "Could not pass reply to client, message too big!\n"
+msgstr "Kunde inte skicka meddelande till gnunetd\n"
 
-#: src/util/getopt.c:714 src/util/getopt.c:882
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: flagga \"%s\" kräver ett argument\n"
+#: src/dht/gnunet-service-dht_nse.c:59
+#, fuzzy
+msgid "# Network size estimates received"
+msgstr "# byte mottogs via TCP"
 
-#: src/util/getopt.c:743
+#: src/dht/gnunet-dht-put.c:100
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: okänd flagga \"--%s\"\n"
+msgid "PUT request sent!\n"
+msgstr ""
 
-#: src/util/getopt.c:747
+#: src/dht/gnunet-dht-put.c:124
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: okänd flagga \"%c%s\"\n"
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
 
-#: src/util/getopt.c:772
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: otillåten flagga -- %c\n"
+#: 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/util/getopt.c:774
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ogiltig flagga -- %c\n"
+#: src/dht/gnunet-dht-put.c:137
+#, fuzzy, c-format
+msgid "Connected to %s service!\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/util/getopt.c:802 src/util/getopt.c:930
+#: src/dht/gnunet-dht-put.c:152
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: flagga kräver ett argument -- %c\n"
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
 
-#: src/util/getopt.c:850
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: flagga \"-W %s\" är tvetydig\n"
+#: src/dht/gnunet-dht-put.c:166
+msgid "the data to insert under the key"
+msgstr ""
 
-#: src/util/getopt.c:868
-#, 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/dht/gnunet-dht-put.c:169
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr ""
 
-#: src/util/getopt.c:1034
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Använd --help för att få en lista på flaggor.\n"
+#: src/dht/gnunet-dht-put.c:175
+msgid "how many replicas to create"
+msgstr ""
 
-#: src/util/signal.c:78
-#, fuzzy, c-format
-msgid "signal (%d, %p) returned %d.\n"
-msgstr "Anrop till \"%s\" returnerade %d.\n"
+#: src/dht/gnunet-dht-put.c:178
+msgid "the type to insert data as"
+msgstr ""
 
-#: src/util/getopt_helpers.c:82
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
+#: src/dht/gnunet-dht-put.c:203
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
-"Argument som är obligatoriska för långa flaggor är också obligatoriska för "
-"korta flaggor.\n"
 
-#: src/util/getopt_helpers.c:253 src/util/getopt_helpers.c:281
-#, 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/dht/gnunet-service-dht_routing.c:220
+msgid "# Good REPLIES matched against routing table"
+msgstr ""
 
-#: src/util/service.c:112 src/util/service.c:138 src/util/service.c:182
-#: src/util/service.c:202 src/util/service.c:209
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Ogiltigt format för IP: \"%s\"\n"
+#: src/dht/gnunet-service-dht_routing.c:235
+msgid "# Duplicate REPLIES matched against routing table"
+msgstr ""
 
-#: src/util/service.c:165
-#, 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/dht/gnunet-service-dht_routing.c:240
+msgid "# Invalid REPLIES matched against routing table"
+msgstr ""
 
-#: src/util/service.c:258
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
+#: src/dht/gnunet-service-dht_routing.c:249
+msgid "# Unsupported REPLIES matched against routing table"
+msgstr ""
 
-#: src/util/service.c:292
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Fel format \"%s\" för nätmask: %s\n"
+#: src/dht/gnunet-service-dht_routing.c:332
+#: src/dht/gnunet-service-dht_routing.c:390
+msgid "# Entries removed from routing table"
+msgstr ""
 
-#: src/util/service.c:323
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Fel format \"%s\" för nätverk: %s\n"
-
-#: src/util/service.c:627
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
+#: src/dht/gnunet-service-dht_routing.c:342
+msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/util/service.c:632
+#: src/dht/gnunet-service-dht_datacache.c:92
 #, fuzzy, c-format
-msgid "Unknown address family %d\n"
-msgstr "Okänd operation \"%s\"\n"
+msgid "%s request received, but have no datacache!\n"
+msgstr "# byte mottagna av typen %d"
 
-#: src/util/service.c:639
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
+#: src/dht/gnunet-service-dht_datacache.c:103
+msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/util/service.c:683
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+#: src/dht/gnunet-service-dht_datacache.c:215
+msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:712
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+#: src/dht/gnunet-service-dht_datacache.c:229
+msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:829
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+#: src/dht/gnunet-service-dht_datacache.c:234
+msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1927
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+#: src/dht/gnunet-service-dht_datacache.c:245
+msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/util/service.c:900
+#: src/dht/gnunet-service-dht_datacache.c:248
 #, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+msgid "Unsupported block type (%u) in local response!\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/dht/gnunet-service-dht_datacache.c:280
+#, fuzzy
+msgid "# GET requests given to datacache"
+msgstr "# byte mottogs via TCP"
 
-#: src/util/service.c:947
+#: src/dht/gnunet-service-dht_hello.c:86
+#, fuzzy
+msgid "# HELLOs obtained from peerinfo"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#: src/arm/gnunet-arm.c:161
 #, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "Service `%s' has been started.\n"
+msgstr "Tjänst borttagen.\n"
 
-#: src/util/service.c:965
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
+msgid "Failed to stop service `%s'!\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/service.c:1121 src/util/service.c:1139
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:171
+#, fuzzy, c-format
+msgid "Service `%s' has been stopped.\n"
+msgstr "Tjänst borttagen.\n"
 
-#: src/util/service.c:1166
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-
-#: src/util/service.c:1315
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "Fel vid %s:%d.\n"
+msgid "Failed to start service `%s'!\n"
+msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/service.c:1349
+#: src/arm/gnunet-arm.c:181
 #, fuzzy, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+msgid "Some error communicating with service `%s'.\n"
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/util/service.c:1397
-msgid "Service process failed to initialize\n"
+#: src/arm/gnunet-arm.c:207
+#, c-format
+msgid "Service `%s' is running.\n"
 msgstr ""
 
-#: src/util/service.c:1401
-msgid "Service process could not initialize server function\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:212
+#, fuzzy, c-format
+msgid "Service `%s' is not running.\n"
+msgstr "\"%s\" är inte en fil.\n"
 
-#: src/util/service.c:1405
-msgid "Service process failed to report status\n"
+#: src/arm/gnunet-arm.c:238
+#, c-format
+msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/util/service.c:1457
-msgid "No such user"
+#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
+msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/util/service.c:1471
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
+#: src/arm/gnunet-arm.c:269
+#, fuzzy, c-format
+msgid "Failed to remove configuration file %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/service.c:1534
-msgid "do daemonize (detach from terminal)"
+#: src/arm/gnunet-arm.c:275
+#, fuzzy, c-format
+msgid "Failed to remove servicehome directory %s\n"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: src/arm/gnunet-arm.c:387
+msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/fs/fs_uri.c:214
-#, c-format
-msgid "`%' must be followed by HEX number"
+#: src/arm/gnunet-arm.c:389
+msgid "start a particular service"
 msgstr ""
 
-#: src/fs/fs_uri.c:273
-#, fuzzy
-msgid "Malformed KSK URI (must not begin or end with `+')"
-msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
-
-#: src/fs/fs_uri.c:291
-msgid "`++' not allowed in KSK URI"
+#: src/arm/gnunet-arm.c:391
+msgid "stop a particular service"
 msgstr ""
 
-#: src/fs/fs_uri.c:298
-msgid "Quotes not balanced in KSK URI"
+#: src/arm/gnunet-arm.c:393
+msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
-msgid "Malformed SKS URI"
+#: src/arm/gnunet-arm.c:396
+msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
-msgid "Malformed CHK URI"
+#: src/arm/gnunet-arm.c:399
+msgid "test if a particular service is running"
 msgstr ""
 
-#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
-#: src/fs/fs_uri.c:615
-msgid "SKS URI malformed"
+#: src/arm/gnunet-arm.c:402
+msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
-msgid "SKS URI malformed (could not decode public key)"
+#: src/arm/gnunet-arm.c:404
+msgid "don't print status messages"
 msgstr ""
 
-#: src/fs/fs_uri.c:603
-msgid "SKS URI malformed (could not find signature)"
+#: src/arm/gnunet-arm.c:407
+msgid "timeout for completing current operation"
 msgstr ""
 
-#: src/fs/fs_uri.c:609
-msgid "SKS URI malformed (could not decode signature)"
+#: src/arm/gnunet-arm.c:418
+msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/fs/fs_uri.c:622
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
+#, fuzzy
+msgid "Failed to transmit shutdown ACK.\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
+msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:634
-msgid "SKS URI malformed (signature failed validation)"
+#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
+msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:672
-msgid "Unrecognized URI type"
+#: src/arm/gnunet-service-arm.c:206
+#, c-format
+msgid "Restarting service `%s' due to configuration file change.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:897
+#: src/arm/gnunet-service-arm.c:234
 #, fuzzy
-msgid "Lacking key configuration settings.\n"
-msgstr "GNUnet-konfiguration"
+msgid "Could not send status result to client\n"
+msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/fs/fs_uri.c:904
-#, fuzzy, c-format
-msgid "Could not access hostkey file `%s'.\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/fs/fs_uri.c:1212 src/fs/fs_uri.c:1239
-msgid "No keywords specified!\n"
-msgstr "Inga nyckelord angivna!\n"
-
-#: src/fs/fs_uri.c:1245
-msgid "Number of double-quotes not balanced!\n"
+#: src/arm/gnunet-service-arm.c:268
+msgid "Not sending status result to client: no client known\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
+#: src/arm/gnunet-service-arm.c:406
 #, 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"
+msgid "Failed to start service `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
 
-#: src/fs/fs_list_indexed.c:117
+#: src/arm/gnunet-service-arm.c:409
 #, 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"
+msgid "Starting service `%s'\n"
+msgstr "Startade samling \"%s\".\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/arm/gnunet-service-arm.c:435
+#, c-format
+msgid "ARM is shutting down, service `%s' not started.\n"
+msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
-#: src/fs/gnunet-service-fs_lc.c:480
-#, fuzzy
-msgid "# client searches active"
-msgstr "# klartext PONG-meddelanden mottagna"
+#: src/arm/gnunet-service-arm.c:443
+#, c-format
+msgid "Service `%s' already running.\n"
+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-service-fs_lc.c:312
-#, fuzzy
-msgid "# client searches received"
-msgstr "# klartext PONG-meddelanden mottagna"
-
-#: src/fs/gnunet-service-fs_lc.c:351
-msgid "# client searches updated (merged content seen list)"
+#: src/arm/gnunet-service-arm.c:453
+#, c-format
+msgid "Binary implementing service `%s' not known!\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
+#: src/arm/gnunet-service-arm.c:464
 #, fuzzy, c-format
-msgid "Publishing failed: %s"
-msgstr ""
-"\n"
-"Fel vid uppladdning av fil: %s\n"
+msgid "Configuration file `%s' for service `%s' not known!\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
-#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
+#: src/arm/gnunet-service-arm.c:498
 #, 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 "Preparing to stop `%s'\n"
+msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/fs_publish.c:649
-msgid "timeout on index-start request to `fs' service"
+#: src/arm/gnunet-service-arm.c:666
+msgid "Stopping all services\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:661
-#, fuzzy
-msgid "unknown error"
-msgstr "Okänt fel"
+#: src/arm/gnunet-service-arm.c:723
+#, fuzzy, c-format
+msgid "Restarting service `%s'.\n"
+msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/fs_publish.c:704
-msgid "failed to compute hash"
+#: src/arm/gnunet-service-arm.c:796
+msgid "exit"
 msgstr ""
 
-#: src/fs/fs_publish.c:724
-msgid "filename too long"
+#: src/arm/gnunet-service-arm.c:801
+msgid "signal"
 msgstr ""
 
-#: src/fs/fs_publish.c:751
+#: src/arm/gnunet-service-arm.c:806
 #, fuzzy
-msgid "could not connect to `fs' service"
-msgstr "Kunde inte ansluta till gnunetd.\n"
+msgid "unknown"
+msgstr "Okänt fel"
 
-#: src/fs/fs_publish.c:775
+#: src/arm/gnunet-service-arm.c:813
 #, fuzzy, c-format
-msgid "Failed to get file identifiers for `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Service `%s' stopped\n"
+msgstr "Tjänst borttagen.\n"
 
-#: src/fs/fs_publish.c:845
+#: src/arm/gnunet-service-arm.c:827
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
+msgstr ""
+
+#: src/arm/arm_api.c:201
+msgid "Failed to transmit shutdown request to client.\n"
+msgstr ""
+
+#: src/arm/arm_api.c:389
 #, fuzzy, c-format
-msgid "Recursive upload failed at `%s': %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/fs/fs_publish.c:851
+#: src/arm/arm_api.c:403
 #, fuzzy, c-format
-msgid "Recursive upload failed: %s"
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/arm/arm_api.c:467
+#, c-format
+msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
-"\n"
-"Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:899
-msgid "needs to be an actual file"
+#: src/arm/arm_api.c:536
+#, c-format
+msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1078
+#: src/arm/arm_api.c:537
 #, c-format
-msgid "Insufficient space for publishing: %s"
+msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1149
+#: src/arm/arm_api.c:559
 #, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
+msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1482
-#, fuzzy
-msgid "Could not connect to datastore."
-msgstr "Kunde inte ansluta till gnunetd.\n"
+#: src/arm/arm_api.c:560
+#, c-format
+msgid "Error while trying to transmit request to stop `%s' to ARM\n"
+msgstr ""
 
-#: src/fs/fs_publish.c:1518 src/fs/fs_namespace.c:822
-#, fuzzy
-msgid "Internal error."
-msgstr "Okänt fel.\n"
+#: src/arm/arm_api.c:592
+#, fuzzy, c-format
+msgid "Asked to start service `%s' within %llu ms\n"
+msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
 
-#: src/fs/gnunet-download.c:100
+#: src/arm/arm_api.c:664
 #, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "Startade samling \"%s\".\n"
+msgid "Stopping service `%s' within %llu ms\n"
+msgstr "Inget svar mottaget inom %llums.\n"
 
-#: src/fs/gnunet-download.c:112
+#: src/arm/gnunet-service-arm_interceptor.c:803
 #, c-format
-msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
+msgid "Unable to forward to service `%s': shutdown\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:121
+#: src/arm/gnunet-service-arm_interceptor.c:812
+#, c-format
+msgid "Unable to forward to service `%s': timeout before connect\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm_interceptor.c:868
 #, fuzzy, c-format
-msgid "Error downloading: %s.\n"
-msgstr "Fel vid nedladdning: %s\n"
+msgid "Unable to start service `%s': %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/fs/gnunet-download.c:129
+#: src/arm/gnunet-service-arm_interceptor.c:936
 #, fuzzy, c-format
-msgid "Downloading `%s' done (%s/s).\n"
-msgstr "Uppladdning vägrades!"
+msgid "Unable to accept connection for service `%s': %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/fs/gnunet-download.c:144 src/fs/gnunet-unindex.c:109
-#: src/fs/gnunet-search.c:190 src/fs/gnunet-publish.c:155
-#, c-format
-msgid "Unexpected status: %d\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:169
+#: src/arm/gnunet-service-arm_interceptor.c:952
 #, fuzzy, c-format
-msgid "You need to specify a URI argument.\n"
-msgstr "Du måste ange en och endast en fil att avindexera.\n"
+msgid "Service `%s' started\n"
+msgstr "Tjänst borttagen.\n"
 
-#: src/fs/gnunet-download.c:175 src/fs/gnunet-publish.c:426
+#: src/arm/gnunet-service-arm_interceptor.c:1080
 #, fuzzy, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "Fil \"%s\" har URI: %s\n"
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Kunde inte skapa användarkonto:"
 
-#: src/fs/gnunet-download.c:182
+#: src/arm/gnunet-service-arm_interceptor.c:1102
 #, c-format
-msgid "Only CHK or LOC URIs supported.\n"
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
+#: src/arm/gnunet-service-arm_interceptor.c:1116
 #, c-format
-msgid "Target filename must be specified.\n"
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:203 src/fs/gnunet-unindex.c:141
-#: src/fs/gnunet-search.c:241 src/fs/gnunet-publish.c:404
-#, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+#: src/fragmentation/defragmentation.c:270
+msgid "# acknowledgements sent for fragment"
+msgstr ""
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-search.c:285
-msgid "set the desired LEVEL of receiver-anonymity"
+#: src/fragmentation/defragmentation.c:454
+#, fuzzy
+msgid "# fragments received"
+msgstr "# byte mottogs via TCP"
+
+#: src/fragmentation/defragmentation.c:513
+#, fuzzy
+msgid "# duplicate fragments received"
+msgstr "# byte mottogs via TCP"
+
+#: src/fragmentation/defragmentation.c:526
+msgid "# messages defragmented"
 msgstr ""
 
-#: src/fs/gnunet-download.c:243
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
+#: src/fragmentation/fragmentation.c:183
+#, fuzzy
+msgid "# fragments transmitted"
+msgstr "# byte skickade av typen %d"
+
+#: src/fragmentation/fragmentation.c:186
+#, fuzzy
+msgid "# fragments retransmitted"
+msgstr "# byte skickade av typen %d"
+
+#: src/fragmentation/fragmentation.c:248
+msgid "# messages fragmented"
 msgstr ""
 
-#: src/fs/gnunet-download.c:246 src/fs/gnunet-search.c:288
-msgid "only search the local peer (no P2P network search)"
+#: src/fragmentation/fragmentation.c:251
+msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fs/gnunet-download.c:249
-msgid "write the file to FILENAME"
-msgstr "skriv filen till FILNAMN"
-
-#: src/fs/gnunet-download.c:253
-msgid "set the maximum number of parallel downloads that is allowed"
+#: src/fragmentation/fragmentation.c:335
+msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
-msgid "set the maximum number of parallel requests for blocks that is allowed"
+#: src/fragmentation/fragmentation.c:341
+msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fs/gnunet-download.c:260
-msgid "download a GNUnet directory recursively"
-msgstr "hämta en GNUnet-katalog rekursivt"
+#: src/fragmentation/fragmentation.c:365
+#, fuzzy
+msgid "# fragmentation transmissions completed"
+msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-download.c:263 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:585
-#: src/mesh/test_mesh_small.c:676 src/dht/gnunet-dht-get-peer.c:190
-#: src/dht/gnunet-dht-put.c:176 src/dht/gnunet-dht-get.c:204
-#: src/nse/gnunet-nse-profiler.c:655
-msgid "be verbose (print progress information)"
+#: src/statistics/gnunet-service-statistics.c:208
+#, fuzzy, c-format
+msgid "Loading %llu bytes of statistics from `%s'\n"
+msgstr "Ladda ner filer från GNUnet."
+
+#: src/statistics/gnunet-service-statistics.c:266
+#, fuzzy, c-format
+msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgstr "Ladda ner filer från GNUnet."
+
+#: src/statistics/statistics_api.c:325
+#, fuzzy
+msgid "Failed to connect to statistics service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/statistics/gnunet-statistics.c:89
+#, fuzzy, c-format
+msgid "Failed to obtain statistics.\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
+
+#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/statistics/gnunet-statistics.c:155
+msgid "limit output to statistcs for the given NAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:270
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+#: src/statistics/gnunet-statistics.c:158
+msgid "make the value being set persistent"
 msgstr ""
 
+#: src/statistics/gnunet-statistics.c:161
+msgid "limit output to the given SUBSYSTEM"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:168
+msgid "Print statistics about GNUnet operations."
+msgstr "Skriv ut statistik om GNUnet-operationer."
+
 #: src/fs/gnunet-unindex.c:89
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
@@ -2177,11 +2052,23 @@
 msgid "Unindexing done.\n"
 msgstr "Avindexera filer."
 
+#: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
+#: src/fs/gnunet-publish.c:158 src/fs/gnunet-download.c:144
+#, c-format
+msgid "Unexpected status: %d\n"
+msgstr ""
+
 #: src/fs/gnunet-unindex.c:131
 #, 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"
 
+#: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
+#: src/fs/gnunet-publish.c:412 src/fs/gnunet-download.c:203
+#, fuzzy, c-format
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
 #: src/fs/gnunet-unindex.c:148
 #, fuzzy, c-format
 msgid "Could not start unindex operation.\n"
@@ -2191,51 +2078,6 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
-#, fuzzy, c-format
-msgid "Configuration fails to specify `%s' in section `%s'\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/fs/fs_namespace.c:107
-#, fuzzy, c-format
-msgid "Failed to open `%s' for writing: %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
-#, fuzzy, c-format
-msgid "Failed to write `%s': %s\n"
-msgstr "Fel vid %s:%d.\n"
-
-#: src/fs/fs_namespace.c:323
-#, fuzzy
-msgid "Unknown error"
-msgstr "Okänt fel"
-
-#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
-#, fuzzy
-msgid "Failed to serialize meta data"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/fs/fs_namespace.c:452
-#, fuzzy
-msgid "Failed to connect to datastore service"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/fs/fs_namespace.c:495
-#, 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:597
-#, c-format
-msgid "Failed to read namespace private key file `%s', deleting it!\n"
-msgstr ""
-
-#: src/fs/fs_namespace.c:866
-#, fuzzy
-msgid "Failed to connect to datastore."
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
 #: src/fs/gnunet-pseudonym.c:165
 #, fuzzy, c-format
 msgid "Namespace `%s' unknown.\n"
@@ -2247,7 +2089,7 @@
 msgid "Option `%s' ignored\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:532
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:538
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
@@ -2265,7 +2107,7 @@
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:551
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:557
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
@@ -2281,7 +2123,7 @@
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:570
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:576
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2298,6 +2140,56 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
+#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
+#, fuzzy, c-format
+msgid "Configuration fails to specify `%s' in section `%s'\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/fs/fs_namespace.c:107
+#, fuzzy, c-format
+msgid "Failed to open `%s' for writing: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
+#, fuzzy, c-format
+msgid "Failed to write `%s': %s\n"
+msgstr "Fel vid %s:%d.\n"
+
+#: src/fs/fs_namespace.c:323
+#, fuzzy
+msgid "Unknown error"
+msgstr "Okänt fel"
+
+#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+#, fuzzy
+msgid "Failed to serialize meta data"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/fs/fs_namespace.c:452
+#, fuzzy
+msgid "Failed to connect to datastore service"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/fs/fs_namespace.c:495
+#, 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:597
+#, c-format
+msgid "Failed to read namespace private key file `%s', deleting it!\n"
+msgstr ""
+
+#: src/fs/fs_namespace.c:822 src/fs/fs_publish.c:1518
+#, fuzzy
+msgid "Internal error."
+msgstr "Okänt fel.\n"
+
+#: src/fs/fs_namespace.c:866
+#, 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"
@@ -2318,6 +2210,14 @@
 msgid "Could not start searching.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
+#: src/fs/gnunet-search.c:285 src/fs/gnunet-download.c:240
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr ""
+
+#: src/fs/gnunet-search.c:288 src/fs/gnunet-download.c:246
+msgid "only search the local peer (no P2P network search)"
+msgstr ""
+
 #: src/fs/gnunet-search.c:291
 msgid "write search results to file starting with PREFIX"
 msgstr ""
@@ -2334,1411 +2234,1074 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/fs_unindex.c:58
-msgid "Failed to find given position in file"
+#: src/fs/fs_uri.c:214
+#, c-format
+msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_uri.c:273
 #, fuzzy
-msgid "Failed to read file"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "Malformed KSK URI (must not begin or end with `+')"
+msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_unindex.c:235
-msgid "Unexpected time for a response from `fs' service."
+#: src/fs/fs_uri.c:291
+msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_unindex.c:243
-msgid "Timeout waiting for `fs' service."
+#: src/fs/fs_uri.c:298
+msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_unindex.c:251
-#, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
+#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
+msgid "Malformed SKS URI"
+msgstr ""
 
-#: src/fs/fs_unindex.c:296
-#, fuzzy
-msgid "Failed to connect to FS service for unindexing."
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
+msgid "Malformed CHK URI"
+msgstr ""
 
-#: src/fs/fs_unindex.c:331
-#, fuzzy
-msgid "Failed to connect to `datastore' service."
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
+#: src/fs/fs_uri.c:615
+msgid "SKS URI malformed"
+msgstr ""
 
-#: src/fs/fs_unindex.c:344
-#, fuzzy
-msgid "Failed to open file for unindexing."
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/fs/fs_uri.c:597
+msgid "SKS URI malformed (could not decode public key)"
+msgstr ""
 
-#: src/fs/fs_unindex.c:378
-#, fuzzy
-msgid "Failed to compute hash of file."
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/fs/fs_uri.c:603
+msgid "SKS URI malformed (could not find signature)"
+msgstr ""
 
-#: src/fs/gnunet-directory.c:49
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
+#: src/fs/fs_uri.c:609
+msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
-#, fuzzy, c-format
-msgid "Directory `%s' meta data:\n"
-msgstr "==> Katalog \"%s\":\n"
+#: src/fs/fs_uri.c:622
+msgid "SKS URI malformed (could not parse expiration time)"
+msgstr ""
 
-#: src/fs/gnunet-directory.c:97
-#, fuzzy, c-format
-msgid "Directory `%s' contents:\n"
-msgstr "==> Katalog \"%s\":\n"
-
-#: src/fs/gnunet-directory.c:132
-#, fuzzy, c-format
-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-directory.c:145
-#, fuzzy, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/fs/gnunet-directory.c:176
-#, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
-
-# drive = hard drive ?
-#: src/fs/fs_file_information.c:349
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s': %s"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
-
-#: 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/gnunet-service-fs_pe.c:228
-msgid "# average retransmission delay (ms)"
+#: src/fs/fs_uri.c:634
+msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:334
-msgid "# queries messages sent to other peers"
+#: src/fs/fs_uri.c:672
+msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:457
+#: src/fs/fs_uri.c:897
 #, fuzzy
-msgid "# requests merged"
-msgstr "# byte mottogs via TCP"
+msgid "Lacking key configuration settings.\n"
+msgstr "GNUnet-konfiguration"
 
-#: src/fs/gnunet-service-fs_pe.c:463
-#, fuzzy
-msgid "# requests refreshed"
-msgstr "# byte mottogs via TCP"
+#: src/fs/fs_uri.c:904
+#, fuzzy, c-format
+msgid "Could not access hostkey file `%s'.\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/fs/gnunet-service-fs_pe.c:511 src/fs/gnunet-service-fs_pe.c:586
-#: src/fs/gnunet-service-fs_pe.c:622
-msgid "# query plan entries"
-msgstr ""
+#: src/fs/fs_uri.c:1238 src/fs/fs_uri.c:1265
+msgid "No keywords specified!\n"
+msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_getopt.c:191
-#, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+#: src/fs/fs_uri.c:1271
+msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/fs_misc.c:126
-#, fuzzy, c-format
-msgid "Did not find mime type `%s' in extension list.\n"
-msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
-
-#: src/fs/gnunet-publish.c:115
+#: src/fs/gnunet-publish.c:118
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:123
+#: src/fs/gnunet-publish.c:126
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-publish.c:134
+#: src/fs/gnunet-publish.c:137
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:138
+#: src/fs/gnunet-publish.c:141
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:265
+#: src/fs/gnunet-publish.c:267
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:267
+#: src/fs/gnunet-publish.c:269
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:312
+#: src/fs/gnunet-publish.c:320
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-publish.c:354
+#: src/fs/gnunet-publish.c:362
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:361
+#: src/fs/gnunet-publish.c:369
 #, 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-publish.c:367
+#: src/fs/gnunet-publish.c:375
 #, 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:375
+#: src/fs/gnunet-publish.c:383
 #, 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:385 src/fs/gnunet-publish.c:392
+#: src/fs/gnunet-publish.c:393 src/fs/gnunet-publish.c:400
+#: src/transport/gnunet-transport.c:328
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:414
+#: src/fs/gnunet-publish.c:422
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-publish.c:459
+#: src/fs/gnunet-publish.c:434 src/fs/gnunet-download.c:175
 #, fuzzy, c-format
+msgid "Failed to parse URI: %s\n"
+msgstr "Fil \"%s\" har URI: %s\n"
+
+#: src/fs/gnunet-publish.c:467
+#, fuzzy, c-format
 msgid "Could not access file: %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:484
+#: src/fs/gnunet-publish.c:492
 #, fuzzy, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:507
+#: src/fs/gnunet-publish.c:515
 #, fuzzy, c-format
 msgid "Could not start publishing.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:536
+#: src/fs/gnunet-publish.c:542
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:539
+#: src/fs/gnunet-publish.c:545
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:543
+#: src/fs/gnunet-publish.c:549
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:547
+#: src/fs/gnunet-publish.c:553
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:554
+#: src/fs/gnunet-publish.c:560
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:565
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:563
+#: src/fs/gnunet-publish.c:569
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-publish.c:567
+#: src/fs/gnunet-publish.c:573
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:573
+#: src/fs/gnunet-publish.c:579
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:577
+#: src/fs/gnunet-publish.c:583
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:581
+#: src/fs/gnunet-publish.c:587
 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:594
+#: src/fs/gnunet-publish.c:600
 msgid "Publish a file or directory on GNUnet"
 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-service-fs_cp.c:694
+#: src/fs/fs_search.c:798
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %llu ms\n"
+msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:729
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
+#: src/fs/gnunet-service-fs_lc.c:480
 #, fuzzy
-msgid "# replies transmitted to other peers"
-msgstr "# byte skickade av typen %d"
+msgid "# client searches active"
+msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:735
-msgid "# replies dropped"
-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-service-fs_cp.c:764 src/fs/gnunet-service-fs_cp.c:880
-#: src/fs/gnunet-service-fs_cp.c:1290 src/fs/gnunet-service-fs_cp.c:1327
-msgid "# P2P searches active"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:837
-msgid "# artificial delays introduced (ms)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:900
+#: src/fs/gnunet-service-fs_lc.c:312
 #, fuzzy
-msgid "# replies received for other peers"
-msgstr "# byte mottagna av typen %d"
+msgid "# client searches received"
+msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:914
-msgid "# replies dropped due to insufficient cover traffic"
+#: src/fs/gnunet-service-fs_lc.c:351
+msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:952
-msgid "# P2P searches destroyed due to ultimate reply"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1019
-msgid "# requests done for free (low load)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1043
-msgid "# request dropped, priority insufficient"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1053
-msgid "# requests done for a price (normal load)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1132
-msgid "# GET requests received (from other peers)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1166
-msgid "# requests dropped due to initiator not being connected"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1190
-msgid "# requests dropped due to missing reverse route"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1256
-msgid "# requests dropped due TTL underflow"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1284
-msgid "# requests dropped due to higher-TTL request"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1325
+#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
 #, fuzzy
-msgid "# P2P query messages received and processed"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_download.c:309
-msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
-msgstr ""
-
-#: src/fs/fs_download.c:329
-msgid "Directory too large for system address space\n"
-msgstr ""
-
-#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
+#: src/fs/fs_misc.c:126
 #, fuzzy, c-format
-msgid "Failed to open file `%s' for writing"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "Did not find mime type `%s' in extension list.\n"
+msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/fs/fs_download.c:872
-#, 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:958
+#: src/fs/gnunet-directory.c:49
 #, c-format
-msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/fs_download.c:985
-msgid "internal error decrypting content"
-msgstr ""
-
-#: src/fs/fs_download.c:1008
+#: src/fs/gnunet-directory.c:94
 #, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+msgid "Directory `%s' meta data:\n"
+msgstr "==> Katalog \"%s\":\n"
 
-#: src/fs/fs_download.c:1020
+#: src/fs/gnunet-directory.c:97
 #, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "Directory `%s' contents:\n"
+msgstr "==> Katalog \"%s\":\n"
 
-#: src/fs/fs_download.c:1029
-#, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr ""
-
-#: src/fs/fs_download.c:1826
-#, fuzzy
-msgid "Invalid URI"
-msgstr "Ogiltiga argument: "
-
-#: src/fs/gnunet-service-fs_indexing.c:113
-#: src/fs/gnunet-service-fs_indexing.c:163
+#: src/fs/gnunet-directory.c:132
 #, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing.\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
+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-service-fs_indexing.c:121
-#: src/fs/gnunet-service-fs_indexing.c:177
+#: src/fs/gnunet-directory.c:145
 #, fuzzy, c-format
-msgid "Could not open `%s'.\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+msgid "Failed to read directory `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:137
-#, fuzzy, c-format
-msgid "Error writing `%s'.\n"
-msgstr "Fel vid skapandet av användare"
-
-#: 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:487
-#, fuzzy, c-format
-msgid "Failed to delete bogus block: %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/fs/gnunet-service-fs_indexing.c:552
-#, fuzzy, c-format
-msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/fs/gnunet-service-fs_indexing.c:554
+#: src/fs/gnunet-directory.c:176
 #, fuzzy
-msgid "not indexed"
-msgstr "Avindexering misslyckades."
+msgid "Display contents of a GNUnet directory"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:569
-#, fuzzy, c-format
-msgid "Indexed file `%s' changed at offset %llu\n"
-msgstr "Indexering av data misslyckades vid position %i.\n"
-
-#: src/fs/fs_search.c:798
-#, c-format
-msgid "Got result with unknown block type `%d', ignoring"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:300
+#: src/fs/gnunet-service-fs_pr.c:272
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:379 src/fs/gnunet-service-fs_pr.c:638
+#: src/fs/gnunet-service-fs_pr.c:352 src/fs/gnunet-service-fs_pr.c:607
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:802
+#: src/fs/gnunet-service-fs_pr.c:771
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:798
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:845
+#: src/fs/gnunet-service-fs_pr.c:814
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:860
+#: src/fs/gnunet-service-fs_pr.c:829
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:952
+#: src/fs/gnunet-service-fs_pr.c:921
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:979
+#: src/fs/gnunet-service-fs_pr.c:948
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1012
+#: src/fs/gnunet-service-fs_pr.c:983
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1102
+#: src/fs/gnunet-service-fs_pr.c:1074
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1123
+#: src/fs/gnunet-service-fs_pr.c:1095
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1170
+#: src/fs/gnunet-service-fs_pr.c:1142
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1184
+#: src/fs/gnunet-service-fs_pr.c:1156
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1193
+#: src/fs/gnunet-service-fs_pr.c:1165
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1209
+#: src/fs/gnunet-service-fs_pr.c:1181
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1226
+#: src/fs/gnunet-service-fs_pr.c:1198
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1239
+#: src/fs/gnunet-service-fs_pr.c:1211
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1216
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1270 src/fs/gnunet-service-fs_pr.c:1311
-#: src/fs/gnunet-service-fs_pr.c:1426
+#: src/fs/gnunet-service-fs_pr.c:1242 src/fs/gnunet-service-fs_pr.c:1281
+#: src/fs/gnunet-service-fs_pr.c:1416
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1329
-msgid "# Datastore lookups concluded (found ultimate result)"
+#: src/fs/gnunet-service-fs_pr.c:1299
+msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1342
+#: src/fs/gnunet-service-fs_pr.c:1312
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1404
+#: src/fs/gnunet-service-fs_pr.c:1394
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1487
+#: src/fs/gnunet-service-fs_pr.c:1474
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_pr.c:1576
+#: src/fs/gnunet-service-fs_pr.c:1565 src/fs/gnunet-service-fs_pr.c:1576
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/fs/fs.c:284
-#, fuzzy, c-format
-msgid "Could not open file `%s': %s"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/fs/fs.c:293
-#, fuzzy, c-format
-msgid "Could not read file `%s': %s"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/fs/fs.c:299
-#, c-format
-msgid "Short read reading from file `%s'!"
+#: src/fs/gnunet-service-fs_pe.c:259
+msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/fs.c:877
-#, fuzzy, c-format
-msgid "Failed to resume publishing information `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+#: src/fs/gnunet-service-fs_pe.c:354
+#, fuzzy
+msgid "# transmission failed (core has no bandwidth)"
+msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/fs/fs.c:1323
-#, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
+#: src/fs/gnunet-service-fs_pe.c:385
+#, fuzzy
+msgid "# query messages sent to other peers"
+msgstr "# byte skickade av typen %d"
+
+#: src/fs/gnunet-service-fs_pe.c:440
+msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/fs.c:1364
-#, c-format
-msgid "Failure while resuming publishing operation `%s': %s\n"
+#: src/fs/gnunet-service-fs_pe.c:450
+msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/fs.c:1380
-#, fuzzy, c-format
-msgid "Failed to resume publishing operation `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+#: src/fs/gnunet-service-fs_pe.c:516
+#, fuzzy
+msgid "# requests merged"
+msgstr "# byte mottogs via TCP"
 
-#: src/fs/fs.c:1984
-#, c-format
-msgid "Failure while resuming unindexing operation `%s': %s\n"
+#: src/fs/gnunet-service-fs_pe.c:522
+#, fuzzy
+msgid "# requests refreshed"
+msgstr "# byte mottogs via TCP"
+
+#: src/fs/gnunet-service-fs_pe.c:576 src/fs/gnunet-service-fs_pe.c:665
+#: src/fs/gnunet-service-fs_pe.c:706
+msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/fs.c:1994
-#, fuzzy, c-format
-msgid "Failed to resume unindexing operation `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1552
+#: src/transport/gnunet-service-transport_neighbours.c:858
+#: src/transport/gnunet-service-transport_neighbours.c:1972
+#: src/transport/gnunet-service-transport_neighbours.c:2058
+#: src/topology/gnunet-daemon-topology.c:653
+#: src/topology/gnunet-daemon-topology.c:755
+#, fuzzy
+msgid "# peers connected"
+msgstr "# av anslutna parter"
 
-#: src/fs/fs.c:2107 src/fs/fs.c:2346
-#, fuzzy, c-format
-msgid "Failed to resume sub-download `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+#: src/fs/gnunet-service-fs_cp.c:701
+#, fuzzy
+msgid "# migration stop messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/fs.c:2124
-#, fuzzy, c-format
-msgid "Failed to resume sub-search `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
+#: src/fs/gnunet-service-fs_cp.c:705
 #, c-format
-msgid "Failure while resuming search operation `%s': %s\n"
+msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/fs.c:2337
-#, c-format
-msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
+#: src/fs/gnunet-service-fs_cp.c:740
+#, fuzzy
+msgid "# replies transmitted to other peers"
+msgstr "# byte skickade av typen %d"
+
+#: src/fs/gnunet-service-fs_cp.c:746
+msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/fs.c:2583
-msgid "Could not resume running search, will resume as paused search\n"
+#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:891
+#: src/fs/gnunet-service-fs_cp.c:1301 src/fs/gnunet-service-fs_cp.c:1340
+msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/fs.c:2669
-#, c-format
-msgid "Failure while resuming download operation `%s': %s\n"
+#: src/fs/gnunet-service-fs_cp.c:848
+msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:642
-#, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
+#: src/fs/gnunet-service-fs_cp.c:911
+#, fuzzy
+msgid "# replies received for other peers"
+msgstr "# byte mottagna av typen %d"
+
+#: src/fs/gnunet-service-fs_cp.c:925
+msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:128
-msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+#: src/fs/gnunet-service-fs_cp.c:963
+msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:99
-#, fuzzy, c-format
-msgid "Block not of type %u\n"
-msgstr "Ingen transport av typ %d är känd.\n"
+#: src/fs/gnunet-service-fs_cp.c:1030
+msgid "# requests done for free (low load)"
+msgstr ""
 
-#: src/block/plugin_block_dht.c:106
-msgid "Size mismatch for block\n"
+#: src/fs/gnunet-service-fs_cp.c:1054
+msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:115
-#, c-format
-msgid "Block of type %u is malformed\n"
+#: src/fs/gnunet-service-fs_cp.c:1064
+msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/block/block.c:108
-#, fuzzy, c-format
-msgid "Loading block plugins `%s'\n"
-msgstr "Testar transport(er) %s\n"
+#: src/fs/gnunet-service-fs_cp.c:1143
+msgid "# GET requests received (from other peers)"
+msgstr ""
 
-#: src/block/block.c:118
-#, fuzzy, c-format
-msgid "Failed to load block plugin `%s'\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/mesh/test_mesh_small.c:689
-msgid "Test mesh in a small network."
+#: src/fs/gnunet-service-fs_cp.c:1177
+msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
-#, fuzzy
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
-msgid "Transmitting shutdown ACK.\n"
+#: src/fs/gnunet-service-fs_cp.c:1201
+msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
-msgid "Initiating shutdown as requested by client.\n"
+#: src/fs/gnunet-service-fs_cp.c:1267
+msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:206
-#, c-format
-msgid "Restarting service `%s' due to configuration file change.\n"
+#: src/fs/gnunet-service-fs_cp.c:1295
+msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:234
+#: src/fs/gnunet-service-fs_cp.c:1338
 #, fuzzy
-msgid "Could not send status result to client\n"
-msgstr "Kunde inte skicka begäran till gnunetd.\n"
+msgid "# P2P query messages received and processed"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/arm/gnunet-service-arm.c:268
-msgid "Not sending status result to client: no client known\n"
+#: src/fs/gnunet-service-fs_push.c:642
+#, c-format
+msgid ""
+"Invalid value specified for option `%s' in section `%s', content pushing "
+"disabled\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:406
+#: src/fs/gnunet-service-fs_indexing.c:113
+#: src/fs/gnunet-service-fs_indexing.c:163
 #, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "Misslyckades att starta samling.\n"
+msgid "Configuration option `%s' in section `%s' missing.\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/arm/gnunet-service-arm.c:409
+#: src/fs/gnunet-service-fs_indexing.c:121
+#: src/fs/gnunet-service-fs_indexing.c:177
 #, fuzzy, c-format
-msgid "Starting service `%s'\n"
-msgstr "Startade samling \"%s\".\n"
+msgid "Could not open `%s'.\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/arm/gnunet-service-arm.c:435
-#, c-format
-msgid "ARM is shutting down, service `%s' not started.\n"
-msgstr ""
+#: src/fs/gnunet-service-fs_indexing.c:137
+#, fuzzy, c-format
+msgid "Error writing `%s'.\n"
+msgstr "Fel vid skapandet av användare"
 
-#: src/arm/gnunet-service-arm.c:443
+#: src/fs/gnunet-service-fs_indexing.c:228
 #, c-format
-msgid "Service `%s' already running.\n"
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:453
+#: src/fs/gnunet-service-fs_indexing.c:266
 #, c-format
-msgid "Binary implementing service `%s' not known!\n"
+msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:464
+#: src/fs/gnunet-service-fs_indexing.c:487
 #, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not known!\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
+msgid "Failed to delete bogus block: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/arm/gnunet-service-arm.c:498
+#: src/fs/gnunet-service-fs_indexing.c:552
 #, fuzzy, c-format
-msgid "Preparing to stop `%s'\n"
-msgstr "Startade samling \"%s\".\n"
+msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/arm/gnunet-service-arm.c:666
-msgid "Stopping all services\n"
-msgstr ""
+#: src/fs/gnunet-service-fs_indexing.c:554
+#, fuzzy
+msgid "not indexed"
+msgstr "Avindexering misslyckades."
 
-#: src/arm/gnunet-service-arm.c:723
+#: src/fs/gnunet-service-fs_indexing.c:569
 #, fuzzy, c-format
-msgid "Restarting service `%s'.\n"
-msgstr "Startade samling \"%s\".\n"
+msgid "Indexed file `%s' changed at offset %llu\n"
+msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/arm/gnunet-service-arm.c:796
-msgid "exit"
-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/arm/gnunet-service-arm.c:801
-msgid "signal"
+#: 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/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/fs_unindex.c:58
+msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:806
+#: src/fs/fs_unindex.c:63
 #, fuzzy
-msgid "unknown"
-msgstr "Okänt fel"
+msgid "Failed to read file"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/arm/gnunet-service-arm.c:813
-#, fuzzy, c-format
-msgid "Service `%s' stopped\n"
-msgstr "Tjänst borttagen.\n"
+#: src/fs/fs_unindex.c:235
+msgid "Unexpected time for a response from `fs' service."
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:827
-#, c-format
-msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
+#: src/fs/fs_unindex.c:243
+msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:161
-#, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "Tjänst borttagen.\n"
+#: src/fs/fs_unindex.c:251
+#, fuzzy
+msgid "Invalid response from `fs' service."
+msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:165
-#, fuzzy, c-format
-msgid "Failed to stop service `%s'!\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/fs/fs_unindex.c:296
+#, fuzzy
+msgid "Failed to connect to FS service for unindexing."
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:171
-#, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "Tjänst borttagen.\n"
+#: src/fs/fs_unindex.c:331
+#, fuzzy
+msgid "Failed to connect to `datastore' service."
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:175
-#, fuzzy, c-format
-msgid "Failed to start service `%s'!\n"
-msgstr "Misslyckades att starta samling.\n"
+#: src/fs/fs_unindex.c:344
+#, fuzzy
+msgid "Failed to open file for unindexing."
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:181
+#: src/fs/fs_unindex.c:378
+#, fuzzy
+msgid "Failed to compute hash of file."
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/fs/gnunet-download.c:100
 #, fuzzy, c-format
-msgid "Some error communicating with service `%s'.\n"
-msgstr "Skriv ut information om GNUnets motparter."
+msgid "Starting download `%s'.\n"
+msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:207
+#: src/fs/gnunet-download.c:112
 #, c-format
-msgid "Service `%s' is running.\n"
+msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:212
+#: src/fs/gnunet-download.c:121
 #, fuzzy, c-format
-msgid "Service `%s' is not running.\n"
-msgstr "\"%s\" är inte en fil.\n"
+msgid "Error downloading: %s.\n"
+msgstr "Fel vid nedladdning: %s\n"
 
-#: src/arm/gnunet-arm.c:238
-#, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
-msgid "Fatal error initializing ARM API.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:269
+#: src/fs/gnunet-download.c:129
 #, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+msgid "Downloading `%s' done (%s/s).\n"
+msgstr "Uppladdning vägrades!"
 
-#: src/arm/gnunet-arm.c:275
+#: src/fs/gnunet-download.c:169
 #, fuzzy, c-format
-msgid "Failed to remove servicehome directory %s\n"
-msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+msgid "You need to specify a URI argument.\n"
+msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/arm/gnunet-arm.c:387
-msgid "stop all GNUnet services"
+#: src/fs/gnunet-download.c:182
+#, c-format
+msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:389
-msgid "start a particular service"
+#: src/fs/gnunet-download.c:189
+#, c-format
+msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
-msgid "stop a particular service"
+#: src/fs/gnunet-download.c:243
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:393
-msgid "start all GNUnet default services"
-msgstr ""
+#: src/fs/gnunet-download.c:249
+msgid "write the file to FILENAME"
+msgstr "skriv filen till FILNAMN"
 
-#: src/arm/gnunet-arm.c:396
-msgid "stop and start all GNUnet default services"
+#: src/fs/gnunet-download.c:253
+msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:399
-msgid "test if a particular service is running"
+#: src/fs/gnunet-download.c:257
+msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:402
-msgid "delete config file and directory on exit"
-msgstr ""
+#: src/fs/gnunet-download.c:260
+msgid "download a GNUnet directory recursively"
+msgstr "hämta en GNUnet-katalog rekursivt"
 
-#: src/arm/gnunet-arm.c:404
-msgid "don't print status messages"
+#: src/fs/gnunet-download.c:270
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:407
-msgid "timeout for completing current operation"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:418
-msgid "Control services and the Automated Restart Manager (ARM)"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:803
+#: src/fs/fs_getopt.c:191
 #, c-format
-msgid "Unable to forward to service `%s': shutdown\n"
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:812
-#, c-format
-msgid "Unable to forward to service `%s': timeout before connect\n"
+#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
+#, fuzzy, c-format
+msgid "Publishing failed: %s"
 msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:868
+#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
+#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
 #, fuzzy, c-format
-msgid "Unable to start service `%s': %s\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+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/arm/gnunet-service-arm_interceptor.c:936
-#, fuzzy, c-format
-msgid "Unable to accept connection for service `%s': %s\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+#: src/fs/fs_publish.c:649
+msgid "timeout on index-start request to `fs' service"
+msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:952
-#, fuzzy, c-format
-msgid "Service `%s' started\n"
-msgstr "Tjänst borttagen.\n"
+#: src/fs/fs_publish.c:661
+#, fuzzy
+msgid "unknown error"
+msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1080
-#, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "Kunde inte skapa användarkonto:"
-
-#: src/arm/gnunet-service-arm_interceptor.c:1102
-#, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+#: src/fs/fs_publish.c:704
+msgid "failed to compute hash"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1116
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+#: src/fs/fs_publish.c:724
+msgid "filename too long"
 msgstr ""
 
-#: src/arm/arm_api.c:201 src/arm/test_exponential_backoff.c:192
-msgid "Failed to transmit shutdown request to client.\n"
-msgstr ""
+#: src/fs/fs_publish.c:751
+#, fuzzy
+msgid "could not connect to `fs' service"
+msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/arm/arm_api.c:390
+#: src/fs/fs_publish.c:775
 #, 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"
+msgid "Failed to get file identifiers for `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/arm/arm_api.c:405
+#: src/fs/fs_publish.c:845
 #, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
+msgid "Recursive upload failed at `%s': %s"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/arm/arm_api.c:469
-#, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
+#: src/fs/fs_publish.c:851
+#, fuzzy, c-format
+msgid "Recursive upload failed: %s"
 msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
 
-#: src/arm/arm_api.c:539
-#, c-format
-msgid "Requesting start of service `%s'.\n"
+#: src/fs/fs_publish.c:899
+msgid "needs to be an actual file"
 msgstr ""
 
-#: src/arm/arm_api.c:540
+#: src/fs/fs_publish.c:1078
 #, c-format
-msgid "Requesting termination of service `%s'.\n"
+msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/arm/arm_api.c:563
+#: src/fs/fs_publish.c:1149
 #, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/arm/arm_api.c:566
-#, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
-msgstr ""
+#: src/fs/fs_publish.c:1482
+#, fuzzy
+msgid "Could not connect to datastore."
+msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/arm/arm_api.c:598 src/arm/arm_api.c:602
+#: src/fs/fs.c:284
 #, fuzzy, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
-msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
+msgid "Could not open file `%s': %s"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/arm/arm_api.c:675
+#: src/fs/fs.c:293
 #, fuzzy, c-format
-msgid "Stopping service `%s' within %llu ms\n"
-msgstr "Inget svar mottaget inom %llums.\n"
+msgid "Could not read file `%s': %s"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/dht/dhtlog.c:56
+#: src/fs/fs.c:299
 #, c-format
-msgid "Loading `%s' dhtlog plugin\n"
+msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/dht/dhtlog.c:65
+#: src/fs/fs.c:877
 #, fuzzy, c-format
-msgid "Failed to load dhtlog plugin for `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Failed to resume publishing information `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:895
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:655
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:686
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:718
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:750
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:782
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:813
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:844
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:875
-#, fuzzy, c-format
-msgid "Failed to get full path for `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/fs/fs.c:1323
+#, c-format
+msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
+msgstr ""
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:924
-#, fuzzy
-msgid "Failed to create file for dhtlog.\n"
-msgstr "Kunde inte skapa användarkonto:"
-
-#: src/dht/gnunet-dht-get-peer.c:84
+#: src/fs/fs.c:1364
 #, c-format
-msgid "Found %u peers\n"
+msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:115
+#: src/fs/fs.c:1380
 #, fuzzy, c-format
-msgid "Found peer `%s'\n"
-msgstr "Jag är ändpunkt \"%s\".\n"
+msgid "Failed to resume publishing operation `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dht/gnunet-dht-get-peer.c:184 src/dht/gnunet-dht-put.c:161
-#: src/dht/gnunet-dht-get.c:195
-msgid "the query key"
-msgstr ""
-
-#: src/dht/gnunet-dht-get-peer.c:187 src/dht/gnunet-dht-put.c:170
-#: src/dht/gnunet-dht-get.c:201
-msgid "how long to execute this query before giving up?"
-msgstr ""
-
-#: src/dht/gnunet-dht-get-peer.c:209
-msgid "Issue a GET PEER request to the GNUnet DHT, print results."
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:95
+#: src/fs/fs.c:1984
 #, c-format
-msgid "PUT request sent!\n"
+msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:119
-#, c-format
-msgid "Must provide KEY and DATA for DHT put!\n"
-msgstr ""
+#: src/fs/fs.c:1994
+#, fuzzy, c-format
+msgid "Failed to resume unindexing operation `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dht/gnunet-dht-put.c:127
+#: src/fs/fs.c:2107 src/fs/fs.c:2346
 #, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
+msgid "Failed to resume sub-download `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dht/gnunet-dht-put.c:132
+#: src/fs/fs.c:2124
 #, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
+msgid "Failed to resume sub-search `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dht/gnunet-dht-put.c:147
+#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
 #, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:164
-msgid "the data to insert under the key"
+#: src/fs/fs.c:2337
+#, c-format
+msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:167
-msgid "the type to insert data as"
+#: src/fs/fs.c:2583
+msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:173
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/fs/fs.c:2669
+#, c-format
+msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+#: src/fs/fs_download.c:309
+msgid ""
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198
-msgid "the type of data to look for"
+#: src/fs/fs_download.c:329
+msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:223
-msgid "Issue a GET request to the GNUnet DHT, prints results."
-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 "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dht/dht_api.c:235
-#, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/fs/fs_download.c:872
+#, 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/dht/plugin_dhtlog_mysql.c:1550
-msgid "Failed to initialize MySQL database connection for dhtlog.\n"
+#: src/fs/fs_download.c:958
+#, 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/transport/test_plugin_transport_udp.c:185
-#: src/transport/test_plugin_transport_https.c:1271
-#: src/transport/test_plugin_transport.c:202
-#: src/transport/gnunet-service-transport.c:439
-#: src/transport/test_plugin_transport_http.c:1232
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+#: src/fs/fs_download.c:985
+msgid "internal error decrypting content"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:195
-#: src/transport/test_plugin_transport_https.c:1335
-#: src/transport/test_plugin_transport.c:212
-#: src/transport/gnunet-service-transport.c:448
-#: src/transport/test_plugin_transport_http.c:1255
-msgid "Transport service could not access hostkey.  Exiting.\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_udp.c:205
-#, fuzzy
-msgid "Loading udp transport plugin\n"
-msgstr "Testar transport(er) %s\n"
-
-#: src/transport/test_plugin_transport_udp.c:213
-#, fuzzy
-msgid "Failed to load transport plugin for udp\n"
+#: src/fs/fs_download.c:1008
+#, fuzzy, c-format
+msgid "Download failed: could not open file `%s': %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/plugin_transport_wlan.c:1436
-#: src/transport/plugin_transport_wlan.c:1631
-#: src/transport/plugin_transport_wlan.c:1750
-#, c-format
-msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
-msgstr ""
+#: src/fs/fs_download.c:1020
+#, fuzzy, c-format
+msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_wlan.c:1868
+#: src/fs/fs_download.c:1029
 #, c-format
-msgid "Wlan Address len %d is wrong\n"
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2728
-#, c-format
-msgid "Finished reading from wlan-helper stdout with code: %d\n"
-msgstr ""
+#: src/fs/fs_download.c:1826
+#, fuzzy
+msgid "Invalid URI"
+msgstr "Ogiltiga argument: "
 
-#: src/transport/gnunet-service-transport_clients.c:246
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+#: src/fs/gnunet-service-fs.c:268 src/fs/gnunet-service-fs.c:448
+msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:251
-msgid "# messages dropped due to slow client"
-msgstr ""
+#: src/fs/gnunet-service-fs.c:542 src/topology/gnunet-daemon-topology.c:1292
+#: src/topology/gnunet-daemon-topology.c:1299
+#: src/hostlist/gnunet-daemon-hostlist.c:290
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' service.\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_clients.c:394
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
+# drive = hard drive ?
+#: src/fs/fs_file_information.c:350
+#, fuzzy, c-format
+msgid "`%s' failed on file `%s': %s"
+msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:435
+msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:511
+#: src/transport/gnunet-service-transport_neighbours.c:807
 #, fuzzy
-msgid "# bytes payload received for other peers"
-msgstr "# byte mottagna av typen %d"
+msgid "# peers disconnected due to external request"
+msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-service-transport_clients.c:528
-msgid "# bytes payload dropped (other peer was not connected)"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:913
+#, fuzzy
+msgid "# peers disconnected due to timeout"
+msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-service-transport_clients.c:579
+#: src/transport/gnunet-service-transport_neighbours.c:937
 #, fuzzy
-msgid "# REQUEST CONNECT messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "# keepalives sent"
+msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_clients.c:607
+#: src/transport/gnunet-service-transport_neighbours.c:969
 #, fuzzy
-msgid "# SET QUOTA messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "# peers disconnected due to global disconnect"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:811
+#: src/transport/gnunet-service-transport_neighbours.c:1499
+#: src/transport/gnunet-service-transport_neighbours.c:1520
 msgid "# messages not sent (no such peer or not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:831
+#: src/transport/gnunet-service-transport_neighbours.c:1536
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:899
+#: src/transport/gnunet-service-transport_neighbours.c:1584
+#, fuzzy
+msgid "# messages discarded due to lack of neighbour record"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1620
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:917
+#: src/transport/gnunet-service-transport_neighbours.c:1638
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:942
+#: src/transport/gnunet-service-transport_neighbours.c:1663
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:972
+#: src/transport/gnunet-service-transport_neighbours.c:1693
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:984
+#: src/transport/gnunet-service-transport_neighbours.c:1706
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:108
-msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1820
+msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:115
-#, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Testar transport(er) %s\n"
-
-#: src/transport/gnunet-service-transport_plugins.c:119
-#, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Testar transport(er) %s\n"
-
-#: src/transport/gnunet-service-transport_plugins.c:139
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/transport/test_plugin_transport_https.c:409
-msgid "Phase 0: Test plugin functions failed\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1832
+msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:418
-msgid "Phase 1: Test connect with wrong data failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:427
-msgid "Phase 2: Test session selection failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:435
-msgid "Phase 3: Test sending with plugin failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:726
-#: src/transport/test_plugin_transport_http.c:692
+#: src/transport/gnunet-service-transport_blacklist.c:247
 #, fuzzy, c-format
-msgid "curl failed for `%s' at %s:%d: `%s'\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+msgid "Could not read blacklist file `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/test_plugin_transport_https.c:746
-#: src/transport/test_plugin_transport_http.c:712
-msgid "Connecting to peer without any peer identification: test failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:759
-#: src/transport/test_plugin_transport_http.c:725
-msgid "Connecting to peer with too short peer identification: test failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:772
-#: src/transport/test_plugin_transport_http.c:738
-msgid "Connecting to peer with too long peer identification: test failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:785
-msgid "Connecting to peer with valid peer identification: test failed\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:924
-#: src/transport/test_plugin_transport_http.c:887
+#: src/transport/gnunet-service-transport_blacklist.c:254
 #, c-format
-msgid "Unknown address size: ipv6 has %u ipv4 has %u but this has %u\n"
+msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:930
-#: src/transport/test_plugin_transport_http.c:893
-#, c-format
-msgid "Transport plugin notification for address: `%s':%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/transport/test_plugin_transport_https.c:1038
-#: src/transport/test_plugin_transport_http.c:1002
-msgid "Connecting to peer without any peer identification.\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/transport/test_plugin_transport_https.c:1053
-#: src/transport/test_plugin_transport_http.c:1017
-msgid "Connecting to peer with too short peer identification.\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1069
-#: src/transport/test_plugin_transport_http.c:1033
-msgid "Connecting to peer with too long peer identification.\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1083
-#: src/transport/test_plugin_transport_http.c:1047
-msgid "Connecting to peer with valid peer identification.\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1093
-msgid ""
-"\n"
-"Phase 1: transmit data to all suggested addresses\n"
-"\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1151
-msgid ""
-"\n"
-"Phase 2: session selection\n"
-"\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1187
-msgid ""
-"\n"
-"Phase 3: send multiple or big messages after disconnect\n"
-"\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1193
-#, fuzzy
-msgid "Phase 3: sending messages\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/transport/test_plugin_transport_https.c:1284
-#: src/transport/plugin_transport_http.c:3323
-#: src/transport/test_plugin_transport_http.c:1245
+#: src/transport/gnunet-service-transport_blacklist.c:298
+#: src/transport/gnunet-service-transport_blacklist.c:336
 #, c-format
-msgid "Require valid port number for transport plugin `%s' in configuration!\n"
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1352
+#: src/transport/gnunet-service-transport_blacklist.c:350
 #, fuzzy, c-format
-msgid "Loading HTTPS transport plugin `%s'\n"
-msgstr "Testar transport(er) %s\n"
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/transport/test_plugin_transport_https.c:1358
-#, fuzzy
-msgid "Failed to load transport plugin for https\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/transport/test_plugin_transport_https.c:1368
+#: src/transport/gnunet-service-transport_blacklist.c:364
 #, c-format
-msgid "Transport plugin returned %u addresses to connect to\n"
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1444
-msgid ""
-"\n"
-"Phase 0\n"
-"\n"
+#: src/transport/gnunet-service-transport_blacklist.c:522
+#: src/transport/gnunet-service-transport_blacklist.c:760
+msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1507
-#: src/transport/test_plugin_transport_https.c:1510
+#: src/transport/plugin_transport_http_server.c:184
 msgid ""
-"\n"
-"delete\n"
-"\n"
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/test_transport_api.c:120
-#, fuzzy
-msgid "Fail! Could not connect peers\n"
-msgstr "\"%s\": Kunde inte ansluta.\n"
-
-#: src/transport/gnunet-transport-list-connections.c:91
-#: src/peerinfo-tool/gnunet-peerinfo.c:200
-#: src/core/gnunet-core-list-connections.c:166
-#, fuzzy, c-format
-msgid "Invalid command line argument `%s'\n"
-msgstr "Ogiltiga kommandoradsargument:\n"
-
-#: src/transport/gnunet-transport-list-connections.c:112
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
-#: src/core/gnunet-core-list-connections.c:187
-msgid "don't resolve host names"
+#: src/transport/plugin_transport_http_server.c:208
+msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-list-connections.c:119
-#: src/core/gnunet-core-list-connections.c:194
-#, fuzzy
-msgid "Print information about connected peers."
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/transport/test_plugin_transport.c:224
-#, fuzzy
-msgid "Loading tcp transport plugin\n"
-msgstr "Testar transport(er) %s\n"
-
-#: src/transport/test_plugin_transport.c:232
-#, fuzzy
-msgid "Failed to load transport plugin for tcp\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/transport/gnunet-service-transport_hello.c:176
+#: src/transport/gnunet-service-transport_hello.c:177
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:698
-#: src/transport/plugin_transport_http.c:1231
-#: src/transport/plugin_transport_http.c:2551
-msgid "# HTTP peers active"
-msgstr ""
+#: src/transport/plugin_transport_udp.c:1428
+#: src/transport/plugin_transport_udp.c:2132
+#, fuzzy
+msgid "# HELLO beacons received via udp"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_http.c:993
-#: src/transport/plugin_transport_http.c:1306
-msgid "# HTTP inbound sessions for peers active"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1889
+#: src/transport/plugin_transport_udp.c:1900
+#: src/transport/plugin_transport_udp_new.c:1209
 #, c-format
-msgid "Connection %X: HTTP PUT to peer `%s' (`%s') failed: `%s' `%s'\n"
+msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1915
-#, c-format
-msgid "Connection %X: HTTP GET to peer `%s' (`%s') failed: `%s' `%s'\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:2193
-#: src/transport/plugin_transport_http.c:2305
+#: src/transport/plugin_transport_udp.c:1953
+#: src/transport/plugin_transport_udp_new.c:1259
 #, fuzzy, c-format
-msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+msgid "Invalid IPv6 address: `%s'\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http.c:2592
-msgid "# HTTP outbound sessions for peers active"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:3351
-#: src/transport/plugin_transport_http.c:3380
+#: src/transport/plugin_transport_udp.c:2146
+#: src/transport/plugin_transport_udp_new.c:1388
 #, fuzzy
-msgid "Misconfigured address to bind to in configuration!\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
+msgid "Failed to open UDP sockets\n"
+msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_http.c:3406
-#, c-format
-msgid "Required configuration options missing in section `%s'\n"
-msgstr ""
+#: src/transport/plugin_transport_http_client.c:107
+#: src/transport/plugin_transport_http_client.c:122
+#: 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\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/transport/plugin_transport_http.c:3444
-msgid ""
-"Could not create a new TLS certificate, program `gnunet-transport-"
-"certificate-creation' could not be started!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:3460
-msgid "No usable TLS certificate found and creating one failed!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:3612
+#: src/transport/plugin_transport_http_client.c:617
 #, c-format
-msgid ""
-"HTTP Server with %s could not be started on port %u! %s plugin failed!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:3628
-#, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
@@ -3749,16 +3312,16 @@
 
 #: src/transport/plugin_transport_tcp.c:590
 #: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:728
-#: src/transport/plugin_transport_tcp.c:817
-#: src/transport/plugin_transport_tcp.c:1142
+#: src/transport/plugin_transport_tcp.c:732
+#: src/transport/plugin_transport_tcp.c:821
+#: src/transport/plugin_transport_tcp.c:1160
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
 #: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:843
-#: src/transport/plugin_transport_tcp.c:1531
+#: src/transport/plugin_transport_tcp.c:847
+#: src/transport/plugin_transport_tcp.c:1548
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
@@ -3768,135 +3331,131 @@
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:731
+#: src/transport/plugin_transport_tcp.c:735
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:821
+#: src/transport/plugin_transport_tcp.c:825
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:942
+#: src/transport/plugin_transport_tcp.c:946
 #, fuzzy
 msgid "# bytes TCP was asked to transmit"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:993
+#: src/transport/plugin_transport_tcp.c:997
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1034
+#: src/transport/plugin_transport_tcp.c:1040
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1051
+#: src/transport/plugin_transport_tcp.c:1057
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1103
+#: src/transport/plugin_transport_tcp.c:1108
 #, fuzzy
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1211
+#: src/transport/plugin_transport_tcp.c:1228
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1574
+#: src/transport/plugin_transport_tcp.c:1591
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:1722
+#: src/transport/plugin_transport_tcp.c:1736
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:1788
+#: src/transport/plugin_transport_tcp.c:1800
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1941
+#: src/transport/plugin_transport_tcp.c:1953
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2001
+#: src/transport/plugin_transport_tcp.c:2013
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2024
+#: src/transport/plugin_transport_tcp.c:2036
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2028
+#: src/transport/plugin_transport_tcp.c:2040
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/plugin_transport_tcp.c:2044
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:518
-msgid "# address records discarded"
+#: src/transport/plugin_transport_http.c:829
+msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:604
-#: src/core/gnunet-service-core.c:4187
+#: src/transport/plugin_transport_http.c:878
 #, fuzzy
-msgid "# PING messages received"
-msgstr "# PING-meddelanden skapade"
+msgid "Require valid port number for service in configuration!\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/transport/gnunet-service-transport_validation.c:626
+#: src/transport/plugin_transport_http.c:1025
 #, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:683
-msgid "# PONGs unicast via reliable transport"
+#: src/transport/plugin_transport_http.c:1040
+#, c-format
+msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:692
-msgid "# PONGs multicast to all available addresses"
+#: src/transport/plugin_transport_http.c:1115
+msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:756
-#, 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:790
+#: src/transport/plugin_transport_http.c:1128
 #, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# PING-meddelanden i klartext skickade"
+msgid "Port is required! Fix in configuration\n"
+msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/gnunet-service-transport_validation.c:862
-msgid "# address revalidations started"
+#: src/transport/plugin_transport_http.c:1139
+msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:921
-#: src/core/gnunet-service-core.c:4210
-#, fuzzy
-msgid "# PONG messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/transport/gnunet-service-transport_validation.c:943
-msgid "# PONGs dropped, no matching pending validation"
+#: src/transport/plugin_transport_http.c:1155
+#, c-format
+msgid ""
+"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:959
-msgid "# PONGs dropped, signature expired"
+#: src/transport/plugin_transport_http.c:1181
+#, 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:1088
+#, fuzzy
+msgid "Failed to open UNIX sockets\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
 #: src/transport/plugin_transport_smtp.c:367
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -3945,89 +3504,395 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/test_plugin_transport_http.c:1271
+#: src/transport/gnunet-service-transport_plugins.c:108
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:115
 #, fuzzy, c-format
-msgid "Loading HTTP transport plugin `%s'\n"
+msgid "Starting transport plugins `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/test_plugin_transport_http.c:1278
-#, fuzzy
-msgid "Failed to load transport plugin for http\n"
+#: src/transport/gnunet-service-transport_plugins.c:119
+#, fuzzy, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr "Testar transport(er) %s\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:139
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/test_plugin_transport_http.c:1364
+#: src/transport/plugin_transport_wlan.c:877
+#, fuzzy
+msgid "# wlan session timeouts"
+msgstr "# sessionsnycklar accepterade"
+
+#: src/transport/plugin_transport_wlan.c:902
+#, fuzzy
+msgid "# wlan session created"
+msgstr "# sessionsnycklar accepterade"
+
+#: src/transport/plugin_transport_wlan.c:985
+#: src/transport/plugin_transport_wlan.c:1143
+#: src/transport/plugin_transport_wlan.c:1163
+#: src/transport/plugin_transport_wlan.c:1193
+#: src/transport/plugin_transport_wlan.c:2361
+#: src/transport/plugin_transport_wlan.c:3192
+msgid "# wlan pending sessions"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1455
+#, c-format
+msgid "Finished reading from wlan-helper stdout with code: %d\n"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1771
+msgid "# wlan hello beacons send"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1803
+#: src/transport/plugin_transport_wlan.c:2016
+#: src/transport/plugin_transport_wlan.c:2109
+#, c-format
+msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:2003
+msgid "# wlan acks send"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:2072
+#, fuzzy
+msgid "# wlan fragments send"
+msgstr "# byte mottogs via TCP"
+
+#: src/transport/plugin_transport_wlan.c:2231
+#, c-format
+msgid "Wlan Address len %d is wrong\n"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:2236
+#, fuzzy
+msgid "# wlan messages queued"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_wlan.c:2323
+#: src/transport/plugin_transport_wlan.c:2959
+#: src/transport/plugin_transport_wlan.c:3194
+msgid "# wlan mac endpoints"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:2543
+#, fuzzy
+msgid "# wlan whole messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_wlan.c:2741
+#, fuzzy
+msgid "# wlan hello messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_wlan.c:2775
+#, fuzzy
+msgid "# wlan fragments received"
+msgstr "# byte mottogs via TCP"
+
+#: src/transport/plugin_transport_wlan.c:2827
+#, fuzzy
+msgid "# wlan acks received"
+msgstr "# klartext PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_wlan.c:2920
+msgid "# wlan mac endpoints timeouts"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:2943
+#, fuzzy
+msgid "# wlan mac endpoints created"
+msgstr "# byte mottogs via TCP"
+
+#: src/transport/plugin_transport_wlan.c:2999
+msgid "# wlan WLAN_HELPER_DATA received"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:3050
+#, fuzzy
+msgid "# wlan messaged for this client received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_wlan.c:3058
+msgid "# wlan messaged inside WLAN_HELPER_DATA received"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:128
+#, c-format
+msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:137
+#, c-format
+msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:176
+#, fuzzy, c-format
+msgid "Transmitting %u bytes to %s\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/transport/gnunet-transport.c:202
+#, fuzzy, c-format
+msgid "Connected to %s\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/transport/gnunet-transport.c:243
+#, fuzzy, c-format
+msgid "Disconnected from %s\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/transport/gnunet-transport.c:283
+#, c-format
+msgid "Received %u bytes from %s\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:305
+#, fuzzy, c-format
+msgid "Peer `%s' plugin: `%s' address `%s'\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+
+#: src/transport/gnunet-transport.c:339
+#, fuzzy, c-format
+msgid "Failed to parse peer identity `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/transport/gnunet-transport.c:377
+msgid "measure how fast we are receiving data (until CTRL-C)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:380
+#, fuzzy
+msgid "try to connect to the given peer"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/transport/gnunet-transport.c:383
+#, fuzzy
+msgid "provide information about all current connections (once)"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/transport/gnunet-transport.c:386
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:393
+#, fuzzy
+msgid "Direct access to transport service."
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/transport/gnunet-service-transport_validation.c:515
+msgid "# address records discarded"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:628
+#, c-format
 msgid ""
-"Phase 0\n"
-"\n"
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1280
+#: src/transport/gnunet-service-transport_validation.c:696
+msgid "# PONGs unicast via reliable transport"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:705
+msgid "# PONGs multicast to all available addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:769
 #, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+msgid ""
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1330
+#: src/transport/gnunet-service-transport_validation.c:803
+#, fuzzy
+msgid "# PING without HELLO messages sent"
+msgstr "# PING-meddelanden i klartext skickade"
+
+#: src/transport/gnunet-service-transport_validation.c:875
+msgid "# address revalidations started"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:956
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:972
+msgid "# PONGs dropped, signature expired"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1050
 #, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
+msgid "Adding `%s' without addresses for peer `%s'\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/plugin_transport_udp.c:1456
+#: src/transport/gnunet-service-transport_clients.c:250
+#, 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:255
+msgid "# messages dropped due to slow client"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:405
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:522
 #, fuzzy
-msgid "Failed to open UDP sockets\n"
-msgstr "Misslyckades att binda till UDP6-port %d.\n"
+msgid "# bytes payload received for other peers"
+msgstr "# byte mottagna av typen %d"
 
-#: src/transport/transport_api.c:570
+#: src/transport/gnunet-service-transport_clients.c:539
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:590
+#, fuzzy
+msgid "# REQUEST CONNECT messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: 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/transport/plugin_transport_unix.c:1092
+#: src/transport/gnunet-service-transport.c:162
 #, fuzzy
-msgid "Failed to open UNIX sockets\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "# bytes payload discarded due to not connected peer "
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
+#: src/transport/gnunet-service-transport.c:519
+msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:528
+msgid "Transport service could not access hostkey.  Exiting.\n"
+msgstr ""
+
+#: src/dv/plugin_transport_dv.c:159
 #, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\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/transport/gnunet-service-transport_blacklist.c:254
+#: 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 ""
+
+#: src/topology/gnunet-daemon-topology.c:379
+#, fuzzy
+msgid "# connect requests issued to transport"
+msgstr "# byte mottogs via TCP"
+
+#: src/topology/gnunet-daemon-topology.c:674
+#: src/topology/gnunet-daemon-topology.c:760
+#, fuzzy
+msgid "# friends connected"
+msgstr "# av anslutna parter"
+
+#: src/topology/gnunet-daemon-topology.c:877
+#: src/hostlist/hostlist-server.c:187
+#, 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:952
+msgid "Failed to connect to core service, can not manage topology!\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:984
 #, c-format
-msgid "Blacklist file `%s' is empty.\n"
+msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/topology/gnunet-daemon-topology.c:996
 #, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
+msgid "Could not read friends list `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
+#: src/topology/gnunet-daemon-topology.c:1002
+#, c-format
+msgid "Friends file `%s' is empty.\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:1011
 #, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
+msgid "Failed to read friends list from `%s': out of memory\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/topology/gnunet-daemon-topology.c:1019
 #, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgid "Failed to read friends list from `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/topology/gnunet-daemon-topology.c:1039
+#, c-format
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
+#: src/topology/gnunet-daemon-topology.c:1052
+#, c-format
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:1062
 #, 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"
+msgid "Found friend `%s' in configuration\n"
+msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/topology/gnunet-daemon-topology.c:1068
 #, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:754
-msgid "# disconnects due to blacklist"
+#: src/topology/gnunet-daemon-topology.c:1078
+#, fuzzy
+msgid "# friends in configuration"
+msgstr " gconfig\tGTK-konfiguration\n"
+
+#: src/topology/gnunet-daemon-topology.c:1084
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
 msgstr ""
 
+#: src/topology/gnunet-daemon-topology.c:1091
+msgid ""
+"More friendly connections required than target total number of connections.\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:1128
+#, fuzzy
+msgid "# HELLO messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/topology/gnunet-daemon-topology.c:1185
+msgid "# HELLO messages gossipped"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:1325
+msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+msgstr ""
+
 #: src/chat/chat.c:175
 #, fuzzy
 msgid "Could not transmit confirmation receipt\n"
@@ -4079,6 +3944,26 @@
 msgid "Undefined mandatory parameter: memberCallback\n"
 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/chat/gnunet-chat.c:92
 #, c-format
 msgid "Joined\n"
@@ -4275,639 +4160,609 @@
 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/nat/gnunet-nat-server.c:289
+#, c-format
+msgid "Please pass valid port number as the first argument! (got `%s')\n"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:546
-#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "Kunde inte spara konfiguration!"
+#: src/nat/gnunet-nat-server.c:328
+msgid "GNUnet NAT traversal test helper daemon"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:729
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "Kunde inte spara konfiguration!"
+#: src/nat/nat.c:776
+#, c-format
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:907
-#, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "Kunde inte spara konfiguration!"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
-#: src/core/gnunet-core-list-connections.c:77
+#: src/nat/nat.c:825
 #, fuzzy, c-format
-msgid "Peer `%s'\n"
-msgstr "Jag är ändpunkt \"%s\".\n"
+msgid "Failed to start %s\n"
+msgstr "Misslyckades att starta samling.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:222
+#: src/nat/nat.c:1094
 #, fuzzy, c-format
-msgid "Could not find option `%s:%s' in configuration.\n"
-msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+msgid "Malformed %s `%s' given in configuration!\n"
+msgstr "Kunde inte spara konfiguration!"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
-#, 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:241
+#: src/nat/nat.c:1156 src/nat/nat.c:1166
 #, c-format
-msgid "I am peer `%s'.\n"
-msgstr "Jag är ändpunkt \"%s\".\n"
+msgid ""
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\n"
+msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
-msgid "output only the identity strings"
+#: src/nat/nat.c:1298
+msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
-msgid "output our own identity only"
+#: src/nat/nat.c:1310
+#, c-format
+msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:270
+#: src/nat/nat_test.c:348
 #, fuzzy
-msgid "Print information about peers."
-msgstr "Skriv ut information om GNUnets motparter."
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:61
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%u with error: %s"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\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/datastore/plugin_datastore_sqlite.c:239
+#: src/block/plugin_block_dht.c:122
 #, fuzzy, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
+msgid "Block not of type %u\n"
+msgstr "Ingen transport av typ %d är känd.\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:677
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+#: src/block/plugin_block_dht.c:129
+msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1130
-msgid "sqlite version to old to determine size, assuming zero\n"
+#: src/block/plugin_block_dht.c:138
+#, c-format
+msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1149
-#, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+#: src/block/plugin_block_fs.c:131
+msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1188
-msgid "Sqlite database running\n"
+#: src/block/block.c:109
+#, fuzzy, c-format
+msgid "Loading block plugins `%s'\n"
+msgstr "Testar transport(er) %s\n"
+
+#: src/block/block.c:119
+#, fuzzy, c-format
+msgid "Failed to load block plugin `%s'\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/mesh/gnunet-service-mesh.c:4121
+msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:52
+#: src/mesh/gnunet-service-mesh.c:4324
 #, fuzzy
-msgid "# bytes used in file-sharing datastore"
-msgstr "# byte krypterade"
+msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
+msgstr "GNUnet-konfiguration"
 
-#: src/datastore/gnunet-service-datastore.c:331
+#: src/mesh/gnunet-service-mesh.c:4333
 #, fuzzy
-msgid "# bytes expired"
-msgstr "# byte mottogs via TCP"
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/datastore/gnunet-service-datastore.c:397
-msgid "# bytes purged (low-priority)"
+#: src/hostlist/hostlist-client.c:286
+msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:457
-msgid "Transmission to client failed!\n"
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
+msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:610
-msgid "# results found"
+#: 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 "Ogiltigt meddelande mottogs den %s:%d."
+
+#: src/hostlist/hostlist-client.c:330
+msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:655
+#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
 #, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
-"%llu bytes\n"
+msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:666
+#: 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 ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:670
+#: src/hostlist/hostlist-client.c:663
+#, c-format
 msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:676
-msgid "Insufficient space to satisfy request"
+#: 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/hostlist/hostlist-client.c:822
+#, c-format
+msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:681
-#: src/datastore/gnunet-service-datastore.c:735
-#: src/datastore/gnunet-service-datastore.c:956
-#: src/datastore/gnunet-service-datastore.c:1441
-msgid "# reserved"
+#: src/hostlist/hostlist-client.c:842
+#, fuzzy, c-format
+msgid "%s failed for `%s' at %s:%d: `%s'\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/hostlist/hostlist-client.c:848
+#, fuzzy, c-format
+msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
+"Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/datastore/gnunet-service-datastore.c:750
-msgid "Could not find matching reservation"
+#: src/hostlist/hostlist-client.c:856
+#, c-format
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/hostlist/hostlist-client.c:909
 #, c-format
-msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
+msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1004
-#, fuzzy
-msgid "# GET requests received"
-msgstr "# byte mottogs via TCP"
+#: src/hostlist/hostlist-client.c:917
+msgid "# hostlist downloads initiated"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1018
-msgid "# requests filtered by bloomfilter"
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1046
-#, fuzzy
-msgid "# UPDATE requests received"
-msgstr "# byte mottogs via TCP"
+#: src/hostlist/hostlist-client.c:1054
+#, c-format
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1080
-msgid "# GET REPLICATION requests received"
+#: src/hostlist/hostlist-client.c:1092
+msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1115
-msgid "# GET ZERO ANONYMITY requests received"
+#: src/hostlist/hostlist-client.c:1096
+#, c-format
+msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1142
+#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
 #, fuzzy
-msgid "Content not found"
-msgstr "Kommando \"%s\" hittades inte!\n"
+msgid "# active connections"
+msgstr "Nätverksanslutning"
 
-#: src/datastore/gnunet-service-datastore.c:1152
-msgid "# bytes removed (explicit request)"
+#: src/hostlist/hostlist-client.c:1253
+#, c-format
+msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1186
-#, fuzzy
-msgid "# REMOVE requests received"
-msgstr "# byte mottogs via TCP"
-
-#: src/datastore/gnunet-service-datastore.c:1230
+#: src/hostlist/hostlist-client.c:1284
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid ""
+"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1303
-#: src/datastore/test_plugin_datastore.c:322
-#: src/datastore/perf_plugin_datastore.c:420
+#: src/hostlist/hostlist-client.c:1290
+#, fuzzy, c-format
+msgid "Loading saved hostlist entries from file `%s' \n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/hostlist/hostlist-client.c:1294
 #, c-format
-msgid "Loading `%s' datastore plugin\n"
+msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1312
+#: src/hostlist/hostlist-client.c:1305
 #, fuzzy, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
+msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1491
-msgid "# quota"
+#: src/hostlist/hostlist-client.c:1338
+#, c-format
+msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1493
-msgid "# cache size"
+#: src/hostlist/hostlist-client.c:1340
+msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/hostlist/hostlist-client.c:1373
 #, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+msgid ""
+"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1516
-#, fuzzy
-msgid "Failed to initialize bloomfilter.\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+#: src/hostlist/hostlist-client.c:1387
+#, fuzzy, c-format
+msgid "Could not open file `%s' for writing to save hostlists: %s\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/datastore/plugin_datastore_template.c:241
-msgid "Template database running\n"
+#: src/hostlist/hostlist-client.c:1392
+#, fuzzy, c-format
+msgid "Writing %u hostlist URIs to `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%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/datastore/datastore_api.c:287
-#, fuzzy
-msgid "Failed to transmit request to drop database.\n"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+#: src/hostlist/hostlist-client.c:1428
+msgid "# hostlist URIs written to file"
+msgstr ""
 
-#: src/datastore/datastore_api.c:370
-msgid "# queue entry timeouts"
+#: src/hostlist/hostlist-client.c:1480
+msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:417
-msgid "# queue overflows"
+#: src/hostlist/hostlist-client.c:1483
+#, c-format
+msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:444
-#, fuzzy
-msgid "# queue entries created"
-msgstr "# PING-meddelanden skapade"
+#: src/hostlist/hostlist-client.c:1492
+msgid "Learning is not enabled on this peer\n"
+msgstr ""
 
-#: src/datastore/datastore_api.c:465
-msgid "# Requests dropped from datastore queue"
+#: 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/datastore/datastore_api.c:514
-#, fuzzy
-msgid "# datastore connections (re)created"
-msgstr "Nätverksanslutning"
+#: src/hostlist/hostlist-client.c:1508
+#, c-format
+msgid "Hostlist file `%s' could not be removed\n"
+msgstr ""
 
-#: src/datastore/datastore_api.c:541
-msgid "# reconnected to DATASTORE"
+#: src/hostlist/gnunet-daemon-hostlist.c:257
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:606
-msgid "Failed to transmit request to DATASTORE.\n"
+#: src/hostlist/gnunet-daemon-hostlist.c:310
+msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
-#, fuzzy
-msgid "# transmission request failures"
-msgstr "# klartext PONG-meddelanden mottagna"
+#: src/hostlist/gnunet-daemon-hostlist.c:315
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
+msgstr ""
 
-#: src/datastore/datastore_api.c:631
-#, fuzzy
-msgid "# bytes sent to datastore"
-msgstr "# byte krypterade"
+#: src/hostlist/gnunet-daemon-hostlist.c:318
+msgid "enable learning about hostlist servers from other peers"
+msgstr ""
 
-#: src/datastore/datastore_api.c:768
-#, fuzzy
-msgid "Failed to receive status response from database."
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+#: src/hostlist/gnunet-daemon-hostlist.c:322
+msgid "provide a hostlist server"
+msgstr ""
 
-#: src/datastore/datastore_api.c:781
-msgid "Error reading response from datastore service"
+#: src/hostlist/gnunet-daemon-hostlist.c:334
+msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
+#: src/hostlist/hostlist-server.c:134
 #, fuzzy
-msgid "Invalid error message received from datastore service"
-msgstr "Ogiltigt meddelande mottogs den %s:%d."
+msgid "bytes in hostlist"
+msgstr "# byte krypterade"
 
-#: src/datastore/datastore_api.c:806
-#, fuzzy
-msgid "# status messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+#: src/hostlist/hostlist-server.c:160
+msgid "expired addresses encountered"
+msgstr ""
 
-#: src/datastore/datastore_api.c:878
-msgid "# PUT requests executed"
+#: src/hostlist/hostlist-server.c:208
+msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:950
-msgid "# RESERVE requests executed"
+#: src/hostlist/hostlist-server.c:224
+msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1015
-msgid "# RELEASE RESERVE requests executed"
+#: src/hostlist/hostlist-server.c:272
+#, c-format
+msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1078
-msgid "# UPDATE requests executed"
+#: src/hostlist/hostlist-server.c:275
+msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1148
-msgid "# REMOVE requests executed"
+#: src/hostlist/hostlist-server.c:283
+msgid "Sending 100 CONTINUE reply\n"
 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/hostlist/hostlist-server.c:290
+#, c-format
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
+msgstr ""
 
-#: src/datastore/datastore_api.c:1254
-#, fuzzy
-msgid "# Results received"
-msgstr "# byte mottogs via TCP"
+#: src/hostlist/hostlist-server.c:294
+msgid "hostlist requests refused (upload data)"
+msgstr ""
 
-#: src/datastore/datastore_api.c:1326
-msgid "# GET REPLICATION requests executed"
+#: src/hostlist/hostlist-server.c:302
+msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1393
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/hostlist/hostlist-server.c:305
+msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1457
-msgid "# GET requests executed"
+#: src/hostlist/hostlist-server.c:309
+msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/hostlist/hostlist-server.c:310
+msgid "hostlist requests processed"
+msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#, 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/hostlist/hostlist-server.c:353
+msgid "# hostlist advertisements send"
+msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1500
-msgid "Mysql database running\n"
+#: src/hostlist/hostlist-server.c:400
+msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:173
+#: src/hostlist/hostlist-server.c:568
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:979
-msgid "Postgres database running\n"
+#: src/hostlist/hostlist-server.c:577
+#, c-format
+msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:159
+#: src/hostlist/hostlist-server.c:591
 #, 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 "Address to obtain hostlist: `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/dv/dv_api.c:178
-#, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/nse/gnunet-service-nse.c:866
+#: src/hostlist/hostlist-server.c:629
 #, c-format
-msgid "Proof of work invalid: %llu!\n"
+msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1288 src/nse/gnunet-service-nse.c:1307
-#: src/nse/gnunet-service-nse.c:1328
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
+#: src/peerinfo-tool/gnunet-peerinfo.c:222
+#, fuzzy, c-format
+msgid "Could not find option `%s:%s' in configuration.\n"
+msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/nse/gnunet-service-nse.c:1295
-#, fuzzy
-msgid "Invalid work requirement for NSE service. Exiting.\n"
-msgstr "Ogiltiga argument. Avslutar.\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#, fuzzy, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/nse/gnunet-service-nse.c:1316
-#, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:241
+#, c-format
+msgid "I am peer `%s'.\n"
+msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/nse/gnunet-nse-profiler.c:673
-#, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "Kan inte tillgå tjänsten"
-
-#: src/core/gnunet-service-core.c:920
-msgid "# total peer preference"
+#: src/peerinfo-tool/gnunet-peerinfo.c:261
+msgid "output only the identity strings"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1040
-msgid "# peer status changes"
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
+msgid "output our own identity only"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1236
-msgid "# send requests dropped (disconnected)"
-msgstr ""
+#: src/peerinfo-tool/gnunet-peerinfo.c:270
+#, fuzzy
+msgid "Print information about peers."
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-service-core.c:1712
-#, c-format
-msgid ""
-"Client asked for preference change with peer `%s', which is not connected!\n"
-msgstr &