1 files changed, 1165 insertions, 883 deletions

diff --git a/po/sv.po b/po/sv.po
index 925f0e601..df829b05f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2014-04-08 11:11+0200\n"
+"POT-Creation-Date: 2014-06-04 18:25+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -346,130 +346,159 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:468
+#: src/ats/ats_api_performance.c:485
 #, fuzzy, c-format
 msgid "Received %s message\n"
 msgstr "mottog ogiltigt \"%s\" meddelande\n"
 
-#: src/ats/ats_api_performance.c:511
+#: src/ats/ats_api_performance.c:528
 #, fuzzy, c-format
 msgid "Received last message for %s \n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2199 src/ats/gnunet-ats-solver-eval.c:2233
-#: src/ats/gnunet-service-ats_addresses.c:1980
-#: src/ats/gnunet-service-ats_addresses.c:2024
+#: src/ats/gnunet-ats-solver-eval.c:2793 src/ats/gnunet-ats-solver-eval.c:2827
+#: src/ats/gnunet-service-ats_addresses.c:1675
+#: src/ats/gnunet-service-ats_addresses.c:1719
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2205
-#: src/ats/gnunet-service-ats_addresses.c:1987
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#: src/ats/gnunet-service-ats_addresses.c:1682
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2212
-#: src/ats/gnunet-service-ats_addresses.c:1995
+#: src/ats/gnunet-ats-solver-eval.c:2806
+#: src/ats/gnunet-service-ats_addresses.c:1690
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2239
-#: src/ats/gnunet-service-ats_addresses.c:2031
+#: src/ats/gnunet-ats-solver-eval.c:2833
+#: src/ats/gnunet-service-ats_addresses.c:1726
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2246
-#: src/ats/gnunet-service-ats_addresses.c:2039
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#: src/ats/gnunet-service-ats_addresses.c:1734
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2671
+#: src/ats/gnunet-ats-solver-eval.c:3397
 #: src/ats-tests/gnunet-solver-eval.c:919
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2674 src/ats/gnunet-ats-solver-eval.c:2677
+#: src/ats/gnunet-ats-solver-eval.c:3400
 #: src/ats-tests/gnunet-solver-eval.c:922
 #: src/ats-tests/gnunet-solver-eval.c:925
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2680
+#: src/ats/gnunet-ats-solver-eval.c:3403
+msgid "be verbose"
+msgstr "var informativ"
+
+#: src/ats/gnunet-ats-solver-eval.c:3406
 #, fuzzy
 msgid "print logging"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2217
+#: src/ats/gnunet-ats-solver-eval.c:3409
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3412
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1912
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2220
+#: src/ats/gnunet-service-ats_addresses.c:1915
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2243
+#: src/ats/gnunet-service-ats_addresses.c:1938
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/plugin_ats_mlp.c:892
+#: src/ats/plugin_ats_mlp.c:949
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1329
+#: src/ats/plugin_ats_mlp.c:1542
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/ats/plugin_ats_mlp.c:1376
+#: src/ats/plugin_ats_mlp.c:1589
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2122
+#: src/ats/plugin_ats_mlp.c:2299
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2339 src/ats/plugin_ats_mlp.c:2356
+#: src/ats/plugin_ats_mlp.c:2388 src/ats/plugin_ats_mlp.c:2406
+#: src/ats/plugin_ats_mlp.c:2425 src/ats/plugin_ats_proportional.c:458
+#: src/ats/plugin_ats_proportional.c:475 src/ats/plugin_ats_ril.c:2220
+#: src/ats/plugin_ats_ril.c:2237 src/ats/plugin_ats_ril.c:2254
+#: src/ats/plugin_ats_ril.c:2271 src/ats/plugin_ats_ril.c:2288
+#: src/ats/plugin_ats_ril.c:2305 src/ats/plugin_ats_ril.c:2322
+#: src/ats/plugin_ats_ril.c:2339
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/ats/plugin_ats_mlp.c:2512
 #, 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:2131
+#: src/ats/plugin_ats_mlp.c:2521
 #, 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:2142
+#: src/ats/plugin_ats_mlp.c:2532
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2150
+#: src/ats/plugin_ats_mlp.c:2540
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2161
+#: src/ats/plugin_ats_mlp.c:2551
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1511
+#: src/ats/plugin_ats_proportional.c:1819
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -507,7 +536,7 @@ msgstr ""
 msgid "Could not connect master [%u] and slave [%u]\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:671
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:673
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
@@ -538,108 +567,164 @@ msgstr ""
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:232
+#: src/ats-tool/gnunet-ats.c:258
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:413
+#: src/ats-tool/gnunet-ats.c:467
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:433 src/core/gnunet-core.c:163
-#: src/namestore/gnunet-namestore.c:550 src/transport/gnunet-transport.c:1246
+#: src/ats-tool/gnunet-ats.c:487 src/namestore/gnunet-namestore.c:639
+#: src/transport/gnunet-transport.c:1349
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/ats-tool/gnunet-ats.c:445 src/transport/gnunet-transport.c:1255
+#: src/ats-tool/gnunet-ats.c:499 src/transport/gnunet-transport.c:1358
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:454
+#: src/ats-tool/gnunet-ats.c:508
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:470 src/ats-tool/gnunet-ats.c:489
-#: src/ats-tool/gnunet-ats.c:506 src/ats-tool/gnunet-ats.c:543
+#: src/ats-tool/gnunet-ats.c:524 src/ats-tool/gnunet-ats.c:543
+#: src/ats-tool/gnunet-ats.c:560 src/ats-tool/gnunet-ats.c:597
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:478 src/ats-tool/gnunet-ats.c:495
+#: src/ats-tool/gnunet-ats.c:532 src/ats-tool/gnunet-ats.c:549
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:515
+#: src/ats-tool/gnunet-ats.c:569
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:574
 #, c-format
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:536
+#: src/ats-tool/gnunet-ats.c:590
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:594
+#: src/ats-tool/gnunet-ats.c:648
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:596
+#: src/ats-tool/gnunet-ats.c:650
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:599
+#: src/ats-tool/gnunet-ats.c:653
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:601
+#: src/ats-tool/gnunet-ats.c:655
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:603
+#: src/ats-tool/gnunet-ats.c:657
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:605
+#: src/ats-tool/gnunet-ats.c:659
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:607
+#: src/ats-tool/gnunet-ats.c:661
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:610
+#: src/ats-tool/gnunet-ats.c:664
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:612
+#: src/ats-tool/gnunet-ats.c:666
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:615
+#: src/ats-tool/gnunet-ats.c:669
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:622
+#: src/ats-tool/gnunet-ats.c:676
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
 
+#: src/cadet/gnunet-cadet.c:357
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/cadet/gnunet-cadet.c:607
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "Ogiltiga argument: "
+
+#: src/cadet/gnunet-cadet.c:650
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#: src/cadet/gnunet-cadet.c:716
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:807
+#, fuzzy
+msgid "provide information about a particular connection"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cadet/gnunet-cadet.c:810
+msgid "activate echo mode"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:816
+msgid "port to listen to (default; 0)"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:819
+#, fuzzy
+msgid "provide information about a patricular peer"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cadet/gnunet-cadet.c:822
+#, fuzzy
+msgid "provide information about all peers"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cadet/gnunet-cadet.c:825
+#, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cadet/gnunet-cadet.c:828
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cadet/gnunet-service-cadet_peer.c:429
+msgid "Wrong CORE service\n"
+msgstr ""
+
 #: src/consensus/gnunet-consensus-profiler.c:437
-#: src/secretsharing/gnunet-secretsharing-profiler.c:535
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "antal iterationer"
@@ -665,7 +750,7 @@ msgid "delay until consensus starts"
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:452
-#: src/secretsharing/gnunet-secretsharing-profiler.c:550
+#: src/secretsharing/gnunet-secretsharing-profiler.c:625
 msgid "be more verbose (print received values)"
 msgstr ""
 
@@ -674,6 +759,11 @@ msgstr ""
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
+#: src/conversation/conversation_api.c:681
+#, fuzzy
+msgid "number too large"
+msgstr "antal iterationer"
+
 #: src/conversation/gnunet-conversation.c:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
@@ -1092,19 +1182,19 @@ msgstr "\"%s\" %s misslyckades: %s\n"
 msgid "Failed to allocate %d bytes for second packet\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/conversation/gnunet-service-conversation.c:841
-msgid "Mesh audio channel not ready; audio data dropped\n"
+#: src/conversation/gnunet-service-conversation.c:852
+msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:932
+#: src/conversation/gnunet-service-conversation.c:943
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1338
+#: src/conversation/gnunet-service-conversation.c:1349
 #, fuzzy, c-format
-msgid "Received incoming channel on port %u\n"
+msgid "Received incoming Cadet channel on port %u\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
 #: src/conversation/microphone.c:121
