GNSRECORD: fix build w/o jansson

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

diff --git a/po/sv.po b/po/sv.po
index dc6edaf403ca77fd1394f765db638e18cea79ee7..323f2de49135263ccab264393a96e434e0a61910 100644 (file)
--- 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-12-26 00:38+0100\n"
+"POT-Creation-Date: 2018-10-20 11:13+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"
@@ -16,1013 +16,1042 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:337
-msgid "Client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/arm_monitor_api.c:321
-msgid ""
-"Monitoring client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:154
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:160
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1137
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:218
-#, fuzzy
-msgid "Misconfiguration (can not connect to the ARM service)"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# av anslutna parter"
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
-msgid "ARM API is busy"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:224
-msgid "Request does not fit into a message"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
-#, fuzzy
-msgid "Request timed out"
-msgstr "# sessionsnycklar accepterade"
-
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
-#, fuzzy, c-format
-msgid "%s is stopped"
+#: src/arm/gnunet-arm.c:240
+#, fuzzy
+msgid "is stopped"
 msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
-#, fuzzy, c-format
-msgid "%s is starting"
+#: src/arm/gnunet-arm.c:242
+#, fuzzy
+msgid "is starting"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
-#, c-format
-msgid "%s is stopping"
-msgstr ""
+#: src/arm/gnunet-arm.c:244
+#, fuzzy
+msgid "is stopping"
+msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
-#, fuzzy, c-format
-msgid "%s is starting already"
+#: src/arm/gnunet-arm.c:246
+#, fuzzy
+msgid "is starting already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
-#, c-format
-msgid "%s is stopping already"
-msgstr ""
+#: src/arm/gnunet-arm.c:248
+#, fuzzy
+msgid "is stopping already"
+msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
-#, c-format
-msgid "%s is started already"
-msgstr ""
+#: src/arm/gnunet-arm.c:250
+#, fuzzy
+msgid "is started already"
+msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
-#, c-format
-msgid "%s is stopped already"
-msgstr ""
+#: src/arm/gnunet-arm.c:252
+#, fuzzy
+msgid "is stopped already"
+msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
-#, fuzzy, c-format
-msgid "%s service is not known to ARM"
+#: src/arm/gnunet-arm.c:254
+#, fuzzy
+msgid "service is not known to ARM"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
-#, fuzzy, c-format
-msgid "%s service failed to start"
+#: src/arm/gnunet-arm.c:256
+#, fuzzy
+msgid "service failed to start"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:262
-#, c-format
-msgid "%s service cannot be started because ARM is shutting down"
+#: src/arm/gnunet-arm.c:258
+msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1061
-#, c-format
-msgid "%.s Unknown result code."
-msgstr ""
+#: src/arm/gnunet-arm.c:260
+#, fuzzy
+msgid "Unknown result code."
+msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:297
+#: src/arm/gnunet-arm.c:292
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
+#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:363
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:379
+#: src/arm/gnunet-arm.c:374
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:421
+#: src/arm/gnunet-arm.c:413
 #, fuzzy, c-format
-msgid "Failed to send a request to start the `%s' service: %%s\n"
+msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:431
+#: src/arm/gnunet-arm.c:423
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:468
+#: src/arm/gnunet-arm.c:460
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:479
+#: src/arm/gnunet-arm.c:471
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:517
+#: src/arm/gnunet-arm.c:511
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:525
+#: src/arm/gnunet-arm.c:520
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:530
+#: src/arm/gnunet-arm.c:526
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:612
+#: src/arm/gnunet-arm.c:614
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:646
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:646
+#: src/arm/gnunet-arm.c:649
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:649
+#: src/arm/gnunet-arm.c:652
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:666
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:767
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:773
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:728
+#: src/arm/gnunet-arm.c:779
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:784
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:733
+#: src/arm/gnunet-arm.c:789
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:736
+#: src/arm/gnunet-arm.c:793
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:798
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:803
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:744
-msgid "timeout in MSECS milliseconds for completing current operation"
+#: src/arm/gnunet-arm.c:809
+msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:746
+#: src/arm/gnunet-arm.c:814
 #, fuzzy
 msgid "list currently running services"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:748
+#: src/arm/gnunet-arm.c:819
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:750
+#: src/arm/gnunet-arm.c:824
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:761
+#: src/arm/gnunet-arm.c:837
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:266
-#, fuzzy
-msgid "Could not send status result to client\n"
-msgstr "Kunde inte skicka begäran till gnunetd.\n"
+#: src/arm/gnunet-service-arm.c:386 src/transport/plugin_transport_tcp.c:1118
+#: src/transport/plugin_transport_xt.c:1118
+#: src/transport/tcp_service_legacy.c:555 src/util/service.c:610
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:302
-#, fuzzy
-msgid "Could not send list result to client\n"
-msgstr "Kunde inte skicka begäran till gnunetd.\n"
+#: src/arm/gnunet-service-arm.c:410 src/arm/gnunet-service-arm.c:416
+#: src/transport/plugin_transport_tcp.c:1137
+#: src/transport/plugin_transport_tcp.c:1143
+#: src/transport/plugin_transport_tcp.c:3823
+#: src/transport/plugin_transport_xt.c:1137
+#: src/transport/plugin_transport_xt.c:1143
+#: src/transport/plugin_transport_xt.c:3831
+#: src/transport/tcp_service_legacy.c:574
+#: src/transport/tcp_service_legacy.c:580 src/util/service.c:635
+#: src/util/service.c:641
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1174
+#: src/transport/plugin_transport_xt.c:1174
+#: src/transport/tcp_service_legacy.c:611 src/util/client.c:504
+#: src/util/service.c:680
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1178
+#: src/transport/plugin_transport_xt.c:1178
+#: src/transport/tcp_service_legacy.c:615 src/util/client.c:509
+#: src/util/service.c:685
+#, fuzzy, c-format
+msgid "Using `%s' instead\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/arm/gnunet-service-arm.c:493 src/transport/plugin_transport_tcp.c:1209
+#: src/transport/plugin_transport_xt.c:1209
+#: src/transport/tcp_service_legacy.c:646 src/util/service.c:721
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:515 src/transport/plugin_transport_tcp.c:1226
+#: src/transport/plugin_transport_xt.c:1226
+#: src/transport/tcp_service_legacy.c:663 src/util/service.c:739
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:554
+#: src/transport/plugin_transport_http_server.c:2682
+#: src/transport/plugin_transport_tcp.c:1257
+#: src/transport/plugin_transport_xt.c:1257
+#: src/transport/tcp_service_legacy.c:694 src/util/service.c:780
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/arm/gnunet-service-arm.c:573
+#: src/transport/plugin_transport_http_server.c:2700
+#: src/transport/plugin_transport_tcp.c:1276
+#: src/transport/plugin_transport_xt.c:1276
+#: src/transport/tcp_service_legacy.c:713 src/util/service.c:800
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/arm/gnunet-service-arm.c:529
+#: src/arm/gnunet-service-arm.c:984
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-service-arm.c:540
+#: src/arm/gnunet-service-arm.c:995
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:639
+#: src/arm/gnunet-service-arm.c:1107
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/arm/gnunet-service-arm.c:661
+#: src/arm/gnunet-service-arm.c:1142
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:695
+#: src/arm/gnunet-service-arm.c:1185
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:835
+#: src/arm/gnunet-service-arm.c:1364
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1105
+#: src/arm/gnunet-service-arm.c:1669
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1199
+#: src/arm/gnunet-service-arm.c:1830
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1204
+#: src/arm/gnunet-service-arm.c:1835
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1209
+#: src/arm/gnunet-service-arm.c:1840
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:1215
+#: src/arm/gnunet-service-arm.c:1846
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm.c:1237
+#: src/arm/gnunet-service-arm.c:1872
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1252
+#: src/arm/gnunet-service-arm.c:1888
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:41
+#: src/arm/mockup-service.c:40
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2804 src/ats/gnunet-ats-solver-eval.c:2838
-#: src/ats/gnunet-service-ats_addresses.c:1789
-#: src/ats/gnunet-service-ats_addresses.c:1833
+#: src/ats/gnunet-ats-solver-eval.c:2779 src/ats/gnunet-ats-solver-eval.c:2820
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2810
-#: src/ats/gnunet-service-ats_addresses.c:1796
-#, c-format
-msgid "Outbound quota configure for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2817
-#: src/ats/gnunet-service-ats_addresses.c:1804
+#: src/ats/gnunet-ats-solver-eval.c:2797
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2844
-#: src/ats/gnunet-service-ats_addresses.c:1840
-#, c-format
-msgid "Inbound quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2851
-#: src/ats/gnunet-service-ats_addresses.c:1848
+#: src/ats/gnunet-ats-solver-eval.c:2838
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3410
-#: src/ats-tests/gnunet-solver-eval.c:918
+#: src/ats/gnunet-ats-solver-eval.c:3292 src/ats-tests/gnunet-solver-eval.c:937
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3413
-#: src/ats-tests/gnunet-solver-eval.c:921
-#: src/ats-tests/gnunet-solver-eval.c:924
+#: src/ats/gnunet-ats-solver-eval.c:3297 src/ats-tests/gnunet-solver-eval.c:943
+#: src/ats-tests/gnunet-solver-eval.c:948
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3416
-msgid "be verbose"
-msgstr "var informativ"
-
-#: src/ats/gnunet-ats-solver-eval.c:3419
+#: src/ats/gnunet-ats-solver-eval.c:3304
 #, fuzzy
 msgid "print logging"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3422
+#: src/ats/gnunet-ats-solver-eval.c:3309
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3425
+#: src/ats/gnunet-ats-solver-eval.c:3314
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2051
+#: src/ats/gnunet-service-ats_plugins.c:302
+#, c-format
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:312
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:357
 #, c-format
-msgid "Initializing solver `%s '`%s'\n"
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2057
+#: src/ats/gnunet-service-ats_plugins.c:449
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2082
-#, fuzzy
-msgid "Failed to initialize solver!\n"
-msgstr "Kunde inte initiera SQLite.\n"
-
-#: src/ats/plugin_ats_mlp.c:1345
+#: src/ats/plugin_ats_mlp.c:1272
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1941
+#: src/ats/plugin_ats_mlp.c:1868
 #, 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:1993
-#, c-format
-msgid "Updating address property `%s' for peer `%s' %p not added before\n"
-msgstr ""
+#: src/ats/plugin_ats_mlp.c:1912
+#, fuzzy, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/ats/plugin_ats_mlp.c:2714
+#: src/ats/plugin_ats_mlp.c:2474
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2754 src/ats/plugin_ats_mlp.c:2771
-#: src/ats/plugin_ats_mlp.c:2803 src/ats/plugin_ats_mlp.c:2821
-#: src/ats/plugin_ats_mlp.c:2840 src/ats/plugin_ats_proportional.c:1989
-#: src/ats/plugin_ats_proportional.c:2010 src/ats/plugin_ats_ril.c:2718
-#: src/ats/plugin_ats_ril.c:2735 src/ats/plugin_ats_ril.c:2752
-#: src/ats/plugin_ats_ril.c:2769 src/ats/plugin_ats_ril.c:2786
-#: src/ats/plugin_ats_ril.c:2803 src/ats/plugin_ats_ril.c:2820
-#: src/ats/plugin_ats_ril.c:2837
+#: src/ats/plugin_ats_mlp.c:2514 src/ats/plugin_ats_mlp.c:2531
+#: src/ats/plugin_ats_mlp.c:2563 src/ats/plugin_ats_mlp.c:2581
+#: src/ats/plugin_ats_mlp.c:2600 src/ats/plugin_ats_proportional.c:1139
+#: src/ats/plugin_ats_ril.c:2610 src/ats/plugin_ats_ril.c:2627
+#: src/ats/plugin_ats_ril.c:2644 src/ats/plugin_ats_ril.c:2661
+#: src/ats/plugin_ats_ril.c:2678 src/ats/plugin_ats_ril.c:2695
+#: src/ats/plugin_ats_ril.c:2712 src/ats/plugin_ats_ril.c:2729
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/ats/plugin_ats_mlp.c:2927
+#: src/ats/plugin_ats_mlp.c:2669
 #, 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:2936
+#: src/ats/plugin_ats_mlp.c:2678
 #, 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:2947
+#: src/ats/plugin_ats_mlp.c:2688
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2955
+#: src/ats/plugin_ats_mlp.c:2697
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2966
-#, c-format
-msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1847
-#, fuzzy, c-format
-msgid "Invalid network type `%u' `%s': Disconnect!\n"
-msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
-
-#: src/ats-tests/ats-testing.c:72
-msgid "Benchmarking done\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:105
+#: src/ats/plugin_ats_proportional.c:1162
 #, fuzzy, c-format
-msgid "Failed to connect peer 0 and %u\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "Invalid %s configuration %f\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/ats-tests/ats-testing.c:413
+#: src/ats-tests/ats-testing.c:420
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:419
+#: src/ats-tests/ats-testing.c:427
 #, fuzzy, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/ats-tests/ats-testing.c:450
-msgid "Connecting peers on CORE level\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:461
-#, c-format
-msgid "Connecting master [%u] with slave [%u]\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:470
-#, fuzzy, c-format
-msgid "Could not connect master [%u] and slave [%u]\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:677
-#, fuzzy
-msgid "Initialization failed, shutdown\n"
-msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
-
-#: src/ats-tests/ats-testing-log.c:846
+#: src/ats-tests/ats-testing-log.c:835
 msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:897
+#: src/ats-tests/ats-testing-log.c:890
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/ats-tests/gnunet-ats-sim.c:86
+#: src/ats-tests/gnunet-ats-sim.c:88
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:296
+#: src/ats-tool/gnunet-ats.c:305
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:300
+#: src/ats-tool/gnunet-ats.c:309
 #, c-format
 msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:378
-msgid "active "
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:378
-msgid "inactive "
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:427
+#: src/ats-tool/gnunet-ats.c:393
 #, 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:544
+#: src/ats-tool/gnunet-ats.c:400
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:400
+msgid "inactive "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:510
 #, fuzzy, c-format
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/ats-tool/gnunet-ats.c:746
+#: src/ats-tool/gnunet-ats.c:703
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:778 src/namestore/gnunet-namestore.c:700
-#: src/transport/gnunet-transport.c:1853
-#: src/transport/gnunet-transport-profiler.c:531
-#, fuzzy, c-format
-msgid "Service `%s' is not running\n"
-msgstr "\"%s\" är inte en fil.\n"
-
-#: src/ats-tool/gnunet-ats.c:792 src/transport/gnunet-transport.c:1862
-#: src/transport/gnunet-transport-profiler.c:549
+#: src/ats-tool/gnunet-ats.c:746 src/ats-tool/gnunet-ats.c:759
 #, 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:802
+#: src/ats-tool/gnunet-ats.c:771
 #, c-format
-msgid "Please select one operation : %s or %s or %s or %s or %s\n"
+msgid "Please select one operation: %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:824 src/ats-tool/gnunet-ats.c:850
-#: src/ats-tool/gnunet-ats.c:878 src/ats-tool/gnunet-ats.c:924
+#: src/ats-tool/gnunet-ats.c:793 src/ats-tool/gnunet-ats.c:818
+#: src/ats-tool/gnunet-ats.c:849 src/ats-tool/gnunet-ats.c:894
 #, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:836 src/ats-tool/gnunet-ats.c:862
+#: src/ats-tool/gnunet-ats.c:804 src/ats-tool/gnunet-ats.c:830
 #, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:890
+#: src/ats-tool/gnunet-ats.c:860
 #, fuzzy
 msgid "No preference type given!\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:897
+#: src/ats-tool/gnunet-ats.c:867
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:915
+#: src/ats-tool/gnunet-ats.c:885
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:948
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:985
+#: src/ats-tool/gnunet-ats.c:952
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:988
+#: src/ats-tool/gnunet-ats.c:958
+#, fuzzy
+msgid "connect to PEER"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/ats-tool/gnunet-ats.c:962
 #, 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:990
+#: src/ats-tool/gnunet-ats.c:967
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:992
+#: src/ats-tool/gnunet-ats.c:972
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:994
+#: src/ats-tool/gnunet-ats.c:977
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:996
+#: src/ats-tool/gnunet-ats.c:982
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:999
+#: src/ats-tool/gnunet-ats.c:988
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1001
+#: src/ats-tool/gnunet-ats.c:994
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1004
+#: src/ats-tool/gnunet-ats.c:999
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1011
+#: src/ats-tool/gnunet-ats.c:1009
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:376
-#, fuzzy, c-format
-msgid "Invalid target `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
+#: src/auction/gnunet-auction-create.c:161
+msgid "description of the item to be sold"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:167
+msgid "mapping of possible prices"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:173
+msgid "max duration per round"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:179
+msgid "duration until auction starts"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:184
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:191
+msgid "public auction outcome"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:196
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:207
+msgid "create a new auction and start listening for bidders"
+msgstr ""
 
-#: src/cadet/gnunet-cadet.c:626
+#: src/auction/gnunet-auction-info.c:74 src/auction/gnunet-auction-join.c:74
+#: src/conversation/gnunet-conversation-test.c:252
+#: src/revocation/gnunet-revocation.c:560 src/template/gnunet-template.c:74
+#, fuzzy
+msgid "help text"
+msgstr "hjälptext för -t"
+
+#: src/cadet/gnunet-cadet.c:705
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/cadet/gnunet-cadet.c:669
+#: src/cadet/gnunet-cadet.c:744
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/cadet/gnunet-cadet.c:735
-msgid "You must NOT give a TARGETwhen using 'request all' options\n"
+#: src/cadet/gnunet-cadet.c:817
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:832
+#: src/cadet/gnunet-cadet.c:908
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/cadet/gnunet-cadet.c:945
 #, fuzzy
-msgid "provide information about a particular connection"
+msgid "No action requested\n"
+msgstr "Samling stoppad.\n"
+
+#: src/cadet/gnunet-cadet.c:970
+#, fuzzy
+msgid "Provide information about a particular connection"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:835
-msgid "activate echo mode"
+#: src/cadet/gnunet-cadet.c:975
+msgid "Activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:838
-msgid "dump debug information to STDERR"
+#: src/cadet/gnunet-cadet.c:980
+msgid "Dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:844
-msgid "port to listen to (default; 0)"
+#: src/cadet/gnunet-cadet.c:986
+msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:847
+#: src/cadet/gnunet-cadet.c:993
 #, fuzzy
-msgid "provide information about a patricular peer"
+msgid "Provide information about a patricular peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:850
+#: src/cadet/gnunet-cadet.c:999
 #, fuzzy
-msgid "provide information about all peers"
+msgid "Provide information about all peers"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:853
+#: src/cadet/gnunet-cadet.c:1005
 #, fuzzy
-msgid "provide information about a particular tunnel"
+msgid "Provide information about a particular tunnel"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:856
+#: src/cadet/gnunet-cadet.c:1011
 #, fuzzy
-msgid "provide information about all tunnels"
+msgid "Provide information about all tunnels"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-service-cadet_peer.c:502
-msgid "Wrong CORE service\n"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-profiler.c:437
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/consensus/gnunet-consensus-profiler.c:521
+#: src/secretsharing/gnunet-secretsharing-profiler.c:608
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus-profiler.c:440
-msgid "how many peers receive one value?"
+#: src/consensus/gnunet-consensus-profiler.c:527
+msgid ""
+"how many peers (random selection without replacement) receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:443
-#: src/set/gnunet-set-profiler.c:289 src/set/gnunet-set-profiler.c:292
-#: src/set/gnunet-set-profiler.c:295
+#: src/consensus/gnunet-consensus-profiler.c:533
+#: src/set/gnunet-set-profiler.c:431 src/set/gnunet-set-profiler.c:437
+#: src/set/gnunet-set-profiler.c:460
 #, fuzzy
 msgid "number of values"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus-profiler.c:446
+#: src/consensus/gnunet-consensus-profiler.c:539
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/consensus/gnunet-consensus-profiler.c:449
+#: src/consensus/gnunet-consensus-profiler.c:546
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:452
-#: src/secretsharing/gnunet-secretsharing-profiler.c:625
+#: src/consensus/gnunet-consensus-profiler.c:552
+#: src/set/gnunet-set-profiler.c:478
+msgid "write statistics to file"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:557
+msgid "distribute elements to a static subset of good peers"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:562
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:493
-#: src/conversation/conversation_api_call.c:475
+#: src/conversation/conversation_api.c:513
+#: src/conversation/conversation_api_call.c:492
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/conversation_api.c:617
-#, fuzzy
-msgid "number too large"
-msgstr "antal iterationer"
-
-#: src/conversation/gnunet-conversation.c:269
+#: src/conversation/gnunet-conversation.c:275
 #, c-format
-msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
+msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:291
+#: src/conversation/gnunet-conversation.c:300
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:323
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:328
+#: src/conversation/gnunet-conversation.c:340
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:346
+#: src/conversation/gnunet-conversation.c:358
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:360
+#: src/conversation/gnunet-conversation.c:373
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/conversation/gnunet-conversation.c:372
+#: src/conversation/gnunet-conversation.c:385
 #, c-format
-msgid ""
-"Phone active on line %u.  Type `/help' for a list of available commands\n"
+msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:394
+#: src/conversation/gnunet-conversation.c:409
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:401
+#: src/conversation/gnunet-conversation.c:416
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:408
+#: src/conversation/gnunet-conversation.c:423
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:416
+#: src/conversation/gnunet-conversation.c:431
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:425
+#: src/conversation/gnunet-conversation.c:440
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:431
+#: src/conversation/gnunet-conversation.c:446
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:436
+#: src/conversation/gnunet-conversation.c:451
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:504
+#: src/conversation/gnunet-conversation.c:522
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/conversation/gnunet-conversation.c:520
-#: src/conversation/gnunet-conversation.c:534
+#: src/conversation/gnunet-conversation.c:538
+#: src/conversation/gnunet-conversation.c:552
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:527
-#: src/conversation/gnunet-conversation.c:584
+#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:601
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:542
-#: src/conversation/gnunet-conversation.c:597
+#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:614
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:552
+#: src/conversation/gnunet-conversation.c:570
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:608
+#: src/conversation/gnunet-conversation.c:625
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:625
+#: src/conversation/gnunet-conversation.c:642
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:655
+#: src/conversation/gnunet-conversation.c:673
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:678
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:683
+#: src/conversation/gnunet-conversation.c:702
 #, c-format
-msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:689
-#: src/conversation/gnunet-conversation.c:713
+#: src/conversation/gnunet-conversation.c:708
+#: src/conversation/gnunet-conversation.c:732
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:694
+#: src/conversation/gnunet-conversation.c:713
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:703
+#: src/conversation/gnunet-conversation.c:722
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:708
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
-msgid "We are calling `%s', his phone should be ringing.\n"
+msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:727
+#: src/conversation/gnunet-conversation.c:746
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:733
+#: src/conversation/gnunet-conversation.c:752
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/conversation/gnunet-conversation.c:761
-#: src/conversation/gnunet-conversation.c:776
+#: src/conversation/gnunet-conversation.c:781
+#: src/conversation/gnunet-conversation.c:796
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:809
-#: src/conversation/gnunet-conversation.c:825
+#: src/conversation/gnunet-conversation.c:829
+#: src/conversation/gnunet-conversation.c:845
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:832
+#: src/conversation/gnunet-conversation.c:852
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:841
+#: src/conversation/gnunet-conversation.c:861
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:858
+#: src/conversation/gnunet-conversation.c:878
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:893
+#: src/conversation/gnunet-conversation.c:913
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:901
+#: src/conversation/gnunet-conversation.c:921
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:918
+#: src/conversation/gnunet-conversation.c:938
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:944
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:946
+#: src/conversation/gnunet-conversation.c:966
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:948
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:950
+#: src/conversation/gnunet-conversation.c:970
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/conversation/gnunet-conversation.c:972
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:954
+#: src/conversation/gnunet-conversation.c:974
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:956
+#: src/conversation/gnunet-conversation.c:976
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/conversation/gnunet-conversation.c:978
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "tillåter klienter att fastställa gnunetds konfiguration"
 
-#: src/conversation/gnunet-conversation.c:960
+#: src/conversation/gnunet-conversation.c:980
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1168
+#: src/conversation/gnunet-conversation.c:1196
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/conversation/gnunet-conversation.c:1181
+#: src/conversation/gnunet-conversation.c:1209
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym \"%s\" togs bort.\n"
 
-#: src/conversation/gnunet-conversation.c:1216
+#: src/conversation/gnunet-conversation.c:1247
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/conversation/gnunet-conversation.c:1240
+#: src/conversation/gnunet-conversation.c:1271
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/conversation/gnunet-conversation.c:1266
-msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+#: src/conversation/gnunet-conversation.c:1300
+msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1269
+#: src/conversation/gnunet-conversation.c:1305
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1295
+#: src/conversation/gnunet-conversation.c:1334
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:121
+#: src/conversation/gnunet-conversation-test.c:118
 #, c-format
 msgid ""
 "\n"
 "End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:149
+#: src/conversation/gnunet-conversation-test.c:143
 #, c-format
 msgid ""
 "\n"
@@ -1030,475 +1059,452 @@ msgid ""
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:215
+#: src/conversation/gnunet-conversation-test.c:214
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:248
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
-#: src/sensordashboard/gnunet-sensordashboard.c:70
-#: src/template/gnunet-template.c:70
-#, fuzzy
-msgid "help text"
-msgstr "hjälptext för -t"
+#: src/conversation/gnunet_gst.c:620
+#: src/conversation/gnunet-helper-audio-playback-gst.c:359
+#, c-format
+msgid "Read error from STDIN: %d %s\n"
+msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:305
+#: src/conversation/gnunet-helper-audio-playback.c:323
 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:589
+#: src/conversation/gnunet-helper-audio-playback.c:625
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:614
-#: src/conversation/gnunet-helper-audio-record.c:545
+#: src/conversation/gnunet-helper-audio-playback.c:651
+#: src/conversation/gnunet-helper-audio-record.c:561
 #, fuzzy
 msgid "Connection established.\n"
 msgstr "Samling stoppad.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:619
-#: src/conversation/gnunet-helper-audio-record.c:550
+#: src/conversation/gnunet-helper-audio-playback.c:656
+#: src/conversation/gnunet-helper-audio-record.c:566
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:633
+#: src/conversation/gnunet-helper-audio-playback.c:670
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:646
-#: src/conversation/gnunet-helper-audio-record.c:576
+#: src/conversation/gnunet-helper-audio-playback.c:683
+#: src/conversation/gnunet-helper-audio-record.c:592
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:667
-#: src/conversation/gnunet-helper-audio-record.c:599
+#: src/conversation/gnunet-helper-audio-playback.c:704
+#: src/conversation/gnunet-helper-audio-record.c:615
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:673
-#: src/conversation/gnunet-helper-audio-record.c:605
+#: src/conversation/gnunet-helper-audio-playback.c:710
+#: src/conversation/gnunet-helper-audio-record.c:621
 #, fuzzy
 msgid "pa_mainloop_new() failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:687
-#: src/conversation/gnunet-helper-audio-record.c:620
+#: src/conversation/gnunet-helper-audio-playback.c:724
+#: src/conversation/gnunet-helper-audio-record.c:636
 #, fuzzy
 msgid "pa_context_new() failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:694
-#: src/conversation/gnunet-helper-audio-record.c:626
+#: src/conversation/gnunet-helper-audio-playback.c:731
+#: src/conversation/gnunet-helper-audio-record.c:642
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "# av anslutna parter"
 
-#: src/conversation/gnunet-helper-audio-playback.c:700
-#: src/conversation/gnunet-helper-audio-record.c:632
+#: src/conversation/gnunet-helper-audio-playback.c:737
+#: src/conversation/gnunet-helper-audio-record.c:648
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:770
+#: src/conversation/gnunet-helper-audio-playback.c:816
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:325
-#, c-format
-msgid "Read error from STDIN: %d %s\n"
-msgstr ""
-
-#: src/conversation/gnunet-helper-audio-record.c:344
+#: src/conversation/gnunet-helper-audio-record.c:351
 #, fuzzy, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
 msgstr "# av anslutna parter"
 
-#: src/conversation/gnunet-helper-audio-record.c:420
+#: src/conversation/gnunet-helper-audio-record.c:430
 #, fuzzy, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:458
+#: src/conversation/gnunet-helper-audio-record.c:472
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:483
+#: src/conversation/gnunet-helper-audio-record.c:498
 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:488
+#: src/conversation/gnunet-helper-audio-record.c:503
 #, fuzzy, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:496
+#: src/conversation/gnunet-helper-audio-record.c:511
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:500
+#: src/conversation/gnunet-helper-audio-record.c:515
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:507
+#: src/conversation/gnunet-helper-audio-record.c:522
 #, fuzzy, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:516
+#: src/conversation/gnunet-helper-audio-record.c:531
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:563
+#: src/conversation/gnunet-helper-audio-record.c:579
 #, fuzzy, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:676
+#: src/conversation/gnunet-helper-audio-record.c:693
 #, fuzzy
 msgid "ogg_stream_init() failed.\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:721
+#: src/conversation/gnunet-helper-audio-record.c:738
 #, fuzzy, c-format
-msgid "Failed to allocate %d bytes for second packet\n"
+msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/conversation/gnunet-service-conversation.c:853
-msgid "Cadet audio channel not ready; audio data dropped\n"
-msgstr ""
-
-#: src/conversation/gnunet-service-conversation.c:944
-#, c-format
-msgid ""
-"No available phone for incoming call on line %u, sending HANG_UP signal\n"
-msgstr ""
-
-#: src/conversation/gnunet-service-conversation.c:1351
+#: src/conversation/gnunet-service-conversation.c:1303
 #, fuzzy, c-format
-msgid "Received incoming Cadet channel on port %u\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
+msgid "Could not open line, port %s already in use!\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/conversation/microphone.c:121
+#: src/conversation/microphone.c:119
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/conversation/plugin_gnsrecord_conversation.c:116
+#: src/conversation/plugin_gnsrecord_conversation.c:70
+#, c-format
+msgid "PHONE version %u not supported\n"
+msgstr ""
+
+#: src/conversation/plugin_gnsrecord_conversation.c:133
+#: src/conversation/plugin_gnsrecord_conversation.c:147
 #, fuzzy, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/conversation/speaker.c:75
+#: src/conversation/speaker.c:73
 #, fuzzy
 msgid "Could not start playback audio helper.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/core/core_api.c:787
-msgid "Client was disconnected from core service, trying to reconnect.\n"
-msgstr ""
-
-#: src/core/gnunet-core.c:92
+#: src/core/gnunet-core.c:88
 #, fuzzy
 msgid "fresh connection"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-core.c:95
+#: src/core/gnunet-core.c:91
 msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:98
+#: src/core/gnunet-core.c:94
 #, fuzzy
 msgid "key received"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-core.c:101
+#: src/core/gnunet-core.c:97
 #, fuzzy
 msgid "connection established"
 msgstr "Samling stoppad.\n"
 
-#: src/core/gnunet-core.c:104
+#: src/core/gnunet-core.c:100
 msgid "rekeying"
 msgstr ""
 
-#: src/core/gnunet-core.c:107
+#: src/core/gnunet-core.c:103
 #, fuzzy
 msgid "disconnected"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:114
+#: src/core/gnunet-core.c:110
 msgid "Connection to CORE service lost (reconnecting)"
 msgstr ""
 
-#: src/core/gnunet-core.c:117
+#: src/core/gnunet-core.c:113
 #, fuzzy
 msgid "unknown state"
 msgstr "Okänt fel"
 
-#: src/core/gnunet-core.c:122
+#: src/core/gnunet-core.c:118
 #, c-format
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:786
+#: src/core/gnunet-core.c:142 src/peerinfo-tool/gnunet-peerinfo.c:726
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/core/gnunet-core.c:157
+#: src/core/gnunet-core.c:153
 #, 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:2114
