updated .po-files

[oweals/gnunet.git] / po / de.po

diff --git a/po/de.po b/po/de.po
index 371d12feb35b747d783f49134c77548fc89fb417..7de227b39898ba2e67f952a3a5cef847e4f29f2a 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-12-12 22:41+0100\n"
+"POT-Creation-Date: 2015-01-11 20:42+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <durner@gnunet.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:336
+#: src/arm/arm_api.c:337
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -266,575 +266,754 @@ msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 msgid "Could not send list result to client\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:528
+#: src/arm/gnunet-service-arm.c:529
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:535
+#: src/arm/gnunet-service-arm.c:540
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:634
+#: src/arm/gnunet-service-arm.c:639
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/arm/gnunet-service-arm.c:656
+#: src/arm/gnunet-service-arm.c:661
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:685
+#: src/arm/gnunet-service-arm.c:695
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:821
+#: src/arm/gnunet-service-arm.c:835
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1085
+#: src/arm/gnunet-service-arm.c:1105
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1178
+#: src/arm/gnunet-service-arm.c:1199
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1183
+#: src/arm/gnunet-service-arm.c:1204
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1188
+#: src/arm/gnunet-service-arm.c:1209
 #, fuzzy
 msgid "unknown"
 msgstr "Unbekannter Fehler"
 
-#: src/arm/gnunet-service-arm.c:1194
+#: src/arm/gnunet-service-arm.c:1215
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-service-arm.c:1216
+#: src/arm/gnunet-service-arm.c:1237
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1231
+#: src/arm/gnunet-service-arm.c:1252
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1484
-#, fuzzy, c-format
-msgid "Starting default services `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
-
-#: src/arm/gnunet-service-arm.c:1495
-#, c-format
-msgid "Default service `%s' not configured correctly!\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1509
-msgid ""
-"No default services configured, GNUnet will not really start right now.\n"
-msgstr ""
-
 #: src/arm/mockup-service.c:41
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:468
-#, fuzzy, c-format
-msgid "Received %s message\n"
-msgstr "ungültige `%s' Nachricht empfangen\n"
-
-#: src/ats/ats_api_performance.c:511
-#, fuzzy, c-format
-msgid "Received last message for %s \n"
-msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
-
-#: src/ats/gnunet-service-ats_addresses.c:1946
-#: src/ats/gnunet-service-ats_addresses.c:1990
+#: src/ats/gnunet-ats-solver-eval.c:2804 src/ats/gnunet-ats-solver-eval.c:2838
+#: src/ats/gnunet-service-ats_addresses.c:1789
+#: src/ats/gnunet-service-ats_addresses.c:1833
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1953
+#: src/ats/gnunet-ats-solver-eval.c:2810
+#: src/ats/gnunet-service-ats_addresses.c:1796
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1961
+#: src/ats/gnunet-ats-solver-eval.c:2817
+#: src/ats/gnunet-service-ats_addresses.c:1804
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1997
+#: src/ats/gnunet-ats-solver-eval.c:2844
+#: src/ats/gnunet-service-ats_addresses.c:1840
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2005
+#: src/ats/gnunet-ats-solver-eval.c:2851
+#: src/ats/gnunet-service-ats_addresses.c:1848
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2175
+#: src/ats/gnunet-ats-solver-eval.c:3410
+#: src/ats-tests/gnunet-solver-eval.c:918
+msgid "solver to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3413
+#: src/ats-tests/gnunet-solver-eval.c:921
+#: src/ats-tests/gnunet-solver-eval.c:924
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3416
+msgid "be verbose"
+msgstr "umfangreiche Meldungen ausgeben"
+
+#: src/ats/gnunet-ats-solver-eval.c:3419
+#, fuzzy
+msgid "print logging"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3422
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3425
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:2051
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2178
+#: src/ats/gnunet-service-ats_addresses.c:2057
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2201
+#: src/ats/gnunet-service-ats_addresses.c:2082
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/ats/plugin_ats_mlp.c:868
+#: src/ats/plugin_ats_mlp.c:1345
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1281
+#: src/ats/plugin_ats_mlp.c:1941
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/ats/plugin_ats_mlp.c:1328
+#: src/ats/plugin_ats_mlp.c:1993
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2059
+#: src/ats/plugin_ats_mlp.c:2714
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2754 src/ats/plugin_ats_mlp.c:2771
+#: src/ats/plugin_ats_mlp.c:2803 src/ats/plugin_ats_mlp.c:2821
+#: src/ats/plugin_ats_mlp.c:2840 src/ats/plugin_ats_proportional.c:1989
+#: src/ats/plugin_ats_proportional.c:2010 src/ats/plugin_ats_ril.c:2718
+#: src/ats/plugin_ats_ril.c:2735 src/ats/plugin_ats_ril.c:2752
+#: src/ats/plugin_ats_ril.c:2769 src/ats/plugin_ats_ril.c:2786
+#: src/ats/plugin_ats_ril.c:2803 src/ats/plugin_ats_ril.c:2820
+#: src/ats/plugin_ats_ril.c:2837
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/ats/plugin_ats_mlp.c:2927
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2067
+#: src/ats/plugin_ats_mlp.c:2936
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2077
+#: src/ats/plugin_ats_mlp.c:2947
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2085
+#: src/ats/plugin_ats_mlp.c:2955
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2096
+#: src/ats/plugin_ats_mlp.c:2966
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1514
+#: src/ats/plugin_ats_proportional.c:1847
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/ats-tool/gnunet-ats.c:145
+#: src/ats-tests/ats-testing.c:72
+msgid "Benchmarking done\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:105
+#, fuzzy, c-format
+msgid "Failed to connect peer 0 and %u\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/ats-tests/ats-testing.c:413
+#, c-format
+msgid "Connected master [%u] with slave [%u]\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:419
+#, fuzzy, c-format
+msgid "Failed to connect master peer [%u] with slave [%u]\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/ats-tests/ats-testing.c:450
+msgid "Connecting peers on CORE level\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:461
+#, c-format
+msgid "Connecting master [%u] with slave [%u]\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:470
+#, fuzzy, c-format
+msgid "Could not connect master [%u] and slave [%u]\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:677
+#, fuzzy
+msgid "Initialization failed, shutdown\n"
+msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
+
+#: src/ats-tests/ats-testing-log.c:846
+msgid "Stop logging\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing-log.c:897
+#, fuzzy, c-format
+msgid "Start logging `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/ats-tests/gnunet-ats-sim.c:86
+#, c-format
+msgid ""
+"Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
+"= %u KiB/s\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:296
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:147
+#: src/ats-tool/gnunet-ats.c:300
 #, c-format
-msgid "ATS returned results for %u addresses\n"
+msgid "ATS returned stat_results for %u addresses\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:378
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:378
+msgid "inactive "
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:204
+#: src/ats-tool/gnunet-ats.c:427
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:328
+#: src/ats-tool/gnunet-ats.c:544
+#, fuzzy, c-format
+msgid "Removed address of peer `%s' with plugin `%s'\n"
+msgstr "Verfügbare(r) Transport(e): %s\n"
+
+#: src/ats-tool/gnunet-ats.c:746
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:547
-#: src/transport/gnunet-transport.c:829
+#: src/ats-tool/gnunet-ats.c:778 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1853
+#: src/transport/gnunet-transport-profiler.c:531
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:838
+#: src/ats-tool/gnunet-ats.c:792 src/transport/gnunet-transport.c:1862
+#: src/transport/gnunet-transport-profiler.c:549
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:367
+#: src/ats-tool/gnunet-ats.c:802
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:383 src/ats-tool/gnunet-ats.c:402
-#: src/ats-tool/gnunet-ats.c:419 src/ats-tool/gnunet-ats.c:457
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:824 src/ats-tool/gnunet-ats.c:850
+#: src/ats-tool/gnunet-ats.c:878 src/ats-tool/gnunet-ats.c:924
+#, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/ats-tool/gnunet-ats.c:392 src/ats-tool/gnunet-ats.c:409
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:836 src/ats-tool/gnunet-ats.c:862
+#, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/ats-tool/gnunet-ats.c:427
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:890
+#, fuzzy
 msgid "No preference type given!\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:432
-#, c-format
+#: src/ats-tool/gnunet-ats.c:897
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:450
+#: src/ats-tool/gnunet-ats.c:915
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:983
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:985
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:514
+#: src/ats-tool/gnunet-ats.c:988
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:517
+#: src/ats-tool/gnunet-ats.c:990
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:992
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:523
+#: src/ats-tool/gnunet-ats.c:994
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:526
+#: src/ats-tool/gnunet-ats.c:996
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:529
+#: src/ats-tool/gnunet-ats.c:999
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:532
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:535
+#: src/ats-tool/gnunet-ats.c:1004
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:544
+#: src/ats-tool/gnunet-ats.c:1011
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/consensus/gnunet-consensus-profiler.c:420
+#: src/cadet/gnunet-cadet.c:376
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/cadet/gnunet-cadet.c:626
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/cadet/gnunet-cadet.c:669
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/cadet/gnunet-cadet.c:735
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:832
+#, fuzzy
+msgid "provide information about a particular connection"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/cadet/gnunet-cadet.c:835
+msgid "activate echo mode"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:838
+msgid "dump debug information to STDERR"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:844
+msgid "port to listen to (default; 0)"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:847
+#, fuzzy
+msgid "provide information about a patricular peer"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/cadet/gnunet-cadet.c:850
+#, fuzzy
+msgid "provide information about all peers"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/cadet/gnunet-cadet.c:853
+#, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/cadet/gnunet-cadet.c:856
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/cadet/gnunet-service-cadet_peer.c:502
+msgid "Wrong CORE service\n"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:437
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus-profiler.c:423
+#: src/consensus/gnunet-consensus-profiler.c:440
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:426
-#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
-#: src/set/gnunet-set-profiler.c:292
+#: src/consensus/gnunet-consensus-profiler.c:443
+#: src/set/gnunet-set-profiler.c:289 src/set/gnunet-set-profiler.c:292
+#: src/set/gnunet-set-profiler.c:295
 #, fuzzy
 msgid "number of values"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus-profiler.c:429
+#: src/consensus/gnunet-consensus-profiler.c:446
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/consensus/gnunet-consensus-profiler.c:432
+#: src/consensus/gnunet-consensus-profiler.c:449
+msgid "delay until consensus starts"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:452
+#: src/secretsharing/gnunet-secretsharing-profiler.c:625
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:468
+#: src/conversation/conversation_api.c:493
+#: src/conversation/conversation_api_call.c:475
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:252
+#: src/conversation/conversation_api.c:617
+#, fuzzy
+msgid "number too large"
+msgstr "Anzahl an Durchläufen"
+
+#: src/conversation/gnunet-conversation.c:269
 #, c-format
 msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:274
+#: src/conversation/gnunet-conversation.c:291
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:307
+#: src/conversation/gnunet-conversation.c:323
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:312
+#: src/conversation/gnunet-conversation.c:328
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:330
+#: src/conversation/gnunet-conversation.c:346
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:344
+#: src/conversation/gnunet-conversation.c:360
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/conversation/gnunet-conversation.c:357
+#: src/conversation/gnunet-conversation.c:372
 #, c-format
-msgid "Phone active on line %u\n"
+msgid ""
+"Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:379
+#: src/conversation/gnunet-conversation.c:394
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:386
+#: src/conversation/gnunet-conversation.c:401
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/conversation/gnunet-conversation.c:393
+#: src/conversation/gnunet-conversation.c:408
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/conversation/gnunet-conversation.c:400
-msgid "Call terminated\n"
+#: src/conversation/gnunet-conversation.c:416
+#, c-format
+msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:406
+#: src/conversation/gnunet-conversation.c:425
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:412
+#: src/conversation/gnunet-conversation.c:431
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:479
+#: src/conversation/gnunet-conversation.c:436
+msgid "Error with the call, restarting it\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:504
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/conversation/gnunet-conversation.c:495
-#: src/conversation/gnunet-conversation.c:509
+#: src/conversation/gnunet-conversation.c:520
+#: src/conversation/gnunet-conversation.c:534
 #, fuzzy, c-format
 msgid "Ego `%s' not available\n"
 msgstr "gconfig ist nicht verfügbar\n"
 
-#: src/conversation/gnunet-conversation.c:502
-#: src/conversation/gnunet-conversation.c:552
+#: src/conversation/gnunet-conversation.c:527
+#: src/conversation/gnunet-conversation.c:584
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:517
-#: src/conversation/gnunet-conversation.c:565
+#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:597
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:576
+#: src/conversation/gnunet-conversation.c:552
+msgid "Call recipient missing.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:608
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:593
+#: src/conversation/gnunet-conversation.c:625
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:621
+#: src/conversation/gnunet-conversation.c:655
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:644
+#: src/conversation/gnunet-conversation.c:678
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:649
+#: src/conversation/gnunet-conversation.c:683
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:655
-#: src/conversation/gnunet-conversation.c:679
+#: src/conversation/gnunet-conversation.c:689
+#: src/conversation/gnunet-conversation.c:713
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:660
+#: src/conversation/gnunet-conversation.c:694
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:669
+#: src/conversation/gnunet-conversation.c:703
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 
-#: src/conversation/gnunet-conversation.c:674
+#: src/conversation/gnunet-conversation.c:708
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:693
+#: src/conversation/gnunet-conversation.c:727
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:699
+#: src/conversation/gnunet-conversation.c:733
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/conversation/gnunet-conversation.c:727
-#: src/conversation/gnunet-conversation.c:742
+#: src/conversation/gnunet-conversation.c:761
+#: src/conversation/gnunet-conversation.c:776
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:775
-#: src/conversation/gnunet-conversation.c:791
+#: src/conversation/gnunet-conversation.c:809
+#: src/conversation/gnunet-conversation.c:825
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:798
+#: src/conversation/gnunet-conversation.c:832
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:807
+#: src/conversation/gnunet-conversation.c:841
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:858
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:859
+#: src/conversation/gnunet-conversation.c:893
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:867
+#: src/conversation/gnunet-conversation.c:901
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:884
+#: src/conversation/gnunet-conversation.c:918
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:911
+#: src/conversation/gnunet-conversation.c:944
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:913
+#: src/conversation/gnunet-conversation.c:946
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:915
+#: src/conversation/gnunet-conversation.c:948
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:917
+#: src/conversation/gnunet-conversation.c:950
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:919
+#: src/conversation/gnunet-conversation.c:952
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:921
+#: src/conversation/gnunet-conversation.c:954
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:923
+#: src/conversation/gnunet-conversation.c:956
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:925
+#: src/conversation/gnunet-conversation.c:958
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
 
-#: src/conversation/gnunet-conversation.c:927
+#: src/conversation/gnunet-conversation.c:960
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1082
+#: src/conversation/gnunet-conversation.c:1168
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/conversation/gnunet-conversation.c:1095
+#: src/conversation/gnunet-conversation.c:1181
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym `%s' wurde gelöscht.\n"
 
-#: src/conversation/gnunet-conversation.c:1130
+#: src/conversation/gnunet-conversation.c:1216
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/conversation/gnunet-conversation.c:1156
+#: src/conversation/gnunet-conversation.c:1240
+#, fuzzy
+msgid "Failed to start gnunet-helper-w32-console\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/conversation/gnunet-conversation.c:1266
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1159
+#: src/conversation/gnunet-conversation.c:1269
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1174
+#: src/conversation/gnunet-conversation.c:1295
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -861,138 +1040,158 @@ msgid ""
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:248
-#: src/integration-tests/connection_watchdog.c:1114
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:517
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
+#: src/sensordashboard/gnunet-sensordashboard.c:70
 #: src/template/gnunet-template.c:70
 #, fuzzy
 msgid "help text"
 msgstr "Hilfetext für -t"
 
-#: src/conversation/gnunet-helper-audio-playback.c:137
+#: src/conversation/gnunet-helper-audio-playback.c:305
 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:186
+#: src/conversation/gnunet-helper-audio-playback.c:589
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:211
-#: src/conversation/gnunet-helper-audio-record.c:362
+#: src/conversation/gnunet-helper-audio-playback.c:614
+#: src/conversation/gnunet-helper-audio-record.c:545
 #, fuzzy
 msgid "Connection established.\n"
 msgstr "Collection beendet.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:216
-#: src/conversation/gnunet-helper-audio-record.c:367
+#: src/conversation/gnunet-helper-audio-playback.c:619
+#: src/conversation/gnunet-helper-audio-record.c:550
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:230
+#: src/conversation/gnunet-helper-audio-playback.c:633
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:243
-#: src/conversation/gnunet-helper-audio-record.c:393
+#: src/conversation/gnunet-helper-audio-playback.c:646
+#: src/conversation/gnunet-helper-audio-record.c:576
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:264
-#: src/conversation/gnunet-helper-audio-record.c:416
+#: src/conversation/gnunet-helper-audio-playback.c:667
+#: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:270
-#: src/conversation/gnunet-helper-audio-record.c:422
+#: src/conversation/gnunet-helper-audio-playback.c:673
+#: src/conversation/gnunet-helper-audio-record.c:605
 #, fuzzy
 msgid "pa_mainloop_new() failed.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:284
-#: src/conversation/gnunet-helper-audio-record.c:437
+#: src/conversation/gnunet-helper-audio-playback.c:687
+#: src/conversation/gnunet-helper-audio-record.c:620
 #, fuzzy
 msgid "pa_context_new() failed.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:291
-#: src/conversation/gnunet-helper-audio-record.c:443
+#: src/conversation/gnunet-helper-audio-playback.c:694
+#: src/conversation/gnunet-helper-audio-record.c:626
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:297
-#: src/conversation/gnunet-helper-audio-record.c:449
+#: src/conversation/gnunet-helper-audio-playback.c:700
+#: src/conversation/gnunet-helper-audio-record.c:632
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:366
+#: src/conversation/gnunet-helper-audio-playback.c:770
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:237
+#: src/conversation/gnunet-helper-audio-playback-gst.c:325
+#, c-format
+msgid "Read error from STDIN: %d %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:344
+#, fuzzy, c-format
+msgid "opus_encode_float() failed: %s. Aborting\n"
+msgstr "`%s' schlug fehl: %s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:420
 #, fuzzy, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:275
+#: src/conversation/gnunet-helper-audio-record.c:458
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:300
+#: src/conversation/gnunet-helper-audio-record.c:483
 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:305
+#: src/conversation/gnunet-helper-audio-record.c:488
 #, fuzzy, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:313
+#: src/conversation/gnunet-helper-audio-record.c:496
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:317
+#: src/conversation/gnunet-helper-audio-record.c:500
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:324
+#: src/conversation/gnunet-helper-audio-record.c:507
 #, fuzzy, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:333
+#: src/conversation/gnunet-helper-audio-record.c:516
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:380
+#: src/conversation/gnunet-helper-audio-record.c:563
 #, fuzzy, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/conversation/gnunet-service-conversation.c:825
-msgid "Mesh audio channel not ready; audio data dropped\n"
+#: src/conversation/gnunet-helper-audio-record.c:676
+#, fuzzy
+msgid "ogg_stream_init() failed.\n"
+msgstr "`%s' schlug fehl: %s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:721
+#, fuzzy, c-format
+msgid "Failed to allocate %d bytes for second packet\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/conversation/gnunet-service-conversation.c:853
+msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:915
+#: src/conversation/gnunet-service-conversation.c:944
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1302
+#: src/conversation/gnunet-service-conversation.c:1351
 #, fuzzy, c-format
-msgid "Received incoming channel on port %u\n"
+msgid "Received incoming Cadet channel on port %u\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
 #: src/conversation/microphone.c:121
@@ -1010,277 +1209,310 @@ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 msgid "Could not start playback audio helper.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/core/core_api.c:765
+#: src/core/core_api.c:787
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:80
-#, fuzzy, c-format
-msgid "Peer `%s'\n"
-msgstr "Ich bin Peer `%s'.\n"
+#: src/core/gnunet-core.c:92
+#, fuzzy
+msgid "fresh connection"
+msgstr "# verbundener Knoten"
 
-#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:609 src/transport/gnunet-transport.c:634
-#, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
+#: src/core/gnunet-core.c:95
+msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:611
+#: src/core/gnunet-core.c:98
 #, fuzzy
-msgid "Connected to"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
+msgid "key received"
+msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:636
+#: src/core/gnunet-core.c:101
 #, fuzzy
-msgid "Disconnected from"
+msgid "connection established"
+msgstr "Collection beendet.\n"
+
+#: src/core/gnunet-core.c:104
+msgid "rekeying"
+msgstr ""
+
+#: src/core/gnunet-core.c:107
+#, fuzzy
+msgid "disconnected"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/core/gnunet-core.c:164 src/peerinfo-tool/gnunet-peerinfo.c:645
+#: src/core/gnunet-core.c:114
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+
+#: src/core/gnunet-core.c:117
+#, fuzzy
+msgid "unknown state"
+msgstr "Unbekannter Fehler"
+
+#: src/core/gnunet-core.c:122
+#, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgstr ""
+
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:786
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\n"
 
-#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1028
+#: src/core/gnunet-core.c:157
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2114
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-core.c:212
+#: src/core/gnunet-core.c:188
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-service-core.c:105
+#: src/core/gnunet-service-core.c:104
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/core/gnunet-service-core.c:126
+#: src/core/gnunet-service-core.c:128
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:370
+#: src/core/gnunet-service-core_clients.c:375
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_clients.c:475
+#: src/core/gnunet-service-core_clients.c:490
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_clients.c:518
+#: src/core/gnunet-service-core_clients.c:536
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:531
+#: src/core/gnunet-service-core_kx.c:565
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:582
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:668
+#: src/core/gnunet-service-core_kx.c:703
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:708
+#: src/core/gnunet-service-core_kx.c:747
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:771
+#: src/core/gnunet-service-core_kx.c:848
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:777
+#: src/core/gnunet-service-core_kx.c:855
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:811
+#: src/core/gnunet-service-core_kx.c:889
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:827
+#: src/core/gnunet-service-core_kx.c:900
 #, fuzzy
-msgid "# EPHEMERAL_KEY messages decrypted"
+msgid "# EPHEMERAL_KEY messages received"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_kx.c:930
-#: src/transport/gnunet-service-transport_validation.c:974
+#: src/core/gnunet-service-core_kx.c:999
+#: src/transport/gnunet-service-transport_validation.c:1039
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:1007
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:965
+#: src/core/gnunet-service-core_kx.c:1034
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:982
+#: src/core/gnunet-service-core_kx.c:1050
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1008
+#: src/core/gnunet-service-core_kx.c:1077
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1018
+#: src/core/gnunet-service-core_kx.c:1088
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1075
-#: src/transport/gnunet-service-transport_validation.c:1285
+#: src/core/gnunet-service-core_kx.c:1156
+#: src/transport/gnunet-service-transport_validation.c:1382
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1081
+#: src/core/gnunet-service-core_kx.c:1162
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1086
+#: src/core/gnunet-service-core_kx.c:1167
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:1116
+#: src/core/gnunet-service-core_kx.c:1197
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1150
+#: src/core/gnunet-service-core_kx.c:1232
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1160
+#: src/core/gnunet-service-core_kx.c:1243
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1167
+#: src/core/gnunet-service-core_kx.c:1250
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1307
+#: src/core/gnunet-service-core_kx.c:1392
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1314
+#: src/core/gnunet-service-core_kx.c:1399
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1317
+#: src/core/gnunet-service-core_kx.c:1402
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1360
-#: src/core/gnunet-service-core_kx.c:1385
+#: src/core/gnunet-service-core_kx.c:1448
+#: src/core/gnunet-service-core_kx.c:1473
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1372
+#: src/core/gnunet-service-core_kx.c:1460
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1413
+#: src/core/gnunet-service-core_kx.c:1502
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1421
+#: src/core/gnunet-service-core_kx.c:1510
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1452
+#: src/core/gnunet-service-core_kx.c:1545
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_neighbours.c:163
+#: src/core/gnunet-service-core_neighbours.c:168
 #, fuzzy
 msgid "# sessions terminated by transport disconnect"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:328