@@ -1122,214 +1212,241 @@ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 msgid "Could not start playback audio helper.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/core/core_api.c:767
+#: src/core/core_api.c:768
 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 "Jag är ändpunkt \"%s\".\n"
+#: src/core/gnunet-core.c:92
+#, fuzzy
+msgid "fresh connection"
+msgstr "# av anslutna parter"
 
-#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:910 src/transport/gnunet-transport.c:930
-#, 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:911
+#: src/core/gnunet-core.c:98
 #, fuzzy
-msgid "Connected to"
-msgstr "\"%s\" ansluten till \"%s\".\n"
+msgid "key received"
+msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:931
+#: src/core/gnunet-core.c:101
 #, fuzzy
-msgid "Disconnected from"
+msgid "connection established"
+msgstr "Samling stoppad.\n"
+
+#: src/core/gnunet-core.c:104
+msgid "rekeying"
+msgstr ""
+
+#: src/core/gnunet-core.c:107
+#, fuzzy
+msgid "disconnected"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:211 src/peerinfo-tool/gnunet-peerinfo.c:694
+#: 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 "Okänt fel"
+
+#: 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:705
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/core/gnunet-core.c:233 src/transport/gnunet-transport.c:1486
+#: src/core/gnunet-core.c:157
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:1590
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-core.c:244
+#: src/core/gnunet-core.c:188
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: 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:372
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:480
+#: src/core/gnunet-service-core_clients.c:483
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_clients.c:526
+#: src/core/gnunet-service-core_clients.c:529
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:535
+#: src/core/gnunet-service-core_kx.c:549
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core_kx.c:586
+#: src/core/gnunet-service-core_kx.c:601
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:688
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:713
+#: src/core/gnunet-service-core_kx.c:732
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:810
+#: src/core/gnunet-service-core_kx.c:832
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:816
+#: src/core/gnunet-service-core_kx.c:839
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:850
+#: src/core/gnunet-service-core_kx.c:873
 #, 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:861
+#: src/core/gnunet-service-core_kx.c:884
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:951
+#: src/core/gnunet-service-core_kx.c:983
 #: src/transport/gnunet-service-transport_validation.c:1016
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:959
+#: src/core/gnunet-service-core_kx.c:991
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:986
+#: src/core/gnunet-service-core_kx.c:1018
 #, 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:1003
+#: src/core/gnunet-service-core_kx.c:1035
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1061
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1072
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1096
+#: src/core/gnunet-service-core_kx.c:1139
 #: src/transport/gnunet-service-transport_validation.c:1328
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1102
+#: src/core/gnunet-service-core_kx.c:1145
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1107
+#: src/core/gnunet-service-core_kx.c:1150
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1137
+#: src/core/gnunet-service-core_kx.c:1180
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1171
+#: src/core/gnunet-service-core_kx.c:1215
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1181
+#: src/core/gnunet-service-core_kx.c:1226
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1188
+#: src/core/gnunet-service-core_kx.c:1233
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1374
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1335
+#: src/core/gnunet-service-core_kx.c:1381
 #, 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:1338
+#: src/core/gnunet-service-core_kx.c:1384
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1383
-#: src/core/gnunet-service-core_kx.c:1408
+#: src/core/gnunet-service-core_kx.c:1430
+#: src/core/gnunet-service-core_kx.c:1455
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1395
+#: src/core/gnunet-service-core_kx.c:1442
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1437
+#: src/core/gnunet-service-core_kx.c:1484
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1445
+#: src/core/gnunet-service-core_kx.c:1492
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1480
+#: src/core/gnunet-service-core_kx.c:1527
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
@@ -1353,37 +1470,47 @@ msgstr ""
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:216
-#: src/core/gnunet-service-core_sessions.c:288
+#: src/core/gnunet-service-core_sessions.c:245
+#: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: src/dht/gnunet-service-xdht_neighbours.c:3586
 #: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
 #: src/topology/gnunet-daemon-topology.c:707
 #: src/topology/gnunet-daemon-topology.c:808
 #: src/transport/gnunet-service-transport_neighbours.c:917
 #: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3142
-#: src/transport/gnunet-service-transport_neighbours.c:3438
+#: src/transport/gnunet-service-transport_neighbours.c:3146
+#: src/transport/gnunet-service-transport_neighbours.c:3449
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-service-core_sessions.c:255
+#: src/core/gnunet-service-core_sessions.c:278
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:426
+#: src/core/gnunet-service-core_sessions.c:394
+#, fuzzy
+msgid "# outdated typemap confirmations received"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/core/gnunet-service-core_sessions.c:405
+#, fuzzy
+msgid "# valid typemap confirmations received"
+msgstr "Kunde inte spara 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 "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_typemap.c:151
+#: src/core/gnunet-service-core_typemap.c:210
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1443,12 +1570,13 @@ 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/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:50
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:44
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -1500,7 +1628,7 @@ msgstr ""
 msgid "# datastore connections (re)created"
 msgstr "Nätverksanslutning"
 
-#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
+#: src/datastore/datastore_api.c:616
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# klartext PONG-meddelanden mottagna"
@@ -1787,6 +1915,7 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
+#: src/peerstore/plugin_peerstore_sqlite.c:434
 #: src/psycstore/plugin_psycstore_sqlite.c:319
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -1943,102 +2072,102 @@ msgid "# GET requests from clients injected"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:927
+#: src/dht/gnunet-service-xdht_clients.c:925
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:1013
+#: src/dht/gnunet-service-xdht_clients.c:1010
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1214
+#: src/dht/gnunet-service-xdht_clients.c:1211
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-dht_clients.c:1040
 #: src/dht/gnunet-service-xdht_clients.c:498
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1052
+#: src/dht/gnunet-service-dht_clients.c:1053
 #: src/dht/gnunet-service-xdht_clients.c:511
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1089
+#: src/dht/gnunet-service-dht_clients.c:1090
 #: src/dht/gnunet-service-xdht_clients.c:548
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1112
+#: src/dht/gnunet-service-dht_clients.c:1113
 #: src/dht/gnunet-service-xdht_clients.c:571
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1166
-#: src/dht/gnunet-service-dht_clients.c:1209
+#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1210
 #: src/dht/gnunet-service-xdht_clients.c:625
 #: src/dht/gnunet-service-xdht_clients.c:668
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1176
+#: src/dht/gnunet-service-dht_clients.c:1177
 #: src/dht/gnunet-service-xdht_clients.c:635
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:69
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# byte mottagna av typen %d"
 
 #: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:79
 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:213
 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:234
 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:240
 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:246
 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:258
 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:261
 #, 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:298
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
@@ -2064,13 +2193,13 @@ msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:703
+#: src/dht/gnunet-service-xdht_neighbours.c:745
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:742
+#: src/dht/gnunet-service-xdht_neighbours.c:786
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
@@ -2089,87 +2218,91 @@ msgstr ""
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1287
+#: src/dht/gnunet-service-dht_neighbours.c:1289
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1316
+#: src/dht/gnunet-service-dht_neighbours.c:1318
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: 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:794
-#: src/dht/gnunet-service-xdht_neighbours.c:860
-#: src/dht/gnunet-service-xdht_neighbours.c:919
-#: src/dht/gnunet-service-xdht_neighbours.c:981
-#: src/dht/gnunet-service-xdht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1328
+#: src/dht/gnunet-service-dht_neighbours.c:1452
+#: src/dht/gnunet-service-dht_neighbours.c:1557
+#: src/dht/gnunet-service-xdht_neighbours.c:843
+#: src/dht/gnunet-service-xdht_neighbours.c:910
+#: src/dht/gnunet-service-xdht_neighbours.c:980
+#: src/dht/gnunet-service-xdht_neighbours.c:1040
+#: src/dht/gnunet-service-xdht_neighbours.c:1098
+#: src/dht/gnunet-service-xdht_neighbours.c:1157
+#: src/dht/gnunet-service-xdht_neighbours.c:1218
+#: src/dht/gnunet-service-xdht_neighbours.c:1280
+#: src/dht/gnunet-service-xdht_neighbours.c:1341
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1405
+#: src/dht/gnunet-service-dht_neighbours.c:1414
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1432
+#: src/dht/gnunet-service-dht_neighbours.c:1441
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1550
+#: src/dht/gnunet-service-dht_neighbours.c:1564
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1636
+#: src/dht/gnunet-service-dht_neighbours.c:1651
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1639
+#: src/dht/gnunet-service-dht_neighbours.c:1654
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1821
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1829
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1904
+#: src/dht/gnunet-service-dht_neighbours.c:1924
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1907
+#: src/dht/gnunet-service-dht_neighbours.c:1927
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1961
+#: src/dht/gnunet-service-dht_neighbours.c:1984
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1975
+#: src/dht/gnunet-service-dht_neighbours.c:1998
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2052
+#: src/dht/gnunet-service-dht_neighbours.c:2083
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2055
+#: src/dht/gnunet-service-dht_neighbours.c:2086
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2212,24 +2345,6 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1398
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1514
-#: src/dht/gnunet-service-xdht_neighbours.c:1524
-#: src/dht/gnunet-service-xdht_neighbours.c:1530
-#: src/dht/gnunet-service-xdht_neighbours.c:1536
-#: src/dht/gnunet-service-xdht_neighbours.c:1545
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d"
-msgstr ""
-
 #: src/dht/plugin_block_dht.c:138
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -2341,12 +2456,12 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3514
+#: 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:3571
+#: 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 "Ogiltigt svar på \"%s\".\n"
@@ -2367,7 +2482,7 @@ msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy
-msgid "# Bytes transmitted via mesh channels"
+msgid "# Bytes transmitted via cadet channels"
 msgstr "# byte skickade av typen %d"
 
 #: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