+#: src/core/gnunet-core.c:175 src/transport/gnunet-transport.c:1447
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-core.c:188
+#: src/core/gnunet-core.c:184
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: 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:128
-#, c-format
-msgid "Core service of `%4s' ready.\n"
+#: src/core/gnunet-service-core.c:345
+msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:375
-msgid "# send requests dropped (disconnected)"
+#: src/core/gnunet-service-core.c:369
+msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:490
+#: src/core/gnunet-service-core.c:441
+#, fuzzy, c-format
+msgid "# bytes of messages of type %u received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/core/gnunet-service-core.c:539
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_clients.c:536
+#: src/core/gnunet-service-core.c:877
 #, fuzzy, c-format
-msgid "# bytes of messages of type %u received"
+msgid "# messages of type %u discarded (client busy)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:565
-msgid "# bytes encrypted"
+#: src/core/gnunet-service-core.c:986
+#, fuzzy
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "GNUnet-konfiguration"
+
+#: src/core/gnunet-service-core.c:1007
+#, fuzzy, c-format
+msgid "Core service of `%s' ready.\n"
+msgstr "\"%s\" är inte en fil.\n"
+
+#: src/core/gnunet-service-core_kx.c:615
+msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core_kx.c:617
+#: src/core/gnunet-service-core_kx.c:675
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:703
+#: src/core/gnunet-service-core_kx.c:777
+#, fuzzy
+msgid "# PAYLOAD dropped (out of order)"
+msgstr "# byte kastade via UDP (utgående)"
+
+#: src/core/gnunet-service-core_kx.c:827
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:747
+#: src/core/gnunet-service-core_kx.c:889
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:848
+#: src/core/gnunet-service-core_kx.c:923
+#, fuzzy
+msgid "# PING messages transmitted"
+msgstr "# PING-meddelanden skapade"
+
+#: src/core/gnunet-service-core_kx.c:990
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:855
+#: src/core/gnunet-service-core_kx.c:1003
 #, fuzzy
-msgid "# ephemeral keys received"
+msgid "# duplicate ephemeral keys ignored"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:889
+#: src/core/gnunet-service-core_kx.c:1038
+#, fuzzy
+msgid "# EPHEMERAL_KEYs rejected (bad signature)"
+msgstr "# PING-meddelanden skapade"
+
+#: src/core/gnunet-service-core_kx.c:1052
 #, 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"
+"EPHEMERAL_KEY 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:900
+#: src/core/gnunet-service-core_kx.c:1058
 #, fuzzy
-msgid "# EPHEMERAL_KEY messages received"
+msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:999
-#: src/transport/gnunet-service-transport_validation.c:1016
+#: src/core/gnunet-service-core_kx.c:1078
+#, fuzzy
+msgid "# valid ephemeral keys received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/core/gnunet-service-core_kx.c:1178
+#: src/transport/gnunet-service-transport_validation.c:1126
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1007
+#: src/core/gnunet-service-core_kx.c:1187
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1034
-#, c-format
-msgid ""
-"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
-"%s'\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:1050
+#: src/core/gnunet-service-core_kx.c:1246
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1272
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1088
+#: src/core/gnunet-service-core_kx.c:1285
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1156
-#: src/transport/gnunet-service-transport_validation.c:1359
+#: src/core/gnunet-service-core_kx.c:1349
+#: src/transport/gnunet-service-transport_validation.c:1459
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1162
+#: src/core/gnunet-service-core_kx.c:1356
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1167
+#: src/core/gnunet-service-core_kx.c:1361
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1197
+#: src/core/gnunet-service-core_kx.c:1396
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1232
+#: src/core/gnunet-service-core_kx.c:1434
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1243
+#: src/core/gnunet-service-core_kx.c:1445
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1250
+#: src/core/gnunet-service-core_kx.c:1452
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1392
+#: src/core/gnunet-service-core_kx.c:1640
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1399
+#: src/core/gnunet-service-core_kx.c:1648
 #, 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:1402
+#: src/core/gnunet-service-core_kx.c:1651
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1448
-#: src/core/gnunet-service-core_kx.c:1473
+#: src/core/gnunet-service-core_kx.c:1740
+#: src/core/gnunet-service-core_kx.c:1766
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1460
+#: src/core/gnunet-service-core_kx.c:1753
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1502
+#: src/core/gnunet-service-core_kx.c:1795
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1510
+#: src/core/gnunet-service-core_kx.c:1803
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1545
-#, fuzzy
-msgid "# PAYLOAD dropped (out of order)"
-msgstr "# byte kastade via UDP (utgående)"
-
-#: src/core/gnunet-service-core_neighbours.c:168
-#, fuzzy
-msgid "# sessions terminated by transport disconnect"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-
-#: src/core/gnunet-service-core_neighbours.c:184
-#: src/core/gnunet-service-core_neighbours.c:342
-msgid "# neighbour entries allocated"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:252
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:425
-#, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_sessions.c:245
-#: src/core/gnunet-service-core_sessions.c:328
-#: src/dht/gnunet-service-dht_neighbours.c:661
-#: src/dht/gnunet-service-dht_neighbours.c:726
-#: src/fs/gnunet-service-fs_cp.c:629 src/fs/gnunet-service-fs_cp.c:1571
-#: src/topology/gnunet-daemon-topology.c:734
-#: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:921
-#: src/transport/gnunet-service-transport_neighbours.c:1145
-#: src/transport/gnunet-service-transport_neighbours.c:3181
-#: src/transport/gnunet-service-transport_neighbours.c:3495
+#: src/core/gnunet-service-core_sessions.c:258
+#: src/core/gnunet-service-core_sessions.c:348
+#: src/dht/gnunet-service-dht_neighbours.c:739
+#: src/dht/gnunet-service-dht_neighbours.c:802
+#: src/fs/gnunet-service-fs_cp.c:613 src/fs/gnunet-service-fs_cp.c:1520
+#: src/topology/gnunet-daemon-topology.c:615
+#: src/topology/gnunet-daemon-topology.c:717
+#: src/transport/gnunet-service-transport_neighbours.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:727
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-service-core_sessions.c:278
+#: src/core/gnunet-service-core_sessions.c:294
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:394
+#: src/core/gnunet-service-core_sessions.c:414
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/core/gnunet-service-core_sessions.c:405
+#: src/core/gnunet-service-core_sessions.c:431
 #, 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:169
-#: src/core/gnunet-service-core_typemap.c:180
+#: src/core/gnunet-service-core_typemap.c:167
+#: src/core/gnunet-service-core_typemap.c:179
 #, fuzzy
 msgid "# type maps received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -1507,1560 +1513,1464 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:855
-#, fuzzy
-msgid "# bytes stored"
-msgstr "# byte krypterade"
+#: src/credential/credential_misc.c:86
+#, fuzzy, c-format
+msgid "Unable to parse CRED record string `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/datacache/datacache.c:117 src/datacache/datacache.c:268
-#, fuzzy
-msgid "# items stored"
-msgstr "# byte krypterade"
+#: src/credential/gnunet-credential.c:262 src/namestore/gnunet-namestore.c:887
+#, fuzzy, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1553
-#: src/datastore/gnunet-service-datastore.c:1564
+#: src/credential/gnunet-credential.c:278
+#: src/credential/gnunet-credential.c:432
 #, fuzzy, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/datacache/datacache.c:184
+#: src/credential/gnunet-credential.c:359
+#: src/credential/gnunet-credential.c:421
+#, fuzzy, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/credential/gnunet-credential.c:370
+#: src/credential/gnunet-credential.c:442
+#, fuzzy, c-format
+msgid "Failed to connect to CREDENTIAL\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/credential/gnunet-credential.c:377
 #, c-format
-msgid "Loading `%s' datacache plugin\n"
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:385
+#, c-format
+msgid "ego required\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:401
+#, c-format
+msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/datacache/datacache.c:192
+#: src/credential/gnunet-credential.c:412
 #, fuzzy, c-format
-msgid "Failed to load datacache plugin for `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/datacache/datacache.c:295
-#, fuzzy
-msgid "# requests received"
-msgstr "# byte mottogs via TCP"
+#: src/credential/gnunet-credential.c:449
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
 
-#: src/datacache/datacache.c:304
-msgid "# requests filtered by bloom filter"
+#: src/credential/gnunet-credential.c:502
+#, c-format
+msgid "Issuer ego required\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:406
-msgid "Heap datacache running\n"
+#: src/credential/gnunet-credential.c:514
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:391
-msgid "Postgres datacache running\n"
+#: src/credential/gnunet-credential.c:534
+msgid "create credential"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:72
-#: src/datastore/plugin_datastore_mysql.c:806
-#: src/datastore/plugin_datastore_mysql.c:820
-#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
-#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
-#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
-#: src/namecache/plugin_namecache_postgres.c:52
-#: 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:622
-#: src/include/gnunet_common.h:631 src/scalarproduct/scalarproduct.h:35
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+#: src/credential/gnunet-credential.c:538
+msgid "verify credential against attribute"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:543
+#, fuzzy
+msgid "The public key of the subject to lookup the credential for"
+msgstr "ange prioritet för innehållet"
 
-#: src/datacache/plugin_datacache_sqlite.c:449
-msgid "Sqlite datacache running\n"
+#: src/credential/gnunet-credential.c:548
+msgid "The name of the credential presented by the subject"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:483
-#: src/datastore/plugin_datastore_sqlite.c:401
-#: src/namecache/plugin_namecache_sqlite.c:292
-#: src/namestore/plugin_namestore_sqlite.c:324
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+#: src/credential/gnunet-credential.c:553
+#, fuzzy
+msgid "The public key of the authority to verify the credential against"
+msgstr "ange prioritet för innehållet"
+
+#: src/credential/gnunet-credential.c:558
+#, fuzzy
+msgid "The ego to use"
+msgstr "meddelandestorlek"
+
+#: src/credential/gnunet-credential.c:563
+msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:490
+#: src/credential/gnunet-credential.c:568
+msgid "The time to live for the credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:572
+msgid "collect credentials"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:586
+#, fuzzy
+msgid "GNUnet credential resolver tool"
+msgstr "Spåra GNUnets nätverkstopologi."
+
+#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:183
+#: src/gns/gnunet-gns-helper-service-w32.c:725
+#, fuzzy, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/credential/gnunet-service-credential.c:1142
+#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
+#, fuzzy, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/credential/plugin_gnsrecord_credential.c:184
 #, fuzzy, c-format
-msgid "Failed to close statement %p: %d\n"
+msgid "Unable to parse ATTR record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/datacache/plugin_datacache_template.c:125
-msgid "Template datacache running\n"
-msgstr ""
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:309
+#: src/datastore/gnunet-service-datastore.c:755
+#, fuzzy
+msgid "# bytes stored"
+msgstr "# byte krypterade"
 
-#: src/datastore/datastore_api.c:310
+#: src/datacache/datacache.c:121 src/datacache/datacache.c:313
 #, fuzzy
-msgid "Failed to transmit request to drop database.\n"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+msgid "# items stored"
+msgstr "# byte krypterade"
 
-#: src/datastore/datastore_api.c:394
-msgid "# queue entry timeouts"
+#: src/datacache/datacache.c:204
+#, c-format
+msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:443
-msgid "# queue overflows"
-msgstr ""
+#: src/datacache/datacache.c:215
+#, fuzzy, c-format
+msgid "Failed to load datacache plugin for `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/datastore/datastore_api.c:471
+#: src/datacache/datacache.c:343
 #, fuzzy
-msgid "# queue entries created"
-msgstr "# PING-meddelanden skapade"
+msgid "# requests received"
+msgstr "# byte mottogs via TCP"
 
-#: src/datastore/datastore_api.c:491
-msgid "# Requests dropped from datastore queue"
+#: src/datacache/datacache.c:353
+msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datastore/datastore_api.c:533
+#: src/datacache/datacache.c:383
 #, fuzzy
-msgid "# datastore connections (re)created"
-msgstr "Nätverksanslutning"
+msgid "# requests for random value received"
+msgstr "# byte mottogs via TCP"
 
-#: src/datastore/datastore_api.c:616
+#: src/datacache/datacache.c:415
 #, fuzzy
-msgid "# transmission request failures"
+msgid "# proximity search requests received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:638
+#: src/datacache/plugin_datacache_heap.c:551
+msgid "Heap datacache running\n"
+msgstr ""
+
+#: src/datacache/plugin_datacache_sqlite.c:116
+#: src/datacache/plugin_datacache_sqlite.c:125
+#: src/datastore/plugin_datastore_mysql.c:890
+#: src/datastore/plugin_datastore_sqlite.c:56
+#: src/datastore/plugin_datastore_sqlite.c:64 src/my/my.c:79 src/my/my.c:91
+#: src/mysql/mysql.c:40 src/mysql/mysql.c:47
+#: src/namecache/plugin_namecache_sqlite.c:50
+#: src/namestore/plugin_namestore_sqlite.c:51
+#: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/psycstore/plugin_psycstore_mysql.c:60
+#: src/reclaim/plugin_reclaim_sqlite.c:50
+#: src/testbed/generate-underlay-topology.c:45
+#: src/testbed/gnunet-daemon-latency-logger.c:50
+#: src/testbed/gnunet-daemon-testbed-underlay.c:54
+#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:51
+#: src/util/crypto_ecc_setup.c:39 src/util/crypto_mpi.c:37
+#: src/include/gnunet_common.h:816 src/include/gnunet_common.h:825
+#: src/scalarproduct/scalarproduct.h:33
+#, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/datacache/plugin_datacache_sqlite.c:861
+#: src/datastore/plugin_datastore_sqlite.c:506
+#: src/namecache/plugin_namecache_sqlite.c:327
+#: src/namestore/plugin_namestore_sqlite.c:262
+#: src/reclaim/plugin_reclaim_sqlite.c:334
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+msgstr ""
+
+#: src/datastore/datastore_api.c:346
 #, fuzzy
-msgid "# bytes sent to datastore"
-msgstr "# byte krypterade"
+msgid "DATASTORE disconnected"
+msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/datastore/datastore_api.c:770
+#: src/datastore/datastore_api.c:466
 #, fuzzy
-msgid "Failed to receive status response from database."
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+msgid "Disconnected from DATASTORE"
+msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/datastore/datastore_api.c:784
-msgid "Error reading response from datastore service"
+#: src/datastore/datastore_api.c:567
+msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
+#: src/datastore/datastore_api.c:597
 #, fuzzy
-msgid "Invalid error message received from datastore service"
-msgstr "Ogiltigt meddelande mottogs den %s:%d."
+msgid "# queue entries created"
+msgstr "# PING-meddelanden skapade"
 
-#: src/datastore/datastore_api.c:806
+#: src/datastore/datastore_api.c:758
 #, fuzzy
 msgid "# status messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:876
+#: src/datastore/datastore_api.c:812
+#, fuzzy
+msgid "# Results received"
+msgstr "# byte mottogs via TCP"
+
+#: src/datastore/datastore_api.c:918
+#, fuzzy
+msgid "# datastore connections (re)created"
+msgstr "Nätverksanslutning"
+
+#: src/datastore/datastore_api.c:1032
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:944
+#: src/datastore/datastore_api.c:1093
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1005
+#: src/datastore/datastore_api.c:1158
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1065
-msgid "# UPDATE requests executed"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1129
+#: src/datastore/datastore_api.c:1236
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1174
-#, fuzzy
-msgid "Failed to receive response from database.\n"
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
-#: src/datastore/datastore_api.c:1233
-#, fuzzy
-msgid "# Results received"
-msgstr "# byte mottogs via TCP"
-
-#: src/datastore/datastore_api.c:1300
+#: src/datastore/datastore_api.c:1296
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1363
+#: src/datastore/datastore_api.c:1358
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1424
+#: src/datastore/datastore_api.c:1439
 msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:114
+#: src/datastore/gnunet-datastore.c:187
+#, c-format
+msgid "Dumped %<PRIu64> records\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:215 src/datastore/gnunet-datastore.c:227
+#, c-format
+msgid "Short write to file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:259
+#, fuzzy
+msgid "Error queueing datastore GET operation\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/datastore/gnunet-datastore.c:285 src/datastore/gnunet-datastore.c:410
+#, fuzzy, c-format
+msgid "Unable to open dump file: %s\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/datastore/gnunet-datastore.c:324
 #, fuzzy, c-format
 msgid "Failed to store item: %s, aborting\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/datastore/gnunet-datastore.c:200
+#: src/datastore/gnunet-datastore.c:338
 #, c-format
-msgid "Cannot use the same configuration for source and destination\n"
+msgid "Inserted %<PRIu64> records\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:246
-msgid ""
-"specifies the configuration to use to access an alternative datastore; will "
-"merge that datastore into our current datastore"
+#: src/datastore/gnunet-datastore.c:347 src/datastore/gnunet-datastore.c:361
+#, c-format
+msgid "Short read from file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:387
+#, fuzzy
+msgid "Error queueing datastore PUT operation\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/datastore/gnunet-datastore.c:430
+msgid "Input file is not of a supported format\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:456
+#, fuzzy
+msgid "Failed connecting to the datastore.\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/datastore/gnunet-datastore.c:468
+#, c-format
+msgid "Please choose at least one operation: %s, %s\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:491
+#, fuzzy
+msgid "Dump all records from the datastore"
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#: src/datastore/gnunet-datastore.c:495
+#, fuzzy
+msgid "Insert records into the datastore"
+msgstr "# byte krypterade"
+
+#: src/datastore/gnunet-datastore.c:500
+msgid "File to dump or insert"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:255
+#: src/datastore/gnunet-datastore.c:509
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/datastore/gnunet-service-datastore.c:365
+#: src/datastore/gnunet-service-datastore.c:336
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:439
+#: src/datastore/gnunet-service-datastore.c:418
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:497
-#: src/gns/gnunet-gns-helper-service-w32.c:223
-msgid "Transmission to client failed!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:528
-#: src/gns/gnunet-gns-helper-service-w32.c:262
-msgid "Shutdown in progress, aborting transmission.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:643
+#: src/datastore/gnunet-service-datastore.c:560
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:686
+#: src/datastore/gnunet-service-datastore.c:601
 #, c-format
 msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:697
+#: src/datastore/gnunet-service-datastore.c:612
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:701
+#: src/datastore/gnunet-service-datastore.c:618
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:707
+#: src/datastore/gnunet-service-datastore.c:625
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:712
-#: src/datastore/gnunet-service-datastore.c:767
-#: src/datastore/gnunet-service-datastore.c:982
-#: src/datastore/gnunet-service-datastore.c:1525
+#: src/datastore/gnunet-service-datastore.c:632
+#: src/datastore/gnunet-service-datastore.c:687
+#: src/datastore/gnunet-service-datastore.c:835
+#: src/datastore/gnunet-service-datastore.c:1467
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:780
+#: src/datastore/gnunet-service-datastore.c:705
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:867
+#: src/datastore/gnunet-service-datastore.c:771
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1029
+#: src/datastore/gnunet-service-datastore.c:874
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1041
-msgid "# requests filtered by bloomfilter"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1069
+#: src/datastore/gnunet-service-datastore.c:905
 #, fuzzy
-msgid "# UPDATE requests received"
+msgid "# GET KEY requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1099
+#: src/datastore/gnunet-service-datastore.c:918
+msgid "# requests filtered by bloomfilter"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:954
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1132
+#: src/datastore/gnunet-service-datastore.c:987
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1157
+#: src/datastore/gnunet-service-datastore.c:1034
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1165
+#: src/datastore/gnunet-service-datastore.c:1041
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1197
+#: src/datastore/gnunet-service-datastore.c:1086
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1241
+#: src/datastore/gnunet-service-datastore.c:1135
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1246
+#: src/datastore/gnunet-service-datastore.c:1141
+#: src/datastore/gnunet-service-datastore.c:1316
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1299
+#: src/datastore/gnunet-service-datastore.c:1195
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1310
+#: src/datastore/gnunet-service-datastore.c:1207
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1412
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
+#: src/datastore/gnunet-service-datastore.c:1267
+msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1419
-msgid "Plugin does not support get_keys function. Please fix!\n"
+#: src/datastore/gnunet-service-datastore.c:1323
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1422
-msgid "Bloomfilter construction complete.\n"
+#: src/datastore/gnunet-service-datastore.c:1334
+msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1558
+#: src/datastore/gnunet-service-datastore.c:1504
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:1569
+#: src/datastore/gnunet-service-datastore.c:1520
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1571
+#: src/datastore/gnunet-service-datastore.c:1525
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1584
+#: src/datastore/gnunet-service-datastore.c:1541
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1602
-#: src/datastore/gnunet-service-datastore.c:1618
+#: src/datastore/gnunet-service-datastore.c:1559
+#: src/datastore/gnunet-service-datastore.c:1575
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/gnunet-service-datastore.c:1648
+#: src/datastore/gnunet-service-datastore.c:1607
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/datastore/plugin_datastore_heap.c:820
+#: src/datastore/plugin_datastore_heap.c:891
 msgid "Heap database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:783
-#, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/datastore/plugin_datastore_mysql.c:369
+#: src/datastore/plugin_datastore_mysql.c:421
+#: src/datastore/plugin_datastore_mysql.c:1073
+msgid "MySQL statement run failure"
+msgstr ""
+
+#: src/datastore/plugin_datastore_mysql.c:408
+#: src/datastore/plugin_datastore_sqlite.c:676
+#, fuzzy
+msgid "Data too large"
+msgstr "antal iterationer"
 
-#: src/datastore/plugin_datastore_mysql.c:791
+#: src/datastore/plugin_datastore_mysql.c:846
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1022
+#: src/datastore/plugin_datastore_mysql.c:1178
+#: src/psycstore/plugin_psycstore_mysql.c:1934
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:832
+#: src/datastore/plugin_datastore_postgres.c:274
+#: src/datastore/plugin_datastore_postgres.c:891
+msgid "Postgress exec failure"
+msgstr ""
+
+#: src/datastore/plugin_datastore_postgres.c:852
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/plugin_datastore_postgres.c:868
-#: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:569
+#: src/datastore/plugin_datastore_postgres.c:950
+#: src/psycstore/plugin_psycstore_postgres.c:1504
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:57
-#: src/testbed/generate-underlay-topology.c:50
-#: src/testbed/gnunet-daemon-latency-logger.c:55
-#: src/testbed/gnunet-daemon-testbed-underlay.c:58
+#: src/datastore/plugin_datastore_sqlite.c:64
+#: src/testbed/generate-underlay-topology.c:48
+#: src/testbed/gnunet-daemon-latency-logger.c:53
+#: src/testbed/gnunet-daemon-testbed-underlay.c:57
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 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:479
-#: src/psycstore/plugin_psycstore_sqlite.c:329
+#: src/datastore/plugin_datastore_sqlite.c:269
+#: src/namecache/plugin_namecache_sqlite.c:207
+#: src/namestore/plugin_namestore_sqlite.c:203
+#: src/peerstore/plugin_peerstore_sqlite.c:533
+#: src/psycstore/plugin_psycstore_sqlite.c:323
+#: src/reclaim/plugin_reclaim_sqlite.c:210
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:661
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+#: src/datastore/plugin_datastore_sqlite.c:627
+msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1154
+#: src/datastore/plugin_datastore_sqlite.c:1325
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1173
+#: src/datastore/plugin_datastore_sqlite.c:1359
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1213
-#: src/namecache/plugin_namecache_sqlite.c:580
-#: src/namestore/plugin_namestore_sqlite.c:716
+#: src/datastore/plugin_datastore_sqlite.c:1403
+#: src/namecache/plugin_namecache_sqlite.c:638
+#: src/namestore/plugin_namestore_sqlite.c:753
+#: src/reclaim/plugin_reclaim_sqlite.c:709
 msgid "Sqlite database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:257
+#: src/datastore/plugin_datastore_template.c:251
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:403
-#, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/dht/gnunet-dht-get.c:133
+#: src/dht/gnunet-dht-get.c:156
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:157
+#, c-format
+msgid "Result %d, type %d:\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:202
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
+#: src/dht/gnunet-dht-get.c:208 src/dht/gnunet-dht-monitor.c:255
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:173
+#: src/dht/gnunet-dht-get.c:217
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-monitor.c:305
+#: src/dht/gnunet-dht-put.c:196
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:192
+#: src/dht/gnunet-dht-get.c:251
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
+#: src/dht/gnunet-dht-get.c:256 src/dht/gnunet-dht-monitor.c:311
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:261
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:265 src/dht/gnunet-dht-put.c:200
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:755
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:941
-#: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:873
-msgid "be verbose (print progress information)"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:225
+#: src/dht/gnunet-dht-get.c:278
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:268
+#: src/dht/gnunet-dht-monitor.c:317
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-monitor.c:322 src/fs/gnunet-download.c:370
+#: src/nse/gnunet-nse-profiler.c:876
+msgid "be verbose (print progress information)"
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:335
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1393
-#: src/testbed/gnunet-testbed-profiler.c:267
+#: src/dht/gnunet_dht_profiler.c:914 src/testbed/gnunet-testbed-profiler.c:251
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/dht/gnunet_dht_profiler.c:1418
+#: src/dht/gnunet_dht_profiler.c:947 src/rps/gnunet-rps-profiler.c:2764
 #, fuzzy
 msgid "number of peers to start"
 msgstr "antal iterationer"
 
-#: src/dht/gnunet_dht_profiler.c:1421
-msgid ""
-"maximum number of times we try to search for successor circle formation (0 "
-"for R5N)"
+#: src/dht/gnunet_dht_profiler.c:952
+msgid "number of PUTs to perform per peer"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1424 src/nse/gnunet-nse-profiler.c:864
-#: src/testbed/gnunet-testbed-profiler.c:306
+#: src/dht/gnunet_dht_profiler.c:957 src/nse/gnunet-nse-profiler.c:858
+#: src/testbed/gnunet-testbed-profiler.c:302
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1427
+#: src/dht/gnunet_dht_profiler.c:962
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1430
+#: src/dht/gnunet_dht_profiler.c:967
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1433
+#: src/dht/gnunet_dht_profiler.c:972
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1436
+#: src/dht/gnunet_dht_profiler.c:977
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1439
+#: src/dht/gnunet_dht_profiler.c:982
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:987
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1457
+#: src/dht/gnunet_dht_profiler.c:1007
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/dht/gnunet-dht-put.c:118
-#, fuzzy
-msgid "PUT request sent with key"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-dht-put.c:121
-msgid "Timeout sending PUT request!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:124
-#, fuzzy
-msgid "PUT request not confirmed!\n"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:132
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:160
-#, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
+#: src/dht/gnunet-dht-put.c:140
+#, fuzzy
+msgid "Could not connect to DHT service!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-put.c:176
+#: src/dht/gnunet-dht-put.c:151
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-put.c:186
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:191
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:205
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:209
+msgid "use DHT's record route option"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:214
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:236
+#: src/dht/gnunet-dht-put.c:231
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:193
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:844
+#: src/dht/gnunet-service-dht_clients.c:367
 #, fuzzy
 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:928
+#: src/dht/gnunet-service-dht_clients.c:481
 #, 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:993
+#: src/dht/gnunet-service-dht_clients.c:614
 #, 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:1195
+#: src/dht/gnunet-service-dht_clients.c:840
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1040
-#: src/dht/gnunet-service-xdht_clients.c:503
+#: src/dht/gnunet-service-dht_clients.c:1025
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1053
-#: src/dht/gnunet-service-xdht_clients.c:517
+#: src/dht/gnunet-service-dht_clients.c:1040
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1090
-#: src/dht/gnunet-service-xdht_clients.c:554
+#: src/dht/gnunet-service-dht_clients.c:1086
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1113
-#: src/dht/gnunet-service-xdht_clients.c:577
+#: src/dht/gnunet-service-dht_clients.c:1093
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1167
-#: src/dht/gnunet-service-dht_clients.c:1210
-#: src/dht/gnunet-service-xdht_clients.c:631
-#: src/dht/gnunet-service-xdht_clients.c:674
+#: src/dht/gnunet-service-dht_clients.c:1171
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1177
-#: src/dht/gnunet-service-xdht_clients.c:641
-#, fuzzy
-msgid "Could not pass reply to client, message too big!\n"
-msgstr "Kunde inte skicka meddelande till gnunetd\n"
-
-#: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:71
+#: src/dht/gnunet-service-dht_datacache.c:71
 #, 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:82
+#: src/dht/gnunet-service-dht_datacache.c:81
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:221
+#: src/dht/gnunet-service-dht_datacache.c:205
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:244
+#: src/dht/gnunet-service-dht_datacache.c:217
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:250
+#: src/dht/gnunet-service-dht_datacache.c:223
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:256
+#: src/dht/gnunet-service-dht_datacache.c:229
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:268
+#: src/dht/gnunet-service-dht_datacache.c:241
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:271
+#: src/dht/gnunet-service-dht_datacache.c:245
 #, 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:309
+#: src/dht/gnunet-service-dht_datacache.c:280
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:515
-msgid "# Preference updates given to core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:609
+#: src/dht/gnunet-service-dht_neighbours.c:677
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:763
-#: src/dht/gnunet-service-xdht_neighbours.c:6059
-#, fuzzy
-msgid "# Queued messages discarded (peer disconnected)"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-
-#: src/dht/gnunet-service-dht_neighbours.c:793
-#: src/dht/gnunet-service-xdht_neighbours.c:987
-#, fuzzy
-msgid "# Messages dropped (CORE timeout)"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-
-#: src/dht/gnunet-service-dht_neighbours.c:823
-#: src/dht/gnunet-service-xdht_neighbours.c:1019
-#, fuzzy
-msgid "# Bytes transmitted to other peers"
-msgstr "# byte skickade av typen %d"
-
-#: src/dht/gnunet-service-dht_neighbours.c:861
-msgid "# Bytes of bandwidth requested from core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:893
+#: src/dht/gnunet-service-dht_neighbours.c:850
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1097
-#: src/dht/gnunet-service-dht_neighbours.c:1134
+#: src/dht/gnunet-service-dht_neighbours.c:1053
+#: src/dht/gnunet-service-dht_neighbours.c:1096
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
+#: src/dht/gnunet-service-dht_neighbours.c:1070
 #: src/dht/gnunet-service-dht_neighbours.c:1112
-#: src/dht/gnunet-service-dht_neighbours.c:1149
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1293
+#: src/dht/gnunet-service-dht_neighbours.c:1269
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1322
+#: src/dht/gnunet-service-dht_neighbours.c:1302
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1332
-#: src/dht/gnunet-service-dht_neighbours.c:1456
-#: src/dht/gnunet-service-dht_neighbours.c:1561
-#: src/dht/gnunet-service-xdht_neighbours.c:1129
-#: src/dht/gnunet-service-xdht_neighbours.c:1198
-#: src/dht/gnunet-service-xdht_neighbours.c:1248
-#: src/dht/gnunet-service-xdht_neighbours.c:1312
-#: src/dht/gnunet-service-xdht_neighbours.c:1379
-#: src/dht/gnunet-service-xdht_neighbours.c:1441
-#: src/dht/gnunet-service-xdht_neighbours.c:1503
-#: src/dht/gnunet-service-xdht_neighbours.c:1565
-#: src/dht/gnunet-service-xdht_neighbours.c:1625
+#: src/dht/gnunet-service-dht_neighbours.c:1313
+#: src/dht/gnunet-service-dht_neighbours.c:1453
+#: src/dht/gnunet-service-dht_neighbours.c:1556
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1418
+#: src/dht/gnunet-service-dht_neighbours.c:1398
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1445
+#: 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:1568
+#: src/dht/gnunet-service-dht_neighbours.c:1571
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1655
+#: src/dht/gnunet-service-dht_neighbours.c:1674
+msgid "# Expired PUTs discarded"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1682
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1658
+#: src/dht/gnunet-service-dht_neighbours.c:1686
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1825
+#: src/dht/gnunet-service-dht_neighbours.c:1912
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1920
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1928
+#: src/dht/gnunet-service-dht_neighbours.c:2082
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1931
+#: src/dht/gnunet-service-dht_neighbours.c:2086
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1988
+#: src/dht/gnunet-service-dht_neighbours.c:2151
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2002
+#: src/dht/gnunet-service-dht_neighbours.c:2172
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2087
+#: src/dht/gnunet-service-dht_neighbours.c:2349
+msgid "# Expired results discarded"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:2365
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2090
+#: src/dht/gnunet-service-dht_neighbours.c:2369
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:57
 #, fuzzy
 msgid "# Network size estimates received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_routing.c:211