+#: src/core/gnunet-service-core_neighbours.c:184
+#: src/core/gnunet-service-core_neighbours.c:342
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:246
+#: src/core/gnunet-service-core_neighbours.c:252
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:411
+#: src/core/gnunet-service-core_neighbours.c:425
 #, fuzzy, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:278
-#: src/dht/gnunet-service-dht_neighbours.c:662
-#: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:662
-#: src/dht/gnunet-service-xdht_neighbours.c:727
-#: src/fs/gnunet-service-fs_cp.c:604 src/fs/gnunet-service-fs_cp.c:1499
-#: src/topology/gnunet-daemon-topology.c:706
-#: src/topology/gnunet-daemon-topology.c:807
-#: src/transport/gnunet-service-transport_neighbours.c:904
-#: src/transport/gnunet-service-transport_neighbours.c:1123
-#: src/transport/gnunet-service-transport_neighbours.c:1132
-#: src/transport/gnunet-service-transport_neighbours.c:2860
-#: src/transport/gnunet-service-transport_neighbours.c:3129
+#: src/core/gnunet-service-core_sessions.c:245
+#: src/core/gnunet-service-core_sessions.c:328
+#: src/dht/gnunet-service-dht_neighbours.c:661
+#: src/dht/gnunet-service-dht_neighbours.c:726
+#: src/fs/gnunet-service-fs_cp.c:629 src/fs/gnunet-service-fs_cp.c:1571
+#: src/topology/gnunet-daemon-topology.c:734
+#: src/topology/gnunet-daemon-topology.c:835
+#: src/transport/gnunet-service-transport_neighbours.c:921
+#: src/transport/gnunet-service-transport_neighbours.c:1145
+#: src/transport/gnunet-service-transport_neighbours.c:3181
+#: src/transport/gnunet-service-transport_neighbours.c:3495
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/core/gnunet-service-core_sessions.c:246
+#: src/core/gnunet-service-core_sessions.c:278
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/core/gnunet-service-core_sessions.c:415
+#: src/core/gnunet-service-core_sessions.c:394
+#, fuzzy
+msgid "# outdated typemap confirmations received"
+msgstr "Fehler beim Speichern der Konfiguration!"
+
+#: src/core/gnunet-service-core_sessions.c:405
+#, fuzzy
+msgid "# valid typemap confirmations received"
+msgstr "Fehler beim Speichern der Konfiguration!"
+
+#: src/core/gnunet-service-core_sessions.c:543
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
+#: src/core/gnunet-service-core_typemap.c:169
+#: src/core/gnunet-service-core_typemap.c:180
 #, fuzzy
 msgid "# type maps received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_typemap.c:151
+#: src/core/gnunet-service-core_typemap.c:210
 msgid "# updates to my type map"
 msgstr ""
 
 #: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/datastore/gnunet-service-datastore.c:855
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# bytes in der Datenbank"
@@ -1291,8 +1523,8 @@ msgid "# items stored"
 msgstr "# bytes in der Datenbank"
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1487
-#: src/datastore/gnunet-service-datastore.c:1498
+#: src/datastore/gnunet-service-datastore.c:1554
+#: src/datastore/gnunet-service-datastore.c:1565
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
@@ -1321,14 +1553,14 @@ msgstr ""
 msgid "Heap datacache running\n"
 msgstr "sqlite Datenspeicher"
 
-#: src/datacache/plugin_datacache_postgres.c:392
+#: src/datacache/plugin_datacache_postgres.c:391
 msgid "Postgres datacache running\n"
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:69
 #: src/datacache/plugin_datacache_sqlite.c:72
-#: src/datastore/plugin_datastore_mysql.c:806
-#: src/datastore/plugin_datastore_mysql.c:820
+#: src/datastore/plugin_datastore_mysql.c:809
+#: src/datastore/plugin_datastore_mysql.c:823
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
@@ -1336,25 +1568,29 @@ msgstr ""
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:52
+#: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/testbed/generate-underlay-topology.c:47
+#: src/testbed/gnunet-daemon-latency-logger.c:52
+#: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
-#: src/include/gnunet_common.h:602 src/include/gnunet_common.h:611
-#: src/scalarproduct/scalarproduct.h:61
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:622
+#: src/include/gnunet_common.h:631 src/scalarproduct/scalarproduct.h:35
 #, 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/datacache/plugin_datacache_sqlite.c:450
+#: src/datacache/plugin_datacache_sqlite.c:449
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:484
+#: src/datacache/plugin_datacache_sqlite.c:483
 #: src/datastore/plugin_datastore_sqlite.c:401
-#: src/namecache/plugin_namecache_sqlite.c:295
-#: src/namestore/plugin_namestore_sqlite.c:327
+#: src/namecache/plugin_namecache_sqlite.c:292
+#: src/namestore/plugin_namestore_sqlite.c:324
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:491
+#: src/datacache/plugin_datacache_sqlite.c:490
 #, fuzzy, c-format
 msgid "Failed to close statement %p: %d\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -1390,82 +1626,82 @@ msgstr "# gap Anfragen verworfen: Kollision in RT"
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
+#: src/datastore/datastore_api.c:621
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/datastore/datastore_api.c:638
+#: src/datastore/datastore_api.c:645
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# bytes in der Datenbank"
 
-#: src/datastore/datastore_api.c:770
+#: src/datastore/datastore_api.c:787
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:784
+#: src/datastore/datastore_api.c:801
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
+#: src/datastore/datastore_api.c:813 src/datastore/datastore_api.c:819
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/datastore/datastore_api.c:806
+#: src/datastore/datastore_api.c:823
 #, fuzzy
 msgid "# status messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/datastore/datastore_api.c:876
+#: src/datastore/datastore_api.c:893
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:944
+#: src/datastore/datastore_api.c:959
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1005
+#: src/datastore/datastore_api.c:1020
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1065
+#: src/datastore/datastore_api.c:1080
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1129
+#: src/datastore/datastore_api.c:1144
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1174
+#: src/datastore/datastore_api.c:1189
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1233
+#: src/datastore/datastore_api.c:1248
 #, fuzzy
 msgid "# Results received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/datastore/datastore_api.c:1300
+#: src/datastore/datastore_api.c:1315
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1363
+#: src/datastore/datastore_api.c:1378
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1424
+#: src/datastore/datastore_api.c:1439
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# dht Anfragen weitergeleitet"
@@ -1492,290 +1728,300 @@ msgid "Manipulate GNUnet datastore"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:365
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/datastore/gnunet-service-datastore.c:425
+#: src/datastore/gnunet-service-datastore.c:439
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:187
+#: src/datastore/gnunet-service-datastore.c:497
+#: src/gns/gnunet-gns-helper-service-w32.c:223
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:215
+#: src/datastore/gnunet-service-datastore.c:528
+#: src/gns/gnunet-gns-helper-service-w32.c:262
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:630
+#: src/datastore/gnunet-service-datastore.c:643
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:673
+#: src/datastore/gnunet-service-datastore.c:686
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:697
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:688
+#: src/datastore/gnunet-service-datastore.c:701
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:694
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:699
-#: src/datastore/gnunet-service-datastore.c:751
-#: src/datastore/gnunet-service-datastore.c:964
-#: src/datastore/gnunet-service-datastore.c:1421
+#: src/datastore/gnunet-service-datastore.c:712
+#: src/datastore/gnunet-service-datastore.c:767
+#: src/datastore/gnunet-service-datastore.c:982
+#: src/datastore/gnunet-service-datastore.c:1526
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:764
+#: src/datastore/gnunet-service-datastore.c:780
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:850
+#: src/datastore/gnunet-service-datastore.c:867
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1010
+#: src/datastore/gnunet-service-datastore.c:1029
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1022
+#: src/datastore/gnunet-service-datastore.c:1041
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1050
+#: src/datastore/gnunet-service-datastore.c:1069
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:1099
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1132
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1138
+#: src/datastore/gnunet-service-datastore.c:1157
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1165
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1178
+#: src/datastore/gnunet-service-datastore.c:1197
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1220
+#: src/datastore/gnunet-service-datastore.c:1241
+#, c-format
+msgid ""
+"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1246
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1299
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1290
+#: src/datastore/gnunet-service-datastore.c:1310
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1412
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1419
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1422
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1559
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1570
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1505
+#: src/datastore/gnunet-service-datastore.c:1572
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1518
+#: src/datastore/gnunet-service-datastore.c:1585
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1536
-#: src/datastore/gnunet-service-datastore.c:1552
+#: src/datastore/gnunet-service-datastore.c:1603
+#: src/datastore/gnunet-service-datastore.c:1619
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/datastore/gnunet-service-datastore.c:1582
+#: src/datastore/gnunet-service-datastore.c:1649
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1611
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1616
-msgid "Plugin does not support get_keys function. Please fix!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1619
-msgid "Bloomfilter construction complete.\n"
-msgstr ""
-
-#: src/datastore/plugin_datastore_heap.c:820
+#: src/datastore/plugin_datastore_heap.c:821
 #, fuzzy
 msgid "Heap database running\n"
 msgstr "sqlite Datenspeicher"
 
-#: src/datastore/plugin_datastore_mysql.c:783
+#: src/datastore/plugin_datastore_mysql.c:786
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/datastore/plugin_datastore_mysql.c:791
+#: src/datastore/plugin_datastore_mysql.c:794
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1022
+#: src/datastore/plugin_datastore_mysql.c:1025
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:824
+#: src/datastore/plugin_datastore_postgres.c:837
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:860
+#: src/datastore/plugin_datastore_postgres.c:873
 #: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:564
+#: src/namestore/plugin_namestore_postgres.c:569
 msgid "Postgres database running\n"
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:57
+#: src/testbed/generate-underlay-topology.c:50
+#: src/testbed/gnunet-daemon-latency-logger.c:55
+#: src/testbed/gnunet-daemon-testbed-underlay.c:58
 #, 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/datastore/plugin_datastore_sqlite.c:253
+#: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
-#: src/psycstore/plugin_psycstore_sqlite.c:319
+#: src/peerstore/plugin_peerstore_sqlite.c:479
+#: src/psycstore/plugin_psycstore_sqlite.c:329
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:649
+#: src/datastore/plugin_datastore_sqlite.c:661
 #, 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:1135
+#: src/datastore/plugin_datastore_sqlite.c:1156
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1154
+#: src/datastore/plugin_datastore_sqlite.c:1176
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1194
-#: src/namecache/plugin_namecache_sqlite.c:583
-#: src/namestore/plugin_namestore_sqlite.c:719
+#: src/datastore/plugin_datastore_sqlite.c:1216
+#: src/namecache/plugin_namecache_sqlite.c:580
+#: src/namestore/plugin_namestore_sqlite.c:716
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite Datenspeicher"
 
-#: src/datastore/plugin_datastore_template.c:257
+#: src/datastore/plugin_datastore_template.c:259
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:376
+#: src/dht/dht_api.c:403
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/dht/gnunet-dht-get.c:132
+#: src/dht/gnunet-dht-get.c:133
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:156
+#: src/dht/gnunet-dht-get.c:159
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:162 src/dht/gnunet-dht-monitor.c:225
+#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/dht/gnunet-dht-get.c:170
+#: src/dht/gnunet-dht-get.c:173
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:186 src/dht/gnunet-dht-monitor.c:262
+#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
 #: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:189
+#: src/dht/gnunet-dht-get.c:192
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:192 src/dht/gnunet-dht-monitor.c:265
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
-#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
+#: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:755
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:941
+#: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:222
+#: src/dht/gnunet-dht-get.c:225
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1787,6 +2033,53 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet_dht_profiler.c:1393
+#: src/testbed/gnunet-testbed-profiler.c:267
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
+
+#: src/dht/gnunet_dht_profiler.c:1418
+#, fuzzy
+msgid "number of peers to start"
+msgstr "Anzahl an Durchläufen"
+
+#: src/dht/gnunet_dht_profiler.c:1421
+msgid ""
+"maximum number of times we try to search for successor circle formation (0 "
+"for R5N)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1424 src/nse/gnunet-nse-profiler.c:864
+#: src/testbed/gnunet-testbed-profiler.c:306
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1427
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1430
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1433
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1436
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1439
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1457
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "Auf den Dienst konnte nicht zugegriffen werden"
+
 #: src/dht/gnunet-dht-put.c:118
 #, fuzzy
 msgid "PUT request sent with key"
@@ -1831,272 +2124,261 @@ msgstr ""
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:235
+#: src/dht/gnunet-dht-put.c:236
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:172
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:193
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:417
+#: src/dht/gnunet-service-xdht_clients.c:844
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_clients.c:511
-#: src/dht/gnunet-service-xdht_clients.c:511
+#: src/dht/gnunet-service-dht_clients.c:513
+#: src/dht/gnunet-service-xdht_clients.c:928
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:595
-#: src/dht/gnunet-service-xdht_clients.c:595
+#: src/dht/gnunet-service-dht_clients.c:597
+#: src/dht/gnunet-service-xdht_clients.c:993
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:796
-#: src/dht/gnunet-service-xdht_clients.c:796
+#: src/dht/gnunet-service-dht_clients.c:798
+#: src/dht/gnunet-service-xdht_clients.c:1195
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1037
-#: src/dht/gnunet-service-xdht_clients.c:1037
+#: src/dht/gnunet-service-dht_clients.c:1040
+#: src/dht/gnunet-service-xdht_clients.c:503
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1050
-#: src/dht/gnunet-service-xdht_clients.c:1050
+#: src/dht/gnunet-service-dht_clients.c:1053
+#: src/dht/gnunet-service-xdht_clients.c:517
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1087
-#: src/dht/gnunet-service-xdht_clients.c:1087
+#: src/dht/gnunet-service-dht_clients.c:1090
+#: src/dht/gnunet-service-xdht_clients.c:554
 #, fuzzy, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1110
-#: src/dht/gnunet-service-xdht_clients.c:1110
+#: src/dht/gnunet-service-dht_clients.c:1113
+#: src/dht/gnunet-service-xdht_clients.c:577
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1164
-#: src/dht/gnunet-service-dht_clients.c:1206
-#: src/dht/gnunet-service-xdht_clients.c:1164
-#: src/dht/gnunet-service-xdht_clients.c:1206
+#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1210
+#: src/dht/gnunet-service-xdht_clients.c:631
+#: src/dht/gnunet-service-xdht_clients.c:674
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1174
-#: src/dht/gnunet-service-xdht_clients.c:1174
+#: src/dht/gnunet-service-dht_clients.c:1177
+#: src/dht/gnunet-service-xdht_clients.c:641
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:71
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# Bytes empfangen über TCP"
 
 #: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:82
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:221
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:244
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:250
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:256
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:268
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:271
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:309
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84
 #: src/dht/gnunet-service-xdht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:516
-#: src/dht/gnunet-service-xdht_neighbours.c:516
+#: src/dht/gnunet-service-dht_neighbours.c:515
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:610
-#: src/dht/gnunet-service-xdht_neighbours.c:610
+#: src/dht/gnunet-service-dht_neighbours.c:609
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:764
-#: src/dht/gnunet-service-xdht_neighbours.c:764
+#: src/dht/gnunet-service-dht_neighbours.c:763
+#: src/dht/gnunet-service-xdht_neighbours.c:6059
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:819
+#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-xdht_neighbours.c:987
+#, fuzzy
+msgid "# Messages dropped (CORE timeout)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/dht/gnunet-service-dht_neighbours.c:823
+#: src/dht/gnunet-service-xdht_neighbours.c:1019
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:857
+#: src/dht/gnunet-service-dht_neighbours.c:861
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:889
-#: src/dht/gnunet-service-xdht_neighbours.c:889
+#: src/dht/gnunet-service-dht_neighbours.c:893
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1093
-#: src/dht/gnunet-service-dht_neighbours.c:1130
-#: src/dht/gnunet-service-xdht_neighbours.c:1093
-#: src/dht/gnunet-service-xdht_neighbours.c:1130
+#: src/dht/gnunet-service-dht_neighbours.c:1097
+#: src/dht/gnunet-service-dht_neighbours.c:1134
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1108
-#: src/dht/gnunet-service-dht_neighbours.c:1145
-#: src/dht/gnunet-service-xdht_neighbours.c:1108
-#: src/dht/gnunet-service-xdht_neighbours.c:1145
+#: src/dht/gnunet-service-dht_neighbours.c:1112
+#: src/dht/gnunet-service-dht_neighbours.c:1149
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1287
-#: src/dht/gnunet-service-xdht_neighbours.c:1287
+#: src/dht/gnunet-service-dht_neighbours.c:1293
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1316
-#: src/dht/gnunet-service-xdht_neighbours.c:1316
+#: src/dht/gnunet-service-dht_neighbours.c:1322
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1323
-#: src/dht/gnunet-service-dht_neighbours.c:1440
-#: src/dht/gnunet-service-dht_neighbours.c:1543
-#: src/dht/gnunet-service-xdht_neighbours.c:1323
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1543
+#: src/dht/gnunet-service-dht_neighbours.c:1332
+#: src/dht/gnunet-service-dht_neighbours.c:1456
+#: src/dht/gnunet-service-dht_neighbours.c:1561
+#: src/dht/gnunet-service-xdht_neighbours.c:1129
+#: src/dht/gnunet-service-xdht_neighbours.c:1198
+#: src/dht/gnunet-service-xdht_neighbours.c:1248
+#: src/dht/gnunet-service-xdht_neighbours.c:1312
+#: src/dht/gnunet-service-xdht_neighbours.c:1379
+#: src/dht/gnunet-service-xdht_neighbours.c:1441
+#: src/dht/gnunet-service-xdht_neighbours.c:1503
+#: src/dht/gnunet-service-xdht_neighbours.c:1565
+#: src/dht/gnunet-service-xdht_neighbours.c:1625
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1405
-#: src/dht/gnunet-service-xdht_neighbours.c:1405
+#: src/dht/gnunet-service-dht_neighbours.c:1418
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1432
-#: src/dht/gnunet-service-xdht_neighbours.c:1432
+#: src/dht/gnunet-service-dht_neighbours.c:1445
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1550
-#: src/dht/gnunet-service-xdht_neighbours.c:1550
+#: src/dht/gnunet-service-dht_neighbours.c:1568
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1637
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
+#: src/dht/gnunet-service-dht_neighbours.c:1655
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1640
-#: src/dht/gnunet-service-xdht_neighbours.c:1640
+#: src/dht/gnunet-service-dht_neighbours.c:1658
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
-#: src/dht/gnunet-service-xdht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1825
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
-#: src/dht/gnunet-service-xdht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1833
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1904
-#: src/dht/gnunet-service-xdht_neighbours.c:1904
+#: src/dht/gnunet-service-dht_neighbours.c:1928
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1907
-#: src/dht/gnunet-service-xdht_neighbours.c:1907
+#: src/dht/gnunet-service-dht_neighbours.c:1931
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1961
-#: src/dht/gnunet-service-xdht_neighbours.c:1961
+#: src/dht/gnunet-service-dht_neighbours.c:1988
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1975
-#: src/dht/gnunet-service-xdht_neighbours.c:1975
+#: src/dht/gnunet-service-dht_neighbours.c:2002
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2052
-#: src/dht/gnunet-service-xdht_neighbours.c:2052
+#: src/dht/gnunet-service-dht_neighbours.c:2087
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2055
-#: src/dht/gnunet-service-xdht_neighbours.c:2055
+#: src/dht/gnunet-service-dht_neighbours.c:2090
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Bytes empfangen über TCP"
@@ -2107,66 +2389,162 @@ msgid "# Network size estimates received"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_routing.c:211
-#: src/dht/gnunet-service-xdht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:220
-#: src/dht/gnunet-service-xdht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:226
-#: src/dht/gnunet-service-xdht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:232
-#: src/dht/gnunet-service-xdht_routing.c:232
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:244
-#: src/dht/gnunet-service-xdht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:317
-#: src/dht/gnunet-service-xdht_routing.c:317
 msgid "# Entries removed from routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:399
-#: src/dht/gnunet-service-xdht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:417
-#: src/dht/gnunet-service-xdht_routing.c:417
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/plugin_block_dht.c:138
-#, fuzzy, c-format
-msgid "Block not of type %u\n"
-msgstr "Kein Transport des Typs %d bekannt.\n"
-
-#: src/dht/plugin_block_dht.c:145
-msgid "Size mismatch for block\n"
+#: src/dht/gnunet-service-xdht_neighbours.c:1832
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail_length = %d"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:154
+#: src/dht/gnunet-service-xdht_neighbours.c:1837
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d]=%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1857
+#, c-format
+msgid ""
+"\n"
+"SUPU************  FRIEND_PEERMAP of %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1867
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1888
+#, c-format
+msgid ""
+"\n"
+"SUPU************  FINGER_TABLE of %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1897
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1904
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail_id[%d]=%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1910
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d] = %s "
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:3559
+msgid "# FINGERS_COUNT"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:3700
+#: src/dht/gnunet-service-xdht_neighbours.c:3937
+#: src/dht/gnunet-service-xdht_neighbours.c:4089
+#: src/dht/gnunet-service-xdht_neighbours.c:4239
+#: src/dht/gnunet-service-xdht_neighbours.c:4420
+#: src/dht/gnunet-service-xdht_neighbours.c:4933
+#: src/dht/gnunet-service-xdht_neighbours.c:5326
+#: src/dht/gnunet-service-xdht_neighbours.c:5419
+#: src/dht/gnunet-service-xdht_neighbours.c:5509
+#: src/dht/gnunet-service-xdht_neighbours.c:5613
+#: src/dht/gnunet-service-xdht_neighbours.c:5757
+#: src/dht/gnunet-service-xdht_neighbours.c:5846
+#, fuzzy
+msgid "# Bytes received from other peers"
+msgstr "# Bytes des Typs %d empfangen"
+
+#: src/dht/gnunet-service-xdht_routing.c:256
+#, c-format
+msgid ""
+"\n"
+"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:264
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->trail_id = %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:267
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->next_hop = %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:270
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->prev_hop = %s"
+msgstr ""
+
+#: src/dht/plugin_block_dht.c:138
+#, fuzzy, c-format
+msgid "Block not of type %u\n"
+msgstr "Kein Transport des Typs %d bekannt.\n"
+
+#: src/dht/plugin_block_dht.c:145
+msgid "Size mismatch for block\n"
+msgstr ""
+
+#: src/dht/plugin_block_dht.c:155
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:257
+#: src/dns/dnsparser.c:254
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/dns/dnsparser.c:856
+#: src/dns/dnsparser.c:818
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -2196,15 +2574,15 @@ msgstr ""
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:352
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:358
+#: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:369
+#: src/dns/gnunet-dns-monitor.c:366
 msgid "Monitor DNS queries."
 msgstr ""
 