@@ -2433,15 +2548,16 @@ msgid "# TCP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
 #: src/exit/gnunet-daemon-exit.c:1872
-msgid "# TCP service creation requests received via mesh"
-msgstr ""
+#, fuzzy
+msgid "# TCP service creation requests received via cadet"
+msgstr "# byte mottogs via TCP"
 
 #: 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 "# byte mottagna via HTTP"
 
 #: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
@@ -2456,12 +2572,12 @@ msgstr "# byte mottogs via TCP"
 
 #: 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 "# byte mottogs via TCP"
 
 #: src/exit/gnunet-daemon-exit.c:2076
 #, fuzzy
-msgid "# TCP data requests received via mesh"
+msgid "# TCP data requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
 #: src/exit/gnunet-daemon-exit.c:2090
@@ -2476,12 +2592,12 @@ msgstr "# byte skickade via UDP"
 
 #: 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 "# byte mottogs via TCP"
 
 #: src/exit/gnunet-daemon-exit.c:2573
 #, fuzzy
-msgid "# ICMP service requests received via mesh"
+msgid "# ICMP service requests received via cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397
@@ -2501,12 +2617,12 @@ msgstr "# byte skickade via UDP"
 
 #: 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 "# byte mottogs via TCP"
 
 #: src/exit/gnunet-daemon-exit.c:2969
 #, fuzzy
-msgid "# UDP service requests received via mesh"
+msgid "# UDP service requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
 #: src/exit/gnunet-daemon-exit.c:2995
@@ -2516,68 +2632,73 @@ msgstr "# byte mottogs via TCP"
 
 #: src/exit/gnunet-daemon-exit.c:3031
 #, fuzzy
-msgid "# Inbound MESH channels created"
+msgid "# Inbound CADET channels created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#: 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: flagga \"%s\" är tvetydig\n"
 
-#: src/exit/gnunet-daemon-exit.c:3259 src/exit/gnunet-daemon-exit.c:3267
+#: 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:3300
+#: 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:3314 src/exit/gnunet-daemon-exit.c:3326
+#: 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:3337
+#: 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:3527
+#: 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:3535
+#: 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:3542
+#: 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:3548
+#: 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:3554 src/exit/gnunet-daemon-exit.c:3717
+#: 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:3664
+#: src/exit/gnunet-daemon-exit.c:3689
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3813
+#: src/exit/gnunet-daemon-exit.c:3838
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2687,11 +2808,6 @@ msgstr "\"%s\" ansluten till \"%s\".\n"
 msgid "Disconnected from peer %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
-#, fuzzy
-msgid "Failed to connect to CORE service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
 #: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
 #, c-format
 msgid "Peer `%s' did not respond to request for experiment `%s'\n"
@@ -3019,12 +3135,12 @@ msgstr "Kunde inte ansluta till gnunetd.\n"
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_search.c:813
+#: src/fs/fs_search.c:751 src/fs/fs_search.c:817
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/fs_search.c:872
+#: src/fs/fs_search.c:876
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3086,79 +3202,101 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_uri.c: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 "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:281
+#: src/fs/fs_uri.c:283
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:299
-msgid "`++' not allowed in KSK URI"
+#: src/fs/fs_uri.c:301
+#, fuzzy
+msgid "Malformed KSK URI (`++' not allowed)"
+msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
+
+#: src/fs/fs_uri.c:308
+#, fuzzy
+msgid "Malformed KSK URI (quotes not balanced)"
+msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
+
+#: src/fs/fs_uri.c:379
+msgid "Malformed SKS URI (wrong syntax)"
+msgstr ""
+
+#: src/fs/fs_uri.c:423
+msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:306
-msgid "Quotes not balanced in KSK URI"
+#: src/fs/fs_uri.c:438
+msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:376
-msgid "Malformed SKS URI"
+#: src/fs/fs_uri.c:517
+msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
-msgid "Malformed CHK URI"
+#: src/fs/fs_uri.c:532
+msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:512 src/fs/fs_uri.c:580
-msgid "SKS URI malformed"
+#: src/fs/fs_uri.c:542
+msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:527 src/fs/fs_uri.c:537
-msgid "LOC URI malformed"
+#: src/fs/fs_uri.c:550
+msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545 src/fs/fs_uri.c:553
+#: src/fs/fs_uri.c:558
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:559
-msgid "SKS URI malformed (could not find signature)"
+#: src/fs/fs_uri.c:564
+msgid "LOC URI malformed (could not find signature)"
+msgstr ""
+
+#: src/fs/fs_uri.c:570
+msgid "LOC URI malformed (wrong syntax for signature)"
+msgstr ""
+
+#: src/fs/fs_uri.c:579
+msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:565 src/fs/fs_uri.c:574
-msgid "SKS URI malformed (could not decode signature)"
+#: src/fs/fs_uri.c:585
+msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/fs/fs_uri.c:591
+msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
-msgid "SKS URI malformed (signature failed validation)"
+#: src/fs/fs_uri.c:603
+msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
+#: src/fs/fs_uri.c:642
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:860
+#: src/fs/fs_uri.c:866
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/fs_uri.c:866
+#: src/fs/fs_uri.c:872
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/fs/fs_uri.c:1050 src/fs/fs_uri.c:1077
+#: src/fs/fs_uri.c:1057 src/fs/fs_uri.c:1084
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1083
+#: src/fs/fs_uri.c:1090
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3491,8 +3629,8 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1284 src/transport/gnunet-transport.c:1314
-#: src/transport/gnunet-transport.c:1344
+#: src/transport/gnunet-transport.c:1387 src/transport/gnunet-transport.c:1417
+#: src/transport/gnunet-transport.c:1447
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -3586,21 +3724,57 @@ msgstr ""
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:271
+#: src/fs/gnunet-service-fs.c:277
 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:332 src/fs/gnunet-service-fs.c:545
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1254
-#: src/topology/gnunet-daemon-topology.c:1261
+#: src/fs/gnunet-service-fs.c:645 src/hostlist/gnunet-daemon-hostlist.c:303
+#: src/topology/gnunet-daemon-topology.c:1260
+#: src/topology/gnunet-daemon-topology.c:1267
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
+#: src/fs/gnunet-service-fs_cadet_client.c:484
+#, fuzzy
+msgid "# replies received via cadet"
+msgstr "# byte mottagna av typen %d"
+
+#: src/fs/gnunet-service-fs_cadet_client.c:498
+#, fuzzy
+msgid "# replies received via cadet dropped"
+msgstr "# byte mottagna av typen %d"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:260
+#, fuzzy
+msgid "# Blocks transferred via cadet"
+msgstr "# byte skickade av typen %d"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:352
+#, fuzzy
+msgid "# queries received via cadet not answered"
+msgstr "# byte mottogs via TCP"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:432
+#, fuzzy
+msgid "# queries received via cadet"
+msgstr "# byte mottogs via TCP"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:476
+#, fuzzy
+msgid "# cadet client connections rejected"
+msgstr "Nätverksanslutning"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:482
+#: src/fs/gnunet-service-fs_cadet_server.c:522
+#, fuzzy
+msgid "# cadet connections active"
+msgstr "Nätverksanslutning"
+
 #: src/fs/gnunet-service-fs_cp.c:682
 #, fuzzy
 msgid "# migration stop messages received"
@@ -3754,42 +3928,6 @@ msgstr "# klartext PONG-meddelanden mottagna"
 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 "# byte mottagna av typen %d"