+#: src/dht/gnunet-service-dht_routing.c:221
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:235
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
+#: src/dht/gnunet-service-dht_routing.c:241
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:247
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:259
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:317
+#: src/dht/gnunet-service-dht_routing.c:337
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:399
+#: src/dht/gnunet-service-dht_routing.c:413
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:417
+#: src/dht/gnunet-service-dht_routing.c:435
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1832
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail_length = %d"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1837
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d]=%s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1857
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FRIEND_PEERMAP of %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1867
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1888
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FINGER_TABLE of %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1897
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1904
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail_id[%d]=%s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1910
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d] = %s "
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:3559
-msgid "# FINGERS_COUNT"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:3700
-#: src/dht/gnunet-service-xdht_neighbours.c:3937
-#: src/dht/gnunet-service-xdht_neighbours.c:4089
-#: src/dht/gnunet-service-xdht_neighbours.c:4239
-#: src/dht/gnunet-service-xdht_neighbours.c:4420
-#: src/dht/gnunet-service-xdht_neighbours.c:4933
-#: src/dht/gnunet-service-xdht_neighbours.c:5326
-#: src/dht/gnunet-service-xdht_neighbours.c:5419
-#: src/dht/gnunet-service-xdht_neighbours.c:5509
-#: src/dht/gnunet-service-xdht_neighbours.c:5613
-#: src/dht/gnunet-service-xdht_neighbours.c:5757
-#: src/dht/gnunet-service-xdht_neighbours.c:5846
-#, fuzzy
-msgid "# Bytes received from other peers"
-msgstr "# byte mottagna av typen %d"
-
-#: src/dht/gnunet-service-xdht_routing.c:256
-#, c-format
-msgid ""
-"\n"
-"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_routing.c:264
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->trail_id = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_routing.c:267
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->next_hop = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_routing.c:270
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->prev_hop = %s"
-msgstr ""
-
-#: src/dht/plugin_block_dht.c:138
+#: src/dht/plugin_block_dht.c:187
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/dht/plugin_block_dht.c:145
+#: src/dht/plugin_block_dht.c:196
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:155
+#: src/dht/plugin_block_dht.c:207
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:254
-#, fuzzy, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/dns/dnsparser.c:818
-#, fuzzy, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/dns/dnsstub.c:175
-#, fuzzy, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "Kunde inte köra \"%s\": %s\n"
-
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
-#, fuzzy, c-format
-msgid "Failed to send DNS request to %s\n"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-
-#: src/dns/dnsstub.c:299
-#, fuzzy, c-format
-msgid "Sent DNS request to %s\n"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-
-#: src/dns/dnsstub.c:368
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:440
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:352
+#: src/dns/gnunet-dns-monitor.c:351 src/dns/gnunet-dns-monitor.c:356
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
-msgid "only monitor DNS replies"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:366
+#: src/dns/gnunet-dns-monitor.c:368
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:236
+#: src/dns/gnunet-dns-redirector.c:235
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:239
+#: src/dns/gnunet-dns-redirector.c:241
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:251
+#: src/dns/gnunet-dns-redirector.c:254
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:456
+#: src/dns/gnunet-service-dns.c:460
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:603
+#: src/dns/gnunet-service-dns.c:608
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:714
+#: src/dns/gnunet-service-dns.c:738
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:792
+#: src/dns/gnunet-service-dns.c:813
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:907
+#: src/dns/gnunet-service-dns.c:928
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:923
+#: src/dns/gnunet-service-dns.c:944
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:932
+#: src/dns/gnunet-service-dns.c:953
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:942
+#: src/dns/gnunet-service-dns.c:963
+msgid "DNS interceptor got non-DNS packet (dropped)\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:965
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1009
+#: src/dns/gnunet-service-dns.c:1032
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: 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:3594
+#: src/dns/gnunet-service-dns.c:1080 src/exit/gnunet-daemon-exit.c:3563
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/dv/gnunet-dv.c:169
-msgid "verbose output"
+#: src/dns/gnunet-service-dns.c:1090
+#, c-format
+msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:178
+#: src/dv/gnunet-dv.c:173
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/exit/gnunet-daemon-exit.c:802
-#, c-format
-msgid "Got duplicate service records for `%s:%u'\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:853
-#, fuzzy
-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
-#: src/exit/gnunet-daemon-exit.c:2654 src/vpn/gnunet-service-vpn.c:1407
-#: src/vpn/gnunet-service-vpn.c:1797 src/vpn/gnunet-service-vpn.c:1960
-msgid "# ICMPv4 packets dropped (type not allowed)"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2456
-#: src/exit/gnunet-daemon-exit.c:2713 src/vpn/gnunet-service-vpn.c:1463
-#: src/vpn/gnunet-service-vpn.c:1856 src/vpn/gnunet-service-vpn.c:1993
-msgid "# ICMPv6 packets dropped (type not allowed)"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1047
-msgid "# ICMP packets dropped (not allowed)"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1054
-msgid "ICMP Packet dropped, have no matching connection information\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1130
-msgid "UDP Packet dropped, have no matching connection information\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1204
-msgid "TCP Packet dropped, have no matching connection information\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1256
-#, fuzzy
-msgid "# Packets received from TUN"
-msgstr "# byte mottagna via HTTP"
-
-#: src/exit/gnunet-daemon-exit.c:1270
+#: src/exit/gnunet-daemon-exit.c:958
 #, fuzzy
-msgid "# Bytes received from TUN"
-msgstr "# byte mottagna via HTTP"
-
-#: src/exit/gnunet-daemon-exit.c:1296
-msgid "IPv4 packet options received.  Ignored.\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1323
-#, c-format
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1369
-#, c-format
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1377
-#, c-format
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
-msgstr ""
+msgid "# TCP packets sent via TUN"
+msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1759
+#: src/exit/gnunet-daemon-exit.c:1059
 #, fuzzy
-msgid "# TCP packets sent via TUN"
+msgid "# ICMP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1872
+#: src/exit/gnunet-daemon-exit.c:1338
 #, fuzzy
-msgid "# TCP service creation requests received via cadet"
-msgstr "# byte mottogs via TCP"
+msgid "# UDP packets sent via TUN"
+msgstr "# byte skickade via UDP"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1462 src/exit/gnunet-daemon-exit.c:1570
+#: src/exit/gnunet-daemon-exit.c:1617 src/exit/gnunet-daemon-exit.c:1699
+#: src/exit/gnunet-daemon-exit.c:1820 src/exit/gnunet-daemon-exit.c:1951
+#: src/exit/gnunet-daemon-exit.c:2205
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
-#, c-format
-msgid "No service %s found for %s on port %d!\n"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1465
+#, fuzzy
+msgid "# UDP IP-exit requests received via cadet"
+msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1914
+#: src/exit/gnunet-daemon-exit.c:1573
 #, fuzzy
-msgid "# TCP requests dropped (no such service)"
+msgid "# UDP service requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1971
+#: src/exit/gnunet-daemon-exit.c:1613
 #, fuzzy
-msgid "# TCP IP-exit creation requests received via cadet"
+msgid "# TCP service creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2076
+#: src/exit/gnunet-daemon-exit.c:1702
 #, fuzzy
-msgid "# TCP data requests received via cadet"
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2090
+#: src/exit/gnunet-daemon-exit.c:1786
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2150
+#: src/exit/gnunet-daemon-exit.c:1823
 #, fuzzy
-msgid "# ICMP packets sent via TUN"
-msgstr "# byte skickade via UDP"
+msgid "# TCP data requests received via cadet"
+msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2324
+#: src/exit/gnunet-daemon-exit.c:1954
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2573
+#: src/exit/gnunet-daemon-exit.c:2020 src/exit/gnunet-daemon-exit.c:2277
+#: src/exit/gnunet-daemon-exit.c:2632 src/vpn/gnunet-service-vpn.c:826
+#: src/vpn/gnunet-service-vpn.c:989 src/vpn/gnunet-service-vpn.c:2103
+msgid "# ICMPv4 packets dropped (type not allowed)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2079 src/exit/gnunet-daemon-exit.c:2336
+#: src/exit/gnunet-daemon-exit.c:2669 src/vpn/gnunet-service-vpn.c:885
+#: src/vpn/gnunet-service-vpn.c:1022 src/vpn/gnunet-service-vpn.c:2156
+msgid "# ICMPv6 packets dropped (type not allowed)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2208
 #, fuzzy
 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
-#: src/vpn/gnunet-service-vpn.c:1954
+#: src/exit/gnunet-daemon-exit.c:2262 src/vpn/gnunet-service-vpn.c:983
+#: src/vpn/gnunet-service-vpn.c:2094
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2698 src/vpn/gnunet-service-vpn.c:1433
-#: src/vpn/gnunet-service-vpn.c:1445 src/vpn/gnunet-service-vpn.c:1844
+#: src/exit/gnunet-daemon-exit.c:2321 src/vpn/gnunet-service-vpn.c:873
+#: src/vpn/gnunet-service-vpn.c:2128 src/vpn/gnunet-service-vpn.c:2139
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2748
+#: src/exit/gnunet-daemon-exit.c:2400 src/exit/gnunet-daemon-exit.c:3066
 #, fuzzy
-msgid "# UDP packets sent via TUN"
-msgstr "# byte skickade via UDP"
+msgid "# Inbound CADET channels created"
+msgstr "# PING-meddelanden skapade"
 
-#: src/exit/gnunet-daemon-exit.c:2862
-#, fuzzy
-msgid "# UDP IP-exit requests received via cadet"
-msgstr "# byte mottogs via TCP"
+#: src/exit/gnunet-daemon-exit.c:2520
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
+msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2969
+#: src/exit/gnunet-daemon-exit.c:2539
 #, fuzzy
-msgid "# UDP service requests received via cadet"
-msgstr "# byte mottogs via TCP"
+msgid "# Messages transmitted via cadet channels"
+msgstr "# byte skickade av typen %d"
+
+#: src/exit/gnunet-daemon-exit.c:2717
+msgid "# ICMP packets dropped (not allowed)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2725
+msgid "ICMP Packet dropped, have no matching connection information\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2799
+msgid "UDP Packet dropped, have no matching connection information\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2871
+msgid "TCP Packet dropped, have no matching connection information\n"
+msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2995
+#: src/exit/gnunet-daemon-exit.c:2919
 #, fuzzy
-msgid "# UDP requests dropped (no such service)"
-msgstr "# byte mottogs via TCP"
+msgid "# Packets received from TUN"
+msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:3031
+#: src/exit/gnunet-daemon-exit.c:2933
 #, fuzzy
-msgid "# Inbound CADET channels created"
-msgstr "# PING-meddelanden skapade"
+msgid "# Bytes received from TUN"
+msgstr "# byte mottagna via HTTP"
+
+#: src/exit/gnunet-daemon-exit.c:2959
+msgid "IPv4 packet options received.  Ignored.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2986
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3032
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3040
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
+msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3255 src/exit/gnunet-daemon-exit.c:3265
+#: src/exit/gnunet-daemon-exit.c:3243 src/exit/gnunet-daemon-exit.c:3253
 #, 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:3279 src/exit/gnunet-daemon-exit.c:3287
+#: src/exit/gnunet-daemon-exit.c:3267 src/exit/gnunet-daemon-exit.c:3275
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3320
+#: src/exit/gnunet-daemon-exit.c:3316
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3334 src/exit/gnunet-daemon-exit.c:3346
+#: src/exit/gnunet-daemon-exit.c:3330 src/exit/gnunet-daemon-exit.c:3343
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3357
+#: src/exit/gnunet-daemon-exit.c:3355
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:3499
 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:3558
+#: src/exit/gnunet-daemon-exit.c:3507
 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:3565
+#: src/exit/gnunet-daemon-exit.c:3514
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3571
+#: src/exit/gnunet-daemon-exit.c:3520
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: 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:3689
+#: src/exit/gnunet-daemon-exit.c:3688
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3838
-msgid "Daemon to run to provide an IP exit node for the VPN"
+#: src/exit/gnunet-daemon-exit.c:3803
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:270
+#: src/exit/gnunet-daemon-exit.c:3815 src/pt/gnunet-daemon-pt.c:1202
+msgid "No useful service enabled.  Exiting.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3964
+msgid "Daemon to run to provide an IP exit node for the VPN"
+msgstr ""
+
+#: src/fragmentation/defragmentation.c:273
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:456
-#: src/transport/plugin_transport_wlan.c:1474
+#: src/fragmentation/defragmentation.c:466
+#: src/transport/plugin_transport_wlan.c:1552
 #, fuzzy
 msgid "# fragments received"
 msgstr "# byte mottogs via TCP"
 
-#: src/fragmentation/defragmentation.c:521
+#: src/fragmentation/defragmentation.c:536
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# byte mottogs via TCP"
 
-#: src/fragmentation/defragmentation.c:534
+#: src/fragmentation/defragmentation.c:554
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:208
+#: src/fragmentation/fragmentation.c:238
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:211
+#: src/fragmentation/fragmentation.c:243
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:237
+#: src/fragmentation/fragmentation.c:276
 #, fuzzy
 msgid "# fragments wrap arounds"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:281
+#: src/fragmentation/fragmentation.c:323
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:284
+#: src/fragmentation/fragmentation.c:329
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:405
+#: src/fragmentation/fragmentation.c:454
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:411
+#: src/fragmentation/fragmentation.c:461
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:435
+#: src/fragmentation/fragmentation.c:485
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/fs_api.c:484
+#: src/fs/fs_api.c:497
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:495
+#: src/fs/fs_api.c:508
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:503
+#: src/fs/fs_api.c:516
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1111
+#: src/fs/fs_api.c:1124
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1631
+#: src/fs/fs_api.c:1644
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1645
+#: src/fs/fs_api.c:1660
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2303
+#: src/fs/fs_api.c:2320
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2313
+#: src/fs/fs_api.c:2330
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2441 src/fs/fs_api.c:2689
+#: src/fs/fs_api.c:2458 src/fs/fs_api.c:2704
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2459
+#: src/fs/fs_api.c:2476
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2474 src/fs/fs_api.c:2493 src/fs/fs_api.c:2985
+#: src/fs/fs_api.c:2491 src/fs/fs_api.c:2510 src/fs/fs_api.c:3014
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2679
+#: src/fs/fs_api.c:2694
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2928
+#: src/fs/fs_api.c:2957
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3023
+#: src/fs/fs_api.c:3052
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:208
+#: src/fs/fs_directory.c:211
 #, fuzzy
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_download.c:322
+#: src/fs/fs_download.c:308
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:342
+#: src/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:523 src/fs/fs_download.c:535
+#: src/fs/fs_download.c:345
+#, fuzzy, c-format
+msgid ""
+"Failed to access full directroy contents of `%s' for recursive download\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/fs/fs_download.c:532 src/fs/fs_download.c:544
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:905
+#: src/fs/fs_download.c:954
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_download.c:987
+#: src/fs/fs_download.c:1045
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1013
+#: src/fs/fs_download.c:1073
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1036
+#: src/fs/fs_download.c:1097
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_download.c:1046
+#: src/fs/fs_download.c:1109
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1055
+#: src/fs/fs_download.c:1118
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1153
+#: src/fs/fs_download.c:1218
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_download.c:1944
+#: src/fs/fs_download.c:1883
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
 
-#: src/fs/fs_getopt.c:192
+#: src/fs/fs_getopt.c:224
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
-#, fuzzy, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
-#: src/fs/fs_list_indexed.c:113
+#: src/fs/fs_list_indexed.c:150
 #, fuzzy, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
+msgid "Failed to receive response from `%s' service.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/fs/fs_list_indexed.c:151
+#: src/fs/fs_list_indexed.c:194
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -3070,354 +2980,347 @@ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/fs/fs_namespace.c:207
+#: src/fs/fs_namespace.c:205
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_namespace.c:229
+#: src/fs/fs_namespace.c:230
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:320
+#: src/fs/fs_namespace.c:322
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:466
+#: src/fs/fs_namespace.c:468
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:126 src/fs/fs_publish.c:431
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:436
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:683 src/fs/fs_publish.c:700 src/fs/fs_publish.c:739
-#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:1034
+#: src/fs/fs_publish.c:722 src/fs/fs_publish.c:776 src/fs/fs_publish.c:821
+#: src/fs/fs_publish.c:842 src/fs/fs_publish.c:872 src/fs/fs_publish.c:1138
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/fs/fs_publish.c:685
-msgid "timeout on index-start request to `fs' service"
-msgstr ""
-
-#: src/fs/fs_publish.c:697
+#: src/fs/fs_publish.c:778
 #, fuzzy
-msgid "unknown error"
-msgstr "Okänt fel"
+msgid "error on index-start request to `fs' service"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:741
+#: src/fs/fs_publish.c:823
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:761
+#: src/fs/fs_publish.c:843
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:786
+#: src/fs/fs_publish.c:874
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:809
+#: src/fs/fs_publish.c:900
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_publish.c:873 src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:989 src/fs/fs_publish.c:1025
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:988
+#: src/fs/fs_publish.c:1092
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_publish.c:996
+#: src/fs/fs_publish.c:1100
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:1036
+#: src/fs/fs_publish.c:1140
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1272
-#, c-format
-msgid "Insufficient space for publishing: %s"
-msgstr ""
+#: src/fs/fs_publish.c:1379
+#, fuzzy, c-format
+msgid "Datastore failure: %s"
+msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/fs/fs_publish.c:1363
+#: src/fs/fs_publish.c:1470
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:219
+#: src/fs/fs_publish_ksk.c:218
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish_ublock.c:243
+#: src/fs/fs_publish_ublock.c:239
 #, fuzzy
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_search.c:812 src/fs/fs_search.c:882
+#: src/fs/fs_search.c:820 src/fs/fs_search.c:890
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/fs_search.c:941
+#: src/fs/fs_search.c:977
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:59
+#: src/fs/fs_unindex.c:61
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
+#: src/fs/fs_unindex.c:66
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:234
-msgid "Unexpected time for a response from `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:242
-msgid "Timeout waiting for `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:250
+#: src/fs/fs_unindex.c:273
 #, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
+msgid "Error communicating with `fs' service."
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/fs/fs_unindex.c:291
+#: src/fs/fs_unindex.c:324
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:347 src/fs/fs_unindex.c:359
+#: src/fs/fs_unindex.c:374 src/fs/fs_unindex.c:386
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_unindex.c:355
+#: src/fs/fs_unindex.c:382
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_unindex.c:414
+#: src/fs/fs_unindex.c:441
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:562 src/fs/fs_unindex.c:626
+#: src/fs/fs_unindex.c:586 src/fs/fs_unindex.c:650
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_unindex.c:639
+#: src/fs/fs_unindex.c:663
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:673
+#: src/fs/fs_unindex.c:702
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_uri.c:223
+#: src/fs/fs_uri.c:232
 #, 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:283
+#: src/fs/fs_uri.c:291
 #, 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:301
+#: src/fs/fs_uri.c:309
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:308
+#: src/fs/fs_uri.c:316
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:378
+#: src/fs/fs_uri.c:386
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:422
+#: src/fs/fs_uri.c:427
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:437
+#: src/fs/fs_uri.c:442
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:516
+#: src/fs/fs_uri.c:521
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:531
+#: src/fs/fs_uri.c:536
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:541
+#: src/fs/fs_uri.c:546
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:549
+#: src/fs/fs_uri.c:554
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:557
+#: src/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:563
+#: src/fs/fs_uri.c:568
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:569
+#: src/fs/fs_uri.c:574
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:578
+#: src/fs/fs_uri.c:583
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:584
+#: src/fs/fs_uri.c:589
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:590
+#: src/fs/fs_uri.c:595
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:602
+#: src/fs/fs_uri.c:607
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
 #: src/fs/fs_uri.c:641
+#, fuzzy
+msgid "invalid argument"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/fs/fs_uri.c:653
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1043 src/fs/fs_uri.c:1070
+#: 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:1076
+#: src/fs/fs_uri.c:1090
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:237
+#: src/fs/gnunet-auto-share.c:230
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/fs/gnunet-auto-share.c:290 src/fs/gnunet-auto-share.c:300
-#: src/fs/gnunet-auto-share.c:310
+#: src/fs/gnunet-auto-share.c:283 src/fs/gnunet-auto-share.c:293
+#: src/fs/gnunet-auto-share.c:303
 #, fuzzy, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-auto-share.c:402
+#: src/fs/gnunet-auto-share.c:405
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:490
+#: src/fs/gnunet-auto-share.c:492
 #, fuzzy, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/gnunet-auto-share.c:499
+#: src/fs/gnunet-auto-share.c:502
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/fs/gnunet-auto-share.c:688
+#: src/fs/gnunet-auto-share.c:711
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-auto-share.c:739 src/fs/gnunet-publish.c:888
+#: src/fs/gnunet-auto-share.c:765 src/fs/gnunet-publish.c:898
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:743 src/fs/gnunet-publish.c:892
+#: src/fs/gnunet-auto-share.c:770 src/fs/gnunet-publish.c:902
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:746 src/fs/gnunet-publish.c:895
+#: src/fs/gnunet-auto-share.c:775 src/fs/gnunet-publish.c:907
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:749 src/fs/gnunet-publish.c:919
+#: src/fs/gnunet-auto-share.c:781 src/fs/gnunet-publish.c:942
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-auto-share.c:752 src/fs/gnunet-publish.c:926
+#: src/fs/gnunet-auto-share.c:787 src/fs/gnunet-publish.c:954
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:772
+#: src/fs/gnunet-auto-share.c:811
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:660
+#: src/fs/gnunet-daemon-fsprofiler.c:646
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:49
+#: src/fs/gnunet-directory.c:51
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
+#: src/fs/gnunet-directory.c:103
 #, fuzzy, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr "==> Katalog \"%s\":\n"
 
-#: src/fs/gnunet-directory.c:97
+#: src/fs/gnunet-directory.c:106
 #, fuzzy, c-format
 msgid "Directory `%s' contents:\n"
 msgstr "==> Katalog \"%s\":\n"
 
-#: src/fs/gnunet-directory.c:132
+#: src/fs/gnunet-directory.c:141
 #, fuzzy
 msgid "You must specify a filename to inspect.\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-directory.c:154
 #, fuzzy, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-directory.c:154
+#: src/fs/gnunet-directory.c:163
 #, fuzzy, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/gnunet-directory.c:183
+#: src/fs/gnunet-directory.c:192
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
@@ -3432,82 +3335,82 @@ msgstr "Startade samling \"%s\".\n"
 msgid "<unknown time>"
 msgstr "Okänt fel"
 
-#: src/fs/gnunet-download.c:157
+#: src/fs/gnunet-download.c:156
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:182
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-download.c:194
+#: src/fs/gnunet-download.c:199
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Uppladdning vägrades!"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:304
-#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-download.c:214 src/fs/gnunet-publish.c:293
+#: src/fs/gnunet-search.c:210 src/fs/gnunet-unindex.c:105
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:234
+#: src/fs/gnunet-download.c:244
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:714
+#: src/fs/gnunet-download.c:251 src/fs/gnunet-publish.c:724
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/gnunet-download.c:247
+#: src/fs/gnunet-download.c:262
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:254
+#: src/fs/gnunet-download.c:271
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:858
-#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
+#: src/fs/gnunet-download.c:289 src/fs/gnunet-publish.c:868
+#: src/fs/gnunet-search.c:268 src/fs/gnunet-unindex.c:137
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289
+#: src/fs/gnunet-download.c:337 src/fs/gnunet-search.c:311
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:308
+#: src/fs/gnunet-download.c:342
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
+#: src/fs/gnunet-download.c:347 src/fs/gnunet-search.c:317
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:314
+#: src/fs/gnunet-download.c:352
 msgid "write the file to FILENAME"
 msgstr "skriv filen till FILNAMN"
 
-#: src/fs/gnunet-download.c:318
+#: src/fs/gnunet-download.c:357
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:322
+#: src/fs/gnunet-download.c:362
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:325
+#: src/fs/gnunet-download.c:366
 msgid "download a GNUnet directory recursively"
 msgstr "hämta en GNUnet-katalog rekursivt"
 
-#: src/fs/gnunet-download.c:339
+#: src/fs/gnunet-download.c:384
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -3517,1123 +3420,1063 @@ msgstr ""
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:127
+#: src/fs/gnunet-fs.c:128
 #, fuzzy
 msgid "Special file-sharing operations"
 msgstr "Visa alla alternativ"
 
-#: src/fs/gnunet-fs-profiler.c:193
+#: src/fs/gnunet-fs-profiler.c:209
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:196
+#: src/fs/gnunet-fs-profiler.c:215
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:199
+#: src/fs/gnunet-fs-profiler.c:221
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:231
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:238 src/fs/gnunet-publish.c:250
+#: src/fs/gnunet-publish.c:217 src/fs/gnunet-publish.c:229
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:257
+#: src/fs/gnunet-publish.c:237
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-publish.c:268
+#: src/fs/gnunet-publish.c:244
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:273
+#: src/fs/gnunet-publish.c:249
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:281
+#: src/fs/gnunet-publish.c:257
 #, fuzzy, c-format
 msgid "Namespace URI is `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:301
+#: src/fs/gnunet-publish.c:273
+#, fuzzy
+msgid "Starting cleanup after abort\n"
+msgstr "\"%s\" uppstart klar.\n"
+
+#: src/fs/gnunet-publish.c:280
+#, fuzzy
+msgid "Cleanup after abort completed.\n"
+msgstr "\"%s\" uppstart klar.\n"
+
+#: src/fs/gnunet-publish.c:286
 #, fuzzy
-msgid "Cleanup after abort complete.\n"
+msgid "Cleanup after abort failed.\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:428
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:429
+#: src/fs/gnunet-publish.c:433
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:574
+#: src/fs/gnunet-publish.c:587
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:599
+#: src/fs/gnunet-publish.c:612
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:633
+#: src/fs/gnunet-publish.c:646
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:637
+#: src/fs/gnunet-publish.c:650
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:643
+#: src/fs/gnunet-publish.c:656
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:650
+#: src/fs/gnunet-publish.c:663
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Nedstängning klar.\n"
 
-#: src/fs/gnunet-publish.c:655
+#: src/fs/gnunet-publish.c:668
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:662
+#: src/fs/gnunet-publish.c:675
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:671
+#: src/fs/gnunet-publish.c:684
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/gnunet-publish.c:703
+#: src/fs/gnunet-publish.c:712
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
 
-#: src/fs/gnunet-publish.c:735
+#: src/fs/gnunet-publish.c:745
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-publish.c:749
+#: src/fs/gnunet-publish.c:759
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:805
+#: src/fs/gnunet-publish.c:815
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:812
+#: src/fs/gnunet-publish.c:822
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:818
+#: src/fs/gnunet-publish.c:828
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:826 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:836 src/vpn/gnunet-vpn.c:208
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/fs/gnunet-publish.c:837 src/fs/gnunet-publish.c:845
-#: src/transport/gnunet-transport.c:1891 src/transport/gnunet-transport.c:1921
-#: src/transport/gnunet-transport.c:1952
+#: src/fs/gnunet-publish.c:847 src/fs/gnunet-publish.c:855
+#: src/transport/gnunet-transport.c:1280 src/transport/gnunet-transport.c:1307
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:899
+#: src/fs/gnunet-publish.c:911
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:903
+#: src/fs/gnunet-publish.c:917
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:907
+#: src/fs/gnunet-publish.c:923
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:910
+#: src/fs/gnunet-publish.c:928
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:915
+#: src/fs/gnunet-publish.c:935
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:923
+#: src/fs/gnunet-publish.c:948
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:929
+#: src/fs/gnunet-publish.c:958
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:933
+#: src/fs/gnunet-publish.c:964
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:937
+#: src/fs/gnunet-publish.c:971
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:953
+#: src/fs/gnunet-publish.c:987
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:114
+#: src/fs/gnunet-search.c:125
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:191
+#: src/fs/gnunet-search.c:202
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/fs/gnunet-search.c:240
+#: src/fs/gnunet-search.c:258
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:264
+#: src/fs/gnunet-search.c:282
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:295
+#: src/fs/gnunet-search.c:323
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:298
+#: src/fs/gnunet-search.c:329
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:305
+#: src/fs/gnunet-search.c:338
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:316
+#: src/fs/gnunet-search.c:351
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:285
+#: src/fs/gnunet-service-fs.c:375 src/fs/gnunet-service-fs.c:880
+#, fuzzy
+msgid "# client searches active"
+msgstr "# klartext PONG-meddelanden mottagna"
+
+#: src/fs/gnunet-service-fs.c:434
+#, fuzzy
+msgid "# replies received for local clients"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#: src/fs/gnunet-service-fs.c:603
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:344 src/fs/gnunet-service-fs.c:607
+#: src/fs/gnunet-service-fs.c:655 src/fs/gnunet-service-fs_cp.c:562
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:731
+#: src/fs/gnunet-service-fs.c:834
+#, fuzzy
+msgid "# client searches received"
+msgstr "# klartext PONG-meddelanden mottagna"
+
+#: src/fs/gnunet-service-fs.c:873
+msgid "# client searches updated (merged content seen list)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1044
+#, c-format
+msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1284
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/gnunet-service-fs.c:757 src/hostlist/gnunet-daemon-hostlist.c:311
-#: src/sensordashboard/gnunet-service-sensordashboard.c:864
-#: src/sensordashboard/gnunet-service-sensordashboard.c:872
-#: src/topology/gnunet-daemon-topology.c:1287
-#: src/topology/gnunet-daemon-topology.c:1294
+#: src/fs/gnunet-service-fs.c:1309 src/hostlist/gnunet-daemon-hostlist.c:353
+#: src/topology/gnunet-daemon-topology.c:1200
 #, 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:494
+#: src/fs/gnunet-service-fs_cadet_client.c:368
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:508
+#: src/fs/gnunet-service-fs_cadet_client.c:382
 #, 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:361
+#: src/fs/gnunet-service-fs_cadet_server.c:263
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:441
+#: src/fs/gnunet-service-fs_cadet_server.c:318
+#, fuzzy
+msgid "# Blocks transferred via cadet"
+msgstr "# byte skickade av typen %d"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:344
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:485
+#: src/fs/gnunet-service-fs_cadet_server.c:386
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "Nätverksanslutning"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:491
-#: src/fs/gnunet-service-fs_cadet_server.c:531
+#: src/fs/gnunet-service-fs_cadet_server.c:393
+#: src/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "Nätverksanslutning"
 