@@ -2258,21 +2636,21 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3499
+#: src/dns/gnunet-service-dns.c:1049
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3556
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3594
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/dv/gnunet-dv.c:166
+#: src/dv/gnunet-dv.c:169
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:175
+#: src/dv/gnunet-dv.c:178
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -2284,17 +2662,17 @@ msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy
-msgid "# Bytes transmitted via mesh channels"
+msgid "# Bytes transmitted via cadet channels"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2394
-#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1407
+#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
+#: src/exit/gnunet-daemon-exit.c:2654 src/vpn/gnunet-service-vpn.c:1407
 #: src/vpn/gnunet-service-vpn.c:1797 src/vpn/gnunet-service-vpn.c:1960
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2453
-#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1463
+#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2456
+#: src/exit/gnunet-daemon-exit.c:2713 src/vpn/gnunet-service-vpn.c:1463
 #: src/vpn/gnunet-service-vpn.c:1856 src/vpn/gnunet-service-vpn.c:1993
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
@@ -2351,279 +2729,165 @@ msgstr "# Bytes gesendet über UDP"
 
 #: src/exit/gnunet-daemon-exit.c:1872
 #, fuzzy
-msgid "# TCP service creation requests received via mesh"
+msgid "# TCP service creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1965
-#: src/exit/gnunet-daemon-exit.c:2070 src/exit/gnunet-daemon-exit.c:2318
-#: src/exit/gnunet-daemon-exit.c:2567 src/exit/gnunet-daemon-exit.c:2856
-#: src/exit/gnunet-daemon-exit.c:2963
+#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1968
+#: src/exit/gnunet-daemon-exit.c:2073 src/exit/gnunet-daemon-exit.c:2321
+#: src/exit/gnunet-daemon-exit.c:2570 src/exit/gnunet-daemon-exit.c:2859
+#: src/exit/gnunet-daemon-exit.c:2966
 #, fuzzy
-msgid "# Bytes received from MESH"
+msgid "# Bytes received from CADET"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1907 src/exit/gnunet-daemon-exit.c:2985
+#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
 #, c-format
-msgid "No service found for %s on port %d!\n"
+msgid "No service %s found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1911
+#: src/exit/gnunet-daemon-exit.c:1914
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:1968
+#: src/exit/gnunet-daemon-exit.c:1971
 #, fuzzy
-msgid "# TCP IP-exit creation requests received via mesh"
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2073
+#: src/exit/gnunet-daemon-exit.c:2076
 #, fuzzy
-msgid "# TCP data requests received via mesh"
+msgid "# TCP data requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2087
+#: src/exit/gnunet-daemon-exit.c:2090
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:2147
+#: src/exit/gnunet-daemon-exit.c:2150
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2321
+#: src/exit/gnunet-daemon-exit.c:2324
 #, fuzzy
-msgid "# ICMP IP-exit requests received via mesh"
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2570
+#: src/exit/gnunet-daemon-exit.c:2573
 #, fuzzy
-msgid "# ICMP service requests received via mesh"
+msgid "# ICMP service requests received via cadet"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2636 src/vpn/gnunet-service-vpn.c:1397
+#: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397
 #: src/vpn/gnunet-service-vpn.c:1954
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2695 src/vpn/gnunet-service-vpn.c:1433
+#: src/exit/gnunet-daemon-exit.c:2698 src/vpn/gnunet-service-vpn.c:1433
 #: src/vpn/gnunet-service-vpn.c:1445 src/vpn/gnunet-service-vpn.c:1844
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2745
+#: src/exit/gnunet-daemon-exit.c:2748
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2859
+#: src/exit/gnunet-daemon-exit.c:2862
 #, fuzzy
-msgid "# UDP IP-exit requests received via mesh"
+msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2966
+#: src/exit/gnunet-daemon-exit.c:2969
 #, fuzzy
-msgid "# UDP service requests received via mesh"
+msgid "# UDP service requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2989
+#: src/exit/gnunet-daemon-exit.c:2995
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:3025
+#: src/exit/gnunet-daemon-exit.c:3031
 #, fuzzy
-msgid "# Inbound MESH channels created"
+msgid "# Inbound CADET channels created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/exit/gnunet-daemon-exit.c:3286
+#: src/exit/gnunet-daemon-exit.c:3255 src/exit/gnunet-daemon-exit.c:3265
+#, fuzzy, c-format
+msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
+msgstr "%s: Option `%s' ist mehrdeutig\n"
+
+#: src/exit/gnunet-daemon-exit.c:3279 src/exit/gnunet-daemon-exit.c:3287
+#, c-format
+msgid "`%s' is not a valid port number (for domain `%s')!"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3320
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3300 src/exit/gnunet-daemon-exit.c:3312
+#: src/exit/gnunet-daemon-exit.c:3334 src/exit/gnunet-daemon-exit.c:3346
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3323
+#: src/exit/gnunet-daemon-exit.c:3357
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3512
+#: src/exit/gnunet-daemon-exit.c:3534
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3550
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3520
+#: src/exit/gnunet-daemon-exit.c:3558
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3527
+#: src/exit/gnunet-daemon-exit.c:3565
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3533
+#: src/exit/gnunet-daemon-exit.c:3571
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3539 src/pt/gnunet-daemon-pt.c:1247
+#: src/exit/gnunet-daemon-exit.c:3577 src/exit/gnunet-daemon-exit.c:3742
+#: src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3655
+#: src/exit/gnunet-daemon-exit.c:3689
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3797
+#: src/exit/gnunet-daemon-exit.c:3838
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:55
-msgid "Experimentation daemon shutting down ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:77
-msgid "Experimentation daemon starting ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:83
-#, fuzzy
-msgid "Failed to create statistics!\n"
-msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
-
-#: src/experimentation/gnunet-daemon-experimentation.c:120
-msgid "GNUnet experimentation daemon"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
-#, c-format
-msgid "Experiment `%s': Experiment signature is invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
-#, c-format
-msgid ""
-"Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
-"sec. \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
-#, c-format
-msgid "Experiment `%s': Issuer missing\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
-#, c-format
-msgid "Experiment `%s': Issuer invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
-#, c-format
-msgid "Experiment `%s': Issuer not accepted!\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
-#, c-format
-msgid "Experiment `%s': Version missing or invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
-#, c-format
-msgid "Experiment `%s': Required capabilities missing \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
-#, c-format
-msgid "Experiment `%s': Required capabilities invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
-#, fuzzy, c-format
-msgid "Failed to parse file `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
-msgid ""
-"No valid experiment issuers configured! Set value to public keys of issuers! "
-"Exiting.\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
-#, fuzzy
-msgid "Invalid value for public key\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
-#, fuzzy, c-format
-msgid "Cannot read experiments file `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:219
-#, c-format
-msgid "Cannot send message to peer `%s' for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:307
-#, c-format
-msgid "Sending experimentation request to peer %s\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:451
-#, c-format
-msgid "Added peer `%s' as active node\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:889
-#, fuzzy, c-format
-msgid "Connected to peer %s\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:919
-#, fuzzy, c-format
-msgid "Disconnected from peer %s\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1102
-#, fuzzy
-msgid "Failed to connect to CORE service!\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
-#, c-format
-msgid "Peer `%s' did not respond to request for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
-#, fuzzy, c-format
-msgid "Starting inbound experiment `%s' with peer `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
-#, fuzzy, c-format
-msgid "Starting outbound experiment `%s' with peer `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
-#, fuzzy, c-format
-msgid "Received %s message from peer %s for experiment `%s'\n"
-msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
 #: src/fragmentation/defragmentation.c:456
+#: src/transport/plugin_transport_wlan.c:1474
 #, fuzzy
 msgid "# fragments received"
 msgstr "# verworfener Nachrichten"
@@ -2674,76 +2938,76 @@ msgstr ""
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/fs_api.c:465
+#: src/fs/fs_api.c:484
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:474
+#: src/fs/fs_api.c:495
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:503
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1064
+#: src/fs/fs_api.c:1111
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1569
+#: src/fs/fs_api.c:1631
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1583
+#: src/fs/fs_api.c:1645
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2240
+#: src/fs/fs_api.c:2303
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2250
+#: src/fs/fs_api.c:2313
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2617
+#: src/fs/fs_api.c:2441 src/fs/fs_api.c:2689
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2393
+#: src/fs/fs_api.c:2459
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2407 src/fs/fs_api.c:2426 src/fs/fs_api.c:2909
+#: src/fs/fs_api.c:2474 src/fs/fs_api.c:2493 src/fs/fs_api.c:2985
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2608
+#: src/fs/fs_api.c:2679
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2853
+#: src/fs/fs_api.c:2928
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2947
+#: src/fs/fs_api.c:3023
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:210
+#: src/fs/fs_directory.c:208
 #, fuzzy
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
@@ -2759,48 +3023,48 @@ msgstr "Rekursiver Download des Verzeichnisses `%s' bei %llu von %llu Bytes.\n"
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:508 src/fs/fs_download.c:520
+#: src/fs/fs_download.c:523 src/fs/fs_download.c:535
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:889
+#: src/fs/fs_download.c:905
 #, 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:971
+#: src/fs/fs_download.c:987
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:997
+#: src/fs/fs_download.c:1013
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1020
+#: src/fs/fs_download.c:1036
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1030
+#: src/fs/fs_download.c:1046
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1039
+#: src/fs/fs_download.c:1055
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1137
+#: src/fs/fs_download.c:1153
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/fs_download.c:1928
+#: src/fs/fs_download.c:1944
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -2852,69 +3116,73 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
+#: src/fs/fs_publish.c:126 src/fs/fs_publish.c:431
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
-#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:683 src/fs/fs_publish.c:700 src/fs/fs_publish.c:739
+#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:1034
 #, 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:669
+#: src/fs/fs_publish.c:685
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:681
+#: src/fs/fs_publish.c:697
 #, fuzzy
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_publish.c:725
+#: src/fs/fs_publish.c:741
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:761
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:770
+#: src/fs/fs_publish.c:786
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:793
+#: src/fs/fs_publish.c:809
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_publish.c:862
+#: src/fs/fs_publish.c:873 src/fs/fs_publish.c:914
+msgid "Can not create LOC URI. Will continue with CHK instead.\n"
+msgstr ""
+
+#: src/fs/fs_publish.c:988
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/fs/fs_publish.c:868
+#: src/fs/fs_publish.c:996
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:915
+#: src/fs/fs_publish.c:1036
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1151
+#: src/fs/fs_publish.c:1272
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1243
+#: src/fs/fs_publish.c:1363
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2924,17 +3192,17 @@ msgstr ""
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish_ublock.c:219
+#: src/fs/fs_publish_ublock.c:243
 #, fuzzy
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_search.c:819
+#: src/fs/fs_search.c:812 src/fs/fs_search.c:882
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/fs/fs_search.c:878
+#: src/fs/fs_search.c:941
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2996,137 +3264,154 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_uri.c:222
-#, no-c-format
-msgid "`%' must be followed by HEX number"
-msgstr ""
+#: src/fs/fs_uri.c:223
+#, fuzzy, no-c-format
+msgid "Malformed KSK URI (`%' must be followed by HEX number)"
+msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:281
+#: src/fs/fs_uri.c:282
 #, 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:299
-msgid "`++' not allowed in KSK URI"
+#: src/fs/fs_uri.c:300
+#, fuzzy
+msgid "Malformed KSK URI (`++' not allowed)"
+msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
+
+#: src/fs/fs_uri.c:307
+#, fuzzy
+msgid "Malformed KSK URI (quotes not balanced)"
+msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
+
+#: src/fs/fs_uri.c:376
+msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:306
-msgid "Quotes not balanced in KSK URI"
+#: src/fs/fs_uri.c:417
+msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:376
-msgid "Malformed SKS URI"
+#: src/fs/fs_uri.c:432
+msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
-msgid "Malformed CHK URI"
+#: src/fs/fs_uri.c:511
+msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:629
-msgid "SKS URI malformed"
+#: src/fs/fs_uri.c:526
+msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
-msgid "LOC URI malformed"
+#: src/fs/fs_uri.c:536
+msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:611
+#: src/fs/fs_uri.c:544
+msgid "LOC URI malformed (wrong syntax for public key)"
+msgstr ""
+
+#: src/fs/fs_uri.c:552
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:617
-msgid "SKS URI malformed (could not find signature)"
+#: src/fs/fs_uri.c:558
+msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:623
-msgid "SKS URI malformed (could not decode signature)"
+#: src/fs/fs_uri.c:564
+msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/fs/fs_uri.c:573
+msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:648
-msgid "SKS URI malformed (signature failed validation)"
+#: src/fs/fs_uri.c:579
+msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:686
-msgid "Unrecognized URI type"
+#: src/fs/fs_uri.c:585
+msgid "LOC URI malformed (could not parse expiration time)"
+msgstr ""
+
+#: src/fs/fs_uri.c:597
+msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:910
+#: src/fs/fs_uri.c:631
 #, fuzzy
-msgid "Lacking key configuration settings.\n"
-msgstr "GNUnet Konfiguration"
+msgid "invalid argument"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/fs/fs_uri.c:916
-#, fuzzy, c-format
-msgid "Could not access hostkey file `%s'.\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+#: src/fs/fs_uri.c:643
+msgid "Unrecognized URI type"
+msgstr ""
 
-#: src/fs/fs_uri.c:1100 src/fs/fs_uri.c:1127
+#: src/fs/fs_uri.c:1045 src/fs/fs_uri.c:1072
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1133
+#: src/fs/fs_uri.c:1078
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:236
+#: src/fs/gnunet-auto-share.c:237
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
-#: src/fs/gnunet-auto-share.c:309
+#: src/fs/gnunet-auto-share.c:290 src/fs/gnunet-auto-share.c:300
+#: src/fs/gnunet-auto-share.c:310
 #, fuzzy, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-auto-share.c:401
+#: src/fs/gnunet-auto-share.c:402
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:488
+#: src/fs/gnunet-auto-share.c:490
 #, fuzzy, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/gnunet-auto-share.c:497
+#: src/fs/gnunet-auto-share.c:499
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/fs/gnunet-auto-share.c:686
+#: src/fs/gnunet-auto-share.c:688
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
+#: src/fs/gnunet-auto-share.c:739 src/fs/gnunet-publish.c:888
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
+#: src/fs/gnunet-auto-share.c:743 src/fs/gnunet-publish.c:892
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
+#: src/fs/gnunet-auto-share.c:746 src/fs/gnunet-publish.c:895
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
+#: src/fs/gnunet-auto-share.c:749 src/fs/gnunet-publish.c:919
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
+#: src/fs/gnunet-auto-share.c:752 src/fs/gnunet-publish.c:926
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:770
+#: src/fs/gnunet-auto-share.c:772
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -3196,8 +3481,8 @@ msgstr "Fehler beim Download: %s\n"
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Upload abgewiesen!"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
-#: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:304
+#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3207,7 +3492,7 @@ msgstr ""
 msgid "You need to specify a URI argument.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:714
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
@@ -3220,13 +3505,13 @@ msgstr ""
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
-#: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:858
+#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:282
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 
@@ -3234,7 +3519,7 @@ msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3285,128 +3570,134 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
+#: src/fs/gnunet-publish.c:238 src/fs/gnunet-publish.c:250
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:250
+#: src/fs/gnunet-publish.c:257
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-publish.c:260
+#: src/fs/gnunet-publish.c:268
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:273
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:283
+#: src/fs/gnunet-publish.c:281
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr "Ich bin Peer `%s'.\n"
+
+#: src/fs/gnunet-publish.c:301
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:401
+#: src/fs/gnunet-publish.c:427
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:403
+#: src/fs/gnunet-publish.c:429
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:542
+#: src/fs/gnunet-publish.c:574
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:599
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:598
+#: src/fs/gnunet-publish.c:633
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-publish.c:600
+#: src/fs/gnunet-publish.c:637
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:643
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:610
+#: src/fs/gnunet-publish.c:650
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/fs/gnunet-publish.c:614
+#: src/fs/gnunet-publish.c:655
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-publish.c:662
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:625
+#: src/fs/gnunet-publish.c:671
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/gnunet-publish.c:656
+#: src/fs/gnunet-publish.c:703
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:735
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-publish.c:695
+#: src/fs/gnunet-publish.c:749
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:805
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:812
 #, 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:760
+#: src/fs/gnunet-publish.c:818
 #, 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:768 src/vpn/gnunet-vpn.c:208
+#: src/fs/gnunet-publish.c:826 src/vpn/gnunet-vpn.c:209
 #, 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:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:865 src/transport/gnunet-transport.c:899
+#: src/fs/gnunet-publish.c:837 src/fs/gnunet-publish.c:845
+#: src/transport/gnunet-transport.c:1891 src/transport/gnunet-transport.c:1921
+#: src/transport/gnunet-transport.c:1952
 #, 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:835
+#: src/fs/gnunet-publish.c:899
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3414,7 +3705,7 @@ msgstr ""
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:839
+#: src/fs/gnunet-publish.c:903
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3422,13 +3713,13 @@ msgstr ""
 "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:843
+#: src/fs/gnunet-publish.c:907
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
 "setzen"
 
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-publish.c:910
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3436,7 +3727,7 @@ msgstr ""
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/fs/gnunet-publish.c:851
+#: src/fs/gnunet-publish.c:915
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3444,32 +3735,32 @@ msgstr ""
 "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:859
+#: src/fs/gnunet-publish.c:923
 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:865
+#: src/fs/gnunet-publish.c:929
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:869
+#: src/fs/gnunet-publish.c:933
 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:873
+#: src/fs/gnunet-publish.c:937
 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:889
+#: src/fs/gnunet-publish.c:953
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3478,142 +3769,185 @@ msgstr ""
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:184
+#: src/fs/gnunet-search.c:191
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/fs/gnunet-search.c:233
+#: src/fs/gnunet-search.c:240
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-search.c:257
+#: src/fs/gnunet-search.c:264
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-search.c:288
+#: src/fs/gnunet-search.c:295
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:291
+#: src/fs/gnunet-search.c:298
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:298
+#: src/fs/gnunet-search.c:305
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:309
+#: src/fs/gnunet-search.c:316
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:271
+#: src/fs/gnunet-service-fs.c:285
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
+#: src/fs/gnunet-service-fs.c:344 src/fs/gnunet-service-fs.c:607
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1253
-#: src/topology/gnunet-daemon-topology.c:1260
+#: src/fs/gnunet-service-fs.c:731
+#, fuzzy
+msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "GNUnet Konfiguration"
+
+#: src/fs/gnunet-service-fs.c:757 src/hostlist/gnunet-daemon-hostlist.c:311
+#: src/sensordashboard/gnunet-service-sensordashboard.c:864
+#: src/sensordashboard/gnunet-service-sensordashboard.c:872
+#: src/topology/gnunet-daemon-topology.c:1287
+#: src/topology/gnunet-daemon-topology.c:1294
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:680
+#: src/fs/gnunet-service-fs_cadet_client.c:494
+#, fuzzy
+msgid "# replies received via cadet"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/fs/gnunet-service-fs_cadet_client.c:508
+#, fuzzy
+msgid "# replies received via cadet dropped"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:260
+#, fuzzy
+msgid "# Blocks transferred via cadet"
+msgstr "# Bytes des Typs %d übertragen"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:361
+#, fuzzy
+msgid "# queries received via CADET not answered"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:441
+#, fuzzy
+msgid "# queries received via cadet"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:485
+#, fuzzy
+msgid "# cadet client connections rejected"
+msgstr "GNUnet Konfiguration"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:491
+#: src/fs/gnunet-service-fs_cadet_server.c:531
+#, fuzzy
+msgid "# cadet connections active"
+msgstr "# verbundener Knoten"
+
+#: src/fs/gnunet-service-fs_cp.c:710
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:714
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:719
+#: src/fs/gnunet-service-fs_cp.c:750
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:725
+#: src/fs/gnunet-service-fs_cp.c:756
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:750 src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:781 src/fs/gnunet-service-fs_cp.c:1337
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:843
+#: src/fs/gnunet-service-fs_cp.c:878
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:896
+#: src/fs/gnunet-service-fs_cp.c:934
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:904
+#: src/fs/gnunet-service-fs_cp.c:942
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:956
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:956
+#: src/fs/gnunet-service-fs_cp.c:994
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1024
+#: src/fs/gnunet-service-fs_cp.c:1062
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1049
+#: src/fs/gnunet-service-fs_cp.c:1087
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1059
+#: src/fs/gnunet-service-fs_cp.c:1097
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1137
+#: src/fs/gnunet-service-fs_cp.c:1175
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1171
+#: src/fs/gnunet-service-fs_cp.c:1209
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1193
+#: src/fs/gnunet-service-fs_cp.c:1231
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1244
+#: src/fs/gnunet-service-fs_cp.c:1282
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1268
+#: src/fs/gnunet-service-fs_cp.c:1306
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1297
+#: src/fs/gnunet-service-fs_cp.c:1335
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1668
+#: src/fs/gnunet-service-fs_cp.c:1754
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -3665,61 +3999,25 @@ msgstr "Deindizierung schlug fehl."
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
+#: src/fs/gnunet-service-fs_lc.c:201 src/fs/gnunet-service-fs_lc.c:371
 #, fuzzy
 msgid "# client searches active"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:256
+#: src/fs/gnunet-service-fs_lc.c:259
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:327
+#: src/fs/gnunet-service-fs_lc.c:330
 #, fuzzy
 msgid "# client searches received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:362
+#: src/fs/gnunet-service-fs_lc.c:365
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_client.c:484
-#, fuzzy
-msgid "# replies received via mesh"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/fs/gnunet-service-fs_mesh_client.c:498
-#, fuzzy
-msgid "# replies received via mesh dropped"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:260
-#, fuzzy
-msgid "# Blocks transferred via mesh"
-msgstr "# Bytes des Typs %d übertragen"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:352
-#, fuzzy
-msgid "# queries received via mesh not answered"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:432
-#, fuzzy
-msgid "# queries received via mesh"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:476
-#, fuzzy
-msgid "# mesh client connections rejected"
-msgstr "GNUnet Konfiguration"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:482
-#: src/fs/gnunet-service-fs_mesh_server.c:522
-#, fuzzy
-msgid "# mesh connections active"
-msgstr "# verbundener Knoten"
-
 #: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""
@@ -3790,86 +4088,86 @@ msgstr ""
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1001
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1029
+#: src/fs/gnunet-service-fs_pr.c:1031
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_pr.c:1064
+#: src/fs/gnunet-service-fs_pr.c:1069
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1192
+#: src/fs/gnunet-service-fs_pr.c:1200
 #, fuzzy
-msgid "# Replies received from MESH"
+msgid "# Replies received from CADET"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1252
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1272
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1319
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1326
+#: src/fs/gnunet-service-fs_pr.c:1334
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1335
+#: src/fs/gnunet-service-fs_pr.c:1343
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1350
+#: src/fs/gnunet-service-fs_pr.c:1358
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1372
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1377
+#: src/fs/gnunet-service-fs_pr.c:1385
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1382
+#: src/fs/gnunet-service-fs_pr.c:1390
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
-#: src/fs/gnunet-service-fs_pr.c:1590
+#: src/fs/gnunet-service-fs_pr.c:1417 src/fs/gnunet-service-fs_pr.c:1457
+#: src/fs/gnunet-service-fs_pr.c:1620
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1475
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1486
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1566
+#: src/fs/gnunet-service-fs_pr.c:1596
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1651
+#: src/fs/gnunet-service-fs_pr.c:1685
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_push.c:631
+#: src/fs/gnunet-service-fs_push.c:672
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3904,9 +4202,9 @@ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:387
+#: src/gns/gns_api.c:393
 #, fuzzy
-msgid "Failed to serialize lookup reply from GNS service!\n"
+msgid "Failed to deserialize lookup reply from GNS service!\n"
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
 #: src/gns/gnunet-bcd.c:123