-
-#: src/fs/gnunet-service-fs_mesh_client.c:498
-#, fuzzy
-msgid "# replies received via mesh dropped"
-msgstr "# byte mottagna av typen %d"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:260
-#, fuzzy
-msgid "# Blocks transferred via mesh"
-msgstr "# byte skickade av typen %d"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:352
-#, fuzzy
-msgid "# queries received via mesh not answered"
-msgstr "# byte mottogs via TCP"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:432
-#, fuzzy
-msgid "# queries received via mesh"
-msgstr "# byte mottogs via TCP"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:476
-#, fuzzy
-msgid "# mesh client connections rejected"
-msgstr "Nätverksanslutning"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:482
-#: src/fs/gnunet-service-fs_mesh_server.c:522
-#, fuzzy
-msgid "# mesh connections active"
-msgstr "Nätverksanslutning"
-
 #: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""
@@ -3874,7 +4012,7 @@ msgstr "# byte mottagna via HTTP"
 
 #: src/fs/gnunet-service-fs_pr.c:1192
 #, fuzzy
-msgid "# Replies received from MESH"
+msgid "# Replies received from CADET"
 msgstr "# byte mottagna via HTTP"
 
 #: src/fs/gnunet-service-fs_pr.c:1244
@@ -3982,7 +4120,7 @@ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:695
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
@@ -4140,13 +4278,17 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: 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:1062
-#: src/transport/plugin_transport_http_client.c:1077
+#: 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:1095
+#: src/transport/plugin_transport_http_client.c:1110
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -4290,36 +4432,36 @@ msgstr ""
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:816
+#: src/gns/gnunet-service-gns_resolver.c:832
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:958
+#: src/gns/gnunet-service-gns_resolver.c:974
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1317
+#: src/gns/gnunet-service-gns_resolver.c:1333
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1817
+#: src/gns/gnunet-service-gns_resolver.c:1831
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1841
+#: src/gns/gnunet-service-gns_resolver.c:1855
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2123
+#: src/gns/gnunet-service-gns_resolver.c:2137
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2272
+#: src/gns/gnunet-service-gns_resolver.c:2286
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4438,304 +4580,328 @@ msgstr "Fel vid skapandet av användare"
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:944
+#: src/hello/hello.c:957
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:953
+#: src/hello/hello.c:966
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:963
+#: src/hello/hello.c:976
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hello/hello.c:973
+#: src/hello/hello.c:986
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hello/hello.c:990
+#: src/hello/hello.c:1004
 #, c-format
-msgid "Plugin `%s' not found\n"
+msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:999
+#: src/hello/hello.c:1012
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1018
+#: src/hello/hello.c:1031
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:259
+#: src/hello/hello.c:1104
+#, 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:323
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
+#: src/hostlist/gnunet-daemon-hostlist.c:328
 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:331
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:335
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:350
 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
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: 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 "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/gnunet-daemon-hostlist_client.c:385
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: 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:1401
 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 "Misslyckades att läsa kompislista från \"%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 ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\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 ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\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:1646
 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 "Nätverksanslutning"
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1347
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1285
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1352
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/hostlist-client.c:1296
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1361
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1395
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
 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 "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1474
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, 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:1486
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1471
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1581
+#: src/transport/plugin_transport_http_client.c:1866
+#, c-format
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1611
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1623
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1495
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1499
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:137
+#: src/hostlist/gnunet-daemon-hostlist_server.c:143
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# byte krypterade"
 
-#: src/hostlist/hostlist-server.c:161
+#: src/hostlist/gnunet-daemon-hostlist_server.c:168
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:350
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
-#: src/peerinfo-tool/gnunet-peerinfo.c:490
+#: src/hostlist/gnunet-daemon-hostlist_server.c:203
+#: src/hostlist/gnunet-daemon-hostlist_server.c:534
+#: src/peerinfo-tool/gnunet-peerinfo.c:361
+#: src/peerinfo-tool/gnunet-peerinfo.c:430
+#: src/peerinfo-tool/gnunet-peerinfo.c:501
 #: src/topology/gnunet-daemon-topology.c:925
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/hostlist/hostlist-server.c:210
+#: src/hostlist/gnunet-daemon-hostlist_server.c:227
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/gnunet-daemon-hostlist_server.c:243
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:268
+#: src/hostlist/gnunet-daemon-hostlist_server.c:363
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:271
+#: src/hostlist/gnunet-daemon-hostlist_server.c:366
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 #, 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:384
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:296
+#: src/hostlist/gnunet-daemon-hostlist_server.c:391
 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:394
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:303
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:304
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:346
+#: src/hostlist/gnunet-daemon-hostlist_server.c:448
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:390
+#: src/hostlist/gnunet-daemon-hostlist_server.c:496
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
-#: src/transport/gnunet-service-transport.c:1114
+#: src/hostlist/gnunet-daemon-hostlist_server.c:683
+#: src/peerinfo-tool/gnunet-peerinfo.c:650
+#: src/transport/gnunet-service-transport.c:1136
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/hostlist/hostlist-server.c:576
+#: src/hostlist/gnunet-daemon-hostlist_server.c:707
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:590
+#: src/hostlist/gnunet-daemon-hostlist_server.c:722
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-server.c:630
+#: src/hostlist/gnunet-daemon-hostlist_server.c:760
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:780
 #, 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\" är inte tillgänglig."
 
-#: src/hostlist/hostlist-server.c:673
+#: src/hostlist/gnunet-daemon-hostlist_server.c:820
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4827,57 +4993,6 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/mesh/gnunet-mesh.c:357
-#, fuzzy, c-format
-msgid "Invalid target `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/mesh/gnunet-mesh.c:607
-#, fuzzy, c-format
-msgid "Invalid peer ID `%s'\n"
-msgstr "Ogiltiga argument: "
-
-#: src/mesh/gnunet-mesh.c:650
-#, fuzzy, c-format
-msgid "Invalid tunnel owner `%s'\n"
-msgstr "Ogiltigt format för IP: \"%s\"\n"
-
-#: src/mesh/gnunet-mesh.c:716
-msgid "You must NOT give a TARGETwhen using 'request all' options\n"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:807
-#, fuzzy
-msgid "provide information about a particular connection"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/mesh/gnunet-mesh.c:810
-msgid "activate echo mode"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:816
-msgid "port to listen to (default; 0)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:819 src/mesh/gnunet-mesh.c:822
-#, fuzzy
-msgid "provide information about all peers"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/mesh/gnunet-mesh.c:825
-#, fuzzy
-msgid "provide information about a particular tunnel"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/mesh/gnunet-mesh.c:828
-#, fuzzy
-msgid "provide information about all tunnels"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/mesh/gnunet-service-mesh_peer.c:390
-msgid "Wrong CORE service\n"
-msgstr ""
-
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -4893,7 +5008,7 @@ msgstr "Kunde inte köra \"%s\": %s\n"
 msgid "No records found for `%s'"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:402
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4903,7 +5018,7 @@ msgstr ""
 msgid "You must specify which zone should be accessed\n"
 msgstr "anger vilken TRANSPORT som ska testas"
 
-#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:783
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
@@ -4913,7 +5028,7 @@ msgstr "Ogiltigt argument: \"%s\"\n"
 msgid "You must specify a name\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1020
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4922,7 +5037,7 @@ msgstr ""
 msgid "spezifies the public key of the zone to look in"
 msgstr "ange prioritet för innehållet"
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1055
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -4937,155 +5052,170 @@ msgstr ""
 msgid "Failed to create indices\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namestore/gnunet-namestore.c:303
+#: src/namestore/gnunet-namestore.c:308
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:332
+#: src/namestore/gnunet-namestore.c:337
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:339
+#: src/namestore/gnunet-namestore.c:344
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:558
+#: src/namestore/gnunet-namestore.c:567
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:606
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:647
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:569
+#: src/namestore/gnunet-namestore.c:658
 #: src/namestore/gnunet-namestore-fcfsd.c:970
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:577 src/namestore/gnunet-namestore.c:586
-#: src/namestore/gnunet-namestore.c:603 src/namestore/gnunet-namestore.c:625
-#: src/namestore/gnunet-namestore.c:665
+#: src/namestore/gnunet-namestore.c:666 src/namestore/gnunet-namestore.c:675
+#: src/namestore/gnunet-namestore.c:692 src/namestore/gnunet-namestore.c:714
+#: src/namestore/gnunet-namestore.c:754
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
-#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
+#: src/namestore/gnunet-namestore.c:667 src/namestore/gnunet-namestore.c:676
+#: src/namestore/gnunet-namestore.c:693 src/namestore/gnunet-namestore.c:715
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:684
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:615
+#: src/namestore/gnunet-namestore.c:704
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
 