-#: src/fs/gnunet-service-fs_cp.c:710
+#: src/fs/gnunet-service-fs_cp.c:684
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:714
+#: src/fs/gnunet-service-fs_cp.c:688
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:750
-#, fuzzy
-msgid "# replies transmitted to other peers"
-msgstr "# byte skickade av typen %d"
-
-#: src/fs/gnunet-service-fs_cp.c:756
-msgid "# replies dropped"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:781 src/fs/gnunet-service-fs_cp.c:1337
+#: src/fs/gnunet-service-fs_cp.c:721 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:878
+#: src/fs/gnunet-service-fs_cp.c:816
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:934
+#: src/fs/gnunet-service-fs_cp.c:873
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:942
+#: src/fs/gnunet-service-fs_cp.c:881
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:956
+#: src/fs/gnunet-service-fs_cp.c:895
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:994
+#: src/fs/gnunet-service-fs_cp.c:942
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1013
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1087
+#: src/fs/gnunet-service-fs_cp.c:1038
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1097
+#: src/fs/gnunet-service-fs_cp.c:1048
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1175
-msgid "# GET requests received (from other peers)"
+#: src/fs/gnunet-service-fs_cp.c:1146
+msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1209
-msgid "# requests dropped due to initiator not being connected"
+#: src/fs/gnunet-service-fs_cp.c:1203
+msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1231
+#: src/fs/gnunet-service-fs_cp.c:1226
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1282
-msgid "# requests dropped due TTL underflow"
-msgstr ""
+#: src/fs/gnunet-service-fs_cp.c:1239
+#, fuzzy
+msgid "# requests dropped due to full reply queue"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1306
-msgid "# requests dropped due to higher-TTL request"
+#: src/fs/gnunet-service-fs_cp.c:1295
+msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1335
+#: src/fs/gnunet-service-fs_cp.c:1339
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1754
+#: src/fs/gnunet-service-fs_cp.c:1706
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:181
+#: src/fs/gnunet-service-fs_indexing.c:132
+#: src/fs/gnunet-service-fs_indexing.c:193
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:142
+#: src/fs/gnunet-service-fs_indexing.c:149
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/fs/gnunet-service-fs_indexing.c:237
-#, c-format
-msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:275
-#, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:477
+#: src/fs/gnunet-service-fs_indexing.c:251
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:542
+#: src/fs/gnunet-service-fs_indexing.c:329
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:557
+#: src/fs/gnunet-service-fs_indexing.c:355
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:559
+#: src/fs/gnunet-service-fs_indexing.c:359
 #, fuzzy
 msgid "not indexed"
 msgstr "Avindexering misslyckades."
 
-#: src/fs/gnunet-service-fs_indexing.c:574
+#: src/fs/gnunet-service-fs_indexing.c:392
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:201 src/fs/gnunet-service-fs_lc.c:371
-#, fuzzy
-msgid "# client searches active"
-msgstr "# klartext PONG-meddelanden mottagna"
-
-#: src/fs/gnunet-service-fs_lc.c:259
-#, fuzzy
-msgid "# replies received for local clients"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/fs/gnunet-service-fs_lc.c:330
-#, fuzzy
-msgid "# client searches received"
-msgstr "# klartext PONG-meddelanden mottagna"
-
-#: src/fs/gnunet-service-fs_lc.c:365
-msgid "# client searches updated (merged content seen list)"
+#: src/fs/gnunet-service-fs_indexing.c:516
+#, c-format
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:269
+#: src/fs/gnunet-service-fs_pe.c:263
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:400
-#, fuzzy
-msgid "# transmission failed (core has no bandwidth)"
-msgstr "Ingen transport av typ %d är känd.\n"
-
-#: src/fs/gnunet-service-fs_pe.c:433
-#, fuzzy
-msgid "# query messages sent to other peers"
-msgstr "# byte skickade av typen %d"
-
-#: src/fs/gnunet-service-fs_pe.c:484
+#: src/fs/gnunet-service-fs_pe.c:425
 msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:492
+#: src/fs/gnunet-service-fs_pe.c:436
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:552
+#: src/fs/gnunet-service-fs_pe.c:464
+#, fuzzy
+msgid "# query messages sent to other peers"
+msgstr "# byte skickade av typen %d"
+
+#: src/fs/gnunet-service-fs_pe.c:534
 #, fuzzy
 msgid "# requests merged"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:560
+#: src/fs/gnunet-service-fs_pe.c:544
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700
-#: src/fs/gnunet-service-fs_pe.c:771
+#: src/fs/gnunet-service-fs_pe.c:604 src/fs/gnunet-service-fs_pe.c:707
+#: src/fs/gnunet-service-fs_pe.c:786
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:311
+#: src/fs/gnunet-service-fs_pr.c:328
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645
+#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:856
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:844
+#: src/fs/gnunet-service-fs_pr.c:892
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:853
+#: src/fs/gnunet-service-fs_pr.c:901
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:867
+#: src/fs/gnunet-service-fs_pr.c:916
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:880
+#: src/fs/gnunet-service-fs_pr.c:933
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1003
+#: src/fs/gnunet-service-fs_pr.c:1063
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1031
+#: src/fs/gnunet-service-fs_pr.c:1091
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1069
+#: src/fs/gnunet-service-fs_pr.c:1129
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1200
+#: src/fs/gnunet-service-fs_pr.c:1260
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1252
+#: src/fs/gnunet-service-fs_pr.c:1312
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1272
+#: src/fs/gnunet-service-fs_pr.c:1333
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1319
+#: src/fs/gnunet-service-fs_pr.c:1393
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1452
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1507
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1334
+#: src/fs/gnunet-service-fs_pr.c:1522
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1343
+#: src/fs/gnunet-service-fs_pr.c:1546
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1358
-msgid "# requested DBLOCK or IBLOCK not found"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:1372
+#: src/fs/gnunet-service-fs_pr.c:1560
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1385
+#: src/fs/gnunet-service-fs_pr.c:1581
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1390
+#: src/fs/gnunet-service-fs_pr.c:1586
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1417 src/fs/gnunet-service-fs_pr.c:1457
-#: src/fs/gnunet-service-fs_pr.c:1620
-msgid "# Datastore lookups concluded (error queueing)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:1475
+#: src/fs/gnunet-service-fs_pr.c:1624
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1486
+#: src/fs/gnunet-service-fs_pr.c:1637
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1596
+#: src/fs/gnunet-service-fs_pr.c:1691
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1685
+#: src/fs/gnunet-service-fs_pr.c:1747
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_push.c:672
+#: src/fs/gnunet-service-fs_push.c:644
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:89
+#: src/fs/gnunet-unindex.c:87
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:95
+#: src/fs/gnunet-unindex.c:93
 #, fuzzy, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 "\n"
 "Fel vid avindexering av fil: %s\n"
 
-#: src/fs/gnunet-unindex.c:100
+#: src/fs/gnunet-unindex.c:98
 #, fuzzy
 msgid "Unindexing done.\n"
 msgstr "Avindexera filer."
 
-#: src/fs/gnunet-unindex.c:130
+#: src/fs/gnunet-unindex.c:127
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-unindex.c:147
+#: src/fs/gnunet-unindex.c:144
 #, fuzzy
 msgid "Could not start unindex operation.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/fs/gnunet-unindex.c:179
+#: src/fs/gnunet-unindex.c:176
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:393
-#, fuzzy
-msgid "Failed to deserialize lookup reply from GNS service!\n"
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+#: src/gns/gns_tld_api.c:274
+msgid "Expected a base32-encoded public zone key\n"
+msgstr ""
 
-#: src/gns/gnunet-bcd.c:123
+#: src/gns/gnunet-bcd.c:125
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:759
+#: src/gns/gnunet-bcd.c:355
 #, fuzzy, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+msgid "Invalid port number %u.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
 #: src/gns/gnunet-bcd.c:360
-#, c-format
-msgid "Businesscard HTTP server starts on %llu\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Businesscard HTTP server starts on %u\n"
+msgstr "Misslyckades att starta samling.\n"
 
 #: src/gns/gnunet-bcd.c:374
 #, fuzzy, c-format
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-bcd.c:519
+#: src/gns/gnunet-bcd.c:521
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:534
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:234
+#: src/gns/gnunet-dns2gns.c:201
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:406
+#: src/gns/gnunet-dns2gns.c:403
 #, fuzzy, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:422
+#: src/gns/gnunet-dns2gns.c:419
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/gns/gnunet-dns2gns.c:430
+#: src/gns/gnunet-dns2gns.c:427
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:708
-msgid "No ego configured for `dns2gns` subsystem\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:734
+#: src/gns/gnunet-dns2gns.c:586
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:756
-#, fuzzy
-msgid "No valid GNS zone specified!\n"
-msgstr "Inga nyckelord angivna!\n"
-
-#: src/gns/gnunet-dns2gns.c:777
+#: src/gns/gnunet-dns2gns.c:686
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:780
-msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:783
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+#: src/gns/gnunet-dns2gns.c:691
+msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:786
-msgid "UDP port to listen on for inbound DNS requests; default: 53"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:789
-msgid "Public key of the GNS zone to use (overrides default)"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:802
+#: src/gns/gnunet-dns2gns.c:708
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:215
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:233
-#, c-format
-msgid "Please specify name to lookup!\n"
+#: src/gns/gnunet-gns-benchmark.c:580
+msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:314
-#, c-format
-msgid "Ego for `%s' not found, cannot perform lookup.\n"
+#: src/gns/gnunet-gns-benchmark.c:585
+msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:353 src/gns/gnunet-gns-helper-service-w32.c:798
-#, c-format
-msgid ""
-"Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
-"gns-import.sh?\n"
+#: src/gns/gnunet-gns-benchmark.c:589
+msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:392 src/gns/gnunet-gns-helper-service-w32.c:828
-#, fuzzy, c-format
-msgid "Failed to connect to GNS\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/gns/gnunet-gns.c:405
+#: src/gns/gnunet-gns.c:197
 #, c-format
-msgid "Public key `%s' is not well-formed\n"
+msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:455
+#: src/gns/gnunet-gns.c:231
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:458
+#: src/gns/gnunet-gns.c:236
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:461
-#, fuzzy
-msgid "Specify timeout for the lookup"
-msgstr "ange prioritet för innehållet"
-
-#: src/gns/gnunet-gns.c:464
+#: src/gns/gnunet-gns.c:240
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:467
-#, fuzzy
-msgid "Specify the public key of the zone to lookup the record in"
-msgstr "ange prioritet för innehållet"
-
-#: src/gns/gnunet-gns.c:470
-#, fuzzy
-msgid "Specify the name of the ego of the zone to lookup the record in"
-msgstr "ange prioritet för innehållet"
-
-#: src/gns/gnunet-gns.c:484
+#: src/gns/gnunet-gns.c:256
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/gns/gnunet-gns-helper-service-w32.c:768
-#, c-format
+#: src/gns/gnunet-gns-helper-service-w32.c:600
+msgid "Not ready to process requests, lacking ego data\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-helper-service-w32.c:699
 msgid ""
-"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
-"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
-"sh?\n"
+"Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
+"gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:838
+#: src/gns/gnunet-gns-helper-service-w32.c:737
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-import.c:479
+#: src/gns/gnunet-gns-import.c:450
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:105
-#: src/hostlist/gnunet-daemon-hostlist_client.c:524
-#: src/hostlist/gnunet-daemon-hostlist_client.c:741
-#: src/hostlist/gnunet-daemon-hostlist_client.c:747
-#: src/hostlist/gnunet-daemon-hostlist_client.c:800
+#: src/gns/gnunet-gns-proxy.c:110
+#: src/hostlist/gnunet-daemon-hostlist_client.c:533
+#: src/hostlist/gnunet-daemon-hostlist_client.c:751
+#: src/hostlist/gnunet-daemon-hostlist_client.c:757
 #: src/hostlist/gnunet-daemon-hostlist_client.c:809
-#: src/hostlist/gnunet-daemon-hostlist_client.c:931
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/transport/plugin_transport_http_client.c:595
-#: src/transport/plugin_transport_http_client.c:613
+#: src/hostlist/gnunet-daemon-hostlist_client.c:818
+#: src/hostlist/gnunet-daemon-hostlist_client.c:929
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1024
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1029
+#: src/transport/plugin_transport_http_client.c:596
+#: src/transport/plugin_transport_http_client.c:614
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/gns/gnunet-gns-proxy.c:833
+#: src/gns/gnunet-gns-proxy.c:960
 #, fuzzy, c-format
-msgid "Unsupported CURL SSL backend %d\n"
+msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:856
+#: src/gns/gnunet-gns-proxy.c:985
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:879
+#: src/gns/gnunet-gns-proxy.c:1008
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/gns/gnunet-gns-proxy.c:892
+#: src/gns/gnunet-gns-proxy.c:1021
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:907
+#: src/gns/gnunet-gns-proxy.c:1036
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:917
+#: src/gns/gnunet-gns-proxy.c:1046
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:941
+#: src/gns/gnunet-gns-proxy.c:1070
 #, c-format
-msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1086
+#: src/gns/gnunet-gns-proxy.c:1200
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1602
+#: src/gns/gnunet-gns-proxy.c:2062
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1973
+#: src/gns/gnunet-gns-proxy.c:2583
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/gns/gnunet-gns-proxy.c:2003
+#: src/gns/gnunet-gns-proxy.c:2615
 #, fuzzy, c-format
-msgid "Unable to import certificate %s\n"
+msgid "Unable to import certificate from `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:2177
+#: src/gns/gnunet-gns-proxy.c:2814
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2196
+#: src/gns/gnunet-gns-proxy.c:2839 src/rest/gnunet-rest-server.c:656
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2518
+#: src/gns/gnunet-gns-proxy.c:3169
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2547
+#: src/gns/gnunet-gns-proxy.c:3198
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2565 src/gns/gnunet-gns-proxy.c:2594
-msgid "SSL connection to plain IPv4 address requested\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:2645
+#: src/gns/gnunet-gns-proxy.c:3280
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2984
-msgid "No ego configured for `shorten-zone`\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3024
-#, c-format
-msgid "No ego configured for `%s`\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3086
+#: src/gns/gnunet-gns-proxy.c:3570
 #, fuzzy, c-format
-msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-proxy.c:3127
+#: src/gns/gnunet-gns-proxy.c:3698
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3130
+#: src/gns/gnunet-gns-proxy.c:3703
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3149
+#: src/gns/gnunet-gns-proxy.c:3707
+msgid "disable use of IPv6"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3733
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:864
+#: src/gns/gnunet-service-gns.c:511
 #, fuzzy
-msgid "Failed to connect to the namestore!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "Properly base32-encoded public key required"
+msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/gns/gnunet-service-gns.c:872
+#: src/gns/gnunet-service-gns.c:547
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:905
+#: src/gns/gnunet-service-gns.c:566
+#: src/zonemaster/gnunet-service-zonemaster.c:873
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:438
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:921
-#, fuzzy
-msgid "valid public key required"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/gns/gnunet-service-gns_interceptor.c:263
+#: src/gns/gnunet-service-gns_interceptor.c:257
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:369
+#: src/gns/gnunet-service-gns_interceptor.c:364
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:650
+#: src/gns/gnunet-service-gns_resolver.c:717
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:661
+#: src/gns/gnunet-service-gns_resolver.c:728
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:854
+#: src/gns/gnunet-service-gns_resolver.c:931
 #, 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:996
+#: src/gns/gnunet-service-gns_resolver.c:1112
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1356
+#: src/gns/gnunet-service-gns_resolver.c:1382
+#, c-format
+msgid "VPN returned empty result for `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1823
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1886
+#: src/gns/gnunet-service-gns_resolver.c:1866
+#, fuzzy, c-format
+msgid "GNS lookup failed (zero records found for `%s')\n"
+msgstr "%d filer hittades i katalog.\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:2281
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1910
+#: src/gns/gnunet-service-gns_resolver.c:2304
 #, 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:2192
+#: src/gns/gnunet-service-gns_resolver.c:2467
 #, c-format
-msgid "Zone %s was revoked, resolution fails\n"
+msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2341
+#: src/gns/gnunet-service-gns_resolver.c:2602
 #, c-format
-msgid "Hostname `%s' is not well-formed, resolution fails\n"
+msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:172
+#: src/gns/plugin_gnsrecord_gns.c:179
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:210
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:222
+#: src/gns/plugin_gnsrecord_gns.c:231
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:245
+#: src/gns/plugin_gnsrecord_gns.c:256
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:280
+#: src/gns/plugin_gnsrecord_gns.c:292
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:291
+#: src/gnsrecord/plugin_gnsrecord_dns.c:357
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:312
+#: src/gnsrecord/plugin_gnsrecord_dns.c:378
 #, fuzzy, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:334
+#: src/gnsrecord/plugin_gnsrecord_dns.c:400
 #, fuzzy, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:418
+#: src/gnsrecord/plugin_gnsrecord_dns.c:485
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:455
+#: src/gnsrecord/plugin_gnsrecord_dns.c:521
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:474
+#: src/gnsrecord/plugin_gnsrecord_dns.c:540
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:497
+#: src/gnsrecord/plugin_gnsrecord_dns.c:563
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:520
+#: src/gnsrecord/plugin_gnsrecord_dns.c:586
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:535
+#: src/gnsrecord/plugin_gnsrecord_dns.c:601
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:562
+#: src/gnsrecord/plugin_gnsrecord_dns.c:628
 #, fuzzy, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:578
+#: src/gnsrecord/plugin_gnsrecord_dns.c:644
 #, fuzzy, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:595
+#: src/gnsrecord/plugin_gnsrecord_dns.c:661
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:619
-#: src/gnsrecord/plugin_gnsrecord_dns.c:635
+#: src/gnsrecord/plugin_gnsrecord_dns.c:685
+#: src/gnsrecord/plugin_gnsrecord_dns.c:701
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hello/gnunet-hello.c:126
+#: src/hello/gnunet-hello.c:124
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:132
+#: src/hello/gnunet-hello.c:130
 #, fuzzy, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/hello/gnunet-hello.c:140
+#: src/hello/gnunet-hello.c:138
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:147
+#: src/hello/gnunet-hello.c:145
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:196
+#: src/hello/gnunet-hello.c:155 src/hello/gnunet-hello.c:196
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/hello/gnunet-hello.c:173
+#: src/hello/gnunet-hello.c:172
 #, fuzzy, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
@@ -4643,2156 +4486,2264 @@ msgstr "%d filer hittades i katalog.\n"
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/hello/gnunet-hello.c:216
+#: src/hello/gnunet-hello.c:217
 #, c-format
-msgid "Modified %u addresses \n"
+msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:955
+#: src/hello/hello.c:1108
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:964
+#: src/hello/hello.c:1117
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:974
+#: src/hello/hello.c:1127
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hello/hello.c:984
+#: src/hello/hello.c:1138
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hello/hello.c:1002
+#: src/hello/hello.c:1156
 #, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:1010
+#: src/hello/hello.c:1164
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1025
+#: src/hello/hello.c:1179
 #, 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/hello/hello.c:1098
-#, c-format
-msgid "HELLO URI contained %u addresses, added %u addresses\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist.c:274
+#: src/hostlist/gnunet-daemon-hostlist.c:314
 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:331
+#: src/hostlist/gnunet-daemon-hostlist.c:374
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:336
+#: src/hostlist/gnunet-daemon-hostlist.c:379
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:339
+#: src/hostlist/gnunet-daemon-hostlist.c:383
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:343
+#: src/hostlist/gnunet-daemon-hostlist.c:388
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:359
+#: src/hostlist/gnunet-daemon-hostlist.c:404
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:343
+#: src/hostlist/gnunet-daemon-hostlist_client.c:347
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:364
-#: src/hostlist/gnunet-daemon-hostlist_client.c:394
+#: src/hostlist/gnunet-daemon-hostlist_client.c:368
+#: src/hostlist/gnunet-daemon-hostlist_client.c:401
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:367
-#: src/hostlist/gnunet-daemon-hostlist_client.c:397
+#: src/hostlist/gnunet-daemon-hostlist_client.c:371
+#: src/hostlist/gnunet-daemon-hostlist_client.c:404
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:385
+#: src/hostlist/gnunet-daemon-hostlist_client.c:389
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:650
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1402
+#: src/hostlist/gnunet-daemon-hostlist_client.c:659
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:680
+#: src/hostlist/gnunet-daemon-hostlist_client.c:689
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:722
+#: src/hostlist/gnunet-daemon-hostlist_client.c:732
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:862
+#: src/hostlist/gnunet-daemon-hostlist_client.c:860
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:876
+#: src/hostlist/gnunet-daemon-hostlist_client.c:874
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:894
 #, 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/gnunet-daemon-hostlist_client.c:902
+#: src/hostlist/gnunet-daemon-hostlist_client.c:900
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:908
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:963
+#: src/hostlist/gnunet-daemon-hostlist_client.c:961
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:971
+#: src/hostlist/gnunet-daemon-hostlist_client.c:969
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1103
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1655
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1096
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1663
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1112
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1105
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1188
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1164
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1185
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1348
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1351
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1356
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1362
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1365
 #, 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/gnunet-daemon-hostlist_client.c:1396
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1399
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1399
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1402
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1445
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1448
 #, 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/gnunet-daemon-hostlist_client.c:1452
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1476
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1479
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1496
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1488
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1588
-#: src/transport/plugin_transport_http_client.c:2274
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1593
+#: src/transport/plugin_transport_http_client.c:2272
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1617
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1622
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1630
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1636
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1649
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:181
+#: src/hostlist/gnunet-daemon-hostlist_server.c:174
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# byte krypterade"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:206
+#: src/hostlist/gnunet-daemon-hostlist_server.c:199
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:241
-#: src/hostlist/gnunet-daemon-hostlist_server.c:590
-#: src/peerinfo-tool/gnunet-peerinfo.c:382
-#: src/peerinfo-tool/gnunet-peerinfo.c:531
-#: src/topology/gnunet-daemon-topology.c:952
+#: src/hostlist/gnunet-daemon-hostlist_server.c:235
+#: src/hostlist/gnunet-daemon-hostlist_server.c:529
+#: src/peerinfo-tool/gnunet-peerinfo.c:383
+#: src/peerinfo-tool/gnunet-peerinfo.c:532
+#: src/topology/gnunet-daemon-topology.c:860
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:265
+#: src/hostlist/gnunet-daemon-hostlist_server.c:259
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:282
+#: src/hostlist/gnunet-daemon-hostlist_server.c:276
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:386
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:389
+#: src/hostlist/gnunet-daemon-hostlist_server.c:383
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:403
+#: src/hostlist/gnunet-daemon-hostlist_server.c:395
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:407
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:414
+#: src/hostlist/gnunet-daemon-hostlist_server.c:406
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/gnunet-daemon-hostlist_server.c:409
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:422
+#: src/hostlist/gnunet-daemon-hostlist_server.c:414
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:424
+#: src/hostlist/gnunet-daemon-hostlist_server.c:416
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:485
+#: src/hostlist/gnunet-daemon-hostlist_server.c:464
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:535
-msgid "Advertisement message could not be queued by core\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:747
-#: src/peerinfo-tool/gnunet-peerinfo.c:736
-#: src/transport/gnunet-service-transport.c:1127
+#: src/hostlist/gnunet-daemon-hostlist_server.c:677
+#: src/transport/gnunet-service-transport.c:2813
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:771
+#: src/hostlist/gnunet-daemon-hostlist_server.c:689
+#, fuzzy, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr "Ogiltiga argument. Avslutar.\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:701
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:786
+#: src/hostlist/gnunet-daemon-hostlist_server.c:716
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:799
+#: src/hostlist/gnunet-daemon-hostlist_server.c:729
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:812
+#: src/hostlist/gnunet-daemon-hostlist_server.c:746
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:833
+#: src/hostlist/gnunet-daemon-hostlist_server.c:767
 #, 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:853
+#: src/hostlist/gnunet-daemon-hostlist_server.c:787
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:893
+#: src/hostlist/gnunet-daemon-hostlist_server.c:827
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:165
+#: src/identity/gnunet-identity.c:177
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/identity/gnunet-identity.c:184
+#: src/identity/gnunet-identity.c:199
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:354
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:360
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:365
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:336
+#: src/identity/gnunet-identity.c:371
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:376
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:342
+#: src/identity/gnunet-identity.c:382
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:351
+#: src/identity/gnunet-identity.c:396
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:338
+#: src/identity/gnunet-service-identity.c:389
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:362
+#: src/identity/gnunet-service-identity.c:414
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:439
-#: src/identity/gnunet-service-identity.c:670
-#: src/identity/gnunet-service-identity.c:778
+#: src/identity/gnunet-service-identity.c:505
+#: src/identity/gnunet-service-identity.c:788
+#: src/identity/gnunet-service-identity.c:916
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:446
+#: src/identity/gnunet-service-identity.c:513
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:516
+#: src/identity/gnunet-service-identity.c:608
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:647
+#: src/identity/gnunet-service-identity.c:763
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:686
-#: src/identity/gnunet-service-identity.c:795
+#: src/identity/gnunet-service-identity.c:806
+#: src/identity/gnunet-service-identity.c:934
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:829
+#: src/identity/gnunet-service-identity.c:969
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:902
+#: src/identity/gnunet-service-identity.c:1027
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/identity/gnunet-service-identity.c:914
+#: src/identity/gnunet-service-identity.c:1037
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/mysql/mysql.c:174
+#: src/json/json.c:121
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/multicast/gnunet-multicast.c:46 src/multicast/gnunet-multicast.c:70
+msgid "This command doesn't do anything yet."
+msgstr ""
+
+#: src/my/my.c:194 src/my/my.c:213
+#, fuzzy, c-format
+msgid "%s failed at %s:%d with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/mysql/mysql.c:178
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 
-#: src/mysql/mysql.c:181
+#: src/mysql/mysql.c:185
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/namecache/gnunet-namecache.c:109
+#: src/namecache/gnunet-namecache.c:105
 #, fuzzy, c-format
 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:120 src/namestore/gnunet-namestore.c:424
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:185
+#: src/namecache/gnunet-namecache.c:181
 #, fuzzy, c-format
 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:844
+#: src/namecache/gnunet-namecache.c:191
 #, fuzzy, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
+msgid "Invalid public key for zone `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namecache/gnunet-namecache.c:203
+#: src/namecache/gnunet-namecache.c:199
 #, fuzzy, c-format
 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:1084
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1290
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:237
+#: src/namecache/gnunet-namecache.c:236
 #, fuzzy
 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:1116
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1342
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
 
-#: src/namecache/namecache_api.c:276
+#: src/namecache/namecache_api.c:294
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/plugin_namecache_postgres.c:89
-#: src/namestore/plugin_namestore_postgres.c:96
+#: src/namecache/namecache_api.c:381
 #, fuzzy
-msgid "Failed to create indices\n"
+msgid "Error communicating with namecache service"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/namecache/plugin_namecache_flat.c:119
+#: src/namecache/plugin_namecache_flat.c:253
+#: src/namestore/plugin_namestore_heap.c:146
+#: src/namestore/plugin_namestore_heap.c:393
+#: src/peerstore/plugin_peerstore_flat.c:377
+#: src/peerstore/plugin_peerstore_flat.c:536
+#, fuzzy, c-format
+msgid "Unable to initialize file: %s.\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/namecache/plugin_namecache_flat.c:130
+#: src/namestore/plugin_namestore_heap.c:157
+#: src/peerstore/plugin_peerstore_flat.c:392
+#, fuzzy, c-format
+msgid "Unable to get filesize: %s.\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/namecache/plugin_namecache_flat.c:149
+#: src/namestore/plugin_namestore_heap.c:170
+#: src/peerstore/plugin_peerstore_flat.c:404
+#, fuzzy, c-format
+msgid "Unable to read file: %s.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namestore/gnunet-namestore.c:303
+#: src/namecache/plugin_namecache_flat.c:408
+msgid "flat plugin running\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:311
 #, 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:341
 #, 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:348
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:477 src/namestore/gnunet-namestore.c:485
-#: src/namestore/gnunet-namestore.c:493
+#: src/namestore/gnunet-namestore.c:628 src/namestore/gnunet-namestore.c:636
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:507 src/namestore/gnunet-namestore.c:519
-#: src/namestore/gnunet-namestore.c:531
+#: src/namestore/gnunet-namestore.c:650 src/namestore/gnunet-namestore.c:662
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:628
+#: src/namestore/gnunet-namestore.c:675
+#, c-format
+msgid ""
+"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:809
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:667
+#: src/namestore/gnunet-namestore.c:850
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:708
+#: src/namestore/gnunet-namestore.c:902
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:719
-#: src/namestore/gnunet-namestore-fcfsd.c:984
-#, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/namestore/gnunet-namestore.c:727 src/namestore/gnunet-namestore.c:736
-#: src/namestore/gnunet-namestore.c:753 src/namestore/gnunet-namestore.c:775
-#: src/namestore/gnunet-namestore.c:815
+#: src/namestore/gnunet-namestore.c:921 src/namestore/gnunet-namestore.c:930
+#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:972
+#: src/namestore/gnunet-namestore.c:1026
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:728 src/namestore/gnunet-namestore.c:737
-#: src/namestore/gnunet-namestore.c:754 src/namestore/gnunet-namestore.c:776
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:974
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:745
+#: src/namestore/gnunet-namestore.c:940
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:765
+#: src/namestore/gnunet-namestore.c:962
 #, 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:801
+#: src/namestore/gnunet-namestore.c:1007
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:816
+#: src/namestore/gnunet-namestore.c:1027
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:868
-#: src/peerinfo-tool/gnunet-peerinfo.c:817
+#: src/namestore/gnunet-namestore.c:1070
 #, fuzzy, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "Ogiltiga argument: "
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:903
+#: src/namestore/gnunet-namestore.c:1099
+#: src/peerinfo-tool/gnunet-peerinfo.c:773
 #, fuzzy, c-format
-msgid "Invalid nick `%s'\n"
+msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:1134
 #, fuzzy, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr "\"%s\": okänd tjänst: %s\n"
+msgid "Invalid nick `%s'\n"
+msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:970
+#: src/namestore/gnunet-namestore.c:1174
 #, 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:1006
-#, fuzzy, c-format
-msgid "Identity service is not running\n"
-msgstr "\"%s\" är inte en fil.\n"
-
-#: src/namestore/gnunet-namestore.c:1018
+#: src/namestore/gnunet-namestore.c:1238
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1263
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1267
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1072
+#: src/namestore/gnunet-namestore.c:1271
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1075
+#: src/namestore/gnunet-namestore.c:1276
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1078
+#: src/namestore/gnunet-namestore.c:1281
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1081
+#: src/namestore/gnunet-namestore.c:1285
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1087
+#: src/namestore/gnunet-namestore.c:1295
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1090
+#: src/namestore/gnunet-namestore.c:1300
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1093
+#: src/namestore/gnunet-namestore.c:1305
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1096
+#: src/namestore/gnunet-namestore.c:1310
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1099
+#: src/namestore/gnunet-namestore.c:1314
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1102
+#: src/namestore/gnunet-namestore.c:1318
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1105
+#: src/namestore/gnunet-namestore.c:1323
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:478
+#: src/namestore/gnunet-namestore-fcfsd.c:547
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:505
+#: src/namestore/gnunet-namestore-fcfsd.c:574
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:539
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:595
+msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:548
-msgid "Error when mapping zone to name\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:627
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:610
+#: src/namestore/gnunet-namestore-fcfsd.c:687
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:666
+#: src/namestore/gnunet-namestore-fcfsd.c:775
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:682
+#: src/namestore/gnunet-namestore-fcfsd.c:794
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:718
+#: src/namestore/gnunet-namestore-fcfsd.c:830
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:726
+#: src/namestore/gnunet-namestore-fcfsd.c:839
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:924
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:950
+#: src/namestore/gnunet-namestore-fcfsd.c:1097
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:992
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1025
+#: src/namestore/gnunet-namestore-fcfsd.c:1171
+msgid "name of the zone that is to be managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:655
+#: src/namestore/gnunet-service-namestore.c:749
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/namestore_api.c:275
+#: src/namestore/gnunet-zoneimport.c:2036
+msgid "size to use for the main hash map"
+msgstr ""
+
+#: src/namestore/gnunet-zoneimport.c:2041
+msgid "minimum expiration time we assume for imported records"
+msgstr ""
+
+#: src/namestore/namestore_api.c:389
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:279
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
+#: src/namestore/plugin_namestore_heap.c:776
+msgid "heap file database running\n"
+msgstr ""
+
+#: src/namestore/plugin_namestore_sqlite.c:216
+#: src/namestore/plugin_namestore_sqlite.c:227
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Fel vid %s:%d.\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:191
+#, fuzzy
+msgid "Suggested configuration changes:\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:217
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/nat-auto/gnunet-nat-auto.c:224
+#, fuzzy, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:343
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "GNUnet-konfiguration"
+
+#: src/nat-auto/gnunet-nat-auto.c:349
+msgid "section name providing the configuration for the adapter"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:451
+msgid "use TCP"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:359 src/nat/gnunet-nat.c:456
+msgid "use UDP"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
-msgid "GNUnet NAT traversal test helper daemon"
+#: src/nat-auto/gnunet-nat-auto.c:364
+#, fuzzy
+msgid "write configuration file (for autoconfiguration)"
+msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:376
+#, fuzzy
+msgid "GNUnet NAT traversal autoconfiguration"
+msgstr "GNUnet-konfiguration"
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:401
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:679
+#: src/nat-auto/nat_auto_api_test.c:403
+#, fuzzy
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:516
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:179
+#: src/nat-auto/gnunet-nat-auto_legacy.c:566
+#: src/nat-auto/nat_auto_api_test.c:569
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/nat-auto/gnunet-service-nat-auto.c:340
+#, fuzzy
+msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:383
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:180
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:384
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:201
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:403
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/nat/nat_auto.c:249
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:435
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Mottog ogiltig RPC \"%s\".\n"
 