@@ -3914,7 +4212,7 @@ msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:566
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:759
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
@@ -3937,120 +4235,130 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:228
+#: src/gns/gnunet-dns2gns.c:234
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-dns2gns.c:400
+#: src/gns/gnunet-dns2gns.c:406
 #, fuzzy, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-dns2gns.c:416
+#: src/gns/gnunet-dns2gns.c:422
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:430
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/gns/gnunet-dns2gns.c:701
+#: src/gns/gnunet-dns2gns.c:708
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:727
+#: src/gns/gnunet-dns2gns.c:734
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:749
+#: src/gns/gnunet-dns2gns.c:756
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:770
+#: src/gns/gnunet-dns2gns.c:777
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:773
+#: src/gns/gnunet-dns2gns.c:780
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:776
+#: src/gns/gnunet-dns2gns.c:783
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:786
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:789
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:795
+#: src/gns/gnunet-dns2gns.c:802
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:217
+#: src/gns/gnunet-gns.c:215
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:298
+#: src/gns/gnunet-gns.c:314
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:753
+#: src/gns/gnunet-gns.c:353 src/gns/gnunet-gns-helper-service-w32.c:798
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:783
+#: src/gns/gnunet-gns.c:392 src/gns/gnunet-gns-helper-service-w32.c:828
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns.c:378
+#: src/gns/gnunet-gns.c:405
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:428
+#: src/gns/gnunet-gns.c:455
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:431
+#: src/gns/gnunet-gns.c:458
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:434
+#: src/gns/gnunet-gns.c:461
+#, fuzzy
+msgid "Specify timeout for the lookup"
+msgstr "Die Priorität des Inhalts angeben"
+
+#: src/gns/gnunet-gns.c:464
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:437
+#: src/gns/gnunet-gns.c:467
 #, fuzzy
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:440
+#: src/gns/gnunet-gns.c:470
 #, fuzzy
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:453
+#: src/gns/gnunet-gns.c:484
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/gns/gnunet-gns-helper-service-w32.c:723
+#: src/gns/gnunet-gns-helper-service-w32.c:768
 #, c-format
 msgid ""
 "Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
@@ -4058,18 +4366,26 @@ msgid ""
 "sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:793
+#: src/gns/gnunet-gns-helper-service-w32.c:838
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
-#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
-#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
-#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
-#: src/hostlist/hostlist-client.c:968
-#: src/transport/plugin_transport_http_client.c:1071
-#: src/transport/plugin_transport_http_client.c:1086
+#: src/gns/gnunet-gns-import.c:479
+msgid "This program will import some GNS authorities into your GNS namestore."
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:105
+#: src/hostlist/gnunet-daemon-hostlist_client.c:524
+#: src/hostlist/gnunet-daemon-hostlist_client.c:741
+#: src/hostlist/gnunet-daemon-hostlist_client.c:747
+#: src/hostlist/gnunet-daemon-hostlist_client.c:800
+#: src/hostlist/gnunet-daemon-hostlist_client.c:809
+#: src/hostlist/gnunet-daemon-hostlist_client.c:931
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
+#: src/transport/plugin_transport_http_client.c:595
+#: src/transport/plugin_transport_http_client.c:613
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
@@ -4139,67 +4455,67 @@ msgstr "Fehler beim Starten der Collection.\n"
 msgid "Failed to pass client to MHD\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2504
+#: src/gns/gnunet-gns-proxy.c:2518
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2533
+#: src/gns/gnunet-gns-proxy.c:2547
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+#: src/gns/gnunet-gns-proxy.c:2565 src/gns/gnunet-gns-proxy.c:2594
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2631
+#: src/gns/gnunet-gns-proxy.c:2645
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2970
+#: src/gns/gnunet-gns-proxy.c:2984
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3010
+#: src/gns/gnunet-gns-proxy.c:3024
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3072
+#: src/gns/gnunet-gns-proxy.c:3086
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:3113
+#: src/gns/gnunet-gns-proxy.c:3127
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3116
+#: src/gns/gnunet-gns-proxy.c:3130
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3135
+#: src/gns/gnunet-gns-proxy.c:3149
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:862
+#: src/gns/gnunet-service-gns.c:864
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/gns/gnunet-service-gns.c:870
+#: src/gns/gnunet-service-gns.c:872
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/gns/gnunet-service-gns.c:903
+#: src/gns/gnunet-service-gns.c:905
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns.c:919
+#: src/gns/gnunet-service-gns.c:921
 #, fuzzy
 msgid "valid public key required"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -4214,461 +4530,515 @@ msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:815
+#: src/gns/gnunet-service-gns_resolver.c:650
+#, c-format
+msgid "Protocol `%s' unknown, skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:661
+#, c-format
+msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:854
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:957
+#: src/gns/gnunet-service-gns_resolver.c:996
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1316
+#: src/gns/gnunet-service-gns_resolver.c:1356
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1809
+#: src/gns/gnunet-service-gns_resolver.c:1886
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1833
+#: src/gns/gnunet-service-gns_resolver.c:1910
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2071
+#: src/gns/gnunet-service-gns_resolver.c:2192
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2220
+#: src/gns/gnunet-service-gns_resolver.c:2341
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:151
+#: src/gns/plugin_gnsrecord_gns.c:172
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:180
+#: src/gns/plugin_gnsrecord_gns.c:201
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:222
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:217
+#: src/gns/plugin_gnsrecord_gns.c:245
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:293
+#: src/gns/plugin_gnsrecord_gns.c:280
+#, fuzzy, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:291
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:314
+#: src/gnsrecord/plugin_gnsrecord_dns.c:312
 #, fuzzy, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:336
+#: src/gnsrecord/plugin_gnsrecord_dns.c:334
 #, fuzzy, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:420
+#: src/gnsrecord/plugin_gnsrecord_dns.c:418
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#: src/gnsrecord/plugin_gnsrecord_dns.c:455
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:471
+#: src/gnsrecord/plugin_gnsrecord_dns.c:474
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:494
+#: src/gnsrecord/plugin_gnsrecord_dns.c:497
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:514
+#: src/gnsrecord/plugin_gnsrecord_dns.c:520
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:529
+#: src/gnsrecord/plugin_gnsrecord_dns.c:535
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:549
+#: src/gnsrecord/plugin_gnsrecord_dns.c:562
 #, fuzzy, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:578
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:595
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:567
+#: src/gnsrecord/plugin_gnsrecord_dns.c:619
+#: src/gnsrecord/plugin_gnsrecord_dns.c:635
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hello/gnunet-hello.c:123
+#: src/hello/gnunet-hello.c:126
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:129
+#: src/hello/gnunet-hello.c:132
 #, fuzzy, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/hello/gnunet-hello.c:137
+#: src/hello/gnunet-hello.c:140
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:144
+#: src/hello/gnunet-hello.c:147
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
+#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:196
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/hello/gnunet-hello.c:170
+#: src/hello/gnunet-hello.c:173
 #, fuzzy, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hello/gnunet-hello.c:195
+#: src/hello/gnunet-hello.c:208
 #, fuzzy, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/hello/gnunet-hello.c:203
+#: src/hello/gnunet-hello.c:216
 #, c-format
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:943
+#: src/hello/hello.c:955
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:952
+#: src/hello/hello.c:964
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:962
+#: src/hello/hello.c:974
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hello/hello.c:972
+#: src/hello/hello.c:984
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/hello/hello.c:989
+#: src/hello/hello.c:1002
 #, c-format
-msgid "Plugin `%s' not found\n"
+msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:998
+#: src/hello/hello.c:1010
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1017
+#: src/hello/hello.c:1025
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:259
+#: src/hello/hello.c:1098
+#, c-format
+msgid "HELLO URI contained %u addresses, added %u addresses\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:274
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/hostlist/gnunet-daemon-hostlist.c:331
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
+#: src/hostlist/gnunet-daemon-hostlist.c:336
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:339
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:343
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:359
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:288
+#: src/hostlist/gnunet-daemon-hostlist_client.c:343
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
+#: src/hostlist/gnunet-daemon-hostlist_client.c:364
+#: src/hostlist/gnunet-daemon-hostlist_client.c:394
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:397
 #, 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
+#: src/hostlist/gnunet-daemon-hostlist_client.c:385
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
+#: src/hostlist/gnunet-daemon-hostlist_client.c:650
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1402
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/gnunet-daemon-hostlist_client.c:680
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/gnunet-daemon-hostlist_client.c:722
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862
 #, 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:816
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1103
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1655
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1049
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1112
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1188
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1348
 #, 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:1285
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/hostlist/hostlist-client.c:1296
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1362
 #, 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:1329
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1399
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1445
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1452
 #, 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:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1476
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1488
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1471
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1588
+#: src/transport/plugin_transport_http_client.c:2274
+#, c-format
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1617
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1630
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1495
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1499
-#, fuzzy, c-format
-msgid "Hostlist file `%s' could not be removed\n"
-msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
-
-#: src/hostlist/hostlist-server.c:137
+#: src/hostlist/gnunet-daemon-hostlist_server.c:181
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# bytes in der Datenbank"
 
-#: src/hostlist/hostlist-server.c:161
+#: src/hostlist/gnunet-daemon-hostlist_server.c:206
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
-#: src/peerinfo-tool/gnunet-peerinfo.c:350
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
-#: src/peerinfo-tool/gnunet-peerinfo.c:490
-#: src/topology/gnunet-daemon-topology.c:924
+#: src/hostlist/gnunet-daemon-hostlist_server.c:241
+#: src/hostlist/gnunet-daemon-hostlist_server.c:590
+#: src/peerinfo-tool/gnunet-peerinfo.c:382
+#: src/peerinfo-tool/gnunet-peerinfo.c:531
+#: src/topology/gnunet-daemon-topology.c:952
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/hostlist/hostlist-server.c:210
+#: src/hostlist/gnunet-daemon-hostlist_server.c:265
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/gnunet-daemon-hostlist_server.c:282
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:268
+#: src/hostlist/gnunet-daemon-hostlist_server.c:386
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/hostlist/hostlist-server.c:271
+#: src/hostlist/gnunet-daemon-hostlist_server.c:389
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:403
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:288
+#: src/hostlist/gnunet-daemon-hostlist_server.c:407
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:296
+#: src/hostlist/gnunet-daemon-hostlist_server.c:414
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/gnunet-daemon-hostlist_server.c:417
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:303
+#: src/hostlist/gnunet-daemon-hostlist_server.c:422
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:304
+#: src/hostlist/gnunet-daemon-hostlist_server.c:424
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:346
+#: src/hostlist/gnunet-daemon-hostlist_server.c:485
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/hostlist/hostlist-server.c:389
+#: src/hostlist/gnunet-daemon-hostlist_server.c:535
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
-#: src/transport/gnunet-service-transport.c:850
+#: src/hostlist/gnunet-daemon-hostlist_server.c:747
+#: src/peerinfo-tool/gnunet-peerinfo.c:736
+#: src/transport/gnunet-service-transport.c:1127
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/hostlist/hostlist-server.c:575
+#: src/hostlist/gnunet-daemon-hostlist_server.c:771
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:589
+#: src/hostlist/gnunet-daemon-hostlist_server.c:786
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-server.c:629
+#: src/hostlist/gnunet-daemon-hostlist_server.c:799
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:812
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:833
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:853
 #, fuzzy, c-format
-msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/hostlist/hostlist-server.c:672
+#: src/hostlist/gnunet-daemon-hostlist_server.c:893
 #, 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"
@@ -4760,67 +5130,6 @@ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/integration-tests/connection_watchdog.c:1012
-#, fuzzy, c-format
-msgid "Transport plugin: `%s' port %llu\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-
-#: src/integration-tests/connection_watchdog.c:1045
-#, fuzzy, c-format
-msgid "Found %u transport plugins: `%s'\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/integration-tests/connection_watchdog.c:1105
-msgid "Send ping messages to test connectivity (default == NO)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:299
-#, fuzzy, c-format
-msgid "Invalid target `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/mesh/gnunet-mesh.c:417
-#, fuzzy, c-format
-msgid "Invalid tunnel owner `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/mesh/gnunet-mesh.c:482
-msgid "You must NOT give a TARGET when using options\n"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:559
-#, fuzzy
-msgid "provide information about a particular channel"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/mesh/gnunet-mesh.c:562
-#, fuzzy
-msgid "provide information about a particular connection"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/mesh/gnunet-mesh.c:565
-#, fuzzy
-msgid "provide information about all tunnels"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/mesh/gnunet-mesh.c:568
-#, fuzzy
-msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/mesh/gnunet-mesh.c:571
-msgid "port to listen to (default; 0)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:574
-#, fuzzy
-msgid "provide information about a particular tunnel"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/mesh/gnunet-service-mesh_peer.c:349
-msgid "Wrong CORE service\n"
-msgstr ""
-
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -4836,7 +5145,7 @@ msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 msgid "No records found for `%s'"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:394
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4846,7 +5155,7 @@ msgstr ""
 msgid "You must specify which zone should be accessed\n"
 msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
 
-#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:692
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:844
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -4856,7 +5165,7 @@ msgstr "Ungültiger Parameter: `%s'\n"
 msgid "You must specify a name\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:925
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1084
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4865,7 +5174,7 @@ msgstr ""
 msgid "spezifies the public key of the zone to look in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:957
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1116
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -4875,224 +5184,247 @@ msgid "Namecache failed to cache block"
 msgstr ""
 
 #: src/namecache/plugin_namecache_postgres.c:89
-#: src/namestore/plugin_namestore_postgres.c:93
+#: src/namestore/plugin_namestore_postgres.c:96
 #, fuzzy
 msgid "Failed to create indices\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/namestore/gnunet-namestore.c:304
+#: src/namestore/gnunet-namestore.c:303
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:333
+#: src/namestore/gnunet-namestore.c:332
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:340
+#: src/namestore/gnunet-namestore.c:339
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:555
+#: src/namestore/gnunet-namestore.c:477 src/namestore/gnunet-namestore.c:485
+#: src/namestore/gnunet-namestore.c:493
+#, c-format
+msgid "A %s record exists already under `%s', no other records can be added.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:507 src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:531
+#, c-format
+msgid "Records already exist under `%s', cannot add `%s' record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:628
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:667
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:708
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:566
-#: src/namestore/gnunet-namestore-fcfsd.c:970
+#: src/namestore/gnunet-namestore.c:719
+#: src/namestore/gnunet-namestore-fcfsd.c:984
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/namestore/gnunet-namestore.c:574 src/namestore/gnunet-namestore.c:583
-#: src/namestore/gnunet-namestore.c:600 src/namestore/gnunet-namestore.c:622
-#: src/namestore/gnunet-namestore.c:662
+#: src/namestore/gnunet-namestore.c:727 src/namestore/gnunet-namestore.c:736
+#: src/namestore/gnunet-namestore.c:753 src/namestore/gnunet-namestore.c:775
+#: src/namestore/gnunet-namestore.c:815
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/namestore/gnunet-namestore.c:575 src/namestore/gnunet-namestore.c:584
-#: src/namestore/gnunet-namestore.c:601 src/namestore/gnunet-namestore.c:623
+#: src/namestore/gnunet-namestore.c:728 src/namestore/gnunet-namestore.c:737
+#: src/namestore/gnunet-namestore.c:754 src/namestore/gnunet-namestore.c:776
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:592
+#: src/namestore/gnunet-namestore.c:745
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/namestore/gnunet-namestore.c:612
+#: src/namestore/gnunet-namestore.c:765
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
 
-#: src/namestore/gnunet-namestore.c:648
+#: src/namestore/gnunet-namestore.c:801
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:663
+#: src/namestore/gnunet-namestore.c:816
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:712
-#: src/peerinfo-tool/gnunet-peerinfo.c:703
+#: src/namestore/gnunet-namestore.c:868
+#: src/peerinfo-tool/gnunet-peerinfo.c:817
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:747
+#: src/namestore/gnunet-namestore.c:903
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:787
+#: src/namestore/gnunet-namestore.c:943
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:814
+#: src/namestore/gnunet-namestore.c:970
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:847
+#: src/namestore/gnunet-namestore.c:1006
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/namestore/gnunet-namestore.c:859
+#: src/namestore/gnunet-namestore.c:1018
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore.c:907
+#: src/namestore/gnunet-namestore.c:1066
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:910
+#: src/namestore/gnunet-namestore.c:1069
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:1072
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1075
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:1078
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/namestore/gnunet-namestore.c:922
+#: src/namestore/gnunet-namestore.c:1081
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/namestore/gnunet-namestore.c:928
+#: src/namestore/gnunet-namestore.c:1087
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:1090
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:1093
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:1096
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:1099
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:1102
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:1105
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:464
+#: src/namestore/gnunet-namestore-fcfsd.c:478
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:491
+#: src/namestore/gnunet-namestore-fcfsd.c:505
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:525
+#: src/namestore/gnunet-namestore-fcfsd.c:539
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:534
+#: src/namestore/gnunet-namestore-fcfsd.c:548
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:596
+#: src/namestore/gnunet-namestore-fcfsd.c:610
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:652
+#: src/namestore/gnunet-namestore-fcfsd.c:666
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:668
+#: src/namestore/gnunet-namestore-fcfsd.c:682
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:704
+#: src/namestore/gnunet-namestore-fcfsd.c:718
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:712
+#: src/namestore/gnunet-namestore-fcfsd.c:726
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:910
+#: src/namestore/gnunet-namestore-fcfsd.c:924
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:936
+#: src/namestore/gnunet-namestore-fcfsd.c:950
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:978
+#: src/namestore/gnunet-namestore-fcfsd.c:992
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1011
+#: src/namestore/gnunet-namestore-fcfsd.c:1025
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:634
+#: src/namestore/gnunet-service-namestore.c:655
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
@@ -5110,110 +5442,222 @@ msgstr ""
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:169
-msgid "NAT traversal with ICMP Server timed out.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:199
+#: src/nat/nat_auto.c:179
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:200
+#: src/nat/nat_auto.c:180
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:219
+#: src/nat/nat_auto.c:201
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/nat/nat_auto.c:265
+#: src/nat/nat_auto.c:249
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Ungültiger RPC `%s' empfangen.\n"
 
-#: src/nat/nat_auto.c:331
+#: src/nat/nat_auto.c:327
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:347
+#: src/nat/nat_auto.c:343
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 
-#: src/nat/nat_auto.c:400
+#: src/nat/nat_auto.c:406
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:401
+#: src/nat/nat_auto.c:407
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat_auto.c:434
-msgid "gnunet-helper-nat-server found, testing it\n"
+#: src/nat/nat_auto.c:437
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:435
-msgid "No working gnunet-helper-nat-server found\n"
+#: src/nat/nat_auto.c:445 src/nat/nat_auto.c:490
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:469
-msgid "gnunet-helper-nat-client found, enabling it\n"
+#: src/nat/nat_auto.c:453 src/nat/nat_auto.c:498
+msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:470
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+#: src/nat/nat_auto.c:483
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:834
+#: src/nat/nat.c:867
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:883
+#: src/nat/nat.c:917
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat.c:1152
+#: src/nat/nat.c:1032
+msgid "Error while running upnp client:\n"
+msgstr ""
+
+#: src/nat/nat.c:1102
+#, fuzzy, c-format
+msgid "Failed to run upnp client for port %u\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#: src/nat/nat.c:1243
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1218 src/nat/nat.c:1230
+#: src/nat/nat.c:1297
+msgid ""
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP \n"
+msgstr ""
+
+#: src/nat/nat.c:1324 src/nat/nat.c:1336
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1365
+#: src/nat/nat.c:1474
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1376
+#: src/nat/nat.c:1490
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:170
+#: src/nat/nat.c:1575
+msgid "Operation Successful"
+msgstr ""
+
+#: src/nat/nat.c:1577
+msgid "Internal Failure (IPC, ...)"
+msgstr ""
+
+#: src/nat/nat.c:1579
+msgid "Failure in network subsystem, check permissions."
+msgstr ""
+
+#: src/nat/nat.c:1581
+msgid "Encountered timeout while performing operation"
+msgstr ""
+
+#: src/nat/nat.c:1583
+msgid "detected that we are offline"
+msgstr ""
+
+#: src/nat/nat.c:1585
+#, fuzzy
+msgid "`upnpc` command not found"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/nat/nat.c:1587
+#, fuzzy
+msgid "Failed to run `upnpc` command"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/nat/nat.c:1589
+#, fuzzy
+msgid "`upnpc' command took too long, process killed"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/nat/nat.c:1591
+msgid "`upnpc' command failed to establish port mapping"
+msgstr ""
+
+#: src/nat/nat.c:1593
+#, fuzzy
+msgid "`external-ip' command not found"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/nat/nat.c:1595
+#, fuzzy
+msgid "Failed to run `external-ip` command"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/nat/nat.c:1597
+msgid "`external-ip' command output invalid"
+msgstr ""
+
+#: src/nat/nat.c:1599
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat.c:1601
+#, fuzzy
+msgid "Could not determine interface with internal/local network address"
+msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+
+#: src/nat/nat.c:1603
+msgid "No functioning gnunet-helper-nat-server installation found"
+msgstr ""
+
+#: src/nat/nat.c:1605
+msgid "NAT test could not be initialized"
+msgstr ""
+
+#: src/nat/nat.c:1607
+msgid "NAT test timeout reached"
+msgstr ""
+
+#: src/nat/nat.c:1609
+msgid "could not register NAT"
+msgstr ""
+
+#: src/nat/nat.c:1611
+msgid "No working gnunet-helper-nat-client installation found"
+msgstr ""
+
+#: src/nat/nat_mini.c:203
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:505
+#: src/nat/nat_mini.c:609
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:345
+#: src/nat/nat_test.c:360
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat/nat_test.c:414
+#: src/nat/nat_test.c:462
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
+#: src/nat/nat_test.c:497
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/nse/gnunet-nse.c:117
+#, fuzzy
+msgid "NSE service is not running\n"
+msgstr "`%s' ist keine Datei.\n"
+
+#: src/nse/gnunet-nse.c:122
+msgid "Error while checking if NSE service is running or not\n"
+msgstr ""
+
+#: src/nse/gnunet-nse.c:168
+#, fuzzy
+msgid "Show network size estimates from NSE service."
+msgstr "# Client Trace-Anfragen empfangen"
+
 #: src/nse/gnunet-nse-profiler.c:858
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
@@ -5223,10 +5667,6 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
 #: src/nse/gnunet-nse-profiler.c:867
 msgid "name of the file for writing the main results"
 msgstr ""
@@ -5244,35 +5684,32 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/nse/gnunet-service-nse.c:1461
-#: src/revocation/gnunet-service-revocation.c:789
+#: src/nse/gnunet-service-nse.c:1537
+#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:260
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1488
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
-
 #: src/peerinfo/gnunet-service-peerinfo.c:215
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:354
+#: src/peerinfo/gnunet-service-peerinfo.c:352
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:373
+#: src/peerinfo/gnunet-service-peerinfo.c:371
+#: src/peerinfo/gnunet-service-peerinfo.c:388
 #, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s %u \n"
+msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:457
+#: src/peerinfo/gnunet-service-peerinfo.c:468
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:494
+#: src/peerinfo/gnunet-service-peerinfo.c:506
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5280,48 +5717,52 @@ msgstr ""
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:644
+#: src/peerinfo/gnunet-service-peerinfo.c:662
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:649
+#: src/peerinfo/gnunet-service-peerinfo.c:668
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:985
+#: src/peerinfo/gnunet-service-peerinfo.c:1037
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1275
+#: src/peerinfo/gnunet-service-peerinfo.c:1358
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:236
+#: src/peerinfo/gnunet-service-peerinfo.c:1371
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:237
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:356
+#: src/peerinfo/peerinfo_api.c:363
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/peerinfo/peerinfo_api.c:506
+#: src/peerinfo/peerinfo_api.c:519
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/peerinfo/peerinfo_api.c:547 src/peerinfo/peerinfo_api.c:566
-#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
-#: src/peerinfo/peerinfo_api.c:603
+#: src/peerinfo/peerinfo_api.c:563 src/peerinfo/peerinfo_api.c:586
+#: src/peerinfo/peerinfo_api.c:603 src/peerinfo/peerinfo_api.c:616
+#: src/peerinfo/peerinfo_api.c:631
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
 