-#: src/namestore/gnunet-namestore.c:651
+#: src/namestore/gnunet-namestore.c:740
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:666
+#: src/namestore/gnunet-namestore.c:755
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:723
+#: src/namestore/gnunet-namestore.c:803
+#: src/peerinfo-tool/gnunet-peerinfo.c:734
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:750
+#: src/namestore/gnunet-namestore.c:838
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:790
+#: src/namestore/gnunet-namestore.c:878
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:817
+#: src/namestore/gnunet-namestore.c:905
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:853
+#: src/namestore/gnunet-namestore.c:941
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/namestore/gnunet-namestore.c:865
+#: src/namestore/gnunet-namestore.c:953
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:1002
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1005
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:1008
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:922
+#: src/namestore/gnunet-namestore.c:1011
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:925
+#: src/namestore/gnunet-namestore.c:1014
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:928
+#: src/namestore/gnunet-namestore.c:1017
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:1023
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:1026
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:1029
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:1032
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:1035
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:949
+#: src/namestore/gnunet-namestore.c:1038
+msgid "create record that is pending approval (and thus for now inactive)"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1041
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:952
+#: src/namestore/gnunet-namestore.c:1044
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
@@ -5168,59 +5298,63 @@ msgstr ""
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:170
+#: src/nat/nat_auto.c:175
 msgid "NAT traversal with ICMP Server timed out.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:203
+#: src/nat/nat_auto.c:207
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:204
+#: src/nat/nat_auto.c:208
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:225
+#: src/nat/nat_auto.c:229
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/nat/nat_auto.c:274
+#: src/nat/nat_auto.c:284
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Mottog ogiltig RPC \"%s\".\n"
 
-#: src/nat/nat_auto.c:344
+#: src/nat/nat_auto.c:362
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:360
+#: src/nat/nat_auto.c:378
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:413
+#: src/nat/nat_auto.c:441
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:414
+#: src/nat/nat_auto.c:442
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat_auto.c:447
-msgid "gnunet-helper-nat-server found, testing it\n"
+#: src/nat/nat_auto.c:472
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:480
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:448
+#: src/nat/nat_auto.c:488
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:482
+#: src/nat/nat_auto.c:527
 msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:483
+#: src/nat/nat_auto.c:528
 msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
@@ -5234,60 +5368,49 @@ msgstr ""
 msgid "Failed to start %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1205
+#: 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 "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/nat/nat.c:1243
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1288
+#: 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:1426
+#: src/nat/nat.c:1474
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1442
+#: src/nat/nat.c:1490
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:155
-msgid "no valid address was returned by `external-ip'"
-msgstr ""
-
-#: src/nat/nat_mini.c:175
-msgid "`external-ip' command not found"
-msgstr ""
-
-#: src/nat/nat_mini.c:201
+#: src/nat/nat_mini.c:203
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:366
-#, fuzzy
-msgid "Failed to run `upnpc` command"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/nat/nat_mini.c:512
-msgid "`upnpc' command took too long, process killed"
-msgstr ""
-
-#: src/nat/nat_mini.c:540
-msgid "`upnpc' command failed to establish port mapping"
-msgstr ""
-
-#: src/nat/nat_mini.c:604
+#: src/nat/nat_mini.c:609
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:608
-#, fuzzy
-msgid "`upnpc` command not found"
-msgstr "Kommando \"%s\" hittades inte!\n"
-
 #: src/nat/nat_test.c:351
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
@@ -5298,6 +5421,11 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
+#: src/nat/nat_test.c:453
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "Misslyckades att starta samling.\n"
+
 #: src/nse/gnunet-nse.c:117
 #, fuzzy
 msgid "NSE service is not running\n"
@@ -5401,7 +5529,7 @@ msgstr ""
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:356
+#: src/peerinfo/peerinfo_api.c:356 src/sensor/sensor_api.c:519
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
@@ -5428,89 +5556,94 @@ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 msgid "Could not connect to `%s' service.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:232
+#: src/peerinfo-tool/gnunet-peerinfo.c:233
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:282
+#, fuzzy, c-format
+msgid "Failure: Cannot convert address to string for peer `%s'\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:439
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:436
+#: src/peerinfo-tool/gnunet-peerinfo.c:447
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:456
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:469
 #, 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:533
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:633
+#: src/peerinfo-tool/gnunet-peerinfo.c:644
 #, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:665 src/util/gnunet-scrypt.c:224
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:745
+#: src/peerinfo-tool/gnunet-peerinfo.c:756
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:800
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:803
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:806
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:809
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:801
+#: src/peerinfo-tool/gnunet-peerinfo.c:812
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:804
+#: src/peerinfo-tool/gnunet-peerinfo.c:815
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:807
+#: src/peerinfo-tool/gnunet-peerinfo.c:818
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:810
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:832
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -5533,6 +5666,36 @@ msgstr "Testar transport(er) %s\n"
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
+#: src/peerstore/gnunet-peerstore.c:97
+msgid "peerstore"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:486
+#, fuzzy
+msgid "Error communicating with `PEERSTORE' service."
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/peerstore/peerstore_api.c:503
+#, fuzzy
+msgid "Received a malformed response from service."
+msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:352
+#: src/psycstore/plugin_psycstore_sqlite.c:276
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/psycstore/plugin_psycstore_sqlite.c:253
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "Fel vid skapandet av användare"
+
 #: src/postgres/postgres.c:59
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
@@ -5630,20 +5793,6 @@ msgstr "Kunde inte skapa värdnyckel!\n"
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:253
-#, fuzzy, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
-msgstr "Fel vid skapandet av användare"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:276
-#, fuzzy, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
-msgstr "Fel vid skapandet av användare"
-
 #: src/psycstore/plugin_psycstore_sqlite.c:1796
 msgid "SQLite database running\n"
 msgstr ""
@@ -5683,7 +5832,7 @@ msgstr "# byte mottogs via TCP"
 
 #: 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 "# byte mottogs via TCP"
 
 #: src/pt/gnunet-daemon-pt.c:896
@@ -5719,7 +5868,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
@@ -5925,249 +6074,317 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:225
+#: src/scalarproduct/gnunet-scalarproduct.c:224
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:232
+#: src/scalarproduct/gnunet-scalarproduct.c:231
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:239
+#: src/scalarproduct/gnunet-scalarproduct.c:238
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:251
+#: src/scalarproduct/gnunet-scalarproduct.c:250
 #, 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:278
-#: src/scalarproduct/gnunet-scalarproduct.c:314
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int32_t.\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:286
+#: src/scalarproduct/gnunet-scalarproduct.c:261
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:346
+#: src/scalarproduct/gnunet-scalarproduct.c:283
+#, fuzzy, c-format
+msgid "Malformed input, could not parse `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:296
 #, fuzzy, c-format
-msgid "Could not convert `%s' to integer.\n"
+msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:407
+#: src/scalarproduct/gnunet-scalarproduct.c:345
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:410
-msgid ""
-"A comma separated mask to select which elements should actually be compared."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:413
+#: src/scalarproduct/gnunet-scalarproduct.c:348
 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:416
+#: src/scalarproduct/gnunet-scalarproduct.c:351
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:425
+#: src/scalarproduct/gnunet-scalarproduct.c:360
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:541
+#: src/scalarproduct/gnunet-service-scalarproduct.c:678
 #, fuzzy, c-format
-msgid "Client (%p) disconnected from us.\n"
+msgid "Client %p disconnected from us.\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:613
-#: src/scalarproduct/gnunet-service-scalarproduct.c:702
+#: src/scalarproduct/gnunet-service-scalarproduct.c:748
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:619
+#: src/scalarproduct/gnunet-service-scalarproduct.c:759
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:712
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:766
-#: src/scalarproduct/gnunet-service-scalarproduct.c:855
-msgid "Could not send service-response message via mesh!)\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1028
-#, c-format
-msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
-msgstr ""
+#: src/scalarproduct/gnunet-service-scalarproduct.c:781
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1459
+#, fuzzy, c-format
+msgid "Successfully created new channel to peer (%s)!\n"
+msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1099
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1208
+#: src/scalarproduct/gnunet-service-scalarproduct.c:818
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1469
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1539
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1108
+#: src/scalarproduct/gnunet-service-scalarproduct.c:830
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
 #, fuzzy
-msgid "Could not send service-request multipart message to channel!\n"
+msgid "Could not send message to channel!\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1147
-#, fuzzy, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
-msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1217
+#: src/scalarproduct/gnunet-service-scalarproduct.c:891
+#: src/scalarproduct/gnunet-service-scalarproduct.c:991
 #, fuzzy
-msgid "Could not send message to channel!\n"
+msgid "Could not send service-response message via cadet!)\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1274
-#, fuzzy
-msgid "Too short message received from client!\n"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1442
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1287
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1550
 #, fuzzy
-msgid "Invalid message received from client, session information incorrect!\n"
-msgstr "Ogiltigt meddelande mottogs den %s:%d."
+msgid "Could not send service-request multipart message to channel!\n"
+msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1298
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1579
 #, c-format
 msgid ""