-#: src/nat/nat_auto.c:327
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:570
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:343
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:588
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:406
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:722
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:407
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:723
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat_auto.c:437
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:760
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:445 src/nat/nat_auto.c:490
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:772
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:832
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:453 src/nat/nat_auto.c:498
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:784
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:844
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:483
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:821
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:867
-#, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
-msgstr ""
-
-#: src/nat/nat.c:917
-#, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: 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: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:1474
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
-msgstr ""
-
-#: src/nat/nat.c:1490
-#, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
-msgstr ""
-
-#: src/nat/nat.c:1575
+#: src/nat-auto/nat_auto_api.c:74
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:1577
-msgid "Internal Failure (IPC, ...)"
+#: src/nat-auto/nat_auto_api.c:76
+msgid "IPC failure"
 msgstr ""
 
-#: src/nat/nat.c:1579
+#: src/nat-auto/nat_auto_api.c:78
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:1581
+#: src/nat-auto/nat_auto_api.c:80
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:1583
+#: src/nat-auto/nat_auto_api.c:82
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:1585
+#: src/nat-auto/nat_auto_api.c:84
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat.c:1587
+#: src/nat-auto/nat_auto_api.c:86
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1589
+#: src/nat-auto/nat_auto_api.c:88
 #, fuzzy
 msgid "`upnpc' command took too long, process killed"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat.c:1591
+#: src/nat-auto/nat_auto_api.c:90
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:1593
+#: src/nat-auto/nat_auto_api.c:92
 #, fuzzy
 msgid "`external-ip' command not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat.c:1595
+#: src/nat-auto/nat_auto_api.c:94
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1597
+#: src/nat-auto/nat_auto_api.c:96
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat.c:1599
+#: src/nat-auto/nat_auto_api.c:98
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:1601
+#: src/nat-auto/nat_auto_api.c:100
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/nat/nat.c:1603
+#: src/nat-auto/nat_auto_api.c:102
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:1605
+#: src/nat-auto/nat_auto_api.c:104
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:1607
+#: src/nat-auto/nat_auto_api.c:106
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:1609
+#: src/nat-auto/nat_auto_api.c:108
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:1611
+#: src/nat-auto/nat_auto_api.c:110
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/nat/nat_mini.c:203
-msgid "`external-ip' command not found\n"
+#: src/nat-auto/nat_auto_api_test.c:475
+#, fuzzy, c-format
+msgid "Failed to find valid PORT in section `%s'\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
+
+#: src/nat-auto/nat_auto_api_test.c:520
+#, fuzzy, c-format
+msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/nat/gnunet-nat.c:429
+msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/nat_mini.c:609
-msgid "`upnpc' command not found\n"
+#: src/nat/gnunet-nat.c:435
+msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/nat_test.c:360
-#, fuzzy
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/nat/gnunet-nat.c:441
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
+msgstr ""
+
+#: src/nat/gnunet-nat.c:446
+msgid "enable STUN processing"
+msgstr ""
+
+#: src/nat/gnunet-nat.c:461
+msgid "watch for connection reversal requests"
+msgstr ""
+
+#: src/nat/gnunet-nat.c:473
+msgid "GNUnet NAT traversal autoconfigure daemon"
+msgstr ""
 
-#: src/nat/nat_test.c:462
+#: src/nat/gnunet-service-nat.c:1337
 #, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/nat_test.c:497
+#: src/nat/gnunet-service-nat.c:1347
+#, c-format
+msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
+msgstr ""
+
+#: src/nat/gnunet-service-nat.c:1363
+#, c-format
+msgid "Malformed punched hole specification `%s' (lacks `]')\n"
+msgstr ""
+
+#: src/nat/gnunet-service-nat.c:1374
+#, c-format
+msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
+msgstr ""
+
+#: src/nat/gnunet-service-nat.c:1839
 #, fuzzy
-msgid "NAT test failed to start NAT library\n"
+msgid "Connection reversal request failed\n"
+msgstr "Samling stoppad.\n"
+
+#: src/nat/gnunet-service-nat.c:1912
+msgid ""
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP\n"
+msgstr ""
+
+#: src/nat/gnunet-service-nat_helper.c:184
+#, c-format
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgstr ""
+
+#: src/nat/gnunet-service-nat_helper.c:271
+#, fuzzy, c-format
+msgid "Failed to start %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nse/gnunet-nse.c:117
-#, fuzzy
-msgid "NSE service is not running\n"
-msgstr "\"%s\" är inte en fil.\n"
+#: src/nat/gnunet-service-nat_mini.c:194
+msgid "`external-ip' command not found\n"
+msgstr ""
 
-#: src/nse/gnunet-nse.c:122
-msgid "Error while checking if NSE service is running or not\n"
+#: src/nat/gnunet-service-nat_mini.c:654
+msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:168
+#: src/nse/gnunet-nse.c:120
 #, fuzzy
 msgid "Show network size estimates from NSE service."
 msgstr "# byte mottogs via TCP"
 
-#: src/nse/gnunet-nse-profiler.c:858
+#: src/nse/gnunet-nse-profiler.c:847
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nse/gnunet-nse-profiler.c:861
+#: src/nse/gnunet-nse-profiler.c:852
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:867
+#: src/nse/gnunet-nse-profiler.c:864
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:870
+#: src/nse/gnunet-nse-profiler.c:871
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:876
+#: src/nse/gnunet-nse-profiler.c:882
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:885
+#: src/nse/gnunet-nse-profiler.c:891
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:1537
-#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:260
+#: src/nse/gnunet-service-nse.c:1532
+#: src/revocation/gnunet-service-revocation.c:841 src/util/gnunet-scrypt.c:274
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:215
+#: src/peerinfo/gnunet-service-peerinfo.c:176
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:352
+#: src/peerinfo/gnunet-service-peerinfo.c:311
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:371
-#: src/peerinfo/gnunet-service-peerinfo.c:388
+#: src/peerinfo/gnunet-service-peerinfo.c:332
+#: src/peerinfo/gnunet-service-peerinfo.c:363
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:468
+#: src/peerinfo/gnunet-service-peerinfo.c:447
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:506
+#: src/peerinfo/gnunet-service-peerinfo.c:490
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:662
+#: src/peerinfo/gnunet-service-peerinfo.c:657
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:668
+#: src/peerinfo/gnunet-service-peerinfo.c:665
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1037
+#: src/peerinfo/gnunet-service-peerinfo.c:1098
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1358
+#: src/peerinfo/gnunet-service-peerinfo.c:1436
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1371
+#: src/peerinfo/gnunet-service-peerinfo.c:1449
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:237
-msgid "aborted due to explicit disconnect request"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:363
-#, fuzzy
-msgid "failed to transmit request (service down?)"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-
-#: src/peerinfo/peerinfo_api.c:519
+#: src/peerinfo/peerinfo_api.c:218
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/peerinfo/peerinfo_api.c:563 src/peerinfo/peerinfo_api.c:586
-#: src/peerinfo/peerinfo_api.c:603 src/peerinfo/peerinfo_api.c:616
-#: src/peerinfo/peerinfo_api.c:631
-#, fuzzy
-msgid "Received invalid message from `PEERINFO' service."
-msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
-
-#: src/peerinfo/peerinfo_api.c:720
-#, fuzzy
-msgid "Timeout transmitting iteration request to `PEERINFO' service."
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-
-#: src/peerinfo/peerinfo_api_notify.c:268
-#, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:245
+#: src/peerinfo-tool/gnunet-peerinfo.c:237
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
+#: src/peerinfo-tool/gnunet-peerinfo.c:244
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:301
+#: src/peerinfo-tool/gnunet-peerinfo.c:297
+#: src/rest-plugins/plugin_rest_peerinfo.c:499
 #, 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:463
+#: src/peerinfo-tool/gnunet-peerinfo.c:464
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:477
+#: src/peerinfo-tool/gnunet-peerinfo.c:478
 #, 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:496
+#: src/peerinfo-tool/gnunet-peerinfo.c:497
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:566
-#, c-format
-msgid "Failure adding HELLO: %s\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:695
-#, fuzzy, c-format
-msgid "Failed to get my own HELLO from this peer!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:727
-#, 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:841
+#: src/peerinfo-tool/gnunet-peerinfo.c:797
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:882
+#: src/peerinfo-tool/gnunet-peerinfo.c:841
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:885
+#: src/peerinfo-tool/gnunet-peerinfo.c:846
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:888
+#: src/peerinfo-tool/gnunet-peerinfo.c:850
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:891
+#: src/peerinfo-tool/gnunet-peerinfo.c:855
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:894
+#: src/peerinfo-tool/gnunet-peerinfo.c:860
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:897
+#: src/peerinfo-tool/gnunet-peerinfo.c:866
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:871
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:903
+#: src/peerinfo-tool/gnunet-peerinfo.c:877
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:917
+#: src/peerinfo-tool/gnunet-peerinfo.c:895
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:127
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:103
+#: src/transport/gnunet-service-transport_plugins.c:166
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:132
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:107
+#: src/transport/gnunet-service-transport_plugins.c:171
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:164
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:206
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/peerstore/gnunet-peerstore.c:92
+#: src/peerstore/gnunet-peerstore.c:89
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:384
-#, fuzzy
-msgid "Malformed iterate request.\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/peerstore/gnunet-service-peerstore.c:391
-msgid "Sub system not supplied in client iterate request.\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:451
-#, fuzzy
-msgid "Malformed store request from client\n"
-msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:459
-msgid "Full key not supplied in client store request\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:478
-#, fuzzy
-msgid "Failed to store requested value, database error."
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-
-#: src/peerstore/gnunet-service-peerstore.c:557
-msgid "No database backend configured\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:568
+#: src/peerstore/gnunet-service-peerstore.c:596
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerstore/peerstore_api.c:329 src/sensor/sensor_api.c:179
-#, c-format
-msgid "Received an error notification from MQ of type: %d\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:375
+#: src/peerstore/peerstore_api.c:348
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:402
-msgid "Iteration canceled due to reconnection."
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:681
+#: src/peerstore/peerstore_api.c:564 src/peerstore/peerstore_api.c:613
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
 
-#: src/peerstore/peerstore_api.c:692
-#, fuzzy
-msgid "Error communicating with `PEERSTORE' service."
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/peerstore/peerstore_api.c:711
+#: src/peerstore/peerstore_api.c:627
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/peerstore/peerstore_api.c:821
-msgid ""
-"Problem receiving a watch response, no way to determine which request.\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:833
+#: src/peerstore/peerstore_api.c:776
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:398
-#: src/psycstore/plugin_psycstore_sqlite.c:286
+#: src/peerstore/plugin_peerstore_sqlite.c:451
+#: src/psycstore/plugin_psycstore_sqlite.c:280
 #, 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:422
-#: src/psycstore/plugin_psycstore_sqlite.c:263
+#: src/peerstore/plugin_peerstore_sqlite.c:486
+#: src/psycstore/plugin_psycstore_mysql.c:248
+#: src/psycstore/plugin_psycstore_sqlite.c:257
 #, fuzzy, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
 "  %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:504
+#: src/peerstore/plugin_peerstore_sqlite.c:568
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/postgres/postgres.c:59
-#, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/postgres/postgres.c:148
+#: src/pq/pq_prepare.c:82
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "Kunde inte initiera SQLite.\n"
+msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
+msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:260
+#: src/psycstore/gnunet-service-psycstore.c:247
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:284
+#: src/psycstore/gnunet-service-psycstore.c:269
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:306
+#: src/psycstore/gnunet-service-psycstore.c:298
+#, fuzzy
+msgid "Dropping invalid fragment\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:309
 #, fuzzy
-msgid "Failed to store fragment!\n"
+msgid "Failed to store fragment\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:362
+#: src/psycstore/gnunet-service-psycstore.c:366
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:402
+#: src/psycstore/gnunet-service-psycstore.c:432
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:433
+#: src/psycstore/gnunet-service-psycstore.c:462
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:461
+#: src/psycstore/gnunet-service-psycstore.c:492
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:497
-#: src/psycstore/gnunet-service-psycstore.c:570
-msgid "Tried to set invalid state variable name!\n"
-msgstr ""
-
-#: src/psycstore/gnunet-service-psycstore.c:513
-#, fuzzy
-msgid "Failed to begin modifying state!\n"
+#: src/psycstore/gnunet-service-psycstore.c:673
+#, fuzzy, c-format
+msgid "Failed to begin modifying state: %d\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:536
+#: src/psycstore/gnunet-service-psycstore.c:683
 #, fuzzy, c-format
-msgid "Unknown operator: %c\n"
-msgstr "Okänd operation \"%s\"\n"
+msgid "Failed to modify state: %d\n"
+msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:546
+#: src/psycstore/gnunet-service-psycstore.c:691
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:584
+#: src/psycstore/gnunet-service-psycstore.c:728
+msgid "Tried to set invalid state variable name!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:742
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:600
+#: src/psycstore/gnunet-service-psycstore.c:759
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:620
-#: src/psycstore/gnunet-service-psycstore.c:639
+#: src/psycstore/gnunet-service-psycstore.c:777
+#: src/psycstore/gnunet-service-psycstore.c:793
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:662
-#: src/psycstore/gnunet-service-psycstore.c:713
+#: src/psycstore/gnunet-service-psycstore.c:822
+#: src/psycstore/gnunet-service-psycstore.c:879
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:689
-#: src/psycstore/gnunet-service-psycstore.c:728
+#: src/psycstore/gnunet-service-psycstore.c:849
+#: src/psycstore/gnunet-service-psycstore.c:894
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:60
+#: src/psycstore/plugin_psycstore_mysql.c:279
+#, fuzzy
+msgid "Unable to initialize Mysql.\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/psycstore/plugin_psycstore_mysql.c:289
+#, fuzzy, c-format
+msgid "Failed to run SQL statement `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:59
 #, fuzzy, c-format
 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:1932
+#: src/psycstore/plugin_psycstore_sqlite.c:1922
 msgid "SQLite database running\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:482
+#: src/pt/gnunet-daemon-pt.c:421
 #, fuzzy
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/pt/gnunet-daemon-pt.c:488
+#: src/pt/gnunet-daemon-pt.c:427
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:541
+#: src/pt/gnunet-daemon-pt.c:481
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:717
+#: src/pt/gnunet-daemon-pt.c:665
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:723
+#: src/pt/gnunet-daemon-pt.c:672
 #, fuzzy
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/pt/gnunet-daemon-pt.c:826
+#: src/pt/gnunet-daemon-pt.c:710
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:766
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:888
+#: src/pt/gnunet-daemon-pt.c:771
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:896
+#: src/pt/gnunet-daemon-pt.c:779
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:969
+#: src/pt/gnunet-daemon-pt.c:874
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:985
+#: src/pt/gnunet-daemon-pt.c:891
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# byte mottagna av typen %d"
 
-#: src/pt/gnunet-daemon-pt.c:1261 src/pt/gnunet-daemon-pt.c:1270
-#: src/pt/gnunet-daemon-pt.c:1290 src/pt/gnunet-daemon-pt.c:1301
-#: src/pt/gnunet-daemon-pt.c:1310
+#: src/pt/gnunet-daemon-pt.c:1217 src/pt/gnunet-daemon-pt.c:1226
+#: src/pt/gnunet-daemon-pt.c:1242 src/pt/gnunet-daemon-pt.c:1251
+#: src/pt/gnunet-daemon-pt.c:1260
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/pt/gnunet-daemon-pt.c:1347
+#: src/pt/gnunet-daemon-pt.c:1305
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:270
-#: src/regex/gnunet-regex-simulation-profiler.c:659
+#: src/reclaim/gnunet-reclaim.c:465
+#, fuzzy, c-format
+msgid "Ego is required\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/reclaim/gnunet-reclaim.c:473
+#, c-format
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:481
+#, fuzzy, c-format
+msgid "Requesting party key is required!\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/reclaim/gnunet-reclaim.c:504
+msgid "Add attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:510
+msgid "Attribute value"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:515
+msgid "Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:520
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:529
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:534
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:539
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:544
+msgid "Type of attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:549
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/reclaim/reclaim_api.c:434
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/regex/gnunet-daemon-regexprofiler.c:265
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:380
+#: src/regex/gnunet-daemon-regexprofiler.c:378
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1288
+#: src/regex/gnunet-regex-profiler.c:1384
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/regex/gnunet-regex-profiler.c:1299
-#, fuzzy
-msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/regex/gnunet-regex-profiler.c:1328
-#: src/regex/gnunet-regex-simulation-profiler.c:622
+#: src/regex/gnunet-regex-profiler.c:1425
+#: src/regex/gnunet-regex-simulation-profiler.c:628
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1334
-#: src/regex/gnunet-regex-simulation-profiler.c:629
+#: src/regex/gnunet-regex-profiler.c:1431
+#: src/regex/gnunet-regex-simulation-profiler.c:636
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1341
+#: src/regex/gnunet-regex-profiler.c:1438
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1350
+#: src/regex/gnunet-regex-profiler.c:1447
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1370
+#: src/regex/gnunet-regex-profiler.c:1467
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1455
+#: src/regex/gnunet-regex-profiler.c:1555
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1458
+#: src/regex/gnunet-regex-profiler.c:1561
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1461
+#: src/regex/gnunet-regex-profiler.c:1567
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1464
+#: src/regex/gnunet-regex-profiler.c:1574
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1467
+#: src/regex/gnunet-regex-profiler.c:1580
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1479
+#: src/regex/gnunet-regex-profiler.c:1593
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:689
+#: src/regex/gnunet-regex-simulation-profiler.c:697
 #, fuzzy
 msgid "name of the table to write DFAs"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:692
+#: src/regex/gnunet-regex-simulation-profiler.c:703
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:705
+#: src/regex/gnunet-regex-simulation-profiler.c:717
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api.c:131
+#: src/regex/regex_api_announce.c:150
 #, fuzzy, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/revocation/gnunet-revocation.c:126
+#: src/regex/regex_api_search.c:210
 #, fuzzy, c-format
-msgid "Key `%s' is valid\n"
-msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
+msgid "Search string `%s' is too long!\n"
+msgstr "\"%s\" är inte en fil.\n"
 
-#: src/revocation/gnunet-revocation.c:131
+#: src/rest/gnunet-rest-server.c:925
+msgid "listen on specified port (default: 7776)"
+msgstr ""
+
+#: src/rest/gnunet-rest-server.c:942
+#, fuzzy
+msgid "GNUnet REST server"
+msgstr "Spåra GNUnets nätverkstopologi."
+
+#: src/rest-plugins/plugin_rest_copying.c:207
+#, fuzzy
+msgid "COPYING REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugins/plugin_rest_credential.c:1126
+#, fuzzy
+msgid "GNS REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugins/plugin_rest_gns.c:450
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugins/plugin_rest_identity.c:1295
+#, fuzzy
+msgid "Identity REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugins/plugin_rest_namestore.c:1077
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugins/plugin_rest_openid_connect.c:2135
+#: src/rest-plugins/plugin_rest_reclaim.c:1079
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugins/plugin_rest_peerinfo.c:794
+#, fuzzy
+msgid "Peerinfo REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/revocation/gnunet-revocation.c:127
+#, fuzzy, c-format
+msgid "Key `%s' is valid\n"
+msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
+
+#: src/revocation/gnunet-revocation.c:132
 #, fuzzy, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/revocation/gnunet-revocation.c:137
+#: src/revocation/gnunet-revocation.c:138
 #, fuzzy
 msgid "Internal error\n"
 msgstr "Okänt fel.\n"
 
-#: src/revocation/gnunet-revocation.c:163
+#: src/revocation/gnunet-revocation.c:164
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:168
+#: src/revocation/gnunet-revocation.c:169
 #, fuzzy
 msgid "Revocation failed (!)\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:174
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:178
+#: src/revocation/gnunet-revocation.c:179
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:183
+#: src/revocation/gnunet-revocation.c:184
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:294
+#: src/revocation/gnunet-revocation.c:321
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:324
+#: src/revocation/gnunet-revocation.c:350
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/revocation/gnunet-revocation.c:345
+#: src/revocation/gnunet-revocation.c:371
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:365
+#: src/revocation/gnunet-revocation.c:391
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:375
+#: src/revocation/gnunet-revocation.c:401
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:407
+#: src/revocation/gnunet-revocation.c:435 src/social/gnunet-social.c:1178
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/revocation/gnunet-revocation.c:421
+#: src/revocation/gnunet-revocation.c:448
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:441
+#: src/revocation/gnunet-revocation.c:468
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/revocation/gnunet-revocation.c:463
+#: src/revocation/gnunet-revocation.c:489
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/revocation/gnunet-revocation.c:488
+#: src/revocation/gnunet-revocation.c:514
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
 
-#: src/revocation/gnunet-revocation.c:504
+#: src/revocation/gnunet-revocation.c:533
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:507
+#: src/revocation/gnunet-revocation.c:539
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:510
+#: src/revocation/gnunet-revocation.c:544
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:513
+#: src/revocation/gnunet-revocation.c:550
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:433
+#: src/revocation/gnunet-service-revocation.c:457
+#, fuzzy
+msgid "# unsupported revocations received via set union"
+msgstr "# byte mottogs via TCP"
+
+#: src/revocation/gnunet-service-revocation.c:466
+#, fuzzy
+msgid "# revocation messages received via set union"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/revocation/gnunet-service-revocation.c:471
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:483
-#: src/revocation/gnunet-service-revocation.c:730
+#: src/revocation/gnunet-service-revocation.c:475
+#, fuzzy
+msgid "# revocation set unions failed"
+msgstr "# sessionsnycklar accepterade"
+
+#: src/revocation/gnunet-service-revocation.c:484
+#, fuzzy
+msgid "# revocation set unions completed"
+msgstr "# klartext PONG-meddelanden mottagna"
+
+#: src/revocation/gnunet-service-revocation.c:523
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:822
+#: src/revocation/gnunet-service-revocation.c:865
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/rps/gnunet-rps.c:67
-msgid "rps"
+#: src/rps/gnunet-rps.c:258
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:262
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:266
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2770
+msgid "duration of the profiling"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:221
+#: src/rps/gnunet-rps-profiler.c:2776
+#, fuzzy
+msgid "timeout for the profiling"
+msgstr "ange prioritet för innehållet"
+
+#: src/rps/gnunet-rps-profiler.c:2782
+#, fuzzy
+msgid "number of PeerIDs to request"
+msgstr "antal iterationer"
+
+#: src/rps/gnunet-rps-profiler.c:2797
+#, fuzzy
+msgid "Measure quality and performance of the RPS service."
+msgstr "Kan inte tillgå tjänsten"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:218
 #, 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:228
+#: src/scalarproduct/gnunet-scalarproduct.c:225
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:241
+#: src/scalarproduct/gnunet-scalarproduct.c:238
 #, 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:259
+#: src/scalarproduct/gnunet-scalarproduct.c:256
 msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:281
+#: src/scalarproduct/gnunet-scalarproduct.c:278
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:299
+#: src/scalarproduct/gnunet-scalarproduct.c:296
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:326
+#: src/scalarproduct/gnunet-scalarproduct.c:323
 #, c-format
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
+#: src/scalarproduct/gnunet-scalarproduct.c:349
+#: src/scalarproduct/gnunet-scalarproduct.c:355
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:353
+#: src/scalarproduct/gnunet-scalarproduct.c:361
 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:356
+#: src/scalarproduct/gnunet-scalarproduct.c:367
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
+#: src/scalarproduct/gnunet-scalarproduct.c:377
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1419
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1564
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1399
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1343
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1170
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1061
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/scalarproduct/scalarproduct_api.c:296
+#: src/scalarproduct/scalarproduct_api.c:183
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+#: src/secretsharing/gnunet-secretsharing-profiler.c:614
 msgid "dkg start delay"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+#: src/secretsharing/gnunet-secretsharing-profiler.c:620
 msgid "dkg timeout"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+#: src/secretsharing/gnunet-secretsharing-profiler.c:626
 msgid "threshold"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+#: src/secretsharing/gnunet-secretsharing-profiler.c:631
 msgid "also profile decryption"
 msgstr ""
 
-#: src/sensordashboard/gnunet-service-sensordashboard.c:353
-#, fuzzy, c-format
-msgid "Error trying to send a message to peer `%s'.\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/set/gnunet-service-set.c:2004
+#, fuzzy
+msgid "Could not connect to CADET service\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/sensor/gnunet-sensor.c:162
+#: src/set/gnunet-set-ibf-profiler.c:250
 #, fuzzy
-msgid "Retrieve information about all defined sensors"
-msgstr "Skriv ut information om GNUnets motparter."
+msgid "number of element in set A-B"
+msgstr "antal iterationer"
 
-#: src/sensor/gnunet-sensor.c:165
+#: src/set/gnunet-set-ibf-profiler.c:256
 #, fuzzy
-msgid "Retrieve information about a single sensor"
-msgstr "Skriv ut information om GNUnets motparter."
+msgid "number of element in set B-A"
+msgstr "antal iterationer"
 
-#: src/sensor/gnunet-sensor.c:168
-msgid "Force an anomaly on a sensor, use only for testing"
+#: src/set/gnunet-set-ibf-profiler.c:262
+msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/sensor/gnunet-sensor.c:175
-msgid "sensor"
+#: src/set/gnunet-set-ibf-profiler.c:268
+msgid "hash num"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:729
-msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
+#: src/set/gnunet-set-ibf-profiler.c:274
+msgid "ibf size"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:736
-#, fuzzy
-msgid "Missing or invalid topology file.\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/sensor/gnunet-sensor-profiler.c:782
-#, fuzzy
-msgid "Number of peers to run"
-msgstr "antal iterationer"
-
-#: src/sensor/gnunet-sensor-profiler.c:784
-msgid "Path to topology file"
+#: src/set/gnunet-set-profiler.c:442
+msgid "use byzantine mode"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:787
-msgid "Change the interval of running sensors to given value"
+#: src/set/gnunet-set-profiler.c:448
+msgid "force sending full set"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:790
-#, fuzzy
-msgid "Number of peers to simulate anomalies on"
-msgstr "antal iterationer"
-
-#: src/sensor/gnunet-sensor-profiler.c:797
-#, fuzzy
-msgid "Profiler for sensor service"
-msgstr "Fel vid skapandet av användare"
-
-#: src/sensor/gnunet-service-sensor_analysis.c:204
-#, fuzzy
-msgid "Received an invalid sensor value."
-msgstr "Mottog ogiltig \"%s\" begäran (fel tabell)\n"
-
-#: src/sensor/gnunet-service-sensor_analysis.c:295
-#, fuzzy
-msgid "Analysis model not defined in configuration.\n"
-msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+#: src/set/gnunet-set-profiler.c:454
+msgid "number delta operation"
+msgstr ""
 
-#: src/sensor/gnunet-service-sensor_analysis.c:304
-#, fuzzy, c-format
-msgid "Could not load analysis model `%s'.\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/set/gnunet-set-profiler.c:466
+msgid "operation to execute"
+msgstr ""
 
-#: src/sensor/gnunet-service-sensor_analysis.c:312
-#, fuzzy
-msgid "Could not connect to peerstore service.\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
+#: src/set/gnunet-set-profiler.c:472
+msgid "element size"
+msgstr ""
 
-#: src/sensor/gnunet-service-sensor_monitoring.c:233
+#: src/social/gnunet-social.c:1164
 #, fuzzy
-msgid "Unknown value type expected by sensor, this should not happen.\n"
-msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
-
-#: src/sensor/gnunet-service-sensor_monitoring.c:268
-#, fuzzy, c-format
-msgid "Received an invalid value for sensor `%s': %s\n"
-msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
+msgid "--place missing or invalid.\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/sensor/gnunet-service-sensor_monitoring.c:345
-#, c-format
-msgid "Sensor `%s': External process should not be a path, disabling sensor.\n"
+#: src/social/gnunet-social.c:1215
+msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_monitoring.c:368
-#, c-format
-msgid ""
-"Sensor `%s' process `%s' problem: binary doesn't exist or not executable\n"
+#: src/social/gnunet-social.c:1220
+msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_monitoring.c:416
-#, c-format
-msgid "Sensor `%s' execution task already set, this should not happen\n"
+#: src/social/gnunet-social.c:1225
+msgid "create a place"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:828
-#, fuzzy
-msgid "Double creation of proof-of-work, this should not happen.\n"
-msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
+#: src/social/gnunet-social.c:1230
+msgid "destroy a place we were hosting"
+msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:834
-#, fuzzy
-msgid "Failed to create pow and signature block.\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+#: src/social/gnunet-social.c:1235
+msgid "enter somebody else's place"
+msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1046
-#, c-format
-msgid "PEERSTORE error: %s.\n"
+#: src/social/gnunet-social.c:1241
+msgid "find state matching name prefix"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1151
-#: src/sensor/gnunet-service-sensor_reporting.c:1409
-#, fuzzy
-msgid "Failed to connect to CORE service.\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/social/gnunet-social.c:1246
+msgid "replay history of messages up to the given --limit"
+msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1158
-msgid "Peer identity received from CORE init doesn't match ours.\n"
+#: src/social/gnunet-social.c:1251
+msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1398
-#, fuzzy
-msgid "Failed to connect to peerstore service.\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/social/gnunet-social.c:1256
+msgid "publish something to a place we are hosting"
+msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1419
-#: src/sensor/gnunet-service-sensor_update.c:781
-#, fuzzy
-msgid "Failed to connect to CADET service.\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/social/gnunet-social.c:1261
+msgid "reconnect to a previously entered place"
+msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1426
-#, fuzzy
-msgid "Failed to load my private key.\n"
-msgstr "Misslyckades att starta samling.\n"
+#: src/social/gnunet-social.c:1266
+msgid "search for state matching exact name"
+msgstr ""
 
-#: src/sensor/gnunet-service-sensor_update.c:327
-#, c-format
-msgid "Error trying to send a message to update point `%s'.\n"
+#: src/social/gnunet-social.c:1271
+msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_update.c:418
-#, fuzzy, c-format
-msgid "Failed to connect to update point `%s'.\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/social/gnunet-social.c:1276
+msgid "list of egos and subscribed places"
+msgstr ""
 
-#: src/sensor/plugin_sensor_model_gaussian.c:203
-msgid "Missing `TRAINING_WINDOW' value in configuration.\n"
+#: src/social/gnunet-social.c:1281
+msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/sensor/plugin_sensor_model_gaussian.c:221
-msgid "Missing `CONFIDENCE_INTERVAL' value in configuration.\n"
+#: src/social/gnunet-social.c:1290
+msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/sensor/plugin_sensor_model_gaussian.c:229
-msgid "Missing `WEIGHT_INC' value in configuration.\n"
+#: src/social/gnunet-social.c:1296
+msgid "message body or state value"
 msgstr ""
 
-#: src/sensor/sensor_api.c:296
+#: src/social/gnunet-social.c:1302
 #, fuzzy
-msgid "Iterate request canceled due to disconnection.\n"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-
-#: src/sensor/sensor_api.c:307
-msgid "Force anomaly request canceled due to disconnection.\n"
-msgstr ""
+msgid "name or public key of ego"
+msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/sensor/sensor_api.c:374
+#: src/social/gnunet-social.c:1307
 #, fuzzy