-#: src/peerinfo/peerinfo_api.c:678
+#: src/peerinfo/peerinfo_api.c:720
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
@@ -5331,111 +5772,205 @@ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 msgid "Could not connect to `%s' service.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:232
+#: src/peerinfo-tool/gnunet-peerinfo.c:245
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:252
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:301
 #, fuzzy, c-format
-msgid "Failure: Did not receive %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "Failure: Cannot convert address to string for peer `%s'\n"
+msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:436
+#: src/peerinfo-tool/gnunet-peerinfo.c:463
 #, fuzzy, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr "ungültige `%s' Nachricht empfangen: %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:477
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:496
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:522
+#: src/peerinfo-tool/gnunet-peerinfo.c:566
 #, fuzzy, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fehler bei %s:%d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:661
+#: src/peerinfo-tool/gnunet-peerinfo.c:695
 #, 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 "Failed to get my own HELLO from this peer!\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:667
+#: src/peerinfo-tool/gnunet-peerinfo.c:727
 #, fuzzy, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
+msgid "Service `%s' is not running, please start GNUnet\n"
+msgstr "`%s' ist keine Datei.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:725
+#: src/peerinfo-tool/gnunet-peerinfo.c:841
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:769
+#: src/peerinfo-tool/gnunet-peerinfo.c:882
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:772
+#: src/peerinfo-tool/gnunet-peerinfo.c:885
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/peerinfo-tool/gnunet-peerinfo.c:888
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:778
+#: src/peerinfo-tool/gnunet-peerinfo.c:891
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:781
+#: src/peerinfo-tool/gnunet-peerinfo.c:894
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:784
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:787
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:790
+#: src/peerinfo-tool/gnunet-peerinfo.c:903
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:801
+#: src/peerinfo-tool/gnunet-peerinfo.c:917
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:123
+#: src/transport/gnunet-service-transport_plugins.c:127
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:132
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Teste Transport(e) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:164
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
+#: src/peerstore/gnunet-peerstore.c:92
+msgid "peerstore"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:384
+#, fuzzy
+msgid "Malformed iterate request.\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/peerstore/gnunet-service-peerstore.c:391
+msgid "Sub system not supplied in client iterate request.\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:451
+#, fuzzy
+msgid "Malformed store request from client\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/peerstore/gnunet-service-peerstore.c:459
+msgid "Full key not supplied in client store request\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:478
+#, fuzzy
+msgid "Failed to store requested value, database error."
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/peerstore/gnunet-service-peerstore.c:557
+msgid "No database backend configured\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:568
+#, fuzzy, c-format
+msgid "Could not load database backend `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/peerstore/peerstore_api.c:329 src/sensor/sensor_api.c:179
+#, c-format
+msgid "Received an error notification from MQ of type: %d\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:375
+msgid "timeout"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:402
+msgid "Iteration canceled due to reconnection."
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:681
+#, fuzzy
+msgid "Unexpected iteration response, this should not happen.\n"
+msgstr "Ausgabeformat ist unbekannt, dies sollte nicht passieren.\n"
+
+#: src/peerstore/peerstore_api.c:692
+#, fuzzy
+msgid "Error communicating with `PEERSTORE' service."
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/peerstore/peerstore_api.c:711
+#, fuzzy
+msgid "Received a malformed response from service."
+msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#: src/peerstore/peerstore_api.c:821
+msgid ""
+"Problem receiving a watch response, no way to determine which request.\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:833
+msgid "Received a watch result for a non existing watch.\n"
+msgstr ""
+
+#: src/peerstore/plugin_peerstore_sqlite.c:398
+#: src/psycstore/plugin_psycstore_sqlite.c:286
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/psycstore/plugin_psycstore_sqlite.c:263
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:504
+#, fuzzy, c-format
+msgid "Unable to create indices: %s.\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
 #: src/postgres/postgres.c:59
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
@@ -5446,84 +5981,84 @@ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 msgid "Unable to initialize Postgres: %s"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:200
+#: src/psycstore/gnunet-service-psycstore.c:260
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:224
+#: src/psycstore/gnunet-service-psycstore.c:284
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:246
+#: src/psycstore/gnunet-service-psycstore.c:306
 #, fuzzy
 msgid "Failed to store fragment!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:272
+#: src/psycstore/gnunet-service-psycstore.c:362
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:299
+#: src/psycstore/gnunet-service-psycstore.c:402
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:328
+#: src/psycstore/gnunet-service-psycstore.c:433
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:356
+#: src/psycstore/gnunet-service-psycstore.c:461
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:392
-#: src/psycstore/gnunet-service-psycstore.c:465
+#: src/psycstore/gnunet-service-psycstore.c:497
+#: src/psycstore/gnunet-service-psycstore.c:570
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:408
+#: src/psycstore/gnunet-service-psycstore.c:513
 #, fuzzy
 msgid "Failed to begin modifying state!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:431
+#: src/psycstore/gnunet-service-psycstore.c:536
 #, fuzzy, c-format
 msgid "Unknown operator: %c\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:441
+#: src/psycstore/gnunet-service-psycstore.c:546
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:479
+#: src/psycstore/gnunet-service-psycstore.c:584
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:495
+#: src/psycstore/gnunet-service-psycstore.c:600
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:515
-#: src/psycstore/gnunet-service-psycstore.c:534
+#: src/psycstore/gnunet-service-psycstore.c:620
+#: src/psycstore/gnunet-service-psycstore.c:639
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:557
-#: src/psycstore/gnunet-service-psycstore.c:608
+#: src/psycstore/gnunet-service-psycstore.c:662
+#: src/psycstore/gnunet-service-psycstore.c:713
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:584
-#: src/psycstore/gnunet-service-psycstore.c:623
+#: src/psycstore/gnunet-service-psycstore.c:689
+#: src/psycstore/gnunet-service-psycstore.c:728
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
@@ -5533,21 +6068,7 @@ msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:253
-#, fuzzy, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
-msgstr "Fehler beim Anlegen des Benutzers"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:276
-#, fuzzy, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
-msgstr "Fehler beim Anlegen des Benutzers"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:1796
+#: src/psycstore/plugin_psycstore_sqlite.c:1932
 #, fuzzy
 msgid "SQLite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -5587,7 +6108,7 @@ msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/pt/gnunet-daemon-pt.c:888
 #, fuzzy
-msgid "# DNS requests dropped (DNS mesh channel down)"
+msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
 #: src/pt/gnunet-daemon-pt.c:896
@@ -5623,7 +6144,7 @@ msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
 #: src/regex/gnunet-daemon-regexprofiler.c:380
-msgid "Daemon to announce regular expressions for the peer using mesh."
+msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1288
@@ -5701,502 +6222,691 @@ msgstr ""
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:121
+#: src/regex/regex_api.c:131
+#, fuzzy, c-format
+msgid "Regex `%s' is too long!\n"
+msgstr "`%s' ist keine Datei.\n"
+
+#: src/revocation/gnunet-revocation.c:126
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
 msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
 
-#: src/revocation/gnunet-revocation.c:126
+#: src/revocation/gnunet-revocation.c:131
 #, fuzzy, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/revocation/gnunet-revocation.c:132
+#: src/revocation/gnunet-revocation.c:137
 #, fuzzy
 msgid "Internal error\n"
 msgstr "Unbekannter Fehler.\n"
 
-#: src/revocation/gnunet-revocation.c:158
+#: src/revocation/gnunet-revocation.c:163
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:163
+#: src/revocation/gnunet-revocation.c:168
 #, fuzzy
 msgid "Revocation failed (!)\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/revocation/gnunet-revocation.c:168
+#: src/revocation/gnunet-revocation.c:173
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:178
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:178
+#: src/revocation/gnunet-revocation.c:183
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:289
+#: src/revocation/gnunet-revocation.c:294
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:319
+#: src/revocation/gnunet-revocation.c:324
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/revocation/gnunet-revocation.c:340
+#: src/revocation/gnunet-revocation.c:345
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:360
+#: src/revocation/gnunet-revocation.c:365
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:370
+#: src/revocation/gnunet-revocation.c:375
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:402
+#: src/revocation/gnunet-revocation.c:407
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/revocation/gnunet-revocation.c:416
+#: src/revocation/gnunet-revocation.c:421
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:436
+#: src/revocation/gnunet-revocation.c:441
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/revocation/gnunet-revocation.c:458
+#: src/revocation/gnunet-revocation.c:463
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/revocation/gnunet-revocation.c:483
+#: src/revocation/gnunet-revocation.c:488
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Keine Oberfläche angegeben, verwende Standard\n"
 
-#: src/revocation/gnunet-revocation.c:499
+#: src/revocation/gnunet-revocation.c:504
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:502
+#: src/revocation/gnunet-revocation.c:507
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:505
+#: src/revocation/gnunet-revocation.c:510
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:508
+#: src/revocation/gnunet-revocation.c:513
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:272
-msgid "Duplicate revocation received from peer. Ignored.\n"
-msgstr ""
-
-#: src/revocation/gnunet-service-revocation.c:434
+#: src/revocation/gnunet-service-revocation.c:433
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:486
+#: src/revocation/gnunet-service-revocation.c:483
+#: src/revocation/gnunet-service-revocation.c:730
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:812
+#: src/revocation/gnunet-service-revocation.c:822
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:225
+#: src/rps/gnunet-rps.c:67
+msgid "rps"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:221
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:232
+#: src/scalarproduct/gnunet-scalarproduct.c:228
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:239
-msgid "Please give a session key for --input_key!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:251
+#: src/scalarproduct/gnunet-scalarproduct.c:241
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:276
+#: src/scalarproduct/gnunet-scalarproduct.c:259
+msgid "Need elements to compute the scalarproduct, got none.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:281
 #, fuzzy, c-format
-msgid "Could not convert `%s' to int32_t.\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:284
-msgid "Need elements to compute the vectorproduct, got none.\n"
-msgstr ""
+msgid "Malformed input, could not parse `%s'\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:336
+#: src/scalarproduct/gnunet-scalarproduct.c:299
 #, fuzzy, c-format
-msgid "Could not convert `%s' to integer.\n"
+msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:397
-msgid ""
-"A comma separated list of elements to compare as vector with our remote peer."
+#: src/scalarproduct/gnunet-scalarproduct.c:326
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:400
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid ""
-"A comma separated mask to select which elements should actually be compared."
+"A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:403
+#: src/scalarproduct/gnunet-scalarproduct.c:353
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:406
+#: src/scalarproduct/gnunet-scalarproduct.c:356
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:415
+#: src/scalarproduct/gnunet-scalarproduct.c:365
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:450
-#, c-format
-msgid "Generated key set with key length %d bits.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1419
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1564
+#, fuzzy
+msgid "Connect to CADET failed\n"
+msgstr " Verbindung fehlgeschlagen (Bug?)\n"
+
+#: src/scalarproduct/scalarproduct_api.c:296
+msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:776
-#, fuzzy, c-format
-msgid "Client (%p) disconnected from us.\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+msgid "dkg start delay"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:848
-#: src/scalarproduct/gnunet-service-scalarproduct.c:938
-#, fuzzy, c-format
-msgid "Could not send message to client (%p)!\n"
-msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg timeout"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:854
-#, c-format
-msgid "Sending session-end notification to client (%p) for session %s\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+msgid "threshold"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:948
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "also profile decryption"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1027
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1165
+#: src/sensordashboard/gnunet-service-sensordashboard.c:353
+#, fuzzy, c-format
+msgid "Error trying to send a message to peer `%s'.\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/sensor/gnunet-sensor.c:162
 #, fuzzy
-msgid "Could not send service-response message via mesh!)\n"
-msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+msgid "Retrieve information about all defined sensors"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1391
-#, c-format
-msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
+#: src/sensor/gnunet-sensor.c:165
+#, fuzzy
+msgid "Retrieve information about a single sensor"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/sensor/gnunet-sensor.c:168
+msgid "Force an anomaly on a sensor, use only for testing"
+msgstr ""
+
+#: src/sensor/gnunet-sensor.c:175
+msgid "sensor"
+msgstr ""
+
+#: src/sensor/gnunet-sensor-profiler.c:729
+msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1495
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1622
+#: src/sensor/gnunet-sensor-profiler.c:736
 #, fuzzy
-msgid "Transmitting service request.\n"
-msgstr "Collection `%s' begonnen.\n"
+msgid "Missing or invalid topology file.\n"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1504
+#: src/sensor/gnunet-sensor-profiler.c:782
 #, fuzzy
-msgid "Could not send service-request multipart message to channel!\n"
-msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+msgid "Number of peers to run"
+msgstr "Anzahl an Durchläufen"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1544
-#, fuzzy, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
-msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
+#: src/sensor/gnunet-sensor-profiler.c:784
+msgid "Path to topology file"
+msgstr ""
+
+#: src/sensor/gnunet-sensor-profiler.c:787
+msgid "Change the interval of running sensors to given value"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1631
+#: src/sensor/gnunet-sensor-profiler.c:790
 #, fuzzy
-msgid "Could not send message to channel!\n"
-msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+msgid "Number of peers to simulate anomalies on"
+msgstr "Anzahl an Durchläufen"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1688
+#: src/sensor/gnunet-sensor-profiler.c:797
 #, fuzzy
-msgid "Too short message received from client!\n"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+msgid "Profiler for sensor service"
+msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1701
+#: src/sensor/gnunet-service-sensor_analysis.c:204
 #, fuzzy
-msgid "Invalid message received from client, session information incorrect!\n"
-msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
+msgid "Received an invalid sensor value."
+msgstr "Ungültige Anfrage `%s' empfangen (falsche Tabelle)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1712
-#, c-format
-msgid ""
-"Duplicate session information received, cannot create new session with key `"
-"%s'\n"
-msgstr ""
+#: src/sensor/gnunet-service-sensor_analysis.c:295
+#, fuzzy
+msgid "Analysis model not defined in configuration.\n"
+msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1733
-#, c-format
-msgid ""
-"Got client-request-session with key %s, preparing channel to remote "
-"service.\n"
+#: src/sensor/gnunet-service-sensor_analysis.c:304
+#, fuzzy, c-format
+msgid "Could not load analysis model `%s'.\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:312
+#, fuzzy
+msgid "Could not connect to peerstore service.\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:233
+#, fuzzy
+msgid "Unknown value type expected by sensor, this should not happen.\n"
+msgstr "Ausgabeformat ist unbekannt, dies sollte nicht passieren.\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:268
+#, fuzzy, c-format
+msgid "Received an invalid value for sensor `%s': %s\n"
 msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1772
+#: src/sensor/gnunet-service-sensor_monitoring.c:347
 #, c-format
-msgid "Creating new channel for session with key %s.\n"
+msgid "Sensor `%s': External process should not be a path, disabling sensor.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1819
+#: src/sensor/gnunet-service-sensor_monitoring.c:370
 #, c-format
 msgid ""
-"Got client-responder-session with key %s and a matching service-request-"
-"session set, processing.\n"
+"Sensor `%s' process `%s' problem: binary doesn't exist or not executable\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1830
+#: src/sensor/gnunet-service-sensor_monitoring.c:418
 #, c-format
-msgid ""
-"Got client-responder-session with key %s but NO matching service-request-"
-"session set, queuing element for later use.\n"
+msgid "Sensor `%s' execution task already set, this should not happen\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1860
-#, fuzzy, c-format
-msgid "New incoming channel from peer %s.\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
+#: src/sensor/gnunet-service-sensor_reporting.c:828
+#, fuzzy
+msgid "Double creation of proof-of-work, this should not happen.\n"
+msgstr "Ausgabeformat ist unbekannt, dies sollte nicht passieren.\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:834
+#, fuzzy
+msgid "Failed to create pow and signature block.\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
+#: src/sensor/gnunet-service-sensor_reporting.c:1046
 #, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
+msgid "PEERSTORE error: %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2083
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2242
-#, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+#: src/sensor/gnunet-service-sensor_reporting.c:1151
+#: src/sensor/gnunet-service-sensor_reporting.c:1409
+#, fuzzy
+msgid "Failed to connect to CORE service.\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:1158
+msgid "Peer identity received from CORE init doesn't match ours.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2092
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2249
+#: src/sensor/gnunet-service-sensor_reporting.c:1398
+#, fuzzy
+msgid "Failed to connect to peerstore service.\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:1419
+#: src/sensor/gnunet-service-sensor_update.c:781
+#, fuzzy
+msgid "Failed to connect to CADET service.\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:1426
+#, fuzzy
+msgid "Failed to load my private key.\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/sensor/gnunet-service-sensor_update.c:327
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid "Error trying to send a message to update point `%s'.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2187
-#, c-format
-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
+#: src/sensor/gnunet-service-sensor_update.c:418
+#, fuzzy, c-format
+msgid "Failed to connect to update point `%s'.\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/sensor/plugin_sensor_model_gaussian.c:203
+msgid "Missing `TRAINING_WINDOW' value in configuration.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2471
-msgid "Shutting down, initiating cleanup.\n"
+#: src/sensor/plugin_sensor_model_gaussian.c:221
+msgid "Missing `CONFIDENCE_INTERVAL' value in configuration.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2536
-msgid "Generating Paillier-Keyset.\n"
+#: src/sensor/plugin_sensor_model_gaussian.c:229
+msgid "Missing `WEIGHT_INC' value in configuration.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2551
+#: src/sensor/sensor_api.c:296
 #, fuzzy
-msgid "Connect to MESH failed\n"
-msgstr " Verbindung fehlgeschlagen (Bug?)\n"
+msgid "Iterate request canceled due to disconnection.\n"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/sensor/sensor_api.c:307
+msgid "Force anomaly request canceled due to disconnection.\n"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2555
+#: src/sensor/sensor_api.c:374
 #, fuzzy
-msgid "Mesh initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
+msgid "Timeout transmitting iteration request to `SENSOR' service."
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/scalarproduct/scalarproduct_api.c:246
+#: src/sensor/sensor_util_lib.c:107
 #, fuzzy
-msgid "# SUC responder result messages received"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
+msgid "Error reading sensor version\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/sensor/sensor_util_lib.c:116
+msgid "Invalid sensor version number, format should be major.minor\n"
+msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:300
+#: src/sensor/sensor_util_lib.c:131
 #, fuzzy
-msgid "# bytes sent to scalarproduct"
-msgstr "# bytes in der Datenbank"
+msgid "Error reading sensor category\n"
+msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/scalarproduct/scalarproduct_api.c:345
-#: src/scalarproduct/scalarproduct_api.c:440
+#: src/sensor/sensor_util_lib.c:164
 #, fuzzy
-msgid "Failed to connect to the scalarproduct service\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+msgid "Error reading sensor run interval\n"
+msgstr "Hostkey wurde erfolgreich erzeugt.\n"
 
-#: src/scalarproduct/scalarproduct_api.c:353
-#: src/scalarproduct/scalarproduct_api.c:448
+#: src/sensor/sensor_util_lib.c:191
 #, fuzzy
-msgid "Failed to send a message to the statistics service\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+msgid "Error reading sensor source\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/sensor/sensor_util_lib.c:206
+msgid "Error reading sensor gnunet-statistics source information\n"
+msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:387
-#: src/scalarproduct/scalarproduct_api.c:485
+#: src/sensor/sensor_util_lib.c:218
 #, fuzzy
-msgid "Failed to send a message to the scalarproduct service\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+msgid "Error reading sensor process name\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/sensor/sensor_util_lib.c:233
+msgid "Error reading sensor expected datatype\n"
+msgstr ""
+
+#: src/sensor/sensor_util_lib.c:241
+msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
+msgstr ""
+
+#: src/sensor/sensor_util_lib.c:299
+#, fuzzy, c-format
+msgid "Failed to access sensor file: %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/sensor/sensor_util_lib.c:308
+#, fuzzy, c-format
+msgid "Failed to load sensor definition: %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/sensor/sensor_util_lib.c:370
+#, c-format
+msgid "Sensor `%s' already exists with same or newer version\n"
+msgstr ""
+
+#: src/sensor/sensor_util_lib.c:387
+#, fuzzy, c-format
+msgid "Error adding new sensor `%s' to global hashmap.\n"
+msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
+
+#: src/sensor/sensor_util_lib.c:412
+#, fuzzy, c-format
+msgid "Error loading sensor from file: %s\n"
+msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
 
-#: src/set/gnunet-service-set.c:1399
+#: src/set/gnunet-service-set.c:1531
 #, fuzzy
-msgid "Could not connect to mesh service\n"
+msgid "Could not connect to cadet service\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:221
+#: src/set/gnunet-set-ibf-profiler.c:237
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "Anzahl an Durchläufen"
 
-#: src/set/gnunet-set-ibf-profiler.c:224
+#: src/set/gnunet-set-ibf-profiler.c:240
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "Anzahl an Durchläufen"
 
-#: src/set/gnunet-set-ibf-profiler.c:227
+#: src/set/gnunet-set-ibf-profiler.c:243
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:230
+#: src/set/gnunet-set-ibf-profiler.c:246
 msgid "hash num"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:233
+#: src/set/gnunet-set-ibf-profiler.c:249
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:295
+#: src/set/gnunet-set-profiler.c:298
 msgid "oeration to execute"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:280
+#: src/statistics/gnunet-service-statistics.c:323
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-service-statistics.c:346
+#: src/statistics/gnunet-service-statistics.c:434
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-statistics.c:140
+#: src/statistics/gnunet-statistics.c:145
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:148
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:189
+#: src/statistics/gnunet-statistics.c:198
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:195
+#: src/statistics/gnunet-statistics.c:204
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:226
+#: src/statistics/gnunet-statistics.c:235
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:234
+#: src/statistics/gnunet-statistics.c:243
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/statistics/gnunet-statistics.c:261
+#: src/statistics/gnunet-statistics.c:269
 #, fuzzy, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:282
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:276
+#: src/statistics/gnunet-statistics.c:290
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:308
+#: src/statistics/gnunet-statistics.c:323
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:349
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:352
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:355
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:358
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:361
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:364
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:367
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:379
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
-#: src/statistics/statistics_api.c:509
+#: src/statistics/statistics_api.c:519
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/statistics/statistics_api.c:1054
+#: src/statistics/statistics_api.c:1090
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
 msgstr ""
 