-"Duplicate session information received, cannot create new session with key `"
-"%s'\n"
+"Got client-responder-session with key %s and a matching service-request-"
+"session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1318
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1601
 #, c-format
 msgid ""
-"Got client-request-session with key %s, preparing channel to remote "
-"service.\n"
+"Got client-responder-session with key %s but NO matching service-request-"
+"session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1354
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1618
 #, c-format
 msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1399
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1777
 #, c-format
 msgid ""
-"Got client-responder-session with key %s and a matching service-request-"
-"session set, processing.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1409
-#, c-format
-msgid ""
-"Got client-responder-session with key %s but NO matching service-request-"
-"session set, queuing element for later use.\n"
+"Duplicate session information received, can not create new session with key `"
+"%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1439
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1862
 #, fuzzy, c-format
 msgid "New incoming channel from peer %s.\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1471
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1672
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1814
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2270
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1681
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1821
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2297
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1771
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2318
 #, c-format
-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
+msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2014
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2565
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2659
 #, fuzzy
-msgid "Connect to MESH failed\n"
+msgid "Connect to CADET failed\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2104
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2664
 #, fuzzy
-msgid "Mesh initialized\n"
+msgid "CADET initialized\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/scalarproduct/scalarproduct_api.c:246
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+msgid "dkg start delay"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg timeout"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+msgid "threshold"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "also profile decryption"
+msgstr ""
+
+#: src/sensor/gnunet-sensor.c:148
 #, fuzzy
-msgid "# SUC responder result messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "Retrieve information about all defined sensors"
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/scalarproduct/scalarproduct_api.c:300
+#: src/sensor/gnunet-sensor.c:151
 #, fuzzy
-msgid "# bytes sent to scalarproduct"
-msgstr "# byte krypterade"
+msgid "Retrieve information about a single sensor"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/sensor/gnunet-sensor.c:160
+msgid "sensor"
+msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:345
-#: src/scalarproduct/scalarproduct_api.c:440
+#: src/sensor/gnunet-service-sensor.c:367
 #, fuzzy
-msgid "Failed to connect to the scalarproduct service\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "Error reading sensor version\n"
+msgstr "Fel vid skapandet av användare"
 
-#: src/scalarproduct/scalarproduct_api.c:353
-#: src/scalarproduct/scalarproduct_api.c:448
+#: src/sensor/gnunet-service-sensor.c:373
+msgid "Invalid sensor version number, format should be major.minor\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:385
 #, fuzzy
-msgid "Failed to send a message to the statistics service\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "Error reading sensor category\n"
+msgstr "Fel vid skapandet av användare"
 
-#: src/scalarproduct/scalarproduct_api.c:387
-#: src/scalarproduct/scalarproduct_api.c:485
+#: src/sensor/gnunet-service-sensor.c:413
 #, fuzzy
-msgid "Failed to send a message to the scalarproduct service\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "Error reading sensor run interval\n"
+msgstr "Klar med skapandet av värdnyckel.\n"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:538
-msgid "dkg start delay"
+#: src/sensor/gnunet-service-sensor.c:419
+#, c-format
+msgid "Sensor run interval too low (%<PRIu64> < %d)\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:541
-msgid "dkg timeout"
+#: src/sensor/gnunet-service-sensor.c:436
+#, fuzzy
+msgid "Error reading sensor source\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/sensor/gnunet-service-sensor.c:445
+msgid "Error reading sensor gnunet-statistics source information\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:544
-msgid "threshold"
+#: src/sensor/gnunet-service-sensor.c:455
+#, fuzzy
+msgid "Error reading sensor process name\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/sensor/gnunet-service-sensor.c:464
+msgid "Error reading sensor expected datatype\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:547
-msgid "also profile decryption"
+#: src/sensor/gnunet-service-sensor.c:470
+msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:498
+#, fuzzy, c-format
+msgid "Failed to access sensor file: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/sensor/gnunet-service-sensor.c:506
+#, fuzzy, c-format
+msgid "Failed to load sensor definition: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/sensor/gnunet-service-sensor.c:559
+#, c-format
+msgid "Sensor `%s' already exists with same or newer version\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:566
+#, c-format
+msgid "Upgrading sensor `%s' to a newer version\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:571
+#, c-format
+msgid ""
+"Error adding new sensor `%s' to global hashmap, this should not happen\n"
 msgstr ""
 
+#: src/sensor/gnunet-service-sensor.c:595
+#, fuzzy, c-format
+msgid "Error loading sensor from file: %s\n"
+msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
+
+#: src/sensor/gnunet-service-sensor.c:599
+#, c-format
+msgid "Sensor `%s' added to global hashmap\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:635
+#, fuzzy, c-format
+msgid "Reloading sensor definitions from directory `%s'\n"
+msgstr "Ladda ner filer från GNUnet."
+
+#: src/sensor/gnunet-service-sensor.c:640
+#, fuzzy, c-format
+msgid "Loaded %d sensors from directory `%s'\n"
+msgstr "Ladda ner filer från GNUnet."
+
+#: src/sensor/sensor_api.c:345
+#, fuzzy
+msgid "Timeout transmitting iteration request to `SENSOR' service."
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/sensor/sensor_api.c:388
+#, fuzzy
+msgid "Failed to receive response from `SENSOR' service."
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#: src/sensor/sensor_api.c:431
+#, fuzzy
+msgid "Received invalid message from `SENSOR' service."
+msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
+
 #: src/set/gnunet-service-set.c:1431
 #, fuzzy
-msgid "Could not connect to mesh service\n"
+msgid "Could not connect to cadet service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
 #: src/set/gnunet-set-ibf-profiler.c:221
@@ -6368,7 +6585,7 @@ msgid ""
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:325
+#: src/testbed/gnunet-daemon-latency-logger.c:331
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6729,8 +6946,8 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1290
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/topology/gnunet-daemon-topology.c:1296
+msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:271
@@ -6763,19 +6980,19 @@ msgstr "# byte krypterade"
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:686
+#: src/transport/gnunet-service-transport.c:708
 #, fuzzy, c-format
 msgid "Could not obtain a valid network for `%s' %s (%s)\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport.c:733
+#: src/transport/gnunet-service-transport.c:755
 #, 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:1084
+#: src/transport/gnunet-service-transport.c:1106
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
@@ -6828,7 +7045,7 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "Received a request disconnect message for peer `%s'\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_hello.c:181
+#: src/transport/gnunet-service-transport_hello.c:182
 msgid "# refreshed my HELLO"
 msgstr ""
 
@@ -6838,7 +7055,7 @@ msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1220
-#: src/transport/gnunet-service-transport_neighbours.c:1629
+#: src/transport/gnunet-service-transport_neighbours.c:1635
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
@@ -6852,185 +7069,185 @@ msgstr "# byte skickade av typen %d"
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1287
+#: src/transport/gnunet-service-transport_neighbours.c:1288
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1343
+#: src/transport/gnunet-service-transport_neighbours.c:1349
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1376
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1384
+#: src/transport/gnunet-service-transport_neighbours.c:1390
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1431
+#: src/transport/gnunet-service-transport_neighbours.c:1437
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1440
+#: src/transport/gnunet-service-transport_neighbours.c:1446
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1448
+#: src/transport/gnunet-service-transport_neighbours.c:1454
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1456
+#: src/transport/gnunet-service-transport_neighbours.c:1462
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1534
+#: src/transport/gnunet-service-transport_neighbours.c:1540
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1568
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1584
+#: src/transport/gnunet-service-transport_neighbours.c:1590
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1678
+#: src/transport/gnunet-service-transport_neighbours.c:1685
 #, fuzzy, c-format
 msgid ""
 "Failed to send CONNECT message to peer `%s' using address `%s' session %p\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1705
+#: src/transport/gnunet-service-transport_neighbours.c:1712
 msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1751
+#: src/transport/gnunet-service-transport_neighbours.c:1757
 #, fuzzy
 msgid "# SESSION_CONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1767
+#: src/transport/gnunet-service-transport_neighbours.c:1773
 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT message via plugin to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1794
+#: src/transport/gnunet-service-transport_neighbours.c:1800
 msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1844
+#: src/transport/gnunet-service-transport_neighbours.c:1849
 #, c-format
 msgid ""
 "Failed to send CONNECT_ACK message to peer `%s' using address `%s' session "
 "%p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1899
+#: src/transport/gnunet-service-transport_neighbours.c:1904
 #, fuzzy
 msgid "# CONNECT_ACK messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1914
+#: src/transport/gnunet-service-transport_neighbours.c:1919
 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2192
+#: src/transport/gnunet-service-transport_neighbours.c:2196
 #, fuzzy, c-format
 msgid "Blacklisting disapproved to connect to peer `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2312