-msgid "Timeout transmitting iteration request to `SENSOR' service."
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+msgid "wait for incoming messages"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/sensor/sensor_util_lib.c:107
+#: src/social/gnunet-social.c:1313
 #, fuzzy
-msgid "Error reading sensor version\n"
-msgstr "Fel vid skapandet av användare"
+msgid "GNS name"
+msgstr "Visa _namn"
 
-#: src/sensor/sensor_util_lib.c:116
-msgid "Invalid sensor version number, format should be major.minor\n"
+#: src/social/gnunet-social.c:1319
+msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:131
-#, fuzzy
-msgid "Error reading sensor category\n"
-msgstr "Fel vid skapandet av användare"
-
-#: src/sensor/sensor_util_lib.c:164
-#, fuzzy
-msgid "Error reading sensor run interval\n"
-msgstr "Klar med skapandet av värdnyckel.\n"
+#: src/social/gnunet-social.c:1325
+msgid "name (key) to query from state"
+msgstr ""
 
-#: src/sensor/sensor_util_lib.c:191
+#: src/social/gnunet-social.c:1331
 #, fuzzy
-msgid "Error reading sensor source\n"
-msgstr "Fel vid skapandet av användare"
-
-#: src/sensor/sensor_util_lib.c:206
-msgid "Error reading sensor gnunet-statistics source information\n"
-msgstr ""
+msgid "method name"
+msgstr "Visa _namn"
 
-#: src/sensor/sensor_util_lib.c:218
+#: src/social/gnunet-social.c:1337
 #, fuzzy
-msgid "Error reading sensor process name\n"
-msgstr "Fel vid skapandet av användare"
+msgid "number of messages to replay from history"
+msgstr "antal meddelanden att använda per iteration"
 
-#: src/sensor/sensor_util_lib.c:233
-msgid "Error reading sensor expected datatype\n"
+#: src/social/gnunet-social.c:1343
+msgid "key address of place"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:241
-msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
+#: src/social/gnunet-social.c:1349
+msgid "start message ID for history replay"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:299
-#, fuzzy, c-format
-msgid "Failed to access sensor file: %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/sensor/sensor_util_lib.c:308
-#, fuzzy, c-format
-msgid "Failed to load sensor definition: %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/sensor/sensor_util_lib.c:370
-#, c-format
-msgid "Sensor `%s' already exists with same or newer version\n"
+#: src/social/gnunet-social.c:1354
+msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:387
-#, fuzzy, c-format
-msgid "Error adding new sensor `%s' to global hashmap.\n"
+#: src/social/gnunet-social.c:1360
+msgid "end message ID for history replay"
 msgstr ""
-"\n"
-"Fel vid uppladdning av fil: %s\n"
 
-#: src/sensor/sensor_util_lib.c:412
-#, fuzzy, c-format
-msgid "Error loading sensor from file: %s\n"
+#: src/social/gnunet-social.c:1365
+msgid "respond to entry requests by refusing all guests"
 msgstr ""
-"\n"
-"Fel vid uppladdning av fil: %s\n"
-
-#: src/set/gnunet-service-set.c:1531
-#, fuzzy
-msgid "Could not connect to cadet service\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/set/gnunet-set-ibf-profiler.c:237
-#, fuzzy
-msgid "number of element in set A-B"
-msgstr "antal iterationer"
-
-#: src/set/gnunet-set-ibf-profiler.c:240
-#, fuzzy
-msgid "number of element in set B-A"
-msgstr "antal iterationer"
 
-#: src/set/gnunet-set-ibf-profiler.c:243
-msgid "number of common elements in A and B"
+#: src/social/gnunet-social.c:1375
+msgid ""
+"gnunet-social - Interact with the social service: enter/leave, send/receive "
+"messages, access history and state.\n"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:246
-msgid "hash num"
+#: src/sq/sq.c:52
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:249
-msgid "ibf size"
+#: src/sq/sq.c:59
+msgid "Failure in sqlite3_reset (!)\n"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:298
-msgid "oeration to execute"
-msgstr ""
+#: src/sq/sq.c:137
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
-#: src/statistics/gnunet-service-statistics.c:323
+#: src/statistics/gnunet-service-statistics.c:336
 #, fuzzy, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-service-statistics.c:434
+#: src/statistics/gnunet-service-statistics.c:1084
 #, fuzzy, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-statistics.c:145
+#: src/statistics/gnunet-statistics.c:407
+#: src/statistics/gnunet-statistics.c:448
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:148
+#: src/statistics/gnunet-statistics.c:410
+#: src/statistics/gnunet-statistics.c:451
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:198
+#: src/statistics/gnunet-statistics.c:526
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:204
+#: src/statistics/gnunet-statistics.c:534
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:235
+#: src/statistics/gnunet-statistics.c:577
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:243
+#: src/statistics/gnunet-statistics.c:592
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:727
 #, fuzzy, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
+msgid "Invalid argument `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/statistics/gnunet-statistics.c:282
+#: src/statistics/gnunet-statistics.c:745
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/statistics/gnunet-statistics.c:290
+#: src/statistics/gnunet-statistics.c:753
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:323
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
+#: src/statistics/gnunet-statistics.c:784
+#, c-format
+msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
+msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:817
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:822
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:355
+#: src/statistics/gnunet-statistics.c:828
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:358
+#: src/statistics/gnunet-statistics.c:834
+msgid "use as csv separator"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:840
+msgid "path to the folder containing the testbed data"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:845
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:850
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:856
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:367
+#: src/statistics/gnunet-statistics.c:862
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:379
+#: src/statistics/gnunet-statistics.c:879
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
-#: src/statistics/statistics_api.c:519
+#: src/statistics/statistics_api.c:751
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/statistics/statistics_api.c:1090
-msgid ""
-"Failed to receive acknowledgement from statistics service, some statistics "
-"might have been lost!\n"
-msgstr ""
-
-#: src/testbed/generate-underlay-topology.c:225
+#: src/testbed/generate-underlay-topology.c:223
 #, fuzzy
 msgid "Need at least 2 arguments\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/testbed/generate-underlay-topology.c:230
+#: src/testbed/generate-underlay-topology.c:228
 msgid "Database filename missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:237
+#: src/testbed/generate-underlay-topology.c:235
 msgid "Topology string missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:242
+#: src/testbed/generate-underlay-topology.c:240
 #, fuzzy, c-format
 msgid "Invalid topology: %s\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/testbed/generate-underlay-topology.c:255
+#: src/testbed/generate-underlay-topology.c:253
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:261
+#: src/testbed/generate-underlay-topology.c:259
 #, fuzzy, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/testbed/generate-underlay-topology.c:269
+#: src/testbed/generate-underlay-topology.c:267
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:283
+#: src/testbed/generate-underlay-topology.c:281
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:289
+#: src/testbed/generate-underlay-topology.c:287
 #, fuzzy, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/testbed/generate-underlay-topology.c:338
-#: src/testbed/gnunet-testbed-profiler.c:293
+#: src/testbed/generate-underlay-topology.c:340
+#: src/testbed/gnunet-testbed-profiler.c:281
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:347
+#: src/testbed/generate-underlay-topology.c:350
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6816,201 +6767,242 @@ msgid ""
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:333
+#: src/testbed/gnunet-daemon-latency-logger.c:313
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:295
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:46
+#: src/testing/testing.c:286 src/util/gnunet-ecc.c:310
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:474
+#: src/testbed/gnunet-daemon-testbed-underlay.c:469
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:730
+#: src/testbed/gnunet-service-testbed_cpustatus.c:726
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1015
-#, fuzzy
-msgid "Misconfiguration (can't connect to the ARM service)"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1157
+#, fuzzy, c-format
+msgid "%s is stopped"
+msgstr "# byte krypterade"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1159
+#, fuzzy, c-format
+msgid "%s is starting"
+msgstr "\"%s\" startar\n"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1161
+#, c-format
+msgid "%s is stopping"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1163
+#, fuzzy, c-format
+msgid "%s is starting already"
+msgstr "\"%s\" startar\n"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1165
+#, c-format
+msgid "%s is stopping already"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1167
+#, c-format
+msgid "%s is started already"
+msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1021
-msgid "Request doesn't fit into a message"
+#: src/testbed/gnunet-service-testbed_peers.c:1169
+#, c-format
+msgid "%s is stopped already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/testbed/gnunet-service-testbed_peers.c:1171
+#, fuzzy, c-format
+msgid "%s service is not known to ARM"
+msgstr "\"%s\" är inte en fil.\n"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1173
+#, fuzzy, c-format
+msgid "%s service failed to start"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:125
+#: src/testbed/gnunet-service-testbed_peers.c:1177
+#, c-format
+msgid "%.s Unknown result code."
+msgstr ""
+
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
 #, fuzzy
 msgid "Waiting for child to exit.\n"
 msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:247
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
 #, fuzzy, c-format
 msgid "Spawning process `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:296
+#: src/testbed/gnunet-testbed-profiler.c:287
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:299
+#: src/testbed/gnunet-testbed-profiler.c:292
 msgid ""
 "run profiler in non-interactive mode where upon testbed setup the profiler "
 "does not wait for a keystroke but continues to run until a termination "
 "signal is received"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:415
+#: src/testbed/testbed_api.c:408
+#, fuzzy, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/testbed/testbed_api_hosts.c:411
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_hosts.c:423
+#: src/testbed/testbed_api_hosts.c:419
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:430
+#: src/testbed/testbed_api_hosts.c:426
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:570
+#: src/testbed/testbed_api_hosts.c:567
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1586
-#, fuzzy, c-format
-msgid "Adding host %u failed with error: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/testbed/testbed_api_testbed.c:819
+#: src/testbed/testbed_api_testbed.c:816
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:988
+#: src/testbed/testbed_api_testbed.c:984
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1054
+#: src/testbed/testbed_api_testbed.c:1050
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1143
+#: src/testbed/testbed_api_testbed.c:1139
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1147
+#: src/testbed/testbed_api_testbed.c:1143
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1185
+#: src/testbed/testbed_api_testbed.c:1181
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1203
+#: src/testbed/testbed_api_testbed.c:1199
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1263
+#: src/testbed/testbed_api_testbed.c:1259
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1275
+#: src/testbed/testbed_api_testbed.c:1271
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1299
+#: src/testbed/testbed_api_testbed.c:1295
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1349
+#: src/testbed/testbed_api_testbed.c:1345
 #, c-format
 msgid ""
 "Maximum number of edges a peer can have in a scale free topology cannot be "
 "more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1365
+#: src/testbed/testbed_api_testbed.c:1361
 #, c-format
 msgid ""
 "The number of edges that can established when adding a new node to scale "
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:960
+#: src/testbed/testbed_api_topology.c:1026
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_topology.c:966
+#: src/testbed/testbed_api_topology.c:1034
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:973
+#: src/testbed/testbed_api_topology.c:1042
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:995
+#: src/testbed/testbed_api_topology.c:1064
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testbed/testbed_api_topology.c:1004
-#: src/testbed/testbed_api_topology.c:1028
+#: src/testbed/testbed_api_topology.c:1073
+#: src/testbed/testbed_api_topology.c:1097
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1010
-#: src/testbed/testbed_api_topology.c:1034
+#: src/testbed/testbed_api_topology.c:1079
+#: src/testbed/testbed_api_topology.c:1103
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testbed/testbed_api_topology.c:1016
-#: src/testbed/testbed_api_topology.c:1040
+#: src/testbed/testbed_api_topology.c:1085
+#: src/testbed/testbed_api_topology.c:1109
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1143
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/testing/gnunet-testing.c:173
+#: src/testing/gnunet-testing.c:171
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/gnunet-testing.c:258
+#: src/testing/gnunet-testing.c:251
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:355
+#: src/testing/gnunet-testing.c:352
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -7019,40 +7011,36 @@ msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:359
+#: src/testing/gnunet-testing.c:363
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/testing/gnunet-testing.c:361
+#: src/testing/gnunet-testing.c:370
 #, fuzzy
 msgid "configuration template"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/testing/gnunet-testing.c:363
+#: src/testing/gnunet-testing.c:376
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:376
+#: src/testing/gnunet-testing.c:389
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:90
+#: src/testing/list-keys.c:89
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/list-keys.c:93
-msgid "skip COUNT number of keys in the beginning"
-msgstr ""
-
-#: src/testing/testing.c:277
+#: src/testing/testing.c:270
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:718
+#: src/testing/testing.c:713
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
@@ -7099,1524 +7087,1541 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing.c:1706
+#: src/testing/testing.c:1645
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/topology/friends.c:100
+#: src/topology/friends.c:124
 #, fuzzy, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/topology/friends.c:154
+#: src/topology/friends.c:178
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:265
+#: src/topology/gnunet-daemon-topology.c:228
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:406
+#: src/topology/gnunet-daemon-topology.c:342
 #, fuzzy
-msgid "# connect requests issued to transport"
+msgid "# connect requests issued to ATS"
 msgstr "# byte mottogs via TCP"
 
-#: src/topology/gnunet-daemon-topology.c:756
-#: src/topology/gnunet-daemon-topology.c:840
+#: src/topology/gnunet-daemon-topology.c:536
+msgid "# HELLO messages gossipped"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:638
+#: src/topology/gnunet-daemon-topology.c:724
 #, fuzzy
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:1020
+#: src/topology/gnunet-daemon-topology.c:921
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:954
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:961
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1077
+#: src/topology/gnunet-daemon-topology.c:983
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1079
+#: src/topology/gnunet-daemon-topology.c:986
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1084
+#: src/topology/gnunet-daemon-topology.c:993
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1090
+#: src/topology/gnunet-daemon-topology.c:999
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1121
-#: src/transport/plugin_transport_wlan.c:1444
+#: src/topology/gnunet-daemon-topology.c:1052
+#: src/transport/plugin_transport_wlan.c:1515
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1178
-msgid "# HELLO messages gossipped"
+#: src/topology/gnunet-daemon-topology.c:1230
+msgid "GNUnet topology control"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1323
-msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
+#: src/transport/gnunet-service-transport_ats.c:139
+msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:274
-#, fuzzy, c-format
-msgid "Adding blacklisting entry for peer `%s'\n"
-msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:283
-#, c-format
-msgid "Adding blacklisting entry for peer `%s':`%s'\n"
+#: src/transport/gnunet-service-transport.c:446
+msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:476
-#: src/transport/gnunet-service-transport_blacklist.c:766
-msgid "# disconnects due to blacklist"
+#: src/transport/gnunet-service-transport.c:816
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:769
-#, fuzzy, c-format
-msgid "Disallowing connection to peer `%s' on transport %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/transport/gnunet-service-transport.c:220
+#: src/transport/gnunet-service-transport.c:1549
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:424
+#: src/transport/gnunet-service-transport.c:1709
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport.c:515
+#: src/transport/gnunet-service-transport.c:1806
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:708
+#: src/transport/gnunet-service-transport.c:2123
+#: src/transport/gnunet-service-transport.c:2595
+msgid "# disconnects due to blacklist"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:2599
 #, fuzzy, c-format
-msgid "Could not obtain a valid network for `%s' %s (%s)\n"
-msgstr "Kunde inte köra \"%s\": %s\n"
+msgid "Disallowing connection to peer `%s' on transport %s\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/transport/gnunet-service-transport.c:2707
+#, fuzzy, c-format
+msgid "Adding blacklisting entry for peer `%s'\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-service-transport.c:757
+#: src/transport/gnunet-service-transport.c:2716
 #, c-format
-msgid ""
-"Address or session unknown: failed to update properties for peer `%s' plugin "
-"`%s' address `%s' session %p\n"
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1094
+#: src/transport/gnunet-service-transport.c:2781
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/transport/gnunet-service-transport_clients.c:481
-msgid "# messages dropped due to slow client"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:774
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/transport/gnunet-service-transport_hello.c:193
+msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:813
-#, fuzzy, c-format
-msgid "Blacklist refuses connection attempt to peer `%s'\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/transport/gnunet-service-transport_clients.c:843
+#: src/transport/gnunet-service-transport_neighbours.c:804
 #, fuzzy
-msgid "# REQUEST CONNECT messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "# session creation failed"
+msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/gnunet-service-transport_clients.c:882
+#: src/transport/gnunet-service-transport_neighbours.c:1051
 #, fuzzy
-msgid "# REQUEST DISCONNECT messages received"
+msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_hello.c:182
-msgid "# refreshed my HELLO"
+#: src/transport/gnunet-service-transport_neighbours.c:1174
+msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1099
-#, fuzzy
-msgid "# DISCONNECT messages sent"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/transport/gnunet-service-transport_neighbours.c:1224
-#: src/transport/gnunet-service-transport_neighbours.c:1639
+#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1783
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1229
+#: src/transport/gnunet-service-transport_neighbours.c:1327
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1234
+#: src/transport/gnunet-service-transport_neighbours.c:1333
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1292
+#: src/transport/gnunet-service-transport_neighbours.c:1393
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1353
-#, fuzzy
-msgid "# keepalives sent"
-msgstr "# sessionsnycklar skickade"
+#: src/transport/gnunet-service-transport_neighbours.c:1477
+msgid "# KEEPALIVES sent"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1386
+#: src/transport/gnunet-service-transport_neighbours.c:1513
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1394
+#: src/transport/gnunet-service-transport_neighbours.c:1521
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1441
+#: src/transport/gnunet-service-transport_neighbours.c:1531
+msgid "# KEEPALIVES received in good order"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1576
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1585
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1450
+#: src/transport/gnunet-service-transport_neighbours.c:1593
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1458
+#: src/transport/gnunet-service-transport_neighbours.c:1602
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1466
+#: src/transport/gnunet-service-transport_neighbours.c:1607
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1544
+#: src/transport/gnunet-service-transport_neighbours.c:1613
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSEs received (OK)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1680
 #, 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:1578
+#: src/transport/gnunet-service-transport_neighbours.c:1714
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1729
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1689
+#: src/transport/gnunet-service-transport_neighbours.c:1852
 #, fuzzy, c-format
-msgid "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "Failed to send SYN message to peer `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1716
+#: src/transport/gnunet-service-transport_neighbours.c:1872
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1761
+#: src/transport/gnunet-service-transport_neighbours.c:1911
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1777
+#: src/transport/gnunet-service-transport_neighbours.c:1928
 #, fuzzy, c-format
-msgid "Failed to transmit SYN message via plugin to %s\n"
+msgid "Failed to transmit SYN message to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1804
+#: src/transport/gnunet-service-transport_neighbours.c:1958
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1853
+#: src/transport/gnunet-service-transport_neighbours.c:2026
 #, fuzzy, c-format
-msgid ""
-"Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
+msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1908
+#: src/transport/gnunet-service-transport_neighbours.c:2080
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1923
+#: src/transport/gnunet-service-transport_neighbours.c:2097
 #, fuzzy, c-format
-msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
+msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2203
-#, 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:2328
+#: src/transport/gnunet-service-transport_neighbours.c:2260
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2333
+#: src/transport/gnunet-service-transport_neighbours.c:2265
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2630
+#: src/transport/gnunet-service-transport_neighbours.c:2652
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3051
-#, 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:3146
+#: src/transport/gnunet-service-transport_neighbours.c:3137
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3154
+#: src/transport/gnunet-service-transport_neighbours.c:3145
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3168
-#: src/transport/gnunet-service-transport_neighbours.c:3203
+#: src/transport/gnunet-service-transport_neighbours.c:3163
+#: src/transport/gnunet-service-transport_neighbours.c:3187
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3215
+#: src/transport/gnunet-service-transport_neighbours.c:3199
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3238
+#: src/transport/gnunet-service-transport_neighbours.c:3224
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3246
+#: src/transport/gnunet-service-transport_neighbours.c:3237
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3445
+#: src/transport/gnunet-service-transport_neighbours.c:3410
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3481
+#: src/transport/gnunet-service-transport_neighbours.c:3446
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3555
-msgid "# SET QUOTA messages ignored (no such peer)"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:3534
+#, fuzzy
+msgid "# quota messages ignored (malformed)"
+msgstr "# byte mottogs via TCP"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3570
-msgid "# disconnects due to quota of 0"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:3541
+#, fuzzy
+msgid "# QUOTA messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3615
+#: src/transport/gnunet-service-transport_neighbours.c:3581
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3621
+#: src/transport/gnunet-service-transport_neighbours.c:3588
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3630
+#: src/transport/gnunet-service-transport_neighbours.c:3599
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3757
+#: src/transport/gnunet-service-transport_neighbours.c:3734
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-service-transport_plugins.c:119
+#: src/transport/gnunet-service-transport_plugins.c:156
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:177
-#: src/transport/gnunet-service-transport_plugins.c:185
-#: src/transport/gnunet-service-transport_plugins.c:193
-#: src/transport/gnunet-service-transport_plugins.c:201
-#: src/transport/gnunet-service-transport_plugins.c:209
-#: src/transport/gnunet-service-transport_plugins.c:217
-#: src/transport/gnunet-service-transport_plugins.c:225
-#: src/transport/gnunet-service-transport_plugins.c:233
-#: src/transport/gnunet-service-transport_plugins.c:241
-#: src/transport/gnunet-service-transport_plugins.c:249
-#: src/transport/gnunet-service-transport_plugins.c:257
+#: src/transport/gnunet-service-transport_plugins.c:221
+#: src/transport/gnunet-service-transport_plugins.c:229
+#: src/transport/gnunet-service-transport_plugins.c:237
+#: src/transport/gnunet-service-transport_plugins.c:245
+#: src/transport/gnunet-service-transport_plugins.c:253
+#: src/transport/gnunet-service-transport_plugins.c:261
+#: src/transport/gnunet-service-transport_plugins.c:269
+#: src/transport/gnunet-service-transport_plugins.c:277
+#: src/transport/gnunet-service-transport_plugins.c:285
+#: src/transport/gnunet-service-transport_plugins.c:293
+#: src/transport/gnunet-service-transport_plugins.c:301
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:264
+#: src/transport/gnunet-service-transport_plugins.c:308
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:493
-msgid "# address records discarded"
+#: src/transport/gnunet-service-transport_validation.c:386
+msgid "# Addresses in validation map"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:563
-#, c-format
-msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+#: src/transport/gnunet-service-transport_validation.c:489
+#: src/transport/gnunet-service-transport_validation.c:675
+#: src/transport/gnunet-service-transport_validation.c:995
+#: src/transport/gnunet-service-transport_validation.c:1607
+msgid "# validations running"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:624
+#: src/transport/gnunet-service-transport_validation.c:530
 #, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# PING-meddelanden i klartext skickade"
+msgid "# address records discarded (timeout)"
+msgstr "# byte kastade via TCP (utgående)"
+
+#: src/transport/gnunet-service-transport_validation.c:578
+msgid "# address records discarded (blacklist)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:666
+msgid "# PINGs for address validation sent"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:746
+msgid "# validations delayed by global throttle"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:722
+#: src/transport/gnunet-service-transport_validation.c:783
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1011
+#: src/transport/gnunet-service-transport_validation.c:1121
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_validation.c:1062
+#: src/transport/gnunet-service-transport_validation.c:1172
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1072
+#: src/transport/gnunet-service-transport_validation.c:1185
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1188
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1083
+#: src/transport/gnunet-service-transport_validation.c:1196
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1095
+#: src/transport/gnunet-service-transport_validation.c:1209
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1103
-#, c-format
-msgid "Received a PING message with validation bug from `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1157
+#: src/transport/gnunet-service-transport_validation.c:1264
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1206
+#: src/transport/gnunet-service-transport_validation.c:1315
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1215
+#: src/transport/gnunet-service-transport_validation.c:1324
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1387
+#: src/transport/gnunet-service-transport_validation.c:1497
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1402
+#: src/transport/gnunet-service-transport_validation.c:1515
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1526
-#, fuzzy, c-format
-msgid "Validation received new %s message for peer `%s' with size %u\n"
-msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
+#: src/transport/gnunet-service-transport_validation.c:1570
+msgid "# validations succeeded"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1533
-#, fuzzy, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
-msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+#: src/transport/gnunet-service-transport_validation.c:1625
+#, fuzzy
+msgid "# HELLOs given to peerinfo"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/transport/gnunet-transport.c:578
+#: src/transport/gnunet-transport.c:411
 #, 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:587
-#: src/transport/gnunet-transport-profiler.c:274
+#: src/transport/gnunet-transport.c:421
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:619
+#: src/transport/gnunet-transport.c:465
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:634
+#: src/transport/gnunet-transport.c:478
 #, 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:646
+#: src/transport/gnunet-transport.c:492
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:673 src/transport/gnunet-transport.c:703
-#, fuzzy, c-format
-msgid "Configuration for plugin `%s' did not work!\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/transport/gnunet-transport.c:678
-#, fuzzy, c-format
-msgid "Configuration for plugin `%s' did work!\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/transport/gnunet-transport.c:683
-#, 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:688
-#, fuzzy, c-format
-msgid "Failed to start NAT test for plugin `%s'\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/transport/gnunet-transport.c:693
-#, c-format
-msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:709
-#, fuzzy, c-format
-msgid "Configuration for plugin `%s' is working!\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/transport/gnunet-transport.c:828
-#, fuzzy, c-format
-msgid ""
-"Peer `%s' %s %s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-msgstr "Jag är ändpunkt \"%s\".\n"
-
-#: src/transport/gnunet-transport.c:864
-#, fuzzy, c-format
-msgid "Peer `%s' %s `%s' \n"
-msgstr "Jag är ändpunkt \"%s\".\n"
-
-#: src/transport/gnunet-transport.c:963 src/transport/gnunet-transport.c:1712
-#, fuzzy
-msgid "Monitor disconnected from transport service. Reconnecting.\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/transport/gnunet-transport.c:1031
-msgid "No transport plugins configured, peer will never communicate\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1045
-#, c-format
-msgid "No port configured for plugin `%s', cannot test it\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1070
-#, fuzzy
-msgid "Failed to start resolver!\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/transport/gnunet-transport.c:1116
+#: src/transport/gnunet-transport.c:525
 #, fuzzy, c-format
-msgid "Transmitting %u bytes to %s\n"
+msgid "Transmitting %u bytes\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1139
-#: src/transport/gnunet-transport-profiler.c:406
-#, fuzzy, c-format
-msgid "Successfully connected to `%s'\n"
-msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
-
-#: src/transport/gnunet-transport.c:1163
+#: src/transport/gnunet-transport.c:559
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1196
-#, fuzzy, c-format
-msgid "Successfully disconnected from `%s'\n"
-msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
-
-#: src/transport/gnunet-transport.c:1219
-#: src/transport/gnunet-transport-profiler.c:434
+#: src/transport/gnunet-transport.c:590
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1244 src/transport/gnunet-transport.c:1270
+#: src/transport/gnunet-transport.c:614 src/transport/gnunet-transport.c:643
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1246
+#: src/transport/gnunet-transport.c:616
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1272
+#: src/transport/gnunet-transport.c:645
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1296
-#: src/transport/gnunet-transport-profiler.c:458
-#, c-format
-msgid "Received %u bytes from %s\n"
-msgstr ""
+#: src/transport/gnunet-transport.c:680
+#, fuzzy, c-format
+msgid "Received %u bytes\n"
+msgstr "mottog ogiltigt \"%s\" meddelande\n"
 
-#: src/transport/gnunet-transport.c:1328
+#: src/transport/gnunet-transport.c:717
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1340
+#: src/transport/gnunet-transport.c:729
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1794
-#: src/transport/gnunet-transport-profiler.c:492
-#, fuzzy
-msgid "Failed to send connect request to transport service\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/transport/gnunet-transport.c:1829
+#: src/transport/gnunet-transport.c:1142
 #, fuzzy
-msgid "Failed to send disconnect request to transport service\n"
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1873
+#: src/transport/gnunet-transport.c:1249
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1881
+#: src/transport/gnunet-transport.c:1262
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1900 src/transport/gnunet-transport.c:1930
-#: src/transport/gnunet-transport.c:1963 src/transport/gnunet-transport.c:1989
-#: src/transport/gnunet-transport.c:2045
-#: src/transport/gnunet-transport-profiler.c:578
+#: src/transport/gnunet-transport.c:1292
 #, fuzzy
-msgid "Failed to connect to transport service\n"
+msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1909 src/transport/gnunet-transport.c:1940
-#: src/transport/gnunet-transport.c:1974
+#: src/transport/gnunet-transport.c:1298
+msgid "Blacklisting request in place, stop with CTRL-C\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:1323 src/transport/gnunet-transport.c:1353
+#: src/transport/gnunet-transport.c:1406
 #, fuzzy
-msgid "Failed to send request to transport service\n"
+msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1994
+#: src/transport/gnunet-transport.c:1360
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2093
+#: src/transport/gnunet-transport.c:1431
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2096
+#: src/transport/gnunet-transport.c:1435
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2099
-#, fuzzy
-msgid "connect to a peer"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/transport/gnunet-transport.c:2102
+#: src/transport/gnunet-transport.c:1439
 #, fuzzy
-msgid "disconnect to a peer"
+msgid "disconnect from a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:2105
-#, fuzzy
-msgid "print information for all pending validations "
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/transport/gnunet-transport.c:2108
-#, fuzzy
-msgid "print information for all pending validations continuously"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/transport/gnunet-transport.c:2111
+#: src/transport/gnunet-transport.c:1443
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2117
+#: src/transport/gnunet-transport.c:1451
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2120
+#: src/transport/gnunet-transport.c:1455
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:2123
-#: src/transport/gnunet-transport-profiler.c:638
+#: src/transport/gnunet-transport.c:1460
+#: src/transport/gnunet-transport-profiler.c:639
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2126
+#: src/transport/gnunet-transport.c:1464
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2129
+#: src/transport/gnunet-transport.c:1469
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2132
-msgid "test transport configuration (involves external server)"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:2143
-#: src/transport/gnunet-transport-profiler.c:649
+#: src/transport/gnunet-transport.c:1480
+#: src/transport/gnunet-transport-profiler.c:650
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport-profiler.c:218
+#: src/transport/gnunet-transport-profiler.c:217
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:254
-#, c-format
-msgid "%u;%u;%llu;%llu;%.2f;%.2f"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:263
-#, c-format
-msgid ";%llu;%.2f"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:280
-msgid "\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:332
-msgid "."
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:352
-#, c-format
-msgid ""
-"\n"
-"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:400
-#, fuzzy, c-format
-msgid "Connected to different peer `%s'\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
-
-#: src/transport/gnunet-transport-profiler.c:483
-#, fuzzy, c-format
-msgid "Retrying to connect to `%s'\n"
-msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
-
-#: src/transport/gnunet-transport-profiler.c:508
-#, fuzzy, c-format
-msgid "Denying connection to `%s'\n"
-msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
-
-#: src/transport/gnunet-transport-profiler.c:537
-#, fuzzy
-msgid "Message size too big!\n"
-msgstr "meddelandestorlek"
-
-#: src/transport/gnunet-transport-profiler.c:543
-#, fuzzy
-msgid "No peer identity given\n"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/transport/gnunet-transport-profiler.c:558
-#, c-format
-msgid "Trying to send %u messages with size %u to peer `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:564
-#, fuzzy, c-format
-msgid "Trying to receive messages from peer `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/transport/gnunet-transport-profiler.c:569
-#, fuzzy
-msgid "No operation given\n"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/transport/gnunet-transport-profiler.c:623
+#: src/transport/gnunet-transport-profiler.c:615
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:626
+#: src/transport/gnunet-transport-profiler.c:619
 #, fuzzy
 msgid "receive data from peer"
 msgstr "# byte mottagna av typen %d"
 
-#: src/transport/gnunet-transport-profiler.c:629
+#: src/transport/gnunet-transport-profiler.c:624
 #, fuzzy
 msgid "iterations"
 msgstr "Visa alla alternativ"
 
-#: src/transport/gnunet-transport-profiler.c:632
+#: src/transport/gnunet-transport-profiler.c:629
 #, fuzzy
 msgid "number of messages to send"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/transport/gnunet-transport-profiler.c:635