+#: src/testbed/generate-underlay-topology.c:225
+#, fuzzy
+msgid "Need at least 2 arguments\n"
+msgstr "Sie müssen einen Empfänger angeben!\n"
+
+#: src/testbed/generate-underlay-topology.c:230
+msgid "Database filename missing\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:237
+msgid "Topology string missing\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:242
+#, fuzzy, c-format
+msgid "Invalid topology: %s\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/testbed/generate-underlay-topology.c:255
+#, c-format
+msgid "An argument is missing for given topology `%s'\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:261
+#, fuzzy, c-format
+msgid "Invalid argument `%s' given as topology argument\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/testbed/generate-underlay-topology.c:269
+#, c-format
+msgid "Filename argument missing for topology `%s'\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:283
+#, c-format
+msgid "Second argument for topology `%s' is missing\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:289
+#, fuzzy, c-format
+msgid "Invalid argument `%s'; expecting unsigned int\n"
+msgstr "Ungültiger Parameter für `%s' bei %s:%d.\n"
+
+#: src/testbed/generate-underlay-topology.c:338
+#: src/testbed/gnunet-testbed-profiler.c:293
+msgid "create COUNT number of peers"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:347
+msgid ""
+"Generates SQLite3 database representing a given underlay topology.\n"
+"Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
+"The following options are available for TOPO followed by TOPOOPTS if "
+"applicable:\n"
+"\t LINE\n"
+"\t RING\n"
+"\t RANDOM <num_rnd_links>\n"
+"\t SMALL_WORLD <num_rnd_links>\n"
+"\t SMALL_WORLD_RING <num_rnd_links>\n"
+"\t CLIQUE\n"
+"\t 2D_TORUS\n"
+"\t SCALE_FREE <cap> <m>\n"
+"\t FROM_FILE <filename>\n"
+"TOPOOPTS:\n"
+"\t num_rnd_links: The number of random links\n"
+"\t cap: the maximum number of links a node can have\n"
+"\t m: the number of links a node should have while joining the network\n"
+"\t filename: the path of the file which contains topology information\n"
+"NOTE: the format of the above file is descibed here: https://www.gnunet.org/"
+"content/topology-file-format\n"
+msgstr ""
+
+#: src/testbed/gnunet-daemon-latency-logger.c:333
+msgid "Daemon to log latency values of connections to neighbours"
+msgstr ""
+
 #: src/testbed/gnunet-daemon-testbed-blacklist.c:264
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:727
+#: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:295
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
+msgstr ""
+
+#: src/testbed/gnunet-daemon-testbed-underlay.c:474
+msgid "Daemon to restrict underlay network in testbed deployments"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_cpustatus.c:730
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
@@ -6228,15 +6938,6 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:267
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
-
-#: src/testbed/gnunet-testbed-profiler.c:293
-msgid "create COUNT number of peers"
-msgstr ""
-
 #: src/testbed/gnunet-testbed-profiler.c:296
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
@@ -6273,101 +6974,101 @@ msgstr ""
 msgid "Adding host %u failed with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/testbed/testbed_api_testbed.c:820
+#: src/testbed/testbed_api_testbed.c:819
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:989
+#: src/testbed/testbed_api_testbed.c:988
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1055
+#: src/testbed/testbed_api_testbed.c:1054
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1144
+#: src/testbed/testbed_api_testbed.c:1143
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1148
+#: src/testbed/testbed_api_testbed.c:1147
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1186
+#: src/testbed/testbed_api_testbed.c:1185
 #, fuzzy
 msgid "Cannot start the master controller"
 msgstr "GNUnet testbed Controller starten."
 
-#: src/testbed/testbed_api_testbed.c:1204
+#: src/testbed/testbed_api_testbed.c:1203
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1264
+#: src/testbed/testbed_api_testbed.c:1263
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1276
+#: src/testbed/testbed_api_testbed.c:1275
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1300
+#: src/testbed/testbed_api_testbed.c:1299
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1350
+#: src/testbed/testbed_api_testbed.c:1349
 #, c-format
 msgid ""
 "Maximum number of edges a peer can have in a scale free topology cannot be "
 "more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1366
+#: src/testbed/testbed_api_testbed.c:1365
 #, c-format
 msgid ""
 "The number of edges that can established when adding a new node to scale "
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:715
+#: src/testbed/testbed_api_topology.c:960
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/testbed/testbed_api_topology.c:721
+#: src/testbed/testbed_api_topology.c:966
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_topology.c:728
+#: src/testbed/testbed_api_topology.c:973
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_topology.c:750
+#: src/testbed/testbed_api_topology.c:995
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/testbed/testbed_api_topology.c:759
-#: src/testbed/testbed_api_topology.c:783
+#: src/testbed/testbed_api_topology.c:1004
+#: src/testbed/testbed_api_topology.c:1028
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:765
-#: src/testbed/testbed_api_topology.c:789
+#: src/testbed/testbed_api_topology.c:1010
+#: src/testbed/testbed_api_topology.c:1034
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/testbed/testbed_api_topology.c:771
-#: src/testbed/testbed_api_topology.c:795
+#: src/testbed/testbed_api_topology.c:1016
+#: src/testbed/testbed_api_topology.c:1040
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:810
+#: src/testbed/testbed_api_topology.c:1074
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
@@ -6413,64 +7114,67 @@ msgstr ""
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/testing.c:277
-#, c-format
-msgid "Hostkeys file not found: %s\n"
+#: src/testing/list-keys.c:90
+msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
+#: src/testing/list-keys.c:93
+msgid "skip COUNT number of keys in the beginning"
+msgstr ""
+
+#: src/testing/testing.c:277
 #, c-format
-msgid "Incorrect hostkey file format: %s\n"
+msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:716
+#: src/testing/testing.c:718
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
-#: src/testing/testing.c:1155
+#: src/testing/testing.c:1157
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1164
+#: src/testing/testing.c:1166
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing.c:1174
+#: src/testing/testing.c:1176
 #, fuzzy
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/testing/testing.c:1187
+#: src/testing/testing.c:1189
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/testing/testing.c:1201
+#: src/testing/testing.c:1203
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testing/testing.c:1213
+#: src/testing/testing.c:1215
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/testing/testing.c:1238
+#: src/testing/testing.c:1240
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/testing/testing.c:1340
+#: src/testing/testing.c:1342
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing.c:1704
+#: src/testing/testing.c:1706
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -6480,768 +7184,997 @@ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/topology/gnunet-daemon-topology.c:255
+#: src/topology/friends.c:154
+#, c-format
+msgid "Directory for file `%s' does not seem to be writable.\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:265
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:388
+#: src/topology/gnunet-daemon-topology.c:406
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:727
-#: src/topology/gnunet-daemon-topology.c:812
+#: src/topology/gnunet-daemon-topology.c:756
+#: src/topology/gnunet-daemon-topology.c:840
 #, fuzzy
 msgid "# friends connected"
 msgstr "# verbundener Knoten"
 
-#: src/topology/gnunet-daemon-topology.c:992
+#: src/topology/gnunet-daemon-topology.c:1020
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1021
+#: src/topology/gnunet-daemon-topology.c:1049
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1028
+#: src/topology/gnunet-daemon-topology.c:1056
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:1077
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1051
+#: src/topology/gnunet-daemon-topology.c:1079
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: 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:1062
+#: src/topology/gnunet-daemon-topology.c:1090
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1093
+#: src/topology/gnunet-daemon-topology.c:1121
+#: src/transport/plugin_transport_wlan.c:1444
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1150
+#: src/topology/gnunet-daemon-topology.c:1178
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:1289
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/topology/gnunet-daemon-topology.c:1323
+msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:267
+#: src/transport/gnunet-service-transport_blacklist.c:274
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:275
+#: src/transport/gnunet-service-transport_blacklist.c:283
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:455
-#: src/transport/gnunet-service-transport_blacklist.c:722
+#: src/transport/gnunet-service-transport_blacklist.c:476
+#: src/transport/gnunet-service-transport_blacklist.c:766
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:160
+#: src/transport/gnunet-service-transport_blacklist.c:769
+#, fuzzy, c-format
+msgid "Disallowing connection to peer `%s' on transport %s\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#: src/transport/gnunet-service-transport.c:220
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport.c:250
+#: src/transport/gnunet-service-transport.c:424
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:325
+#: src/transport/gnunet-service-transport.c:515
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# Bytes entschlüsselt"
 
-#: src/transport/gnunet-service-transport.c:479
+#: src/transport/gnunet-service-transport.c:708
 #, fuzzy, c-format
-msgid "Could not obtain a valid network for `%s' %s\n"
+msgid "Could not obtain a valid network for `%s' %s (%s)\n"
 msgstr ""
 "Es konnte keine IP für das Gerät `%s' unter Verwendung von `%s' ermittelt "
 "werden.\n"
 
-#: src/transport/gnunet-service-transport.c:529
+#: src/transport/gnunet-service-transport.c:757
 #, c-format
 msgid ""
 "Address or session unknown: failed to update properties for peer `%s' plugin "
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:820
+#: src/transport/gnunet-service-transport.c:1094
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/transport/gnunet-service-transport_clients.c:384
-#, 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:391
+#: src/transport/gnunet-service-transport_clients.c:481
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_clients.c:533
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:674
+#: src/transport/gnunet-service-transport_clients.c:774
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:731
+#: src/transport/gnunet-service-transport_clients.c:813
+#, fuzzy, c-format
+msgid "Blacklist refuses connection attempt to peer `%s'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/transport/gnunet-service-transport_clients.c:843
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_hello.c:181
+#: src/transport/gnunet-service-transport_clients.c:882
+#, fuzzy
+msgid "# REQUEST DISCONNECT messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/gnunet-service-transport_hello.c:182
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1074
+#: src/transport/gnunet-service-transport_neighbours.c:1099
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1206
-#: src/transport/gnunet-service-transport_neighbours.c:1541
+#: src/transport/gnunet-service-transport_neighbours.c:1224
+#: src/transport/gnunet-service-transport_neighbours.c:1639
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1211
+#: src/transport/gnunet-service-transport_neighbours.c:1229
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1216
+#: src/transport/gnunet-service-transport_neighbours.c:1234
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1273
+#: src/transport/gnunet-service-transport_neighbours.c:1292
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1353
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1339
+#: src/transport/gnunet-service-transport_neighbours.c:1386
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1347
+#: src/transport/gnunet-service-transport_neighbours.c:1394
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1380
+#: src/transport/gnunet-service-transport_neighbours.c:1441
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1389
+#: src/transport/gnunet-service-transport_neighbours.c:1450
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1446
+#: src/transport/gnunet-service-transport_neighbours.c:1458
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+msgstr "# defragmentierter Nachrichten"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1466
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+msgstr "# defragmentierter Nachrichten"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1544
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1480
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1496
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1585
+#: src/transport/gnunet-service-transport_neighbours.c:1689
+#, fuzzy, c-format
+msgid "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, fuzzy
-msgid "# SESSION_CONNECT messages sent"
+msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1761
+#, fuzzy
+msgid "# SYN messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1601
+#: src/transport/gnunet-service-transport_neighbours.c:1777
 #, fuzzy, c-format
-msgid "Failed to transmit CONNECT message via plugin to %s\n"
+msgid "Failed to transmit SYN message via plugin to %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1641
+#: src/transport/gnunet-service-transport_neighbours.c:1804
 #, fuzzy
-msgid "# CONNECT_ACK messages sent"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+msgid "# Failed attempts to switch addresses (failed to send SYN)"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1853
+#, fuzzy, c-format
+msgid ""
+"Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2106
+#: src/transport/gnunet-service-transport_neighbours.c:1908
 #, fuzzy
-msgid "# CONNECT messages received"
+msgid "# SYN_ACK messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2111
+#: src/transport/gnunet-service-transport_neighbours.c:1923
+#, fuzzy, c-format
+msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2203
+#, fuzzy, c-format
+msgid "Blacklisting disapproved to connect to peer `%s'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2328
+#, fuzzy
+msgid "# SYN messages received"
+msgstr "# PING Nachrichten erstellt"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2333
 #, c-format
-msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgid "SYN request from peer `%s' ignored due impending shutdown\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2630
+msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2824
+#: src/transport/gnunet-service-transport_neighbours.c:3051
 #, fuzzy
-msgid "# CONNECT_ACK messages received"
+msgid "# Failed attempts to switch addresses (no response)"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3146
+#, fuzzy
+msgid "# SYN_ACK messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2832
+#: src/transport/gnunet-service-transport_neighbours.c:3154
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (no peer)"
+msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2847
-#: src/transport/gnunet-service-transport_neighbours.c:2882
+#: src/transport/gnunet-service-transport_neighbours.c:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3203
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (not ready)"
+msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2895
+#: src/transport/gnunet-service-transport_neighbours.c:3215
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2926
+#: src/transport/gnunet-service-transport_neighbours.c:3238
+msgid "# Successful attempts to switch addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3246
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3106
+#: src/transport/gnunet-service-transport_neighbours.c:3445
 #, fuzzy
-msgid "# SESSION_ACK messages received"
+msgid "# ACK messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3122
+#: src/transport/gnunet-service-transport_neighbours.c:3481
 #, fuzzy
-msgid "# unexpected SESSION_ACK messages"
+msgid "# unexpected ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3555
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3190
+#: src/transport/gnunet-service-transport_neighbours.c:3570
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3220
-msgid "# disconnect messages ignored (old format)"
+#: src/transport/gnunet-service-transport_neighbours.c:3615
+msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3226
+#: src/transport/gnunet-service-transport_neighbours.c:3621
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3235
+#: src/transport/gnunet-service-transport_neighbours.c:3630
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3271
-msgid "# other peer asked to disconnect from us"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:3366
+#: src/transport/gnunet-service-transport_neighbours.c:3757
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_plugins.c:116
+#: src/transport/gnunet-service-transport_plugins.c:119
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:170
-#: src/transport/gnunet-service-transport_plugins.c:178
-#: src/transport/gnunet-service-transport_plugins.c:186
-#: src/transport/gnunet-service-transport_plugins.c:194
-#: src/transport/gnunet-service-transport_plugins.c:202
-#: src/transport/gnunet-service-transport_plugins.c:210
-#: src/transport/gnunet-service-transport_plugins.c:218
-#: src/transport/gnunet-service-transport_plugins.c:226
-#: src/transport/gnunet-service-transport_plugins.c:234
+#: src/transport/gnunet-service-transport_plugins.c:177
+#: src/transport/gnunet-service-transport_plugins.c:185
+#: src/transport/gnunet-service-transport_plugins.c:193
+#: src/transport/gnunet-service-transport_plugins.c:201
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:264
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Fehler beim Laden des Plugins `%s' bei %s:%d. Plugin wird entladen.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:456
+#: src/transport/gnunet-service-transport_validation.c:464
+#: src/transport/gnunet-service-transport_validation.c:643
+#: src/transport/gnunet-service-transport_validation.c:907
+#: src/transport/gnunet-service-transport_validation.c:1499
+#, fuzzy
+msgid "# validations running"
+msgstr "sqlite Datenspeicher"
+
+#: src/transport/gnunet-service-transport_validation.c:503
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:526
-#, c-format
-msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+#: src/transport/gnunet-service-transport_validation.c:588
+msgid "# validations not attempted (no plugin)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:584
-#, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# Klartext PING Nachrichten gesendet"
+#: src/transport/gnunet-service-transport_validation.c:633
+msgid "# PINGs for address validation sent"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:685
+#: src/transport/gnunet-service-transport_validation.c:742
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:969
+#: src/transport/gnunet-service-transport_validation.c:1034
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:1019
+#: src/transport/gnunet-service-transport_validation.c:1085
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1029
+#: src/transport/gnunet-service-transport_validation.c:1095
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1032
+#: src/transport/gnunet-service-transport_validation.c:1098
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1040
+#: src/transport/gnunet-service-transport_validation.c:1106
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1052
+#: src/transport/gnunet-service-transport_validation.c:1118
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1060
+#: src/transport/gnunet-service-transport_validation.c:1126
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1114
+#: src/transport/gnunet-service-transport_validation.c:1180
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1163
+#: src/transport/gnunet-service-transport_validation.c:1229
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1172
+#: src/transport/gnunet-service-transport_validation.c:1238
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1312
+#: src/transport/gnunet-service-transport_validation.c:1410
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1327
+#: src/transport/gnunet-service-transport_validation.c:1425
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1448
+#: src/transport/gnunet-service-transport_validation.c:1477
+msgid "# validations succeeded"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1557
+#, fuzzy, c-format
+msgid "Validation received new %s message for peer `%s' with size %u\n"
+msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#: src/transport/gnunet-service-transport_validation.c:1564
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/gnunet-transport.c:258
+#: src/transport/gnunet-transport.c:578
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:265
+#: src/transport/gnunet-transport.c:587
+#: src/transport/gnunet-transport-profiler.c:274
 #, fuzzy, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/transport/gnunet-transport.c:296
+#: src/transport/gnunet-transport.c:619
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:309
+#: src/transport/gnunet-transport.c:634
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/gnunet-transport.c:318
+#: src/transport/gnunet-transport.c:646
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/transport/gnunet-transport.c:423
+#: src/transport/gnunet-transport.c:673 src/transport/gnunet-transport.c:703
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' did not work!\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
+
+#: src/transport/gnunet-transport.c:678
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' did work!\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
+
+#: src/transport/gnunet-transport.c:683
+#, fuzzy, c-format
+msgid "Internal NAT error while running test for plugin `%s'\n"
+msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
+
+#: src/transport/gnunet-transport.c:688
+#, fuzzy, c-format
+msgid "Failed to start NAT test for plugin `%s'\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/transport/gnunet-transport.c:693
+#, c-format
+msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:709
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' is working!\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
+
+#: src/transport/gnunet-transport.c:828
+#, fuzzy, c-format
+msgid ""
+"Peer `%s' %s %s\n"
+"\t%s%s\n"
+"\t%s%s\n"
+"\t%s%s\n"
+msgstr "Ich bin Peer `%s'.\n"
+
+#: src/transport/gnunet-transport.c:864
+#, fuzzy, c-format
+msgid "Peer `%s' %s `%s' \n"
+msgstr "Ich bin Peer `%s'.\n"
+
+#: src/transport/gnunet-transport.c:963 src/transport/gnunet-transport.c:1712
+#, fuzzy
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#: src/transport/gnunet-transport.c:1031
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:436
+#: src/transport/gnunet-transport.c:1045
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:506
+#: src/transport/gnunet-transport.c:1070
+#, fuzzy
+msgid "Failed to start resolver!\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/transport/gnunet-transport.c:1116
 #, 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:529
+#: src/transport/gnunet-transport.c:1139
+#: src/transport/gnunet-transport-profiler.c:406
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:552
+#: src/transport/gnunet-transport.c:1163
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:587
+#: src/transport/gnunet-transport.c:1196
+#, fuzzy, c-format
+msgid "Successfully disconnected from `%s'\n"
+msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
+
+#: src/transport/gnunet-transport.c:1219
+#: src/transport/gnunet-transport-profiler.c:434
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:660
+#: src/transport/gnunet-transport.c:1244 src/transport/gnunet-transport.c:1270
+#, c-format
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:1246
+#, fuzzy
+msgid "Connected to"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#: src/transport/gnunet-transport.c:1272
+#, fuzzy
+msgid "Disconnected from"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#: src/transport/gnunet-transport.c:1296
+#: src/transport/gnunet-transport-profiler.c:458
 #, 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:685
-#, fuzzy, c-format
-msgid "Peer `%s': %s %s\n"
-msgstr "Ich bin Peer `%s'.\n"
-
-#: src/transport/gnunet-transport.c:704
+#: src/transport/gnunet-transport.c:1328
 #, c-format
-msgid "Peer `%s': %s <unable to resolve address>\n"
+msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:772
+#: src/transport/gnunet-transport.c:1340
 #, fuzzy, c-format
-msgid "Peer `%s' disconnected\n"
-msgstr "# verbundener Knoten"
+msgid "Peer `%s': %s %s\n"
+msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:802
+#: src/transport/gnunet-transport.c:1794
+#: src/transport/gnunet-transport-profiler.c:492
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:848
+#: src/transport/gnunet-transport.c:1829
+#, fuzzy
+msgid "Failed to send disconnect request to transport service\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#: src/transport/gnunet-transport.c:1873
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
-"%s, %s\n"
+"%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:855
+#: src/transport/gnunet-transport.c:1881
 #, c-format
 msgid ""
-"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:878 src/transport/gnunet-transport.c:910
-#: src/transport/gnunet-transport.c:932 src/transport/gnunet-transport.c:969
+#: src/transport/gnunet-transport.c:1900 src/transport/gnunet-transport.c:1930
+#: src/transport/gnunet-transport.c:1963 src/transport/gnunet-transport.c:1989
+#: src/transport/gnunet-transport.c:2045
+#: src/transport/gnunet-transport-profiler.c:578
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:887 src/transport/gnunet-transport.c:917
+#: src/transport/gnunet-transport.c:1909 src/transport/gnunet-transport.c:1940
+#: src/transport/gnunet-transport.c:1974
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:937
+#: src/transport/gnunet-transport.c:1994
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1019
+#: src/transport/gnunet-transport.c:2093
+#, fuzzy
+msgid "print information for all peers (instead of only connected peers)"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/transport/gnunet-transport.c:2096
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1022
+#: src/transport/gnunet-transport.c:2099
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:1025
+#: src/transport/gnunet-transport.c:2102
+#, fuzzy
+msgid "disconnect to a peer"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/transport/gnunet-transport.c:2105
+#, fuzzy
+msgid "print information for all pending validations "
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/transport/gnunet-transport.c:2108
+#, fuzzy
+msgid "print information for all pending validations continuously"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/transport/gnunet-transport.c:2111
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1031
+#: src/transport/gnunet-transport.c:2117
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1034
+#: src/transport/gnunet-transport.c:2120
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:1037
+#: src/transport/gnunet-transport.c:2123
+#: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1041
+#: src/transport/gnunet-transport.c:2126
+msgid "monitor plugin sessions"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:2129
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1044
+#: src/transport/gnunet-transport.c:2132
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1055
+#: src/transport/gnunet-transport.c:2143
+#: src/transport/gnunet-transport-profiler.c:649
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_bluetooth.c:616
-msgid "# Bluetooth ACKs sent"
+#: src/transport/gnunet-transport-profiler.c:218
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:635
-#, fuzzy
-msgid "# Bluetooth messages defragmented"
-msgstr "# defragmentierter Nachrichten"
+#: src/transport/gnunet-transport-profiler.c:254
+#, c-format
+msgid "%u;%u;%llu;%llu;%.2f;%.2f"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:681
-#: src/transport/plugin_transport_bluetooth.c:731
-#: src/transport/plugin_transport_bluetooth.c:1854
-#, fuzzy
-msgid "# Bluetooth sessions allocated"
-msgstr "# Sitzungsschlüssel akzeptiert"
+#: src/transport/gnunet-transport-profiler.c:263
+#, c-format
+msgid ";%llu;%.2f"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:806
-#, fuzzy
-msgid "# Bluetooth message fragments sent"
-msgstr "# fragmentierter Nachrichten"
+#: src/transport/gnunet-transport-profiler.c:280
+msgid "\n"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:830
-msgid "# Bluetooth messages pending (with fragmentation)"
+#: src/transport/gnunet-transport-profiler.c:332
+msgid "."
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:938
-#: src/transport/plugin_transport_bluetooth.c:1023
-#: src/transport/plugin_transport_bluetooth.c:1856
-#, fuzzy
-msgid "# Bluetooth MAC endpoints allocated"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/transport/gnunet-transport-profiler.c:352
+#, c-format
+msgid ""
+"\n"
+"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1235
-#, fuzzy
-msgid "# HELLO messages received via Bluetooth"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+#: src/transport/gnunet-transport-profiler.c:400
+#, fuzzy, c-format
+msgid "Connected to different peer `%s'\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#: src/transport/gnunet-transport-profiler.c:483
+#, fuzzy, c-format
+msgid "Retrying to connect to `%s'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/transport/gnunet-transport-profiler.c:508
+#, fuzzy, c-format
+msgid "Denying connection to `%s'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/plugin_transport_bluetooth.c:1261
+#: src/transport/gnunet-transport-profiler.c:537
 #, fuzzy