+#: src/transport/gnunet-service-transport_neighbours.c:2316
 #, fuzzy
 msgid "# CONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2317
+#: src/transport/gnunet-service-transport_neighbours.c:2321
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2590
+#: src/transport/gnunet-service-transport_neighbours.c:2594
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3012
+#: src/transport/gnunet-service-transport_neighbours.c:3016
 #, fuzzy
 msgid "# Failed attempts to switch addresses (no response)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
+#: src/transport/gnunet-service-transport_neighbours.c:3111
 #, fuzzy
 msgid "# CONNECT_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3115
+#: src/transport/gnunet-service-transport_neighbours.c:3119
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3129
-#: src/transport/gnunet-service-transport_neighbours.c:3164
+#: src/transport/gnunet-service-transport_neighbours.c:3133
+#: src/transport/gnunet-service-transport_neighbours.c:3168
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3176
+#: src/transport/gnunet-service-transport_neighbours.c:3180
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3200
+#: src/transport/gnunet-service-transport_neighbours.c:3203
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3208
+#: src/transport/gnunet-service-transport_neighbours.c:3211
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3396
+#: src/transport/gnunet-service-transport_neighbours.c:3399
 #, fuzzy
 msgid "# SESSION_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3424
+#: src/transport/gnunet-service-transport_neighbours.c:3435
 #, fuzzy
 msgid "# unexpected SESSION_ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3490
+#: src/transport/gnunet-service-transport_neighbours.c:3509
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3505
+#: src/transport/gnunet-service-transport_neighbours.c:3524
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3545
+#: src/transport/gnunet-service-transport_neighbours.c:3564
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3570
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3560
+#: src/transport/gnunet-service-transport_neighbours.c:3579
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3687
+#: src/transport/gnunet-service-transport_neighbours.c:3706
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -7145,32 +7362,57 @@ msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:367
+#: src/transport/gnunet-transport.c:388
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:375
+#: src/transport/gnunet-transport.c:396
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:415
+#: src/transport/gnunet-transport.c:436
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:449
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/gnunet-transport.c:438
+#: src/transport/gnunet-transport.c:459
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:559
+#: src/transport/gnunet-transport.c:483
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' did not work!\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/transport/gnunet-transport.c:487
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' did work!\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/transport/gnunet-transport.c:491
+#, fuzzy, c-format
+msgid "Internal NAT error while running test for plugin `%s'\n"
+msgstr "=\tFel vid läsning av katalog.\n"
+
+#: src/transport/gnunet-transport.c:495
+#, fuzzy, c-format
+msgid "Failed to start NAT test for plugin `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/transport/gnunet-transport.c:499
+#, c-format
+msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:614
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7179,155 +7421,180 @@ msgid ""
 "\t%s%s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:586
+#: src/transport/gnunet-transport.c:643
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:712
+#: src/transport/gnunet-transport.c:717 src/transport/gnunet-transport.c:1240
+#, fuzzy
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/transport/gnunet-transport.c:784
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:726
+#: src/transport/gnunet-transport.c:798
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:789
+#: src/transport/gnunet-transport.c:823
+#, fuzzy
+msgid "Failed to start resolver!\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/transport/gnunet-transport.c:866
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:888
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:912
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:865
+#: src/transport/gnunet-transport.c:943
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:966
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:950
+#: src/transport/gnunet-transport.c:988 src/transport/gnunet-transport.c:1009
+#, c-format
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:989
+#, fuzzy
+msgid "Connected to"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/transport/gnunet-transport.c:1010
+#, fuzzy
+msgid "Disconnected from"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/transport/gnunet-transport.c:1031
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:975
+#: src/transport/gnunet-transport.c:1061
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:986
+#: src/transport/gnunet-transport.c:1072
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1197 src/transport/gnunet-transport.c:1222
+#: src/transport/gnunet-transport.c:1300 src/transport/gnunet-transport.c:1325
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1266
+#: src/transport/gnunet-transport.c:1369
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1274
+#: src/transport/gnunet-transport.c:1377
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1293 src/transport/gnunet-transport.c:1323
-#: src/transport/gnunet-transport.c:1353 src/transport/gnunet-transport.c:1376
-#: src/transport/gnunet-transport.c:1419
+#: src/transport/gnunet-transport.c:1396 src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport.c:1456 src/transport/gnunet-transport.c:1479
+#: src/transport/gnunet-transport.c:1523
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1302 src/transport/gnunet-transport.c:1332
-#: src/transport/gnunet-transport.c:1362
+#: src/transport/gnunet-transport.c:1405 src/transport/gnunet-transport.c:1435
+#: src/transport/gnunet-transport.c:1465
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1381
+#: src/transport/gnunet-transport.c:1484
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1569
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers )"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1572
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1471
+#: src/transport/gnunet-transport.c:1575
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1474
+#: src/transport/gnunet-transport.c:1578
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1477
+#: src/transport/gnunet-transport.c:1581
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1480
+#: src/transport/gnunet-transport.c:1584
 #, fuzzy
 msgid "print information for all pending validations continously"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1483
+#: src/transport/gnunet-transport.c:1587
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1489
+#: src/transport/gnunet-transport.c:1593
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1491
+#: src/transport/gnunet-transport.c:1595
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1493
+#: src/transport/gnunet-transport.c:1597
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1495
+#: src/transport/gnunet-transport.c:1599
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1498
+#: src/transport/gnunet-transport.c:1602
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1507
+#: src/transport/gnunet-transport.c:1611
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -7399,150 +7666,151 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_bluetooth.c:1723
-msgid "Bluetooth address with invalid size encountered\n"
-msgstr ""
-
 #: src/transport/plugin_transport_bluetooth.c:1923
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1622
+#: src/transport/plugin_transport_http_client.c:1685
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1697
-#: src/transport/plugin_transport_http_server.c:3007
+#: src/transport/plugin_transport_http_client.c:1760
+#: src/transport/plugin_transport_http_server.c:3031
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1722
-#: src/transport/plugin_transport_http_server.c:3063
+#: src/transport/plugin_transport_http_client.c:1785
+#: src/transport/plugin_transport_http_server.c:3088
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/transport/plugin_transport_http_client.c:1750
-#: src/transport/plugin_transport_http_server.c:2907
+#: src/transport/plugin_transport_http_client.c:1819
+#: src/transport/plugin_transport_http_server.c:2931
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/transport/plugin_transport_http_server.c:1402
+#: src/transport/plugin_transport_http_server.c:1423
 #, 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:1663
+#: src/transport/plugin_transport_http_server.c:1687
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1671
+#: src/transport/plugin_transport_http_server.c:1695
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1958
+#: src/transport/plugin_transport_http_server.c:1982
 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:1982
+#: src/transport/plugin_transport_http_server.c:2006
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2405
+#: src/transport/plugin_transport_http_server.c:2429
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/transport/plugin_transport_http_server.c:2437 src/util/service.c:698
+#: src/transport/plugin_transport_http_server.c:2461 src/util/service.c:700
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_http_server.c:2454 src/util/service.c:715
+#: src/transport/plugin_transport_http_server.c:2478 src/util/service.c:719
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/plugin_transport_http_server.c:2565
+#: src/transport/plugin_transport_http_server.c:2589
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2637
+#: src/transport/plugin_transport_http_server.c:2661
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2730
+#: src/transport/plugin_transport_http_server.c:2754
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2744
+#: src/transport/plugin_transport_http_server.c:2768
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2775
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2762
+#: src/transport/plugin_transport_http_server.c:2786
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2769
+#: src/transport/plugin_transport_http_server.c:2793
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2784
+#: src/transport/plugin_transport_http_server.c:2808
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2794
+#: src/transport/plugin_transport_http_server.c:2818
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_http_server.c:2839
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2825
+#: src/transport/plugin_transport_http_server.c:2849
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2877
+#: src/transport/plugin_transport_http_server.c:2901
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2893
+#: src/transport/plugin_transport_http_server.c:2917
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
+#: src/transport/plugin_transport_http_server.c:3177
+#, fuzzy
+msgid "Unable to compile URL regex\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
 #: src/transport/plugin_transport_smtp.c:223
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -7591,91 +7859,91 @@ msgstr "# byte skickades via TCP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:555
+#: src/transport/plugin_transport_tcp.c:565
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:762
-#: src/transport/plugin_transport_tcp.c:928
-#: src/transport/plugin_transport_tcp.c:2005
-#: src/transport/plugin_transport_tcp.c:2558
+#: src/transport/plugin_transport_tcp.c:787
+#: src/transport/plugin_transport_tcp.c:962
+#: src/transport/plugin_transport_tcp.c:2047
+#: src/transport/plugin_transport_tcp.c:2620
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:795
-#: src/transport/plugin_transport_tcp.c:921
-#: src/transport/plugin_transport_tcp.c:1009
-#: src/transport/plugin_transport_tcp.c:1056
-#: src/transport/plugin_transport_tcp.c:1219
-#: src/transport/plugin_transport_tcp.c:1237
+#: src/transport/plugin_transport_tcp.c:823
+#: src/transport/plugin_transport_tcp.c:955
+#: src/transport/plugin_transport_tcp.c:1045
+#: src/transport/plugin_transport_tcp.c:1093
+#: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/plugin_transport_tcp.c:1277
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:798
+#: src/transport/plugin_transport_tcp.c:826
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1012
+#: src/transport/plugin_transport_tcp.c:1048
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1096
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:1193
+#: src/transport/plugin_transport_tcp.c:1233
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1462
+#: src/transport/plugin_transport_tcp.c:1504
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:1609
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2055
+#: src/transport/plugin_transport_tcp.c:2097
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2215
+#: src/transport/plugin_transport_tcp.c:2257
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2279
+#: src/transport/plugin_transport_tcp.c:2321
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2437 src/util/service.c:582
+#: src/transport/plugin_transport_tcp.c:2490 src/util/service.c:582
 #: src/util/service.c:588
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2451
+#: src/transport/plugin_transport_tcp.c:2504
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2547
+#: src/transport/plugin_transport_tcp.c:2607
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2551
+#: src/transport/plugin_transport_tcp.c:2611
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2554
+#: src/transport/plugin_transport_tcp.c:2615
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7745,12 +8013,12 @@ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 msgid "Cannot create path to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1652
+#: src/transport/plugin_transport_unix.c:1645
 #, fuzzy
 msgid "No UNIXPATH given in configuration!\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/transport/plugin_transport_unix.c:1688