+#: src/transport/gnunet-transport-profiler.c:634
 #, fuzzy
 msgid "message size to use"
 msgstr "meddelandestorlek"
 
-#: src/transport/plugin_transport_http_client.c:1491
-#: src/transport/plugin_transport_http_server.c:2274
-#: src/transport/plugin_transport_http_server.c:3441
-#: src/transport/plugin_transport_tcp.c:2826
-#: src/transport/plugin_transport_tcp.c:2833
+#: src/transport/plugin_transport_http_client.c:1472
+#: src/transport/plugin_transport_http_server.c:2310
+#: src/transport/plugin_transport_http_server.c:3524
+#: src/transport/plugin_transport_tcp.c:3889
+#: src/transport/plugin_transport_tcp.c:3896
+#: src/transport/plugin_transport_xt.c:3897
+#: src/transport/plugin_transport_xt.c:3904
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2115
+#: src/transport/plugin_transport_http_client.c:2113
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2164
-#: src/transport/plugin_transport_http_server.c:3175
+#: src/transport/plugin_transport_http_client.c:2162
+#: src/transport/plugin_transport_http_server.c:3239
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:2181
-#: src/transport/plugin_transport_http_server.c:3245
+#: src/transport/plugin_transport_http_client.c:2179
+#: src/transport/plugin_transport_http_server.c:3309
 #, 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:2215
+#: src/transport/plugin_transport_http_client.c:2213
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/transport/plugin_transport_http_server.c:1761
+#: src/transport/plugin_transport_http_server.c:1754
 #, 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:1992
+#: src/transport/plugin_transport_http_server.c:2026
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2000
+#: src/transport/plugin_transport_http_server.c:2034
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2150
+#: src/transport/plugin_transport_http_server.c:2184
 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:2173
+#: src/transport/plugin_transport_http_server.c:2207
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2300
+#: src/transport/plugin_transport_http_server.c:2336
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2609
+#: src/transport/plugin_transport_http_server.c:2648
 #, 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:2643 src/util/service.c:703
-#, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/transport/plugin_transport_http_server.c:2661 src/util/service.c:722
-#, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
-
-#: src/transport/plugin_transport_http_server.c:2774
+#: src/transport/plugin_transport_http_server.c:2813
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2852
+#: src/transport/plugin_transport_http_server.c:2899
+#: src/transport/plugin_transport_udp.c:3621
+#: src/transport/plugin_transport_xu.c:2047
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2951
+#: src/transport/plugin_transport_http_server.c:3005
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2966
+#: src/transport/plugin_transport_http_server.c:3020
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2972
+#: src/transport/plugin_transport_http_server.c:3026
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2983
+#: src/transport/plugin_transport_http_server.c:3037
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2989
+#: src/transport/plugin_transport_http_server.c:3043
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:3003
+#: src/transport/plugin_transport_http_server.c:3062
 #, 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:3013
-#, fuzzy, c-format
-msgid "Binding to IPv4 address %s\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
-
-#: src/transport/plugin_transport_http_server.c:3035
+#: src/transport/plugin_transport_http_server.c:3097
 #, 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:3045
-#, fuzzy, c-format
-msgid "Binding to IPv6 address %s\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
-
-#: src/transport/plugin_transport_http_server.c:3108
+#: src/transport/plugin_transport_http_server.c:3172
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3129
+#: src/transport/plugin_transport_http_server.c:3193
 #, 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:3146
+#: src/transport/plugin_transport_http_server.c:3210
 #, 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:3453
+#: src/transport/plugin_transport_http_server.c:3536
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/transport/plugin_transport_smtp.c:223
+#: src/transport/plugin_transport_smtp.c:221
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
 # capped är inte ett bra ord IMHO
-#: src/transport/plugin_transport_smtp.c:310
+#: src/transport/plugin_transport_smtp.c:308
 #, fuzzy
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
 
 # capped är inte ett bra ord IMHO
-#: src/transport/plugin_transport_smtp.c:319
+#: src/transport/plugin_transport_smtp.c:317
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
 
-#: src/transport/plugin_transport_smtp.c:414
-#: src/transport/plugin_transport_smtp.c:424
-#: src/transport/plugin_transport_smtp.c:437
-#: src/transport/plugin_transport_smtp.c:456
-#: src/transport/plugin_transport_smtp.c:479
-#: src/transport/plugin_transport_smtp.c:487
-#: src/transport/plugin_transport_smtp.c:500
-#: src/transport/plugin_transport_smtp.c:511
+#: src/transport/plugin_transport_smtp.c:412
+#: src/transport/plugin_transport_smtp.c:422
+#: src/transport/plugin_transport_smtp.c:435
+#: src/transport/plugin_transport_smtp.c:454
+#: src/transport/plugin_transport_smtp.c:477
+#: src/transport/plugin_transport_smtp.c:485
+#: src/transport/plugin_transport_smtp.c:498
+#: src/transport/plugin_transport_smtp.c:509
 #, fuzzy, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/transport/plugin_transport_smtp.c:652
+#: src/transport/plugin_transport_smtp.c:650
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:664
+#: src/transport/plugin_transport_smtp.c:662
 #, fuzzy
 msgid "# bytes received via SMTP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_smtp.c:665
+#: src/transport/plugin_transport_smtp.c:663
 #, fuzzy
 msgid "# bytes sent via SMTP"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_smtp.c:667
+#: src/transport/plugin_transport_smtp.c:665
 #, fuzzy
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:648
+#: src/transport/plugin_transport_tcp.c:1545
+#: src/transport/plugin_transport_tcp.c:2871
+#: src/transport/plugin_transport_xt.c:1551
+#: src/transport/plugin_transport_xt.c:2877
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:829
-#: src/transport/plugin_transport_tcp.c:1044
-#: src/transport/plugin_transport_tcp.c:2232
-#: src/transport/plugin_transport_tcp.c:2932
+#: src/transport/plugin_transport_tcp.c:1728
+#: src/transport/plugin_transport_tcp.c:1952
+#: src/transport/plugin_transport_tcp.c:3135
+#: src/transport/plugin_transport_tcp.c:4012
+#: src/transport/plugin_transport_xt.c:1734
+#: src/transport/plugin_transport_xt.c:1958
+#: src/transport/plugin_transport_xt.c:3141
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:870
-#: src/transport/plugin_transport_tcp.c:1027
-#: src/transport/plugin_transport_tcp.c:1146
-#: src/transport/plugin_transport_tcp.c:1214
-#: src/transport/plugin_transport_tcp.c:1312
-#: src/transport/plugin_transport_tcp.c:1336
+#: src/transport/plugin_transport_tcp.c:1770
+#: src/transport/plugin_transport_tcp.c:1934
+#: src/transport/plugin_transport_tcp.c:2058
+#: src/transport/plugin_transport_tcp.c:2131
+#: src/transport/plugin_transport_tcp.c:2231
+#: src/transport/plugin_transport_tcp.c:2256
+#: src/transport/plugin_transport_xt.c:1776
+#: src/transport/plugin_transport_xt.c:1940
+#: src/transport/plugin_transport_xt.c:2064
+#: src/transport/plugin_transport_xt.c:2137
+#: src/transport/plugin_transport_xt.c:2237
+#: src/transport/plugin_transport_xt.c:2262
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:873
+#: src/transport/plugin_transport_tcp.c:1773
+#: src/transport/plugin_transport_xt.c:1779
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1149
+#: src/transport/plugin_transport_tcp.c:2061
+#: src/transport/plugin_transport_xt.c:2067
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1218
+#: src/transport/plugin_transport_tcp.c:2135
+#: src/transport/plugin_transport_xt.c:2141
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:1611
+#: src/transport/plugin_transport_tcp.c:2533
+#: src/transport/plugin_transport_xt.c:2539
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1775
+#: src/transport/plugin_transport_tcp.c:2709
+#: src/transport/plugin_transport_xt.c:2715
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2282
+#: src/transport/plugin_transport_tcp.c:3201
+#: src/transport/plugin_transport_xt.c:3207
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2452
+#: src/transport/plugin_transport_tcp.c:3407
+#: src/transport/plugin_transport_xt.c:3413
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2524
-msgid "# network-level TCP disconnect events"
+#: src/transport/plugin_transport_tcp.c:3458
+#: src/transport/plugin_transport_tcp.c:3516
+#: src/transport/plugin_transport_xt.c:3464
+#: src/transport/plugin_transport_xt.c:3522
+#, fuzzy
+msgid "# TCP server connections active"
+msgstr "Nätverksanslutning"
+
+#: src/transport/plugin_transport_tcp.c:3462
+#: src/transport/plugin_transport_xt.c:3468
+#, fuzzy
+msgid "# TCP server connect events"
+msgstr "# av anslutna parter"
+
+#: src/transport/plugin_transport_tcp.c:3468
+#: src/transport/plugin_transport_xt.c:3474
+msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:585
-#: src/util/service.c:591
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+#: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_xt.c:3476
+msgid "# TCP service suspended"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:3510
+#: src/transport/plugin_transport_xt.c:3516
+msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2776
+#: src/transport/plugin_transport_tcp.c:3520
+#: src/transport/plugin_transport_xt.c:3526
+msgid "# network-level TCP disconnect events"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:3839
+#: src/transport/plugin_transport_xt.c:3847
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2919
+#: src/transport/plugin_transport_tcp.c:4000
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2923
+#: src/transport/plugin_transport_tcp.c:4004
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2927
+#: src/transport/plugin_transport_tcp.c:4008
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:167
-#, fuzzy
-msgid "# IPv6 multicast HELLO beacons received via udp"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:210
+#: src/transport/plugin_transport_udp_broadcasting.c:166
 #, fuzzy
-msgid "# IPv4 broadcast HELLO beacons received via udp"
+msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:603
+#: src/transport/plugin_transport_udp_broadcasting.c:546
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:626
+#: src/transport/plugin_transport_udp_broadcasting.c:563
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1655
-#, c-format
-msgid ""
-"Trying to create session for address of unexpected length %u (should be %u "
-"or %u)\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp.c:2888
+#: src/transport/plugin_transport_udp.c:3365
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2901
+#: src/transport/plugin_transport_udp.c:3379
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3254
+#: src/transport/plugin_transport_udp.c:3697
+#: src/transport/plugin_transport_udp.c:3796
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3262
+#: src/transport/plugin_transport_udp.c:3715
+#: src/transport/plugin_transport_xu.c:2141
+msgid "Disabling IPv4 since it is not supported on this system!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:3806
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3421
-#, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+#: src/transport/plugin_transport_udp.c:3877
+#: src/transport/plugin_transport_udp.c:3891
+#: src/transport/plugin_transport_xu.c:2299
+#: src/transport/plugin_transport_xu.c:2313
+msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3468
-#, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
+#: src/transport/plugin_transport_udp.c:3923
+#: src/transport/plugin_transport_xu.c:2345
+#, fuzzy
+msgid "must be valid IPv4 address"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/transport/plugin_transport_udp.c:3950
+#: src/transport/plugin_transport_xu.c:2372
+#, fuzzy
+msgid "must be valid IPv6 address"
+msgstr "\"%s\" är inte tillgänglig."
 
-#: src/transport/plugin_transport_udp.c:3536
+#: src/transport/plugin_transport_udp.c:4014
 #, fuzzy
-msgid "Failed to create network sockets, plugin failed\n"
+msgid "Failed to create UDP network sockets\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1402
+#: src/transport/plugin_transport_unix.c:1401
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1415
+#: src/transport/plugin_transport_unix.c:1414
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1816
+#: src/transport/plugin_transport_unix.c:1814
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_wlan.c:725
+#: src/transport/plugin_transport_wlan.c:766
 msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:745
+#: src/transport/plugin_transport_wlan.c:786
 #, fuzzy
 msgid "# Messages defragmented"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/plugin_transport_wlan.c:786
-#: src/transport/plugin_transport_wlan.c:873
+#: src/transport/plugin_transport_wlan.c:827
+#: src/transport/plugin_transport_wlan.c:912
 #, fuzzy
 msgid "# Sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:989
+#: src/transport/plugin_transport_wlan.c:1033
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1015
+#: src/transport/plugin_transport_wlan.c:1062
 #, fuzzy
 msgid "# messages pending (with fragmentation)"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1129
-#: src/transport/plugin_transport_wlan.c:1222
-#: src/transport/plugin_transport_wlan.c:2185
+#: src/transport/plugin_transport_wlan.c:1191
+#: src/transport/plugin_transport_wlan.c:1282
+#: src/transport/plugin_transport_wlan.c:2303
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1487
+#: src/transport/plugin_transport_wlan.c:1565
 #, fuzzy
 msgid "# ACKs received"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1555
+#: src/transport/plugin_transport_wlan.c:1634
 #, fuzzy
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_wlan.c:1696
+#: src/transport/plugin_transport_wlan.c:1738
+#, fuzzy
+msgid "# HELLO beacons sent"
+msgstr "# byte skickade via UDP"
+
+#: src/transport/plugin_transport_wlan.c:1854
 #, fuzzy
 msgid "# DATA messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1730
+#: src/transport/plugin_transport_wlan.c:1888
 #, fuzzy
 msgid "# DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1793
-#, fuzzy
-msgid "# HELLO beacons sent"
-msgstr "# byte skickade via UDP"
-
-#: src/transport/plugin_transport_wlan.c:2160
+#: src/transport/plugin_transport_wlan.c:2278
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2182
+#: src/transport/plugin_transport_wlan.c:2300
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/transport_api.c:816
-#, fuzzy, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
-msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
-
-#: src/transport/transport-testing.c:603
-#, fuzzy
-msgid "Failed to initialize testing library!\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-
-#: src/tun/regex.c:129
+#: src/transport/plugin_transport_xt.c:4008
 #, c-format
-msgid "Bad mask: %d\n"
+msgid "XT transport listening on port %llu\n"
 msgstr ""
 
-#: src/util/bio.c:170 src/util/bio.c:178
+#: src/transport/plugin_transport_xt.c:4012
+msgid "XT transport not listening on any port (client only)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4016
+#, c-format
+msgid "XT transport advertises itself as being on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4020
+#, fuzzy
+msgid "# XT sessions active"
+msgstr "# sessionsnycklar accepterade"
+
+#: src/transport/plugin_transport_xu.c:1235
+#, c-format
+msgid ""
+"XU could not transmit message to `%s': Network seems down, please check your "
+"network configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xu.c:1249
+msgid ""
+"XU could not transmit IPv6 message! Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xu.c:2123
+#: src/transport/plugin_transport_xu.c:2222
 #, fuzzy, c-format
-msgid "Error reading `%s': %s"
-msgstr "Fel vid skapandet av användare"
+msgid "Failed to bind XU socket to %s: %s\n"
+msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/util/bio.c:180
+#: src/transport/plugin_transport_xu.c:2232
 #, fuzzy
-msgid "End of file"
-msgstr "Läs in en konfigurationsfil"
+msgid "Failed to open XU sockets\n"
+msgstr "Misslyckades att binda till UDP6-port %d.\n"
+
+#: src/transport/plugin_transport_xu.c:2396
+#, fuzzy
+msgid "Failed to create XU network sockets\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/transport/tcp_connection_legacy.c:450
+#, fuzzy, c-format
+msgid "Access denied to `%s'\n"
+msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/util/bio.c:237
+#: src/transport/tcp_connection_legacy.c:467
 #, c-format
-msgid "Error reading length of string `%s'"
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/bio.c:247
+# drive = hard drive ?
+#: src/transport/tcp_server_legacy.c:472 src/util/service.c:1109
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+
+#: src/transport/tcp_server_legacy.c:482 src/util/service.c:1119
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
+
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1125
+#, fuzzy, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
+
+#: src/transport/tcp_server_legacy.c:888
 #, c-format
-msgid "String `%s' longer than allowed (%u > %u)"
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/bio.c:293
+#: src/transport/tcp_service_legacy.c:337 src/util/service.c:2378
+#, fuzzy, c-format
+msgid "Unknown address family %d\n"
+msgstr "Okänd operation \"%s\"\n"
+
+#: src/transport/tcp_service_legacy.c:344
 #, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/bio.c:307
+#: src/transport/tcp_service_legacy.c:400 src/util/service.c:437
 #, c-format
-msgid "Metadata `%s' failed to deserialize"
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:622
+#: src/transport/tcp_service_legacy.c:438 src/util/service.c:480
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:626
-#, fuzzy, c-format
-msgid "Using `%s' instead\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
+#: src/transport/tcp_service_legacy.c:902 src/util/service.c:1040
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
 
-#: src/util/client.c:360
+#: src/transport/tcp_service_legacy.c:951
+#: src/transport/tcp_service_legacy.c:969 src/util/service.c:1192
 #, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/client.c:368
+#: src/transport/tcp_service_legacy.c:994 src/util/service.c:1224
 #, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/client.c:1008
+#: src/transport/tcp_service_legacy.c:1159
 #, fuzzy, c-format
-msgid "Could not connect to service `%s', configuration broken.\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "Fel vid %s:%d.\n"
 
-#: src/util/client.c:1020
+#: src/transport/tcp_service_legacy.c:1200
 #, fuzzy, c-format
-msgid "Failure to transmit request to service `%s'\n"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+msgid "Service `%s' runs at %s\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+
+#: src/transport/tcp_service_legacy.c:1249 src/util/service.c:1498
+msgid "Service process failed to initialize\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1253 src/util/service.c:1502
+msgid "Service process could not initialize server function\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1257 src/util/service.c:1506
+msgid "Service process failed to report status\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1311 src/util/disk.c:1521
+#: src/util/service.c:1376
+#, fuzzy, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
+
+#: src/transport/tcp_service_legacy.c:1312 src/util/service.c:1378
+msgid "No such user"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1325 src/util/service.c:1397
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
+
+#: src/transport/tcp_service_legacy.c:1396 src/util/service.c:1757
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1446 src/util/program.c:277
+#: src/util/service.c:1820
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/transport/tcp_service_legacy.c:1456 src/util/program.c:297
+#: src/util/service.c:1831
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/transport/tcp_service_legacy.c:1461 src/util/program.c:290
+#: src/util/service.c:1837
+#, fuzzy, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/util/bio.c:179 src/util/bio.c:187
+#, fuzzy, c-format
+msgid "Error reading `%s': %s"
+msgstr "Fel vid skapandet av användare"
+
+#: src/util/bio.c:189
+#, fuzzy
+msgid "End of file"
+msgstr "Läs in en konfigurationsfil"
+
+#: src/util/bio.c:246
+#, c-format
+msgid "Error reading length of string `%s'"
+msgstr ""
+
+#: src/util/bio.c:256
+#, c-format
+msgid "String `%s' longer than allowed (%u > %u)"
+msgstr ""
+
+#: src/util/bio.c:304
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+msgstr ""
 
-#: src/util/client.c:1299
-msgid "Could not submit request, not expecting to receive a response.\n"
+#: src/util/bio.c:326
+#, c-format
+msgid "Metadata `%s' failed to deserialize"
+msgstr ""
+
+#: src/util/client.c:732
+msgid "not a valid filename"
+msgstr ""
+
+#: src/util/client.c:923
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:254 src/util/common_logging.c:1039
+#: src/util/common_logging.c:257 src/util/common_logging.c:1159
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:256 src/util/common_logging.c:1037
+#: src/util/common_logging.c:259 src/util/common_logging.c:1157
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1035
+#: src/util/common_logging.c:261 src/util/common_logging.c:1155
+msgid "MESSAGE"
+msgstr "MEDDELANDE"
+
+#: src/util/common_logging.c:263 src/util/common_logging.c:1153
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1033
+#: src/util/common_logging.c:265 src/util/common_logging.c:1151
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1041
+#: src/util/common_logging.c:267 src/util/common_logging.c:1161
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:391
-#, fuzzy, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+#: src/util/common_logging.c:631 src/util/common_logging.c:661
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
 
-#: src/util/common_logging.c:817
+#: src/util/common_logging.c:895
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1042
+#: src/util/common_logging.c:1162
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1157
+#: src/util/common_logging.c:1455
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1196
+#: src/util/common_logging.c:1497
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1214
+#: src/util/common_logging.c:1515
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/common_logging.c:1235
+#: src/util/common_logging.c:1536
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#: src/util/configuration.c:288
+#: src/util/configuration.c:294
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:1025
+#: src/util/configuration.c:361
+#, fuzzy, c-format
+msgid "Error while reading file `%s'\n"
+msgstr "Fel vid nedladdning: %s\n"
+
+#: src/util/configuration.c:970
+#, fuzzy
+msgid "Not a valid relative time specification"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/util/configuration.c:1059
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1095
+#: src/util/configuration.c:1178
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1127
+#: src/util/configuration.c:1211
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/configuration.c:1201
+#: src/util/configuration.c:1279
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:423
-#, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
-
-#: src/util/connection.c:438
+#: src/util/container_bloomfilter.c:530
 #, c-format
-msgid "Accepting connection from `%s': %p\n"
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/util/connection.c:553
+#: src/util/crypto_ecc.c:860
 #, fuzzy, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
-msgstr "Misslyckades att starta samling.\n"
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/connection.c:751 src/util/connection.c:914
+#: src/util/crypto_ecc.c:915
 #, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+msgid "EdDSA signing failed at %s:%d: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/connection.c:904
+#: src/util/crypto_ecc.c:994
 #, fuzzy, c-format
-msgid "Attempt to connect to `%s' failed\n"
-msgstr " Anslutning misslyckades\n"
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/container_bloomfilter.c:531
-#, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
-msgstr ""
+#: src/util/crypto_ecc.c:1055
+#, fuzzy, c-format
+msgid "EdDSA signature verification failed at %s:%d: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
-#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
+#: src/util/crypto_ecc_setup.c:121 src/util/crypto_ecc_setup.c:160
+#: src/util/crypto_ecc_setup.c:303 src/util/crypto_ecc_setup.c:350
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863
+#: src/util/crypto_ecc_setup.c:127 src/util/crypto_ecc_setup.c:309
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
-#: src/util/crypto_ecc.c:744 src/util/crypto_ecc.c:900
+#: src/util/crypto_ecc_setup.c:164 src/util/crypto_ecc_setup.c:354
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
+#: src/util/crypto_ecc_setup.c:194 src/util/crypto_ecc_setup.c:396
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:778 src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:400
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1016
+#: src/util/crypto_ecc_setup.c:466
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/crypto_ecc.c:1120
+#: src/util/crypto_random.c:304
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
+
+#: src/util/crypto_rsa.c:848
 #, fuzzy, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
+msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:1170
+#: src/util/crypto_rsa.c:1187
 #, fuzzy, c-format
-msgid "EdDSA signing failed at %s:%d: %s\n"
+msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:1244
+#: src/util/disk.c:1251
 #, fuzzy, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+msgid "Expected `%s' to be a directory!\n"
+msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/crypto_ecc.c:1301
+#: src/util/dnsparser.c:250
 #, fuzzy, c-format
-msgid "EdDSA signature verification failed at %s:%d: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/util/dnsparser.c:940
+#, fuzzy, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/util/dnsstub.c:229
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/util/crypto_random.c:284
+#: src/util/dnsstub.c:360
 #, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
 
-#: src/util/disk.c:1202
+#: src/util/dnsstub.c:507
 #, fuzzy, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/util/disk.c:1564 src/util/service.c:1327
+#: src/util/dnsstub.c:513
 #, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
+msgid "Sent DNS request to %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
 #: src/util/getopt.c:568
 #, c-format
@@ -8673,12 +8678,21 @@ msgstr "%s: flagga \"-W %s\" är tvetydig\n"
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:933
+#: src/util/getopt.c:947
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Använd --help för att få en lista på flaggor.\n"
 
-#: src/util/getopt_helpers.c:84
+#: src/util/getopt.c:962
+#, fuzzy, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/util/getopt_helpers.c:68
+msgid "print the version number"
+msgstr "skriv ut versionsnummer"
+
+#: src/util/getopt_helpers.c:113
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8686,174 +8700,236 @@ msgstr ""
 "Argument som är obligatoriska för långa flaggor är också obligatoriska för "
 "korta flaggor.\n"
 
-#: src/util/getopt_helpers.c:268 src/util/getopt_helpers.c:326
+#: src/util/getopt_helpers.c:201
+msgid "print this help"
+msgstr "skriv ut denna hjälp"
+
+#: src/util/getopt_helpers.c:279
+msgid "be verbose"
+msgstr "var informativ"
+
+#: src/util/getopt_helpers.c:420
+msgid "configure logging to use LOGLEVEL"
+msgstr ""
+
+#: src/util/getopt_helpers.c:500
+msgid "configure logging to write logs to FILENAME"
+msgstr ""
+
+#: src/util/getopt_helpers.c:522
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+
+#: src/util/getopt_helpers.c:559 src/util/getopt_helpers.c:763
+#: src/util/getopt_helpers.c:830
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:298
+#: src/util/getopt_helpers.c:624
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/gnunet-config.c:90
+#: src/util/getopt_helpers.c:690
+#, fuzzy, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+
+#: src/util/getopt_helpers.c:754
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number \n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:837
+#, fuzzy, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+
+#: src/util/getopt_helpers.c:923
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:157
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/util/gnunet-config.c:170
 #, c-format
 msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:133
+#: src/util/gnunet-config.c:173
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:224
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:160
+#: src/util/gnunet-config.c:263
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:163
+#: src/util/gnunet-config.c:268
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:166
+#: src/util/gnunet-config.c:273
 #, fuzzy
 msgid "name of the option to access"
 msgstr "Visa värde av alternativet"
 
-#: src/util/gnunet-config.c:169
+#: src/util/gnunet-config.c:278
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:178
+#: src/util/gnunet-config.c:282
+#, fuzzy
+msgid "print available configuration sections"
+msgstr "GNUnet-konfiguration"
+
+#: src/util/gnunet-config.c:286
+msgid "write configuration file that only contains delta to defaults"
+msgstr ""
+
+#: src/util/gnunet-config.c:299
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-ecc.c:81
+#: src/util/gnunet-ecc.c:92
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/gnunet-ecc.c:117
+#: src/util/gnunet-ecc.c:128
 #, c-format
 msgid "Generating %u keys like %s, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:130
+#: src/util/gnunet-ecc.c:141
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:171
+#: src/util/gnunet-ecc.c:182
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/gnunet-ecc.c:181
+#: src/util/gnunet-ecc.c:192
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "Slutför"
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:195
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:277
+#: src/util/gnunet-ecc.c:288
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/util/gnunet-ecc.c:288
+#: src/util/gnunet-ecc.c:303
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/util/gnunet-ecc.c:310
+#: src/util/gnunet-ecc.c:332
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/util/gnunet-ecc.c:361
+#: src/util/gnunet-ecc.c:389
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:411
+#: src/util/gnunet-ecc.c:454
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:414
+#: src/util/gnunet-ecc.c:459
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:417
+#: src/util/gnunet-ecc.c:464
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:420
+#: src/util/gnunet-ecc.c:468
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:423
+#: src/util/gnunet-ecc.c:472
+msgid "print the private key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:476
+msgid "print the public key in HEX format"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:480
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:434
+#: src/util/gnunet-ecc.c:496
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-resolver.c:149
+#: src/util/gnunet-resolver.c:166
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:160
+#: src/util/gnunet-resolver.c:177
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:233
+#: src/util/gnunet-scrypt.c:240
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/util/gnunet-scrypt.c:294
+#: src/util/gnunet-scrypt.c:315
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:297
+#: src/util/gnunet-scrypt.c:320
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:300
+#: src/util/gnunet-scrypt.c:325
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:303
+#: src/util/gnunet-scrypt.c:330
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:315
+#: src/util/gnunet-scrypt.c:343
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-service-resolver.c:310
-#, fuzzy, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/util/gnunet-service-resolver.c:382
-#: src/util/gnunet-service-resolver.c:423
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
+#: src/util/gnunet-service-resolver.c:1443
+msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:84
+#: src/util/gnunet-uri.c:83
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
@@ -8877,560 +8953,1064 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:338
+#: src/util/helper.c:333
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/helper.c:383
+#: src/util/helper.c:384
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/helper.c:609
+#: src/util/helper.c:604
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/network.c:137
+#: src/util/network.c:134
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1640 src/util/network.c:1797
+#: src/util/network.c:1793 src/util/network.c:1977
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:421
+#: src/util/os_installation.c:507
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:766
+#: src/util/os_installation.c:879
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
+#: src/util/os_installation.c:920
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+
 # drive = hard drive ?
-#: src/util/os_installation.c:826
+#: src/util/os_installation.c:951
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/os_installation.c:836
+#: src/util/os_installation.c:961
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/plugin.c:87
+#: src/util/plugin.c:84
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/util/plugin.c:148
+#: src/util/plugin.c:149
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
-#: src/util/plugin.c:223
+#: src/util/plugin.c:224
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/plugin.c:382
+#: src/util/plugin.c:383
 #, fuzzy
 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:1461
-#, 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:1476
-#, 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:1471
-#, fuzzy
-msgid "Malformed configuration, exit ...\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+#: src/util/regex.c:132
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
 
-#: src/util/resolver_api.c:201
-#, fuzzy, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
-msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
+#: src/util/resolver_api.c:216
+#, c-format
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
+msgstr ""
 
-#: src/util/resolver_api.c:220
+#: src/util/resolver_api.c:237
 #, fuzzy, c-format
 msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
+"resolution will be unavailable.\n"
 msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/util/resolver_api.c:354
-#, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:361
+#: src/util/resolver_api.c:873
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/resolver_api.c:974
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/util/scheduler.c:812
-msgid "Looks like we're busy waiting...\n"
-msgstr ""
-
-# drive = hard drive ?
-#: src/util/server.c:484
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
-
-#: src/util/server.c:493
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
-
-#: src/util/server.c:499
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
-
-#: src/util/server.c:896
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVER_receive_done' after %s\n"
-msgstr ""
-
-#: src/util/service.c:347
-#, fuzzy, c-format
-msgid "Unknown address family %d\n"
-msgstr "Okänd operation \"%s\"\n"
-
-#: src/util/service.c:354
+#: src/util/resolver_api.c:886
 #, c-format
-msgid "Access from `%s' denied to service `%s'\n"
+msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/service.c:410
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+#: src/util/resolver_api.c:1071
+msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/service.c:448
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
+#: src/util/resolver_api.c:1158 src/util/resolver_api.c:1181
+#: src/util/resolver_api.c:1195
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN: %s\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/service.c:566
-#, c-format
+#: src/util/service.c:1303
 msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/service.c:656
+#: src/util/service.c:2123
 #, c-format
 msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:672
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
-msgstr ""
-
-#: src/util/service.c:911
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
-msgstr ""
-
-#: src/util/service.c:960 src/util/service.c:978
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
-
-#: src/util/service.c:1003
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1174
-#, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "Fel vid %s:%d.\n"
-
-#: src/util/service.c:1216
+#: src/util/signal.c:87
 #, 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:1265
-msgid "Service process failed to initialize\n"
-msgstr ""
-
-#: src/util/service.c:1269
-msgid "Service process could not initialize server function\n"
-msgstr ""
-
-#: src/util/service.c:1273
-msgid "Service process failed to report status\n"
-msgstr ""
+msgid "signal (%d, %p) returned %d.\n"
+msgstr "Anrop till \"%s\" returnerade %d.\n"
 
-#: src/util/service.c:1328
-msgid "No such user"
+#: src/util/socks.c:595
+#, c-format
+msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/service.c:1341
+#: src/util/socks.c:614
 #, 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:1411
-msgid "do daemonize (detach from terminal)"
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/signal.c:89
-#, fuzzy, c-format
-msgid "signal (%d, %p) returned %d.\n"
-msgstr "Anrop till \"%s\" returnerade %d.\n"
-
-#: src/util/strings.c:145
+#: src/util/strings.c:174
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:434
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:562
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:659
+#: src/util/strings.c:702
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:663
+#: src/util/strings.c:706
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:665
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:671
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:677
+#: src/util/strings.c:720
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:683
+#: src/util/strings.c:726
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:689
+#: src/util/strings.c:732
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:696
+#: src/util/strings.c:739
 #, fuzzy
 msgid "day"
 msgstr " dagar"
 