-msgid "# fragments received via Bluetooth"
-msgstr "# verworfener Nachrichten"
+msgid "Message size too big!\n"
+msgstr "Nachrichtengröße"
 
-#: src/transport/plugin_transport_bluetooth.c:1271
+#: src/transport/gnunet-transport-profiler.c:543
 #, fuzzy
-msgid "# ACKs received via Bluetooth"
-msgstr "# Bytes empfangen über TCP"
+msgid "No peer identity given\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/transport/gnunet-transport-profiler.c:558
+#, fuzzy, c-format
+msgid "Trying to send %u messages with size %u to peer `%s'\n"
+msgstr "Verwende %u Nachrichten der Größe %u %umal.\n"
 
-#: src/transport/plugin_transport_bluetooth.c:1328
+#: src/transport/gnunet-transport-profiler.c:564
+#, fuzzy, c-format
+msgid "Trying to receive messages from peer `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/transport/gnunet-transport-profiler.c:569
 #, fuzzy
-msgid "# Bluetooth DATA messages discarded due to CRC32 error"
-msgstr "# defragmentierter Nachrichten"
+msgid "No operation given\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/plugin_transport_bluetooth.c:1440
+#: src/transport/gnunet-transport-profiler.c:623
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:626
 #, fuzzy
-msgid "# DATA messages received via Bluetooth"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+msgid "receive data from peer"
+msgstr "# Bytes des Typs %d empfangen"
 
-#: src/transport/plugin_transport_bluetooth.c:1475
+#: src/transport/gnunet-transport-profiler.c:629
 #, fuzzy
-msgid "# Bluetooth DATA messages processed"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+msgid "iterations"
+msgstr "Weitere Einstellungen"
 
-#: src/transport/plugin_transport_bluetooth.c:1538
+#: src/transport/gnunet-transport-profiler.c:632
 #, fuzzy
-msgid "# HELLO beacons sent via Bluetooth"
-msgstr "# Bytes gesendet über UDP"
+msgid "number of messages to send"
+msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
-#: src/transport/plugin_transport_bluetooth.c:1651
-msgid "Bluetooth address with invalid size encountered\n"
-msgstr ""
+#: src/transport/gnunet-transport-profiler.c:635
+#, fuzzy
+msgid "message size to use"
+msgstr "Nachrichtengröße"
 
-#: src/transport/plugin_transport_bluetooth.c:1835
-#, c-format
-msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+#: src/transport/plugin_transport_http_client.c:1491
+#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:3441
+#: src/transport/plugin_transport_tcp.c:2826
+#: src/transport/plugin_transport_tcp.c:2833
+msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1590
+#: src/transport/plugin_transport_http_client.c:2115
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1727
-#: src/transport/plugin_transport_http_server.c:2974
+#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_server.c:3175
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1752
-#: src/transport/plugin_transport_http_server.c:3032
+#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_server.c:3245
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/transport/plugin_transport_http_client.c:1780
-#: src/transport/plugin_transport_http_server.c:2874
+#: src/transport/plugin_transport_http_client.c:2215
 #, fuzzy, c-format
-msgid "Maximum number of connections is %u\n"
+msgid "Maximum number of requests is %u\n"
 msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
 
-#: src/transport/plugin_transport_http_server.c:1389
+#: src/transport/plugin_transport_http_server.c:1761
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1653
+#: src/transport/plugin_transport_http_server.c:1992
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1661
+#: src/transport/plugin_transport_http_server.c:2000
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1947
+#: src/transport/plugin_transport_http_server.c:2150
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1971
+#: src/transport/plugin_transport_http_server.c:2173
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2378
+#: src/transport/plugin_transport_http_server.c:2300
+msgid "Could not load or create server certificate! Loading plugin failed!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2609
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/transport/plugin_transport_http_server.c:2410 src/util/service.c:696
+#: src/transport/plugin_transport_http_server.c:2643 src/util/service.c:703
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_http_server.c:2427 src/util/service.c:713
+#: src/transport/plugin_transport_http_server.c:2661 src/util/service.c:722
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/plugin_transport_http_server.c:2538
+#: src/transport/plugin_transport_http_server.c:2774
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2610
+#: src/transport/plugin_transport_http_server.c:2852
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2697
+#: src/transport/plugin_transport_http_server.c:2951
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2711
+#: src/transport/plugin_transport_http_server.c:2966
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2718
+#: src/transport/plugin_transport_http_server.c:2972
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
 
-#: src/transport/plugin_transport_http_server.c:2729
+#: src/transport/plugin_transport_http_server.c:2983
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2736
+#: src/transport/plugin_transport_http_server.c:2989
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:3003
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/transport/plugin_transport_http_server.c:2761
+#: src/transport/plugin_transport_http_server.c:3013
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2782
+#: src/transport/plugin_transport_http_server.c:3035
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/transport/plugin_transport_http_server.c:2792
+#: src/transport/plugin_transport_http_server.c:3045
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2844
+#: src/transport/plugin_transport_http_server.c:3108
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/transport/plugin_transport_http_server.c:2860
+#: src/transport/plugin_transport_http_server.c:3129
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
+#: src/transport/plugin_transport_http_server.c:3146
+#, fuzzy, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
+
+#: src/transport/plugin_transport_http_server.c:3453
+#, fuzzy
+msgid "Unable to compile URL regex\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+
 #: src/transport/plugin_transport_smtp.c:223
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -7292,243 +8225,243 @@ msgstr "# Bytes gesendet über TCP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:632
+#: src/transport/plugin_transport_tcp.c:648
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:842
-#: src/transport/plugin_transport_tcp.c:931
-#: src/transport/plugin_transport_tcp.c:981
-#: src/transport/plugin_transport_tcp.c:1077
-#: src/transport/plugin_transport_tcp.c:1225
-#: src/transport/plugin_transport_tcp.c:1242
+#: src/transport/plugin_transport_tcp.c:829
+#: src/transport/plugin_transport_tcp.c:1044
+#: src/transport/plugin_transport_tcp.c:2232
+#: src/transport/plugin_transport_tcp.c:2932
+#, fuzzy
+msgid "# TCP sessions active"
+msgstr "# Sitzungsschlüssel akzeptiert"
+
+#: src/transport/plugin_transport_tcp.c:870
+#: src/transport/plugin_transport_tcp.c:1027
+#: src/transport/plugin_transport_tcp.c:1146
+#: src/transport/plugin_transport_tcp.c:1214
+#: src/transport/plugin_transport_tcp.c:1312
+#: src/transport/plugin_transport_tcp.c:1336
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_tcp.c:849
-#: src/transport/plugin_transport_tcp.c:1043
-#: src/transport/plugin_transport_tcp.c:2041
-#: src/transport/plugin_transport_tcp.c:2721
+#: src/transport/plugin_transport_tcp.c:873
 #, fuzzy
-msgid "# TCP sessions active"
-msgstr "# Sitzungsschlüssel akzeptiert"
+msgid "# bytes discarded by TCP (disconnect)"
+msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:935
+#: src/transport/plugin_transport_tcp.c:1149
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:984
+#: src/transport/plugin_transport_tcp.c:1218
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:1081
-#, fuzzy
-msgid "# bytes discarded by TCP (disconnect)"
-msgstr "# Bytes verworfen von TCP (ausgehend)"
-
-#: src/transport/plugin_transport_tcp.c:1199
-#, c-format
-msgid "Trying to send with invalid session %p\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1440
-#: src/transport/plugin_transport_udp.c:1471
+#: src/transport/plugin_transport_tcp.c:1611
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1558
+#: src/transport/plugin_transport_tcp.c:1775
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2091
+#: src/transport/plugin_transport_tcp.c:2282
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2274
+#: src/transport/plugin_transport_tcp.c:2452
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2354
+#: src/transport/plugin_transport_tcp.c:2524
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2602 src/util/service.c:589
-#: src/util/service.c:595
+#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:585
+#: src/util/service.c:591
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2616
+#: src/transport/plugin_transport_tcp.c:2776
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2710
+#: src/transport/plugin_transport_tcp.c:2919
 #, 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:2713
+#: src/transport/plugin_transport_tcp.c:2923
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2716
+#: src/transport/plugin_transport_tcp.c:2927
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:173
+#: src/transport/plugin_transport_udp_broadcasting.c:167
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:222
+#: src/transport/plugin_transport_udp_broadcasting.c:210
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:605
+#: src/transport/plugin_transport_udp_broadcasting.c:603
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:619
+#: src/transport/plugin_transport_udp_broadcasting.c:626
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1581
+#: src/transport/plugin_transport_udp.c:1655
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2635
+#: src/transport/plugin_transport_udp.c:2888
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2649
+#: src/transport/plugin_transport_udp.c:2901
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2949
+#: src/transport/plugin_transport_udp.c:3254
+#, fuzzy, c-format
+msgid "Failed to bind UDP socket to %s: %s\n"
+msgstr "Fehler beim Binden an UDP6 Port %d.\n"
+
+#: src/transport/plugin_transport_udp.c:3262
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3046
+#: src/transport/plugin_transport_udp.c:3421
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3089
+#: src/transport/plugin_transport_udp.c:3468
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_udp.c:3148
+#: src/transport/plugin_transport_udp.c:3536
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/transport/plugin_transport_unix.c:1625
+#: src/transport/plugin_transport_unix.c:1402
+#, fuzzy, c-format
+msgid "Cannot create path to `%s'\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/transport/plugin_transport_unix.c:1415
+#, fuzzy, c-format
+msgid "Cannot bind to `%s'\n"
+msgstr "`%s' konnte nicht gehashed werden.\n"
+
+#: src/transport/plugin_transport_unix.c:1816
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_wlan.c:623
-msgid "# WLAN ACKs sent"
+#: src/transport/plugin_transport_wlan.c:725
+msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:642
+#: src/transport/plugin_transport_wlan.c:745
 #, fuzzy
-msgid "# WLAN messages defragmented"
+msgid "# Messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:691
-#: src/transport/plugin_transport_wlan.c:763
-#: src/transport/plugin_transport_wlan.c:1910
+#: src/transport/plugin_transport_wlan.c:786
+#: src/transport/plugin_transport_wlan.c:873
 #, fuzzy
-msgid "# WLAN sessions allocated"
+msgid "# Sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:868
+#: src/transport/plugin_transport_wlan.c:989
 #, fuzzy
-msgid "# WLAN message fragments sent"
+msgid "# message fragments sent"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:892
-msgid "# WLAN messages pending (with fragmentation)"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1000
-#: src/transport/plugin_transport_wlan.c:1086
-#: src/transport/plugin_transport_wlan.c:1912
-#, fuzzy
-msgid "# WLAN MAC endpoints allocated"
-msgstr "# Client Trace-Anfragen empfangen"
-
-#: src/transport/plugin_transport_wlan.c:1282
+#: src/transport/plugin_transport_wlan.c:1015
 #, fuzzy
-msgid "# HELLO messages received via WLAN"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+msgid "# messages pending (with fragmentation)"
+msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1308
+#: src/transport/plugin_transport_wlan.c:1129
+#: src/transport/plugin_transport_wlan.c:1222
+#: src/transport/plugin_transport_wlan.c:2185
 #, fuzzy
-msgid "# fragments received via WLAN"
-msgstr "# verworfener Nachrichten"
+msgid "# MAC endpoints allocated"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1318
+#: src/transport/plugin_transport_wlan.c:1487
 #, fuzzy
-msgid "# ACKs received via WLAN"
+msgid "# ACKs received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_wlan.c:1375
+#: src/transport/plugin_transport_wlan.c:1555
 #, fuzzy
-msgid "# WLAN DATA messages discarded due to CRC32 error"
+msgid "# DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1496
+#: src/transport/plugin_transport_wlan.c:1696
 #, fuzzy
-msgid "# DATA messages received via WLAN"
+msgid "# DATA messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1531
+#: src/transport/plugin_transport_wlan.c:1730
 #, fuzzy
-msgid "# WLAN DATA messages processed"
+msgid "# DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1594
+#: src/transport/plugin_transport_wlan.c:1793
 #, fuzzy
-msgid "# HELLO beacons sent via WLAN"
+msgid "# HELLO beacons sent"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_wlan.c:1707
-msgid "WLAN address with invalid size encountered\n"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1891
+#: src/transport/plugin_transport_wlan.c:2160
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:682
+#: src/transport/plugin_transport_wlan.c:2182
+#, fuzzy
+msgid "# sessions allocated"
+msgstr "# Sitzungsschlüssel akzeptiert"
+
+#: src/transport/transport_api.c:816
 #, 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/transport-testing.c:584
+#: src/transport/transport-testing.c:603
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
@@ -7568,12 +8501,12 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:851 src/util/service.c:625
+#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:622
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:856 src/util/service.c:629
+#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:626
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
@@ -7590,17 +8523,17 @@ msgstr ""
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:989
+#: src/util/client.c:1008
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/util/client.c:1001
+#: src/util/client.c:1020
 #, 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:1284
+#: src/util/client.c:1299
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -7638,24 +8571,24 @@ msgstr ""
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1150
+#: src/util/common_logging.c:1157
 #, fuzzy
 msgid "unknown address"
 msgstr "Unbekannter Fehler"
 
-#: src/util/common_logging.c:1189
+#: src/util/common_logging.c:1196
 #, fuzzy
 msgid "invalid address"
 msgstr "Ungültige Parameter: "
 
-#: src/util/common_logging.c:1207
+#: src/util/common_logging.c:1214
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/util/common_logging.c:1228
+#: src/util/common_logging.c:1235
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -7668,24 +8601,24 @@ msgstr ""
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:996
+#: src/util/configuration.c:1025
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1066
+#: src/util/configuration.c:1095
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1098
+#: src/util/configuration.c:1127
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/configuration.c:1172
+#: src/util/configuration.c:1201
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -7708,85 +8641,90 @@ 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:751 src/util/connection.c:909
+#: src/util/connection.c:751 src/util/connection.c:914
 #, 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:900
+#: src/util/connection.c:904
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/container_bloomfilter.c:516
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:789 src/util/crypto_ecc.c:827
-#: src/util/crypto_ecc.c:945 src/util/crypto_ecc.c:983
+#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
+#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/crypto_ecc.c:794 src/util/crypto_ecc.c:950
+#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863
 #, 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_ecc.c:831 src/util/crypto_ecc.c:987
+#: src/util/crypto_ecc.c:744 src/util/crypto_ecc.c:900
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:861 src/util/crypto_ecc.c:1017
+#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:865 src/util/crypto_ecc.c:1021
+#: src/util/crypto_ecc.c:778 src/util/crypto_ecc.c:934
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1103
+#: src/util/crypto_ecc.c:1016
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/crypto_ecc.c:1207
+#: src/util/crypto_ecc.c:1120
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_ecc.c:1257
+#: src/util/crypto_ecc.c:1170
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_ecc.c:1331
+#: src/util/crypto_ecc.c:1244
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:1388
+#: src/util/crypto_ecc.c:1301
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/crypto_random.c:280
+#: src/util/crypto_random.c:284
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/disk.c:1184
+#: src/util/crypto_rsa.c:786
+#, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
+msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
+
+#: src/util/disk.c:1202
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1546 src/util/service.c:1315
+#: src/util/disk.c:1564 src/util/service.c:1327
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
@@ -7901,81 +8839,82 @@ msgid "Manipulate GNUnet configuration files"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/util/gnunet-ecc.c:75
+#: src/util/gnunet-ecc.c:81
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/gnunet-ecc.c:81
+#: src/util/gnunet-ecc.c:117
+#, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:130
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:97
+#: src/util/gnunet-ecc.c:171
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/gnunet-ecc.c:107
+#: src/util/gnunet-ecc.c:181
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "Fertigstellen"
 
-#: src/util/gnunet-ecc.c:110
+#: src/util/gnunet-ecc.c:184
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199
+#: src/util/gnunet-ecc.c:277
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/util/gnunet-ecc.c:210
+#: src/util/gnunet-ecc.c:288
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/util/gnunet-ecc.c:232
+#: src/util/gnunet-ecc.c:310
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/gnunet-ecc.c:286
+#: src/util/gnunet-ecc.c:361
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:341
+#: src/util/gnunet-ecc.c:411
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:344
+#: src/util/gnunet-ecc.c:414
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:347
+#: src/util/gnunet-ecc.c:417
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:350
+#: src/util/gnunet-ecc.c:420
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:353
-msgid "print the hash of the public key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:356
+#: src/util/gnunet-ecc.c:423
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:367
+#: src/util/gnunet-ecc.c:434
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -7987,13 +8926,40 @@ msgstr ""
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:288
+#: src/util/gnunet-scrypt.c:233
+#, fuzzy, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
+
+#: src/util/gnunet-scrypt.c:294
+msgid "number of bits to require for the proof of work"
+msgstr ""
+
+#: src/util/gnunet-scrypt.c:297
+msgid "file with private key, otherwise default is used"
+msgstr ""
+
+#: src/util/gnunet-scrypt.c:300
+msgid "file with proof of work, otherwise default is used"
+msgstr ""
+
+#: src/util/gnunet-scrypt.c:303
+msgid "time to wait between calculations"
+msgstr ""
+
+#: src/util/gnunet-scrypt.c:315
+#, fuzzy
+msgid "Manipulate GNUnet proof of work files"
+msgstr ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
+
+#: src/util/gnunet-service-resolver.c:310
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/gnunet-service-resolver.c:358
-#: src/util/gnunet-service-resolver.c:399
+#: src/util/gnunet-service-resolver.c:382
+#: src/util/gnunet-service-resolver.c:423
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
@@ -8037,12 +9003,12 @@ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 msgid "Error writing to `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/network.c:134
+#: src/util/network.c:137
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1397
+#: src/util/network.c:1640 src/util/network.c:1797
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8055,17 +9021,17 @@ msgid ""
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:713
+#: src/util/os_installation.c:766
 #, 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:773
+#: src/util/os_installation.c:826
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/os_installation.c:783
+#: src/util/os_installation.c:836
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8091,27 +9057,27 @@ msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/program.c:260 src/util/service.c:1449
+#: src/util/program.c:246 src/util/service.c:1461
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/util/program.c:270 src/util/service.c:1464
+#: src/util/program.c:258 src/util/service.c:1476
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/program.c:275 src/util/service.c:1459
+#: src/util/program.c:263 src/util/service.c:1471
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/util/resolver_api.c:198
+#: src/util/resolver_api.c:201
 #, fuzzy, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
 
-#: src/util/resolver_api.c:216
+#: src/util/resolver_api.c:220
 #, fuzzy, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -8119,30 +9085,25 @@ msgstr ""
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/util/resolver_api.c:343
+#: 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/util/resolver_api.c:347
+#: src/util/resolver_api.c:361
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/resolver_api.c:891
+#: src/util/resolver_api.c:974
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/scheduler.c:813
+#: src/util/scheduler.c:812
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:948
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
-msgstr ""
-
 #: src/util/server.c:484
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
@@ -8158,97 +9119,97 @@ msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\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/util/server.c:892
+#: src/util/server.c:896
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:362
+#: src/util/service.c:347
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/util/service.c:369
+#: src/util/service.c:354
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:424
+#: src/util/service.c:410
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:461
+#: src/util/service.c:448
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:570
+#: src/util/service.c:566
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:651
+#: src/util/service.c:656
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:667
+#: src/util/service.c:672
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:901
+#: src/util/service.c:911
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:950 src/util/service.c:968
+#: src/util/service.c:960 src/util/service.c:978
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:993
+#: src/util/service.c:1003
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1163
+#: src/util/service.c:1174
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/service.c:1204
+#: src/util/service.c:1216
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/service.c:1253
+#: src/util/service.c:1265
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1257
+#: src/util/service.c:1269
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1261
+#: src/util/service.c:1273
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1316
+#: src/util/service.c:1328
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1329
+#: src/util/service.c:1341
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/util/service.c:1399
+#: src/util/service.c:1411
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -8261,317 +9222,599 @@ msgstr "Aufruf von `%s' gibt %d zurück.\n"
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:450
+#: src/util/strings.c:434
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:578
+#: src/util/strings.c:562
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:675
+#: src/util/strings.c:659
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:679
+#: src/util/strings.c:663
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:681
+#: src/util/strings.c:665
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:687
+#: src/util/strings.c:671
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:693
+#: src/util/strings.c:677
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:683
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:705
+#: src/util/strings.c:689
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:712
+#: src/util/strings.c:696
 #, fuzzy
 msgid "day"
 msgstr " Tage"
 
-#: src/util/strings.c:714
+#: src/util/strings.c:698
 #, fuzzy
 msgid "days"
 msgstr " Tage"
 