+#: src/transport/plugin_transport_unix.c:1681
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -7822,10 +8090,6 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_wlan.c:1729
-msgid "WLAN address with invalid size encountered\n"
-msgstr ""
-
 #: src/transport/plugin_transport_wlan.c:1929
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
@@ -7970,24 +8234,24 @@ msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:996
+#: src/util/configuration.c:1023
 #, 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:1093
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1098
+#: src/util/configuration.c:1125
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/configuration.c:1172
+#: src/util/configuration.c:1199
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8087,7 +8351,7 @@ msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/disk.c:1546 src/util/service.c:1318
+#: src/util/disk.c:1546 src/util/service.c:1323
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -8414,17 +8678,17 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/util/program.c:246 src/util/service.c:1452
+#: src/util/program.c:246 src/util/service.c:1457
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/program.c:258 src/util/service.c:1467
+#: src/util/program.c:258 src/util/service.c:1472
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/program.c:263 src/util/service.c:1462
+#: src/util/program.c:263 src/util/service.c:1467
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -8527,52 +8791,52 @@ msgstr ""
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:903
+#: src/util/service.c:908
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:952 src/util/service.c:970
+#: src/util/service.c:957 src/util/service.c:975
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:995
+#: src/util/service.c:1000
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1165
+#: src/util/service.c:1170
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1207
+#: src/util/service.c:1212
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/util/service.c:1256
+#: src/util/service.c:1261
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1260
+#: src/util/service.c:1265
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1264
+#: src/util/service.c:1269
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1319
+#: src/util/service.c:1324
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1332
+#: src/util/service.c:1337
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/util/service.c:1402
+#: src/util/service.c:1407
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -8704,22 +8968,22 @@ msgstr "Nätverksanslutning"
 
 #: src/vpn/gnunet-service-vpn.c:642
 #, fuzzy
-msgid "# Bytes given to mesh for transmission"
+msgid "# Bytes given to cadet for transmission"
 msgstr "# PING-meddelanden skapade"
 
 #: src/vpn/gnunet-service-vpn.c:680
 #, fuzzy
-msgid "# Bytes dropped in mesh queue (overflow)"
+msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr "# byte kastade via UDP (utgående)"
 
 #: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Mesh channels created"
+msgid "# Cadet channels created"
 msgstr "# PING-meddelanden skapade"
 
 #: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
-msgid "Failed to setup mesh channel!\n"
+msgid "Failed to setup cadet channel!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
 #: src/vpn/gnunet-service-vpn.c:978
@@ -8756,17 +9020,17 @@ msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:1706
 #, fuzzy
-msgid "# ICMP packets received from mesh"
+msgid "# ICMP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
-msgid "# UDP packets received from mesh"
+msgid "# UDP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/vpn/gnunet-service-vpn.c:2200
 #, fuzzy
-msgid "# TCP packets received from mesh"
+msgid "# TCP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/vpn/gnunet-service-vpn.c:2351
@@ -8786,29 +9050,29 @@ msgstr "Nätverksanslutning"
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2982
+#: src/vpn/gnunet-service-vpn.c:2987
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3006
+#: src/vpn/gnunet-service-vpn.c:3011
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3014
+#: 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:3027
+#: src/vpn/gnunet-service-vpn.c:3032
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3040
+#: src/vpn/gnunet-service-vpn.c:3045
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3050
+#: src/vpn/gnunet-service-vpn.c:3055
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8897,6 +9161,59 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Peer `%s'\n"
+#~ msgstr "Jag är ändpunkt \"%s\".\n"
+
+#, fuzzy
+#~ msgid "# Bytes received from MESH"
+#~ msgstr "# byte mottagna via HTTP"
+
+#, fuzzy
+#~ msgid "# Replies received from MESH"
+#~ msgstr "# byte mottagna via HTTP"
+
+#, fuzzy
+#~ msgid "Failed to run `upnpc` command"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "`upnpc` command not found"
+#~ msgstr "Kommando \"%s\" hittades inte!\n"
+
+#, fuzzy
+#~ msgid "Could not convert `%s' to integer.\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Too short message received from client!\n"
+#~ msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Invalid message received from client, session information incorrect!\n"
+#~ msgstr "Ogiltigt meddelande mottogs den %s:%d."
+
+#, fuzzy
+#~ msgid "# SUC responder result messages received"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# bytes sent to scalarproduct"
+#~ msgstr "# byte krypterade"
+
+#, fuzzy
+#~ msgid "Failed to connect to the scalarproduct service\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to send a message to the statistics service\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to send a message to the scalarproduct service\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
 #~ msgid "# TRAIL SETUP requests received"
 #~ msgstr "# byte mottogs via TCP"
 
@@ -9040,10 +9357,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
 #, fuzzy
-#~ msgid "Unable to initialize resolver!\n"
-#~ msgstr "Kunde inte initiera SQLite.\n"
-
-#, fuzzy
 #~ msgid "Using default zone file `%s'\n"
 #~ msgstr "Startade samling \"%s\".\n"
 
@@ -9185,10 +9498,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "\"%s\" är inte en fil.\n"
 
 #, fuzzy
-#~ msgid "Error communicating with ARM service.\n"
-#~ msgstr "Skriv ut information om GNUnets motparter."
-
-#, fuzzy
 #~ msgid "Timeout communicating with ARM service.\n"
 #~ msgstr "Skriv ut information om GNUnets motparter."
 
@@ -9229,10 +9538,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Misslyckades att starta samling.\n"
 
 #, fuzzy
-#~ msgid "# session keys received"
-#~ msgstr "# sessionnycklar vägrade"
-
-#, fuzzy
 #~ msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 #~ msgstr "storlek på \"%s\" meddelande är för litet. Ignorerar.\n"
 
@@ -9377,10 +9682,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Kunde inte spara konfiguration!"
 
 #, fuzzy
-#~ msgid "Failed to queue a confirmation receipt\n"
-#~ msgstr "Kunde inte spara konfiguration!"
-
-#, fuzzy
 #~ msgid "Failed to queue a leave notification\n"
 #~ msgstr "Kunde inte spara konfiguration!"
 
@@ -9389,10 +9690,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "\"%s\" ansluten till \"%s\".\n"
 
 #, fuzzy
-#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
-#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
@@ -9619,9 +9916,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "print the version number"
 #~ msgstr "skriv ut versionsnummer"
 
-#~ msgid "be verbose"
-#~ msgstr "var informativ"
-
 #, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "Misslyckades att starta samling.\n"
@@ -10190,14 +10484,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ "Upload aborted.\n"
 #~ msgstr "Nedladdning avbruten."
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Error uploading file: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Fel vid uppladdning av fil: %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"
@@ -10262,10 +10548,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "No filename specified, using `%s' instead (for now).\n"
 #~ msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
 
-#, fuzzy
-#~ msgid "Downloading %d files from directory `%s'.\n"
-#~ msgstr "Ladda ner filer från GNUnet."
-
 #~ msgid "File stored as `%s'.\n"
 #~ msgstr "Fil lagrad som \"%s\".\n"