-#: src/util/strings.c:698
+#: src/util/strings.c:741
 #, fuzzy
 msgid "days"
 msgstr " dagar"
 
-#: src/util/strings.c:727
+#: src/util/strings.c:770
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1192
+#: src/util/strings.c:1272
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1200
+#: src/util/strings.c:1280
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1206
+#: src/util/strings.c:1286
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1213
+#: src/util/strings.c:1293
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1222
+#: src/util/strings.c:1302
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/strings.c:1428 src/util/strings.c:1444
+#: src/util/strings.c:1574 src/util/strings.c:1590
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1453
+#: src/util/strings.c:1599
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/strings.c:1536 src/util/strings.c:1567 src/util/strings.c:1615
-#: src/util/strings.c:1636
+#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761
+#: src/util/strings.c:1782
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1593
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
+#: src/util/strings.c:1739
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
+
+#: src/util/strings.c:1791
+#, fuzzy, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#: src/util/strings.c:1843
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
+
+#: src/util/strings.c:1893
+#, fuzzy, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Fel format \"%s\" för nätmask: %s\n"
+
+#: src/util/strings.c:1924
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Fel format \"%s\" för nätverk: %s\n"
+
+#: src/vpn/gnunet-service-vpn.c:538 src/vpn/gnunet-service-vpn.c:1805
+#, fuzzy
+msgid "# Active channels"
+msgstr "Nätverksanslutning"
+
+#: src/vpn/gnunet-service-vpn.c:597
+#, fuzzy
+msgid "# Messages dropped in cadet queue (overflow)"
+msgstr "# byte kastade via UDP (utgående)"
+
+#: src/vpn/gnunet-service-vpn.c:751
+#, fuzzy
+msgid "# ICMP packets received from cadet"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#: src/vpn/gnunet-service-vpn.c:1094
+#, fuzzy
+msgid "# UDP packets received from cadet"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#: src/vpn/gnunet-service-vpn.c:1253
+#, fuzzy
+msgid "# TCP packets received from cadet"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#: src/vpn/gnunet-service-vpn.c:1465
+#, fuzzy
+msgid "# Cadet channels created"
+msgstr "# PING-meddelanden skapade"
+
+#: src/vpn/gnunet-service-vpn.c:1685
+#, c-format
+msgid "Protocol %u not supported, dropping\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1824
+#, fuzzy
+msgid "# Packets dropped (channel not yet online)"
+msgstr "# byte kastade via UDP (utgående)"
+
+#: src/vpn/gnunet-service-vpn.c:2004
+msgid "# ICMPv4 packets dropped (not allowed)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2025
+msgid "# ICMPv6 packets dropped (not allowed)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2233
+#, fuzzy
+msgid "# Packets received from TUN interface"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#: src/vpn/gnunet-service-vpn.c:2266 src/vpn/gnunet-service-vpn.c:2302
+#, c-format
+msgid "Packet received for unmapped destination `%s' (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2312
+msgid "Received IPv4 packet with options (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2326
+#, c-format
+msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2365
+msgid "Failed to find unallocated IPv4 address in VPN's range\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2420
+msgid "Failed to find unallocated IPv6 address in VPN's range\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2462 src/vpn/gnunet-service-vpn.c:2684
+#, fuzzy
+msgid "# Active destinations"
+msgstr "Nätverksanslutning"
+
+#: src/vpn/gnunet-service-vpn.c:2733
+msgid "Failed to allocate IP address for new destination\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2996
+#, fuzzy
+msgid "Must specify valid IPv6 address"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/vpn/gnunet-service-vpn.c:3020
+msgid "Must specify valid IPv6 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3028
+msgid "IPv6 support disabled as this system does not support IPv6\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3041
+#, fuzzy
+msgid "Must specify valid IPv4 address"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/vpn/gnunet-service-vpn.c:3054
+msgid "Must specify valid IPv4 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3064
+msgid "IPv4 support disabled as this system does not support IPv4\n"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:145
+#, fuzzy
+msgid "Error creating tunnel\n"
+msgstr "Klar med skapandet av värdnyckel.\n"
+
+#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:220
+#, fuzzy, c-format
+msgid "Option `%s' makes no sense with option `%s'.\n"
+msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
+
+#: src/vpn/gnunet-vpn.c:202
+#, fuzzy, c-format
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/vpn/gnunet-vpn.c:214
+#, fuzzy, c-format
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
+msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
+
+#: src/vpn/gnunet-vpn.c:234
+#, fuzzy, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "\"%s\" är inte en vanlig fil.\n"
+
+#: src/vpn/gnunet-vpn.c:254
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/vpn/gnunet-vpn.c:290
+msgid "request that result should be an IPv4 address"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:295
+msgid "request that result should be an IPv6 address"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:301
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:307
+msgid "destination IP for the tunnel"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:313
+msgid "peer offering the service we would like to access"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:319
+msgid "name of the service we would like to access"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:324
+#, fuzzy
+msgid "service is offered via TCP"
+msgstr "# byte mottogs via TCP"
+
+#: src/vpn/gnunet-vpn.c:329
+#, fuzzy
+msgid "service is offered via UDP"
+msgstr "# byte mottagna via UDP"
+
+#: src/vpn/gnunet-vpn.c:342
+msgid "Setup tunnels via VPN."
+msgstr ""
+
+#: src/zonemaster/gnunet-service-zonemaster.c:836
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:414
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/include/gnunet_common.h:770 src/include/gnunet_common.h:777
+#: src/include/gnunet_common.h:787
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d. Aborting.\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/include/gnunet_common.h:795
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d.\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/include/gnunet_common.h:807
+#, c-format
+msgid "External protocol violation detected at %s:%d.\n"
+msgstr ""
+
+#: src/include/gnunet_common.h:834 src/include/gnunet_common.h:843
+#, c-format
+msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
+msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
+
+#, fuzzy
+#~ msgid "Could not resolve `%s' (%s): %s\n"
+#~ msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "PUT request sent with key"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "PUT request not confirmed!\n"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "Could not connect to %s service!\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "No valid GNS zone specified!\n"
+#~ msgstr "Inga nyckelord angivna!\n"
+
+#, fuzzy
+#~ msgid "Specify the name of the ego of the zone to lookup the record in"
+#~ msgstr "ange prioritet för innehållet"
+
+#, fuzzy
+#~ msgid "Token `%s' is malformed\n"
+#~ msgstr "Ogiltigt argument: \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Failed to create indices\n"
+#~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#, fuzzy
+#~ msgid "`%s:%s' failed at %s:%d with error: %s\n"
+#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#, fuzzy
+#~ msgid "Unable to connect to Postgres database '%s': %s\n"
+#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#, fuzzy
+#~ msgid "Misconfiguration (can not connect to the ARM service)"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Request timed out"
+#~ msgstr "# sessionsnycklar accepterade"
+
+#, fuzzy
+#~ msgid "Could not pass reply to client, message too big!\n"
+#~ msgstr "Kunde inte skicka meddelande till gnunetd\n"
+
+#, fuzzy
+#~ msgid "# Bytes received from other peers"
+#~ msgstr "# byte mottagna av typen %d"
+
+#, fuzzy
+#~ msgid "Specify the public key of the zone to reverse lookup a name for"
+#~ msgstr "ange prioritet för innehållet"
+
+#, fuzzy
+#~ msgid "Misconfiguration (can't connect to the ARM service)"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "# Bytes given to cadet for transmission"
+#~ msgstr "# PING-meddelanden skapade"
+
+#, fuzzy
+#~ msgid "# UPDATE requests received"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "Could not connect to cadet service\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to run upnp client for port %u\n"
+#~ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#, fuzzy
+#~ msgid "NAT plugin `%s' reports: %s\n"
+#~ msgstr "Testar transport(er) %s\n"
+
+#, fuzzy
+#~ msgid "Failed to start resolver!\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Postgres: %s\n"
+#~ msgstr "Kunde inte initiera SQLite.\n"
+
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' did not work!\n"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' did work!\n"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
+#~ msgid "Internal NAT error while running test for plugin `%s'\n"
+#~ msgstr "=\tFel vid läsning av katalog.\n"
+
+#, fuzzy
+#~ msgid "Failed to start NAT test for plugin `%s'\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "Could not send status result to client\n"
+#~ msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Could not send list result to client\n"
+#~ msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect peer 0 and %u\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Could not connect master [%u] and slave [%u]\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Initialization failed, shutdown\n"
+#~ msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
+
+#, fuzzy
+#~ msgid "number too large"
+#~ msgstr "antal iterationer"
+
+#, fuzzy
+#~ msgid "Received incoming Cadet channel on port %u\n"
+#~ msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#, fuzzy
+#~ msgid "# sessions terminated by transport disconnect"
+#~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#, fuzzy
+#~ msgid "Failed to transmit request to drop database.\n"
+#~ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "# transmission request failures"
+#~ msgstr "# klartext PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "Failed to receive status response from database."
+#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#, fuzzy
+#~ msgid "Invalid error message received from datastore service"
+#~ msgstr "Ogiltigt meddelande mottogs den %s:%d."
+
+#, fuzzy
+#~ msgid "No `%s' specified for `%s' in configuration!\n"
+#~ msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the DHT service!\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to transport service!\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "# Queued messages discarded (peer disconnected)"
+#~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#, fuzzy
+#~ msgid "# Messages dropped (CORE timeout)"
+#~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#, fuzzy
+#~ msgid "# Bytes transmitted to other peers"
+#~ msgstr "# byte skickade av typen %d"
+
+#, fuzzy
+#~ msgid "PUT request received, but have no datacache!\n"
+#~ msgstr "# byte mottagna av typen %d"
+
+#, fuzzy
+#~ msgid "# TCP requests dropped (no such service)"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# UDP requests dropped (no such service)"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "Failed to receive response for `%s' request from `%s' service.\n"
+#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to receive valid response for `%s' request from `%s' service.\n"
+#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Okänt fel"
+
+#, fuzzy
+#~ msgid "Invalid response from `fs' service."
+#~ msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "# replies transmitted to other peers"
+#~ msgstr "# byte skickade av typen %d"
+
+#, fuzzy
+#~ msgid "# transmission failed (core has no bandwidth)"
+#~ msgstr "Ingen transport av typ %d är känd.\n"
+
+#, fuzzy
+#~ msgid "Failed to deserialize lookup reply from GNS service!\n"
+#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#, fuzzy
+#~ msgid "Service `%s' is not running\n"
+#~ msgstr "\"%s\" är inte en fil.\n"
+
+#, fuzzy
+#~ msgid "Identity service is not running\n"
+#~ msgstr "\"%s\" är inte en fil.\n"
+
+#, fuzzy
+#~ msgid "NSE service is not running\n"
+#~ msgstr "\"%s\" är inte en fil.\n"
+
+#, fuzzy
+#~ msgid "failed to transmit request (service down?)"
+#~ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "Received invalid message from `PEERINFO' service."
+#~ msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
+
+#, fuzzy
+#~ msgid "Timeout transmitting iteration request to `PEERINFO' service."
+#~ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Could not connect to `%s' service.\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to get my own HELLO from this peer!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "Service `%s' is not running, please start GNUnet\n"
+#~ msgstr "\"%s\" är inte en fil.\n"
+
+#, fuzzy
+#~ msgid "Malformed iterate request.\n"
+#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#, fuzzy
+#~ msgid "Malformed store request from client\n"
+#~ msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
+
+#, fuzzy
+#~ msgid "Failed to store requested value, database error."
+#~ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "Trying to connect to remote host, but service `%s' is not running\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Peer `%s' %s %s\n"
+#~ "\t%s%s\n"
+#~ "\t%s%s\n"
+#~ "\t%s%s\n"
+#~ msgstr "Jag är ändpunkt \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Peer `%s' %s `%s' \n"
+#~ msgstr "Jag är ändpunkt \"%s\".\n"
+
+#, fuzzy
+#~ msgid "print information for all pending validations "
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "print information for all pending validations continuously"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "Connected to different peer `%s'\n"
+#~ msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Successfully connected to `%s'\n"
+#~ msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Denying connection to `%s'\n"
+#~ msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+
+#, fuzzy
+#~ msgid "Message size too big!\n"
+#~ msgstr "meddelandestorlek"
+
+#, fuzzy
+#~ msgid "No peer identity given\n"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "Trying to receive messages from peer `%s'\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "No operation given\n"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "Failed to connect to ATS service\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Binding to IPv4 address %s\n"
+#~ msgstr "Ogiltigt svar på \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Binding to IPv6 address %s\n"
+#~ msgstr "Ogiltigt svar på \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Received unexpected message of type %u in %s:%u\n"
+#~ msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Failed to initialize testing library!\n"
+#~ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Could not connect to service `%s', configuration broken.\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failure to transmit request to service `%s'\n"
+#~ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "Failed to setup cadet channel!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
+#~ msgid "Error trying to send a message to peer `%s'.\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Retrieve information about all defined sensors"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "Retrieve information about a single sensor"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "Number of peers to run"
+#~ msgstr "antal iterationer"
+
+#, fuzzy
+#~ msgid "Number of peers to simulate anomalies on"
+#~ msgstr "antal iterationer"
+
+#, fuzzy
+#~ msgid "Profiler for sensor service"
+#~ msgstr "Fel vid skapandet av användare"
+
+#, fuzzy
+#~ msgid "Received an invalid sensor value."
+#~ msgstr "Mottog ogiltig \"%s\" begäran (fel tabell)\n"
+
+#, fuzzy
+#~ msgid "Analysis model not defined in configuration.\n"
+#~ msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+
+#, fuzzy
+#~ msgid "Could not load analysis model `%s'.\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Could not connect to peerstore service.\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/util/strings.c:1645
-#, fuzzy, c-format
-msgid "Invalid format: `%s'\n"
-msgstr "Ogiltigt format för IP: \"%s\"\n"
+#, fuzzy
+#~ msgid "Unknown value type expected by sensor, this should not happen.\n"
+#~ msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
 
-#: src/util/strings.c:1697
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
+#, fuzzy
+#~ msgid "Received an invalid value for sensor `%s': %s\n"
+#~ msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#: src/util/strings.c:1747
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Fel format \"%s\" för nätmask: %s\n"
+#, fuzzy
+#~ msgid "Double creation of proof-of-work, this should not happen.\n"
+#~ msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
 
-#: src/util/strings.c:1778
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Fel format \"%s\" för nätverk: %s\n"
+#, fuzzy
+#~ msgid "Failed to create pow and signature block.\n"
+#~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
 #, fuzzy
-msgid "# Active channels"
-msgstr "Nätverksanslutning"
+#~ msgid "Failed to connect to CORE service.\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/vpn/gnunet-service-vpn.c:642
 #, fuzzy
-msgid "# Bytes given to cadet for transmission"
-msgstr "# PING-meddelanden skapade"
+#~ msgid "Failed to connect to peerstore service.\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/vpn/gnunet-service-vpn.c:680
 #, fuzzy
-msgid "# Bytes dropped in cadet queue (overflow)"
-msgstr "# byte kastade via UDP (utgående)"
+#~ msgid "Failed to load my private key.\n"
+#~ msgstr "Misslyckades att starta samling.\n"
 
-#: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Cadet channels created"
-msgstr "# PING-meddelanden skapade"
+#~ msgid "Failed to connect to update point `%s'.\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
-msgid "Failed to setup cadet channel!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
+#~ msgid "Iterate request canceled due to disconnection.\n"
+#~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/vpn/gnunet-service-vpn.c:978
-#, c-format
-msgid "Protocol %u not supported, dropping\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Timeout transmitting iteration request to `SENSOR' service."
+#~ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/vpn/gnunet-service-vpn.c:1305
-msgid "# ICMPv4 packets dropped (not allowed)"
-msgstr ""
+#, fuzzy
+#~ msgid "Error reading sensor category\n"
+#~ msgstr "Fel vid skapandet av användare"
 
-#: src/vpn/gnunet-service-vpn.c:1326
-msgid "# ICMPv6 packets dropped (not allowed)"
-msgstr ""
+#, fuzzy
+#~ msgid "Error reading sensor run interval\n"
+#~ msgstr "Klar med skapandet av värdnyckel.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1531
 #, fuzzy
-msgid "# Packets received from TUN interface"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
+#~ msgid "Error reading sensor source\n"
+#~ msgstr "Fel vid skapandet av användare"
 
-#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
-#, c-format
-msgid "Packet received for unmapped destination `%s' (dropping it)\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Error reading sensor process name\n"
+#~ msgstr "Fel vid skapandet av användare"
 
-#: src/vpn/gnunet-service-vpn.c:1610
-msgid "Received IPv4 packet with options (dropping it)\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to access sensor file: %s\n"
+#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1624
-#, c-format
-msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to load sensor definition: %s\n"
+#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1706
 #, fuzzy
-msgid "# ICMP packets received from cadet"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
+#~ msgid "Error adding new sensor `%s' to global hashmap.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Fel vid uppladdning av fil: %s\n"
 
-#: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
-msgid "# UDP packets received from cadet"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
+#~ msgid "Error loading sensor from file: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Fel vid uppladdning av fil: %s\n"
 
-#: src/vpn/gnunet-service-vpn.c:2200
 #, fuzzy
-msgid "# TCP packets received from cadet"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
+#~ msgid "dump statistics to stdout after completion"
+#~ msgstr "behåller statistik om gnunetds operation"
 
-#: src/vpn/gnunet-service-vpn.c:2351
-msgid "Failed to find unallocated IPv4 address in VPN's range\n"
-msgstr ""
+#, fuzzy
+#~ msgid "# REQUEST CONNECT messages received"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/vpn/gnunet-service-vpn.c:2406
-msgid "Failed to find unallocated IPv6 address in VPN's range\n"
-msgstr ""
+#, fuzzy
+#~ msgid "# REQUEST DISCONNECT messages received"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
 #, fuzzy
-msgid "# Active destinations"
-msgstr "Nätverksanslutning"
+#~ msgid "Blacklisting disapproved to connect to peer `%s'\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2715
-msgid "Failed to allocate IP address for new destination\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Successfully disconnected from `%s'\n"
+#~ msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2987
 #, fuzzy
-msgid "Must specify valid IPv6 address"
-msgstr "\"%s\" är inte tillgänglig."
+#~ msgid "Failed to send connect request to transport service\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3011
-msgid "Must specify valid IPv6 mask"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to send disconnect request to transport service\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3019
-msgid "IPv6 support disabled as this system does not support IPv6\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Retrying to connect to `%s'\n"
+#~ msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/vpn/gnunet-service-vpn.c:3032
 #, fuzzy
-msgid "Must specify valid IPv4 address"
-msgstr "\"%s\" är inte tillgänglig."
+#~ msgid "Must specify `%s' for `%s' in configuration!\n"
+#~ msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3045
-msgid "Must specify valid IPv4 mask"
-msgstr ""
+#, fuzzy
+#~ msgid "Unknown operator: %c\n"
+#~ msgstr "Okänd operation \"%s\"\n"
 
-#: src/vpn/gnunet-service-vpn.c:3055
-msgid "IPv4 support disabled as this system does not support IPv4\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to create or access directory for log file `%s'\n"
+#~ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/vpn/gnunet-vpn.c:147
 #, fuzzy
-msgid "Error creating tunnel\n"
-msgstr "Klar med skapandet av värdnyckel.\n"
+#~ msgid "Failed to close statement %p: %d\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
-#, fuzzy, c-format
-msgid "Option `%s' makes no sense with option `%s'.\n"
-msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
+#, fuzzy
+#~ msgid "Failed to initialize solver!\n"
+#~ msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/vpn/gnunet-vpn.c:203
-#, fuzzy, c-format
-msgid "Option `%s' or `%s' is required.\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
+#, fuzzy
+#~ msgid "Invalid network type `%u' `%s': Disconnect!\n"
+#~ msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/vpn/gnunet-vpn.c:215
-#, fuzzy, c-format
-msgid "Option `%s' or `%s' is required when using option `%s'.\n"
-msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
+#, fuzzy
+#~ msgid "Failed to receive response from database.\n"
+#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/vpn/gnunet-vpn.c:235
-#, fuzzy, c-format
-msgid "`%s' is not a valid peer identifier.\n"
-msgstr "\"%s\" är inte en vanlig fil.\n"
+#, fuzzy
+#~ msgid "Could not obtain a valid network for `%s' %s (%s)\n"
+#~ msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/vpn/gnunet-vpn.c:255
-#, fuzzy, c-format
-msgid "`%s' is not a valid IP address.\n"
-msgstr "\"%s\" är inte tillgänglig."
+#, fuzzy
+#~ msgid "Blacklist refuses connection attempt to peer `%s'\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/vpn/gnunet-vpn.c:290
-msgid "request that result should be an IPv4 address"
-msgstr ""
+#, fuzzy
+#~ msgid "# keepalives sent"
+#~ msgstr "# sessionsnycklar skickade"
 
-#: src/vpn/gnunet-vpn.c:293
-msgid "request that result should be an IPv6 address"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/vpn/gnunet-vpn.c:296
-msgid "how long should the mapping be valid for new tunnels?"
-msgstr ""
+#, fuzzy
+#~ msgid "# Failed attempts to switch addresses (no response)"
+#~ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/vpn/gnunet-vpn.c:299
-msgid "destination IP for the tunnel"
-msgstr ""
+#, fuzzy
+#~ msgid "Validation received new %s message for peer `%s' with size %u\n"
+#~ msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/vpn/gnunet-vpn.c:302
-msgid "peer offering the service we would like to access"
-msgstr ""
+#, fuzzy
+#~ msgid "Adding `%s' without addresses for peer `%s'\n"
+#~ msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/vpn/gnunet-vpn.c:305
-msgid "name of the service we would like to access"
-msgstr ""
+#, fuzzy
+#~ msgid "# IPv4 broadcast HELLO beacons received via udp"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/vpn/gnunet-vpn.c:308
 #, fuzzy
-msgid "service is offered via TCP"
-msgstr "# byte mottogs via TCP"
+#~ msgid "Invalid IPv6 address: `%s'\n"
+#~ msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/vpn/gnunet-vpn.c:311
 #, fuzzy
-msgid "service is offered via UDP"
-msgstr "# byte mottagna via UDP"
+#~ msgid ""
+#~ "Failed to establish TCP connection to `%s:%u', no further addresses to "
+#~ "try.\n"
+#~ msgstr "Misslyckades att starta samling.\n"
 
-#: src/vpn/gnunet-vpn.c:323
-msgid "Setup tunnels via VPN."
-msgstr ""
+#, fuzzy
+#~ msgid "Trying to connect to `%s' (%p)\n"
+#~ msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/include/gnunet_common.h:586 src/include/gnunet_common.h:593
-#: src/include/gnunet_common.h:601
-#, fuzzy, c-format
-msgid "Assertion failed at %s:%d.\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+#, fuzzy
+#~ msgid "Attempt to connect to `%s' failed\n"
+#~ msgstr " Anslutning misslyckades\n"
 
-#: src/include/gnunet_common.h:613
-#, c-format
-msgid "External protocol violation detected at %s:%d.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "# PING without HELLO messages sent"
+#~ msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:649
-#, c-format
-msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
-msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' is working!\n"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
 #, fuzzy
 #~ msgid "Starting default services `%s'\n"
 #~ msgstr "Startade samling \"%s\".\n"
 
-#, fuzzy
-#~ msgid "Received %s message\n"
-#~ msgstr "mottog ogiltigt \"%s\" meddelande\n"
-
 #, fuzzy
 #~ msgid "Received last message for %s \n"
 #~ msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
@@ -9443,10 +10023,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Failed to parse file `%s'\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#, fuzzy
-#~ msgid "Invalid value for public key\n"
-#~ msgstr "Ogiltigt argument: \"%s\"\n"
-
 #, fuzzy
 #~ msgid "Cannot read experiments file `%s'\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -9471,10 +10047,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Received %s message from peer %s for experiment `%s'\n"
 #~ msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#, fuzzy
-#~ msgid "Lacking key configuration settings.\n"
-#~ msgstr "GNUnet-konfiguration"
-
 #, fuzzy
 #~ msgid "Could not access hostkey file `%s'.\n"
 #~ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
@@ -9527,10 +10099,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "New incoming channel from peer %s.\n"
 #~ msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#, fuzzy
-#~ msgid "CADET initialized\n"
-#~ msgstr " Anslutning misslyckades\n"
-
 #, fuzzy
 #~ msgid "Reloading sensor definitions from directory `%s'\n"
 #~ msgstr "Ladda ner filer från GNUnet."
@@ -9539,10 +10107,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Loaded %d sensors from directory `%s'\n"
 #~ msgstr "Ladda ner filer från GNUnet."
 
-#, fuzzy
-#~ msgid "Failed to receive response from `SENSOR' service."
-#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
 #, fuzzy
 #~ msgid "Received invalid message from `SENSOR' service."
 #~ msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
@@ -9587,10 +10151,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 #~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#, fuzzy
-#~ msgid "# DATA messages received via Bluetooth"
-#~ msgstr "# krypterade PONG-meddelanden mottagna"
-
 #, fuzzy
 #~ msgid "# Bluetooth DATA messages processed"
 #~ msgstr "# krypterade PONG-meddelanden mottagna"
@@ -9680,18 +10240,10 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Peer `%s' disconnected\n"
 #~ msgstr "# av anslutna parter"
 
-#, fuzzy
-#~ msgid "Transport plugin: `%s' port %llu\n"
-#~ msgstr "Testar transport(er) %s\n"
-
 #, fuzzy
 #~ msgid "Found %u transport plugins: `%s'\n"
 #~ msgstr "Testar transport(er) %s\n"
 
-#, fuzzy
-#~ msgid "Failed to parse HELLO in file `%s': %s %u \n"
-#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
 #, fuzzy
 #~ msgid "Internal error %d\n"
 #~ msgstr "Okänt fel.\n"
@@ -9748,10 +10300,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Job command file not given. Exiting\n"
 #~ msgstr "använd konfigurationsfil FILNAMN"
 
-#, fuzzy
-#~ msgid "Error while decoding key %u\n"
-#~ msgstr "Fel vid nedladdning: %s\n"
-
 #, fuzzy
 #~ msgid "Could not read friends list `%s'\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -9839,10 +10387,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Mesh service could not access hostkey: %s. Exiting.\n"
 #~ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#, fuzzy
-#~ msgid "No valid expiration time for operation `%s'\n"
-#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
 #, fuzzy
 #~ msgid "Failed to find record to remove\n"
 #~ msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -9855,10 +10399,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Failed to put new set of records in database"
 #~ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#, fuzzy
-#~ msgid "Failed to remove records from database"
-#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
 #, fuzzy
 #~ msgid "Failed to access database"
 #~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -9916,10 +10456,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "`%s' failed for drive `%S': %u\n"
 #~ msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#, fuzzy
-#~ msgid "Service `%s' was already running.\n"
-#~ msgstr "\"%s\" är inte en fil.\n"
-
 #, fuzzy
 #~ msgid "Service `%s' has been started.\n"
 #~ msgstr "Tjänst borttagen.\n"
@@ -10172,10 +10708,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Setting d->dead on peer `%4s'\n"
 #~ msgstr "Startade samling \"%s\".\n"
 
-#, fuzzy
-#~ msgid "Failed to write new configuration to disk."
-#~ msgstr "Kunde inte spara konfiguration!"
-
 #, fuzzy
 #~ msgid "Could not start `%s' process to copy configuration file.\n"
 #~ msgstr "Kunde inte skapa värdnyckel!\n"
@@ -10200,10 +10732,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Could not create configuration for peer number %u on `%s'!\n"
 #~ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#, fuzzy
-#~ msgid "Failed to find option %s in section %s!\n"
-#~ msgstr "Misslyckades att binda till UDP-port %d.\n"
-
 #, fuzzy
 #~ msgid "Invalid configuration option `%s' in section `%s'\n"
 #~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
@@ -10232,10 +10760,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "access (%s, X_OK) failed: %s\n"
 #~ msgstr "\"%s\" %s misslyckades: %s\n"
 
-#, fuzzy
-#~ msgid "# Peers connected"
-#~ msgstr "# av anslutna parter"
-
 #, fuzzy
 #~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
 #~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -10280,10 +10804,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "# unexpected CONNECT_ACK messages"
 #~ msgstr "skicka ANTAL meddelanden"
 
-#, fuzzy
-#~ msgid "# wlan session created"
-#~ msgstr "# sessionsnycklar accepterade"
-
 #, fuzzy
 #~ msgid "# wlan whole messages received"
 #~ msgstr "# krypterade PONG-meddelanden mottagna"
@@ -10329,12 +10849,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "# wlan messages queued"
 #~ msgstr "# krypterade PONG-meddelanden mottagna"
 
-#~ msgid "print this help"
-#~ msgstr "skriv ut denna hjälp"
-
-#~ msgid "print the version number"
-#~ msgstr "skriv ut versionsnummer"
-
 #, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "Misslyckades att starta samling.\n"
@@ -10343,10 +10857,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Service `%s' stopped\n"
 #~ msgstr "Tjänst borttagen.\n"
 
-#, fuzzy
-#~ msgid "Unable to accept connection for service `%s': %s\n"
-#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
 #, fuzzy
 #~ msgid "Failed to create IPv4 broadcast socket on port %d\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -10375,10 +10885,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "curl failed for `%s' at %s:%d: `%s'\n"
 #~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#, fuzzy
-#~ msgid "Phase 3: sending messages\n"
-#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
 #, fuzzy
 #~ msgid "Loading HTTPS transport plugin `%s'\n"
 #~ msgstr "Testar transport(er) %s\n"
@@ -10399,10 +10905,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Failed to load transport plugin for tcp\n"
 #~ msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#, fuzzy
-#~ msgid "Misconfigured address to bind to in configuration!\n"
-#~ msgstr "Inga applikationer definierade i konfiguration!\n"
-
 #, fuzzy
 #~ msgid "Failed to load transport plugin for http\n"
 #~ msgstr "Kunde inte slå upp \"%s\": %s\n"
@@ -10512,10 +11014,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "How much downstream bandwidth (in bytes/s) may be used?"
 #~ msgstr "Hur mycket CPU (i %) får användas?"
 
-#, fuzzy
-#~ msgid "Quota configuration"
-#~ msgstr "GNUnet-konfiguration"
-
 #, fuzzy
 #~ msgid "Daemon configuration: user account"
 #~ msgstr "Kunde inte skapa användarkonto:"
@@ -10524,10 +11022,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Save configuration?"
 #~ msgstr "GNUnet-konfiguration"
 
-#, fuzzy
-#~ msgid "GNUnet Configuration"
-#~ msgstr "GNUnet-konfiguration"
-
 #~ msgid "Back"
 #~ msgstr "Tillbaka"
 
@@ -10555,10 +11049,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Error: can't delete service: %s\n"
 #~ msgstr "Fel: kan inte ta bort tjänst: %s\n"
 
-#, fuzzy
-#~ msgid "Configuration changed. Save?"
-#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
 #, fuzzy
 #~ msgid "Error saving configuration."
 #~ msgstr "Kunde inte spara konfiguration!"
@@ -11024,9 +11514,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 #~ msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
 
-#~ msgid "keeps statistics about gnunetd's operation"
-#~ msgstr "behåller statistik om gnunetds operation"
-
 #~ msgid "prints supported protocol messages"
 #~ msgstr "skriver ut stödda protokollmeddelanden"
 
@@ -11361,9 +11848,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "_Quit"
 #~ msgstr "_Avsluta"
 
-#~ msgid "Show _name"
-#~ msgstr "Visa _namn"
-
 #~ msgid "Show _range"
 #~ msgstr "Visa _omfång"
 
@@ -11575,9 +12059,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "FAILURE"
 #~ msgstr "MISSLYCKANDE"
 
-#~ msgid "MESSAGE"
-#~ msgstr "MEDDELANDE"
-
 #~ msgid "CRON"
 #~ msgstr "CRON"