-#: src/util/strings.c:743
+#: src/util/strings.c:727
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1149
+#: src/util/strings.c:1192
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1157
+#: src/util/strings.c:1200
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1163
+#: src/util/strings.c:1206
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1170
+#: src/util/strings.c:1213
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1179
+#: src/util/strings.c:1222
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/strings.c:1385 src/util/strings.c:1401
+#: src/util/strings.c:1428 src/util/strings.c:1444
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1410
+#: src/util/strings.c:1453
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/util/strings.c:1493 src/util/strings.c:1524 src/util/strings.c:1572
-#: src/util/strings.c:1593
+#: src/util/strings.c:1536 src/util/strings.c:1567 src/util/strings.c:1615
+#: src/util/strings.c:1636
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/strings.c:1550
+#: src/util/strings.c:1593
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/util/strings.c:1602
-#, fuzzy, c-format
-msgid "Invalid format: `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
+#: src/util/strings.c:1645
+#, fuzzy, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/util/strings.c:1697
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
+
+#: src/util/strings.c:1747
+#, fuzzy, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Falsches Format `%s' für Netzmaske: %s\n"
+
+#: src/util/strings.c:1778
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Falsches Format `%s' für Netzwerk: %s\n"
+
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
+#, fuzzy
+msgid "# Active channels"
+msgstr "GNUnet Konfiguration"
+
+#: src/vpn/gnunet-service-vpn.c:642
+#, fuzzy
+msgid "# Bytes given to cadet for transmission"
+msgstr "# PING Nachrichten erstellt"
+
+#: src/vpn/gnunet-service-vpn.c:680
+#, fuzzy
+msgid "# Bytes dropped in cadet queue (overflow)"
+msgstr "# Bytes verworfen von UDP (outgoing)"
+
+#: src/vpn/gnunet-service-vpn.c:753
+#, fuzzy
+msgid "# Cadet channels created"
+msgstr "# dht Anfragen weitergeleitet"
+
+#: src/vpn/gnunet-service-vpn.c:784
+#, fuzzy
+msgid "Failed to setup cadet channel!\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/vpn/gnunet-service-vpn.c:978
+#, c-format
+msgid "Protocol %u not supported, dropping\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1305
+msgid "# ICMPv4 packets dropped (not allowed)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1326
+msgid "# ICMPv6 packets dropped (not allowed)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1531
+#, fuzzy
+msgid "# Packets received from TUN interface"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
+#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
+#, c-format
+msgid "Packet received for unmapped destination `%s' (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1610
+msgid "Received IPv4 packet with options (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1624
+#, c-format
+msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1706
+#, fuzzy
+msgid "# ICMP packets received from cadet"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
+#: src/vpn/gnunet-service-vpn.c:2045
+#, fuzzy
+msgid "# UDP packets received from cadet"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
+#: src/vpn/gnunet-service-vpn.c:2200
+#, fuzzy
+msgid "# TCP packets received from cadet"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
+#: src/vpn/gnunet-service-vpn.c:2351
+msgid "Failed to find unallocated IPv4 address in VPN's range\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2406
+#, fuzzy
+msgid "Failed to find unallocated IPv6 address in VPN's range\n"
+msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
+
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
+#, fuzzy
+msgid "# Active destinations"
+msgstr "GNUnet Konfiguration"
+
+#: src/vpn/gnunet-service-vpn.c:2715
+msgid "Failed to allocate IP address for new destination\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2987
+#, fuzzy
+msgid "Must specify valid IPv6 address"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/vpn/gnunet-service-vpn.c:3011
+msgid "Must specify valid IPv6 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3019
+msgid "IPv6 support disabled as this system does not support IPv6\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3032
+#, fuzzy
+msgid "Must specify valid IPv4 address"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/vpn/gnunet-service-vpn.c:3045
+msgid "Must specify valid IPv4 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3055
+msgid "IPv4 support disabled as this system does not support IPv4\n"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:147
+#, fuzzy
+msgid "Error creating tunnel\n"
+msgstr "Hostkey wurde erfolgreich erzeugt.\n"
+
+#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
+#, fuzzy, c-format
+msgid "Option `%s' makes no sense with option `%s'.\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/vpn/gnunet-vpn.c:203
+#, fuzzy, c-format
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "%s: Option `%s' ist mehrdeutig\n"
+
+#: src/vpn/gnunet-vpn.c:215
+#, fuzzy, c-format
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/vpn/gnunet-vpn.c:235
+#, fuzzy, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/vpn/gnunet-vpn.c:255
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/vpn/gnunet-vpn.c:290
+msgid "request that result should be an IPv4 address"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:293
+msgid "request that result should be an IPv6 address"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:296
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:299
+msgid "destination IP for the tunnel"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:302
+msgid "peer offering the service we would like to access"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:305
+msgid "name of the service we would like to access"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:308
+#, fuzzy
+msgid "service is offered via TCP"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/vpn/gnunet-vpn.c:311
+#, fuzzy
+msgid "service is offered via UDP"
+msgstr "# Bytes empfangen über UDP"
+
+#: src/vpn/gnunet-vpn.c:323
+msgid "Setup tunnels via VPN."
+msgstr ""
+
+#: src/include/gnunet_common.h:586 src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:601
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d.\n"
+msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+
+#: src/include/gnunet_common.h:613
+#, fuzzy, c-format
+msgid "External protocol violation detected at %s:%d.\n"
+msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+
+#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:649
+#, 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 "# PING without HELLO messages sent"
+#~ msgstr "# Klartext PING Nachrichten gesendet"
+
+#, fuzzy
+#~ msgid "Starting default services `%s'\n"
+#~ msgstr "Collection `%s' begonnen.\n"
+
+#, fuzzy
+#~ msgid "Received %s message\n"
+#~ msgstr "ungültige `%s' Nachricht empfangen\n"
+
+#, fuzzy
+#~ msgid "Received last message for %s \n"
+#~ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "Failed to create statistics!\n"
+#~ msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#, fuzzy
+#~ msgid "Failed to parse file `%s'\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#, fuzzy
+#~ msgid "Invalid value for public key\n"
+#~ msgstr "Ungültiger Parameter: `%s'\n"
+
+#, fuzzy
+#~ msgid "Cannot read experiments file `%s'\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#, fuzzy
+#~ msgid "Connected to peer %s\n"
+#~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#, fuzzy
+#~ msgid "Disconnected from peer %s\n"
+#~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#, fuzzy
+#~ msgid "Starting inbound experiment `%s' with peer `%s'\n"
+#~ msgstr "Collection `%s' begonnen.\n"
+
+#, fuzzy
+#~ msgid "Starting outbound experiment `%s' with peer `%s'\n"
+#~ msgstr "Collection `%s' begonnen.\n"
+
+#, fuzzy
+#~ msgid "Received %s message from peer %s for experiment `%s'\n"
+#~ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "Lacking key configuration settings.\n"
+#~ msgstr "GNUnet Konfiguration"
+
+#, fuzzy
+#~ msgid "Could not access hostkey file `%s'.\n"
+#~ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#, fuzzy
+#~ msgid "Hostlist file `%s' could not be removed\n"
+#~ msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
+
+#, fuzzy
+#~ msgid "Failure: Did not receive %s\n"
+#~ msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#, fuzzy
+#~ msgid "Blacklist allows connection attempt to peer `%s'\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Received a request connect message for peer `%s'\n"
+#~ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "Received a request disconnect message for peer `%s'\n"
+#~ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "Client %p disconnected from us.\n"
+#~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#, fuzzy
+#~ msgid "Could not send message to client (%p)!\n"
+#~ msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+
+#, fuzzy
+#~ msgid "Successfully created new channel to peer (%s)!\n"
+#~ msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Transmitting service request.\n"
+#~ msgstr "Collection `%s' begonnen.\n"
 
-#: src/util/strings.c:1654
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
+#, fuzzy
+#~ msgid "Could not send message to channel!\n"
+#~ msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/util/strings.c:1704
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Falsches Format `%s' für Netzmaske: %s\n"
+#, fuzzy
+#~ msgid "Could not send service-response message via cadet!)\n"
+#~ msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/util/strings.c:1735
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Falsches Format `%s' für Netzwerk: %s\n"
+#, fuzzy
+#~ msgid "Could not send service-request multipart message to channel!\n"
+#~ msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
 #, fuzzy
-msgid "# Active channels"
-msgstr "GNUnet Konfiguration"
+#~ msgid "New incoming channel from peer %s.\n"
+#~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/vpn/gnunet-service-vpn.c:642
 #, fuzzy
-msgid "# Bytes given to mesh for transmission"
-msgstr "# PING Nachrichten erstellt"
+#~ msgid "CADET initialized\n"
+#~ msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/vpn/gnunet-service-vpn.c:680
 #, fuzzy
-msgid "# Bytes dropped in mesh queue (overflow)"
-msgstr "# Bytes verworfen von UDP (outgoing)"
+#~ msgid "Reloading sensor definitions from directory `%s'\n"
+#~ msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Mesh channels created"
-msgstr "# dht Anfragen weitergeleitet"
+#~ msgid "Loaded %d sensors from directory `%s'\n"
+#~ msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
-msgid "Failed to setup mesh channel!\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+#~ msgid "Failed to receive response from `SENSOR' service."
+#~ msgstr ""
+#~ "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/vpn/gnunet-service-vpn.c:978
-#, c-format
-msgid "Protocol %u not supported, dropping\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Received invalid message from `SENSOR' service."
+#~ msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1305
-msgid "# ICMPv4 packets dropped (not allowed)"
-msgstr ""
+#, fuzzy
+#~ msgid "# SESSION_CONNECT messages sent"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/vpn/gnunet-service-vpn.c:1326
-msgid "# ICMPv6 packets dropped (not allowed)"
-msgstr ""
+#, fuzzy
+#~ msgid "# CONNECT messages received"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/vpn/gnunet-service-vpn.c:1531
 #, fuzzy
-msgid "# Packets received from TUN interface"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+#~ msgid "# Bluetooth messages defragmented"
+#~ msgstr "# defragmentierter Nachrichten"
 
-#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
-#, c-format
-msgid "Packet received for unmapped destination `%s' (dropping it)\n"
-msgstr ""
+#, fuzzy
+#~ msgid "# Bluetooth sessions allocated"
+#~ msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/vpn/gnunet-service-vpn.c:1610
-msgid "Received IPv4 packet with options (dropping it)\n"
-msgstr ""
+#, fuzzy
+#~ msgid "# Bluetooth message fragments sent"
+#~ msgstr "# fragmentierter Nachrichten"
 
-#: src/vpn/gnunet-service-vpn.c:1624
-#, c-format
-msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
-msgstr ""
+#, fuzzy
+#~ msgid "# Bluetooth MAC endpoints allocated"
+#~ msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/vpn/gnunet-service-vpn.c:1706
 #, fuzzy
-msgid "# ICMP packets received from mesh"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+#~ msgid "# HELLO messages received via Bluetooth"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
-msgid "# UDP packets received from mesh"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+#~ msgid "# fragments received via Bluetooth"
+#~ msgstr "# verworfener Nachrichten"
 
-#: src/vpn/gnunet-service-vpn.c:2200
 #, fuzzy
-msgid "# TCP packets received from mesh"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+#~ msgid "# ACKs received via Bluetooth"
+#~ msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-service-vpn.c:2351
-msgid "Failed to find unallocated IPv4 address in VPN's range\n"
-msgstr ""
+#, fuzzy
+#~ msgid "# Bluetooth DATA messages discarded due to CRC32 error"
+#~ msgstr "# defragmentierter Nachrichten"
 
-#: src/vpn/gnunet-service-vpn.c:2406
 #, fuzzy
-msgid "Failed to find unallocated IPv6 address in VPN's range\n"
-msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
+#~ msgid "# DATA messages received via Bluetooth"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
 #, fuzzy
-msgid "# Active destinations"
-msgstr "GNUnet Konfiguration"
+#~ msgid "# Bluetooth DATA messages processed"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/vpn/gnunet-service-vpn.c:2715
-msgid "Failed to allocate IP address for new destination\n"
-msgstr ""
+#, fuzzy
+#~ msgid "# HELLO beacons sent via Bluetooth"
+#~ msgstr "# Bytes gesendet über UDP"
 
-#: src/vpn/gnunet-service-vpn.c:2982
 #, fuzzy
-msgid "Must specify valid IPv6 address"
-msgstr "`%s' ist nicht verfügbar."
+#~ msgid "No UNIXPATH given in configuration!\n"
+#~ msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/vpn/gnunet-service-vpn.c:3006
-msgid "Must specify valid IPv6 mask"
-msgstr ""
+#, fuzzy
+#~ msgid "# WLAN messages defragmented"
+#~ msgstr "# defragmentierter Nachrichten"
 
-#: src/vpn/gnunet-service-vpn.c:3014
-msgid "IPv6 support disabled as this system does not support IPv6\n"
-msgstr ""
+#, fuzzy
+#~ msgid "# HELLO messages received via WLAN"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/vpn/gnunet-service-vpn.c:3027
 #, fuzzy
-msgid "Must specify valid IPv4 address"
-msgstr "`%s' ist nicht verfügbar."
+#~ msgid "# fragments received via WLAN"
+#~ msgstr "# verworfener Nachrichten"
 
-#: src/vpn/gnunet-service-vpn.c:3040
-msgid "Must specify valid IPv4 mask"
-msgstr ""
+#, fuzzy
+#~ msgid "# DATA messages received via WLAN"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/vpn/gnunet-service-vpn.c:3050
-msgid "IPv4 support disabled as this system does not support IPv4\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Peer `%s'\n"
+#~ msgstr "Ich bin Peer `%s'.\n"
 
-#: src/vpn/gnunet-vpn.c:146
 #, fuzzy
-msgid "Error creating tunnel\n"
-msgstr "Hostkey wurde erfolgreich erzeugt.\n"
+#~ msgid "# Bytes received from MESH"
+#~ msgstr "# Bytes empfangen über HTTP"
 
-#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:220
-#, fuzzy, c-format
-msgid "Option `%s' makes no sense with option `%s'.\n"
-msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+#, fuzzy
+#~ msgid "# Replies received from MESH"
+#~ msgstr "# Bytes empfangen über HTTP"
 
-#: src/vpn/gnunet-vpn.c:202
-#, fuzzy, c-format
-msgid "Option `%s' or `%s' is required.\n"
-msgstr "%s: Option `%s' ist mehrdeutig\n"
+#, fuzzy
+#~ msgid "Could not convert `%s' to integer.\n"
+#~ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/vpn/gnunet-vpn.c:214
-#, fuzzy, c-format
-msgid "Option `%s' or `%s' is required when using option `%s'.\n"
-msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+#, fuzzy
+#~ msgid "Too short message received from client!\n"
+#~ msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-vpn.c:233
-#, fuzzy, c-format
-msgid "`%s' is not a valid peer identifier.\n"
-msgstr "`%s' ist nicht verfügbar."
+#, fuzzy
+#~ msgid ""
+#~ "Invalid message received from client, session information incorrect!\n"
+#~ msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/vpn/gnunet-vpn.c:254
-#, fuzzy, c-format
-msgid "`%s' is not a valid IP address.\n"
-msgstr "`%s' ist nicht verfügbar."
+#, fuzzy
+#~ msgid "# SUC responder result messages received"
+#~ msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/vpn/gnunet-vpn.c:289
-msgid "request that result should be an IPv4 address"
-msgstr ""
+#, fuzzy
+#~ msgid "# bytes sent to scalarproduct"
+#~ msgstr "# bytes in der Datenbank"
 
-#: src/vpn/gnunet-vpn.c:292
-msgid "request that result should be an IPv6 address"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to connect to the scalarproduct service\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/vpn/gnunet-vpn.c:295
-msgid "how long should the mapping be valid for new tunnels?"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to send a message to the statistics service\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/vpn/gnunet-vpn.c:298
-msgid "destination IP for the tunnel"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to send a message to the scalarproduct service\n"
+#~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/vpn/gnunet-vpn.c:301
-msgid "peer offering the service we would like to access"
-msgstr ""
+#, fuzzy
+#~ msgid "# TRAIL SETUP requests received"
+#~ msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/vpn/gnunet-vpn.c:304
-msgid "name of the service we would like to access"
-msgstr ""
+#, fuzzy
+#~ msgid "# TRAIL SETUP bytes received"
+#~ msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/vpn/gnunet-vpn.c:307
 #, fuzzy
-msgid "service is offered via TCP"
-msgstr "# Bytes empfangen über TCP"
+#~ msgid "provide information about a particular channel"
+#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/vpn/gnunet-vpn.c:310
 #, fuzzy
-msgid "service is offered via UDP"
-msgstr "# Bytes empfangen über UDP"
+#~ msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
+#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/vpn/gnunet-vpn.c:322
-msgid "Setup tunnels via VPN."
-msgstr ""
+#, fuzzy
+#~ msgid "Peer `%s' disconnected\n"
+#~ msgstr "# verbundener Knoten"
 
-#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
-#: src/include/gnunet_common.h:581
-#, fuzzy, c-format
-msgid "Assertion failed at %s:%d.\n"
-msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+#, fuzzy
+#~ msgid "Transport plugin: `%s' port %llu\n"
+#~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/include/gnunet_common.h:593
-#, fuzzy, c-format
-msgid "External protocol violation detected at %s:%d.\n"
-msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+#, fuzzy
+#~ msgid "Found %u transport plugins: `%s'\n"
+#~ msgstr "Teste Transport(e) %s\n"
 
-#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
-#, 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 "Failed to parse HELLO in file `%s': %s %u \n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
 #, fuzzy
 #~ msgid "Internal error %d\n"
@@ -8710,10 +9953,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Failed to read or create private zone key\n"
 #~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#, fuzzy
-#~ msgid "Unable to initialize resolver!\n"
-#~ msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
-
 #, fuzzy
 #~ msgid "Using default zone file `%s'\n"
 #~ msgstr "Collection `%s' begonnen.\n"
@@ -8731,10 +9970,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr ""
 #~ "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#, fuzzy
-#~ msgid "number of peers to start"
-#~ msgstr "Anzahl an Durchläufen"
-
 #, fuzzy
 #~ msgid "Failed to read or generate private key: %s\n"
 #~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
@@ -8781,10 +10016,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Could not parse zone key file `%s'\n"
 #~ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#, fuzzy
-#~ msgid "Failed to create new signature"
-#~ msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
-
 #, fuzzy
 #~ msgid "Failed to put new set of records in database"
 #~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
@@ -8847,17 +10078,10 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "gnunet-rsa failed"
 #~ msgstr "gnunet-update ausführen"
 
-#~ msgid "RSA signature verification failed at %s:%d: %s\n"
-#~ msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
-
 #, fuzzy
 #~ msgid "`%s' failed for drive `%S': %u\n"
 #~ msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#, fuzzy
-#~ msgid "Failed to transmit shutdown request to client.\n"
-#~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
 #, fuzzy
 #~ msgid "Service `%s' was already running.\n"
 #~ msgstr "Diese Suche läuft bereits!\n"
@@ -8874,10 +10098,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Service `%s' was already not running.\n"
 #~ msgstr "Diese Suche läuft bereits!\n"
 
-#, fuzzy
-#~ msgid "Error communicating with ARM service.\n"
-#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
 #, fuzzy
 #~ msgid "Timeout communicating with ARM service.\n"
 #~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -8902,10 +10122,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ "\n"
 #~ "Abbruch.\n"
 
-#, fuzzy
-#~ msgid "Could not read blacklist file `%s'\n"
-#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
 #, fuzzy
 #~ msgid "Failed to read blacklist from `%s'\n"
 #~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -8922,10 +10138,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Failed to read hostkey: %s\n"
 #~ msgstr "Fehler beim Starten der Collection.\n"
 
-#, fuzzy
-#~ msgid "# session keys received"
-#~ msgstr "# Sitzungsschlüssel abgelehnt"
-
 #, fuzzy
 #~ msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 #~ msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
@@ -8946,10 +10158,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Failed to serialize meta data"
 #~ msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#, fuzzy
-#~ msgid "Failed to connect to datastore service"
-#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
 #, fuzzy
 #~ msgid "Failed to parse URI `%s' from KBlock!\n"
 #~ msgstr "Datei `%s' hat URI: %s\n"
@@ -9006,10 +10214,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 #~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#, fuzzy
-#~ msgid "list information for all peers"
-#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
 #, fuzzy
 #~ msgid "Could not transmit confirmation receipt\n"
 #~ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -9100,10 +10304,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Failed to queue a join notification\n"
 #~ msgstr "Fehler beim Abfragen der Netzwerkverkehrsbedingungen von gnunetd.\n"
 
-#, fuzzy
-#~ msgid "Failed to queue a confirmation receipt\n"
-#~ msgstr "Fehler beim Speichern der Konfiguration!"
-
 #, fuzzy
 #~ msgid "Failed to queue a leave notification\n"
 #~ msgstr "Fehler beim Speichern der Konfiguration!"
@@ -9112,12 +10312,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Connected to %s service!\n"
 #~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#, fuzzy
-#~ 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"
-
 #, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
@@ -9132,10 +10326,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ "Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
 #~ "gesetzt, sie wird auf %dm gesetzt.\n"
 
-#, fuzzy
-#~ msgid "Malformed %s `%s' given in configuration!\n"
-#~ msgstr "Fehler beim Speichern der Konfiguration!"
-
 #, fuzzy
 #~ msgid "Peer is lacking HOSTKEY configuration setting.\n"
 #~ msgstr "GNUnet Konfiguration"
@@ -9148,20 +10338,12 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 #~ msgstr "Fehler beim Starten der Collection.\n"
 
-#, fuzzy
-#~ msgid "Failed to create pipe for `ssh' process.\n"
-#~ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
 #, fuzzy
 #~ msgid "Could not start `%s' process to create hostkey.\n"
 #~ msgstr ""
 #~ "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP "
 #~ "in der Konfigurationsdatei an.\n"
 
-#, fuzzy
-#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
-#~ msgstr "Fehler beim Starten der Collection.\n"
-
 #, fuzzy
 #~ msgid "Failed to start `ssh' process.\n"
 #~ msgstr "Fehler beim Starten der Collection.\n"
@@ -9334,10 +10516,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "# peers disconnected due to timeout"
 #~ msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#, fuzzy
-#~ msgid "# peers disconnected due to global disconnect"
-#~ msgstr "# Knotenankündigungen empfangen"
-
 #, fuzzy
 #~ msgid "# messages not sent (no such peer or not connected)"
 #~ msgstr "# defragmentierter Nachrichten"
@@ -9412,9 +10590,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "print the version number"
 #~ msgstr "Versionsnummer ausgeben"
 
-#~ msgid "be verbose"
-#~ msgstr "umfangreiche Meldungen ausgeben"
-
 #, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -10077,9 +11252,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "`%s' registering handlers %d %d %d\n"
 #~ msgstr "`%s' registriert Handler %d %d %d\n"
 
-#~ msgid "Using %u messages of size %u for %u times.\n"
-#~ msgstr "Verwende %u Nachrichten der Größe %u %umal.\n"
-
 #~ msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 #~ msgstr "Zeiten:   Max %16llu  Min %16llu  Mittel %12.3f  Varianz %12.3f\n"
 
@@ -10098,15 +11270,9 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "output in gnuplot format"
 #~ msgstr "Ausgabe im gnuplot Format"
 
-#~ msgid "number of messages to use per iteration"
-#~ msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
-
 #~ msgid "receiver host identifier (ENC file name)"
 #~ msgstr "Bezeichner des Empfängerhosts (ENC Dateiname)"
 
-#~ msgid "message size"
-#~ msgstr "Nachrichtengröße"
-
 #~ msgid "sleep for SPACE ms after each a message block"
 #~ msgstr "Für SPACE ms nach jedem Nachrichtenblock pausieren"
 
@@ -10153,9 +11319,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "\tvariance %8.4f\n"
 #~ msgstr "\tVarianz %8.4f\n"
 
-#~ msgid "Output format not known, this should not happen.\n"
-#~ msgstr "Ausgabeformat ist unbekannt, dies sollte nicht passieren.\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Did not receive the message from gnunetd. Is gnunetd running?\n"
@@ -10559,14 +11722,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ "\n"
 #~ "Upload abgebrochen.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Error uploading file: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Fehler beim Uploaden der Datei: %s\n"
-
 #~ msgid ""
 #~ "even if gnunetd is running on the local machine, force the creation of a "
 #~ "copy instead of making a link to the GNUnet share directory"
@@ -10634,10 +11789,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "No filename specified, using `%s' instead (for now).\n"
 #~ msgstr "Kein Tabellenname angegeben, verwende `%s'.\n"
 
-#, fuzzy
-#~ msgid "Downloading %d files from directory `%s'.\n"
-#~ msgstr "Dateien aus dem GNUnet herunterladen."
-
 #~ msgid "File stored as `%s'.\n"
 #~ msgstr "Datei wurde als `%s' gespeichert.\n"
 
@@ -10647,9 +11798,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Cannot get size of file `%s'"
 #~ msgstr "Die Größe der Datei `%s' konnte nicht ermittelt werden"
 
-#~ msgid "Cannot hash `%s'.\n"
-#~ msgstr "`%s' konnte nicht gehashed werden.\n"
-
 #~ msgid "Initialization for indexing file `%s' failed.\n"
 #~ msgstr "Initialisierung der Indizierung der Datei `%s' fehlgeschlagen.\n"
 
@@ -11106,10 +12254,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "This is equivalent to the -H option.  The format is IP:PORT."
 #~ msgstr "Wert der Option anzeigen"
 
-#, fuzzy
-#~ msgid "General options"
-#~ msgstr "Weitere Einstellungen"
-
 #, fuzzy
 #~ msgid "Options related to gnunet-gtk"
 #~ msgstr "Nicht verbunden zu gnunetd."
@@ -12008,9 +13152,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Received invalid `%s' request (size %d)\n"
 #~ msgstr "Ungültige Anfrage `%s' empfangen (Größe %d)\n"
 
-#~ msgid "Received invalid `%s' request (wrong table)\n"
-#~ msgstr "Ungültige Anfrage `%s' empfangen (falsche Tabelle)\n"
-
 #~ msgid "Received unknown request type %d at %s:%d\n"
 #~ msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
 
@@ -12489,9 +13630,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ "%s\n"
 #~ "\n"
 
-#~ msgid "Invalid argument for `%s' at %s:%d.\n"
-#~ msgstr "Ungültiger Parameter für `%s' bei %s:%d.\n"
-
 #~ msgid "g"
 #~ msgstr "g"