Update po files

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

diff --git a/po/fr.po b/po/fr.po
index 5e8e07c09ff37e6426038e5e22dd1c9638a78d61..91032f7498f7a700b749dc6fc2534202b30fc6bc 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2015-06-27 21:45+0200\n"
-"PO-Revision-Date: 2015-03-24 01:41+0100\n"
+"POT-Creation-Date: 2016-10-26 09:18-0500\n"
+"PO-Revision-Date: 2015-12-24 01:20+0100\n"
 "Last-Translator: Stéphane  Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -16,378 +16,413 @@ 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:152
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:158
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:213 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:218
+#: src/arm/gnunet-arm.c:215
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:217 src/testbed/gnunet-service-testbed_peers.c:1143
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1145
 msgid "ARM API is busy"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:224
-msgid "Request does not fit into a message"
-msgstr ""
+msgstr "API ARM occupé"
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1147
 msgid "Request timed out"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
+#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1149
 msgid "Unknown request status"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:239 src/testbed/gnunet-service-testbed_peers.c:1165
 #, c-format
 msgid "%s is stopped"
 msgstr "%s est arrêté"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:241 src/testbed/gnunet-service-testbed_peers.c:1167
 #, c-format
 msgid "%s is starting"
 msgstr "%s est en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is stopping"
 msgstr "%s est en cours d'arrêt"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1171
 #, c-format
 msgid "%s is starting already"
 msgstr "%s est déjà en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1173
 #, c-format
 msgid "%s is stopping already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s is started already"
 msgstr "%s est déjà démarré"
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s is stopped already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1179
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1181
 #, c-format
 msgid "%s service failed to start"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262
+#: src/arm/gnunet-arm.c:257
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1061
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1185
 #, c-format
 msgid "%.s Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
 
-#: src/arm/gnunet-arm.c:297
+#: src/arm/gnunet-arm.c:291
 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
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:364
 #, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:379
+#: src/arm/gnunet-arm.c:375
 #, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:421
+#: src/arm/gnunet-arm.c:417
 #, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:431
+#: src/arm/gnunet-arm.c:428
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:468
+#: src/arm/gnunet-arm.c:467
 #, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:479
+#: src/arm/gnunet-arm.c:478
 #, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:517
+#: src/arm/gnunet-arm.c:519
 #, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:525
+#: src/arm/gnunet-arm.c:528
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:530
+#: src/arm/gnunet-arm.c:534
 msgid "Running services:\n"
-msgstr ""
+msgstr "Services en exécution :\n"
 
-#: src/arm/gnunet-arm.c:612
+#: src/arm/gnunet-arm.c:622
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "Arrêté %s.\n"
 
-#: src/arm/gnunet-arm.c:646
+#: src/arm/gnunet-arm.c:657
 #, c-format
 msgid "Starting %s...\n"
 msgstr "En cous de démarrage %s…\n"
 
-#: src/arm/gnunet-arm.c:649
+#: src/arm/gnunet-arm.c:660
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "En cour d'arrêt %s…\n"
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:674
 #, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:756
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:758
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:728
+#: src/arm/gnunet-arm.c:760
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:762
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:733
+#: src/arm/gnunet-arm.c:765
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:736
+#: src/arm/gnunet-arm.c:768
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:771
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:773
 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:776
+msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:746
+#: src/arm/gnunet-arm.c:778
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:748
+#: src/arm/gnunet-arm.c:780
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:750
+#: src/arm/gnunet-arm.c:782
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:761
+#: src/arm/gnunet-arm.c:794
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:266
-msgid "Could not send status result to client\n"
+#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
+#: src/util/service.c:565 src/util/service_new.c:604
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
+#: src/transport/plugin_transport_tcp.c:652
+#: src/transport/plugin_transport_tcp.c:658
+#: src/transport/plugin_transport_tcp.c:3299 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:629 src/util/service_new.c:635
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
+#: src/util/client_new.c:464 src/util/service.c:621 src/util/service_new.c:674
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
+#: src/util/client_new.c:469 src/util/service.c:625 src/util/service_new.c:679
+#, c-format
+msgid "Using `%s' instead\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:724
+#: src/util/service.c:656 src/util/service_new.c:715
+#, 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:482 src/transport/plugin_transport_tcp.c:741
+#: src/util/service.c:673 src/util/service_new.c:733
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:302
-msgid "Could not send list result to client\n"
+#: src/arm/gnunet-service-arm.c:513
+#: src/transport/plugin_transport_http_server.c:2617
+#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
+#: src/util/service_new.c:774
+#, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/arm/gnunet-service-arm.c:532
+#: src/transport/plugin_transport_http_server.c:2635
+#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
+#: src/util/service_new.c:794
+#, c-format
+msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:529
+#: src/arm/gnunet-service-arm.c:932
 #, c-format
 msgid "Failed to start service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:540
+#: src/arm/gnunet-service-arm.c:943
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:639
+#: src/arm/gnunet-service-arm.c:1055
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:661
+#: src/arm/gnunet-service-arm.c:1090
 #, 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:1133
 #, 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:1309
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1105
+#: src/arm/gnunet-service-arm.c:1611
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1199
+#: src/arm/gnunet-service-arm.c:1771
 msgid "exit"
 msgstr "exit"
 
-#: src/arm/gnunet-service-arm.c:1204
+#: src/arm/gnunet-service-arm.c:1776
 msgid "signal"
 msgstr "signal"
 
-#: src/arm/gnunet-service-arm.c:1209
+#: src/arm/gnunet-service-arm.c:1781
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/arm/gnunet-service-arm.c:1215
+#: src/arm/gnunet-service-arm.c:1787
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1237
+#: src/arm/gnunet-service-arm.c:1813
 #, 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:1829
 #, 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:42
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2778 src/ats/gnunet-ats-solver-eval.c:2819
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2796
+#: src/ats/gnunet-ats-solver-eval.c:2799
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2837
+#: src/ats/gnunet-ats-solver-eval.c:2840
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3290
-#: src/ats-tests/gnunet-solver-eval.c:918
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
 msgid "solver to use"
 msgstr "solveur utilisé"
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:921
-#: src/ats-tests/gnunet-solver-eval.c:924
+#: src/ats/gnunet-ats-solver-eval.c:3296 src/ats-tests/gnunet-solver-eval.c:938
+#: src/ats-tests/gnunet-solver-eval.c:941
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
+#: src/ats/gnunet-ats-solver-eval.c:3299
 msgid "be verbose"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3299
+#: src/ats/gnunet-ats-solver-eval.c:3302
 msgid "print logging"
 msgstr "afficher le journal"
 
-#: src/ats/gnunet-ats-solver-eval.c:3302
+#: src/ats/gnunet-ats-solver-eval.c:3305
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3305
+#: src/ats/gnunet-ats-solver-eval.c:3308
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:305
+#: src/ats/gnunet-service-ats_plugins.c:304
 #, 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:315
+#: src/ats/gnunet-service-ats_plugins.c:314
 #, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:360
+#: src/ats/gnunet-service-ats_plugins.c:359
 #, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:452
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr ""
@@ -413,14 +448,14 @@ msgstr ""
 
 #: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
 #: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
-#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1140
-#: src/ats/plugin_ats_ril.c:2613 src/ats/plugin_ats_ril.c:2630
-#: src/ats/plugin_ats_ril.c:2647 src/ats/plugin_ats_ril.c:2664
-#: src/ats/plugin_ats_ril.c:2681 src/ats/plugin_ats_ril.c:2698
-#: src/ats/plugin_ats_ril.c:2715 src/ats/plugin_ats_ril.c:2732
-#, c-format
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
+#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
+#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
+#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
+#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
-msgstr ""
+msgstr "fornat invalide : « %s »\n"
 
 #: src/ats/plugin_ats_mlp.c:2670
 #, c-format
@@ -448,276 +483,247 @@ msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1163
-#, c-format
+#: src/ats/plugin_ats_proportional.c:1164
+#, fuzzy, c-format
 msgid "Invalid %s configuration %f\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:72
-msgid "Benchmarking done\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:105
-#, c-format
-msgid "Failed to connect peer 0 and %u\n"
-msgstr ""
+msgstr "fornat invalide : « %s »\n"
 
-#: src/ats-tests/ats-testing.c:413
+#: src/ats-tests/ats-testing.c:441
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:419
+#: src/ats-tests/ats-testing.c:448
 #, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr ""
 
-#: 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
-#, c-format
-msgid "Could not connect master [%u] and slave [%u]\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:634
-msgid "Initialization failed, shutdown\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing-log.c:834
+#: src/ats-tests/ats-testing-log.c:837
 msgid "Stop logging\n"
 msgstr "Arrêter la journalisation\n"
 
-#: src/ats-tests/ats-testing-log.c:885
+#: src/ats-tests/ats-testing-log.c:892
 #, c-format
 msgid "Start logging `%s'\n"
 msgstr "Démarrer la journalisation « %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:289
+#: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:293
+#: src/ats-tool/gnunet-ats.c:311
 #, c-format
 msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:366
+#: src/ats-tool/gnunet-ats.c:395
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:373
+#: src/ats-tool/gnunet-ats.c:402
 msgid "active "
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:373
+#: src/ats-tool/gnunet-ats.c:402
 msgid "inactive "
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:483
+#: src/ats-tool/gnunet-ats.c:512
 #, c-format
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:676
+#: src/ats-tool/gnunet-ats.c:705
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:708 src/namestore/gnunet-namestore.c:700
-#: src/namestore/plugin_rest_namestore.c:812
-#: src/transport/gnunet-transport.c:1890
-#: src/transport/gnunet-transport-profiler.c:531
-#, c-format
-msgid "Service `%s' is not running\n"
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:722 src/transport/gnunet-transport.c:1899
-#: src/transport/gnunet-transport-profiler.c:549
+#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
+#: src/transport/gnunet-transport.c:1536
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:732
+#: src/ats-tool/gnunet-ats.c:773
 #, 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:754 src/ats-tool/gnunet-ats.c:780
-#: src/ats-tool/gnunet-ats.c:808 src/ats-tool/gnunet-ats.c:854
+#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820
+#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:766 src/ats-tool/gnunet-ats.c:792
+#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:820
+#: src/ats-tool/gnunet-ats.c:862
 msgid "No preference type given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:827
+#: src/ats-tool/gnunet-ats.c:869
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:845
+#: src/ats-tool/gnunet-ats.c:887
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:916
+#: src/ats-tool/gnunet-ats.c:949
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:918
+#: src/ats-tool/gnunet-ats.c:951
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:921
+#: src/ats-tool/gnunet-ats.c:954
+#, fuzzy
+msgid "connect to PEER"
+msgstr "Connecté à"
+
+#: src/ats-tool/gnunet-ats.c:957
 msgid "do not resolve IP addresses to hostnames"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:923
+#: src/ats-tool/gnunet-ats.c:959
 msgid "monitor mode"
-msgstr ""
+msgstr "mode moniteur"
 
-#: src/ats-tool/gnunet-ats.c:925
+#: src/ats-tool/gnunet-ats.c:961
 msgid "set preference for the given peer"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:927
+#: src/ats-tool/gnunet-ats.c:963
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:929
+#: src/ats-tool/gnunet-ats.c:965
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:932
+#: src/ats-tool/gnunet-ats.c:968
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:934
+#: src/ats-tool/gnunet-ats.c:970
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:937
+#: src/ats-tool/gnunet-ats.c:973
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:944
+#: src/ats-tool/gnunet-ats.c:983
 msgid "Print information about ATS state"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:376
+#: src/cadet/gnunet-cadet.c:511
 #, c-format
 msgid "Invalid target `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:643
+#: src/cadet/gnunet-cadet.c:787
 #, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:686
+#: src/cadet/gnunet-cadet.c:825
 #, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:752
-msgid "You must NOT give a TARGETwhen using 'request all' options\n"
+#: src/cadet/gnunet-cadet.c:892
+msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:849
+#: src/cadet/gnunet-cadet.c:982
 msgid "provide information about a particular connection"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:852
+#: src/cadet/gnunet-cadet.c:985
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:855
+#: src/cadet/gnunet-cadet.c:988
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:861
-msgid "port to listen to (default; 0)"
+#: src/cadet/gnunet-cadet.c:994
+msgid "port to listen to"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:864
+#: src/cadet/gnunet-cadet.c:997
 msgid "provide information about a patricular peer"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:867
+#: src/cadet/gnunet-cadet.c:1000
 msgid "provide information about all peers"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:870
+#: src/cadet/gnunet-cadet.c:1003
 msgid "provide information about a particular tunnel"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:873
+#: src/cadet/gnunet-cadet.c:1006
 msgid "provide information about all tunnels"
 msgstr ""
 
-#: src/cadet/gnunet-service-cadet_peer.c:537
+#: src/cadet/gnunet-service-cadet_peer.c:707
 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:499
+#: src/secretsharing/gnunet-secretsharing-profiler.c:607
 msgid "number of peers in consensus"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:440
-msgid "how many peers receive one value?"
+#: src/consensus/gnunet-consensus-profiler.c:502
+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:505
+#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
+#: src/set/gnunet-set-profiler.c:384
 msgid "number of values"
 msgstr "nombre de valeurs"
 
-#: src/consensus/gnunet-consensus-profiler.c:446
+#: src/consensus/gnunet-consensus-profiler.c:508
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:449
+#: src/consensus/gnunet-consensus-profiler.c:511
 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:514
+#: src/set/gnunet-set-profiler.c:390
+msgid "write statistics to file"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:517
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
 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:490
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/conversation_api.c:617
-#, fuzzy
-msgid "number too large"
-msgstr "nombre de valeurs"
-
 #: src/conversation/gnunet-conversation.c:269
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -743,243 +749,242 @@ msgstr ""
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:366
+#: src/conversation/gnunet-conversation.c:367
 msgid "Failed to setup phone (internal error)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:378
+#: src/conversation/gnunet-conversation.c:379
 #, 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:400
+#: src/conversation/gnunet-conversation.c:401
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:407
+#: src/conversation/gnunet-conversation.c:408
 #, c-format
 msgid "Connection established to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:414
+#: src/conversation/gnunet-conversation.c:415
 #, c-format
 msgid "Failed to resolve `%s'\n"
-msgstr ""
+msgstr "Résolution de « %s » échouée\n"
 
-#: src/conversation/gnunet-conversation.c:422
-#, c-format
+#: src/conversation/gnunet-conversation.c:423
+#, fuzzy, c-format
 msgid "Call to `%s' terminated\n"
-msgstr ""
+msgstr "Appel terminé\n"
 
-#: src/conversation/gnunet-conversation.c:431
+#: src/conversation/gnunet-conversation.c:432
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:437
+#: src/conversation/gnunet-conversation.c:438
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:442
+#: src/conversation/gnunet-conversation.c:443
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:511
+#: src/conversation/gnunet-conversation.c:512
 #, c-format
 msgid "Unknown command `%s'\n"
-msgstr ""
+msgstr "Commande « %s » inconnue\n"
 
-#: src/conversation/gnunet-conversation.c:527
-#: src/conversation/gnunet-conversation.c:541
+#: src/conversation/gnunet-conversation.c:528
+#: src/conversation/gnunet-conversation.c:542
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:534
-#: src/conversation/gnunet-conversation.c:591
+#: src/conversation/gnunet-conversation.c:535
+#: src/conversation/gnunet-conversation.c:592
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:549
-#: src/conversation/gnunet-conversation.c:604
+#: src/conversation/gnunet-conversation.c:550
+#: src/conversation/gnunet-conversation.c:605
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:559
+#: src/conversation/gnunet-conversation.c:560
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:615
+#: src/conversation/gnunet-conversation.c:616
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:632
+#: src/conversation/gnunet-conversation.c:633
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:662
+#: src/conversation/gnunet-conversation.c:663
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:685
+#: src/conversation/gnunet-conversation.c:686
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:691
 #, 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:696
-#: src/conversation/gnunet-conversation.c:720
+#: src/conversation/gnunet-conversation.c:697
+#: src/conversation/gnunet-conversation.c:721
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:701
+#: src/conversation/gnunet-conversation.c:702
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:710
+#: src/conversation/gnunet-conversation.c:711
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:715
+#: src/conversation/gnunet-conversation.c:716
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/conversation/gnunet-conversation.c:735
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:740
+#: src/conversation/gnunet-conversation.c:741
 #, c-format
 msgid "#%u: `%s'\n"
 msgstr "#%u : « %s »\n"
 
-#: src/conversation/gnunet-conversation.c:768
-#: src/conversation/gnunet-conversation.c:783
+#: src/conversation/gnunet-conversation.c:769
+#: src/conversation/gnunet-conversation.c:784
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:816
-#: src/conversation/gnunet-conversation.c:832
+#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:839
+#: src/conversation/gnunet-conversation.c:840
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:848
+#: src/conversation/gnunet-conversation.c:849
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:865
+#: src/conversation/gnunet-conversation.c:866
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:900
+#: src/conversation/gnunet-conversation.c:901
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:908
+#: src/conversation/gnunet-conversation.c:909
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:925
+#: src/conversation/gnunet-conversation.c:926
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:952
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:954
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
+#: src/conversation/gnunet-conversation.c:956
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:957
+#: src/conversation/gnunet-conversation.c:958
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:959
+#: src/conversation/gnunet-conversation.c:960
 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:961
+#: src/conversation/gnunet-conversation.c:962
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:963
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:965
+#: src/conversation/gnunet-conversation.c:966
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:967
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1175
+#: src/conversation/gnunet-conversation.c:1172
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1188
+#: src/conversation/gnunet-conversation.c:1185
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1223
+#: src/conversation/gnunet-conversation.c:1220
 msgid "You must specify the NAME of an ego to use\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1247
+#: src/conversation/gnunet-conversation.c:1244
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1270
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1276
+#: src/conversation/gnunet-conversation.c:1273
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1302
+#: src/conversation/gnunet-conversation.c:1299
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:121
+#: src/conversation/gnunet-conversation-test.c:119
 #, 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:145
 #, c-format
 msgid ""
 "\n"
@@ -987,87 +992,86 @@ msgid ""
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:215
+#: src/conversation/gnunet-conversation-test.c:210
 #, 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
+#: src/conversation/gnunet-conversation-test.c:243
+#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:305
+#: src/conversation/gnunet_gst.c:630
+#: src/conversation/gnunet-helper-audio-playback-gst.c:357
+#, c-format
+msgid "Read error from STDIN: %d %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:320
 #, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "pa_stream_write() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:589
+#: src/conversation/gnunet-helper-audio-playback.c:608
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:614
+#: src/conversation/gnunet-helper-audio-playback.c:633
 #: src/conversation/gnunet-helper-audio-record.c:545
 msgid "Connection established.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:619
+#: src/conversation/gnunet-helper-audio-playback.c:638
 #: src/conversation/gnunet-helper-audio-record.c:550
 #, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "pa_stream_new() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:633
+#: src/conversation/gnunet-helper-audio-playback.c:652
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr "pa_stream_connect_playback() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:646
+#: src/conversation/gnunet-helper-audio-playback.c:665
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, c-format
 msgid "Connection failure: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:667
+#: src/conversation/gnunet-helper-audio-playback.c:686
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr "Spécification incorrecte\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:673
+#: src/conversation/gnunet-helper-audio-playback.c:692
 #: src/conversation/gnunet-helper-audio-record.c:605
 msgid "pa_mainloop_new() failed.\n"
 msgstr "pa_mainloop_new() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:687
+#: src/conversation/gnunet-helper-audio-playback.c:706
 #: src/conversation/gnunet-helper-audio-record.c:620
 msgid "pa_context_new() failed.\n"
 msgstr "pa_context_new() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:694
+#: src/conversation/gnunet-helper-audio-playback.c:713
 #: src/conversation/gnunet-helper-audio-record.c:626
 #, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "pa_context_connect() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:700
+#: src/conversation/gnunet-helper-audio-playback.c:719
 #: src/conversation/gnunet-helper-audio-record.c:632
 msgid "pa_mainloop_run() failed.\n"
 msgstr "pa_mainloop_run() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:770
+#: src/conversation/gnunet-helper-audio-playback.c:789
 #, 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
 #, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
@@ -1122,29 +1126,20 @@ msgstr "ogg_stream_init() échoué.\n"
 
 #: src/conversation/gnunet-helper-audio-record.c:721
 #, c-format
-msgid "Failed to allocate %d bytes for second packet\n"
+msgid "Failed to allocate %u bytes for second packet\n"
 msgstr ""
 
-#: 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"
+#: src/conversation/microphone.c:121
+msgid "Could not start record audio helper\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1351
+#: src/conversation/plugin_gnsrecord_conversation.c:71
 #, c-format
-msgid "Received incoming Cadet channel on port %u\n"
-msgstr ""
-
-#: src/conversation/microphone.c:121
-msgid "Could not start record audio helper\n"
+msgid "PHONE version %u not supported\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:116
+#: src/conversation/plugin_gnsrecord_conversation.c:133
+#: src/conversation/plugin_gnsrecord_conversation.c:147
 #, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr ""
@@ -1153,264 +1148,236 @@ msgstr ""
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: 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:90
 msgid "fresh connection"
 msgstr ""
 
-#: src/core/gnunet-core.c:95
+#: src/core/gnunet-core.c:93
 msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:98
+#: src/core/gnunet-core.c:96
 msgid "key received"
 msgstr ""
 
-#: src/core/gnunet-core.c:101
+#: src/core/gnunet-core.c:99
 msgid "connection established"
 msgstr ""
 
-#: src/core/gnunet-core.c:104
+#: src/core/gnunet-core.c:102
 msgid "rekeying"
 msgstr ""
 
-#: src/core/gnunet-core.c:107
+#: src/core/gnunet-core.c:105
+#, fuzzy
 msgid "disconnected"
-msgstr ""
+msgstr "Déconnecté de"
 
-#: src/core/gnunet-core.c:114
+#: src/core/gnunet-core.c:112
 msgid "Connection to CORE service lost (reconnecting)"
 msgstr ""
 
-#: src/core/gnunet-core.c:117
+#: src/core/gnunet-core.c:115
 #, fuzzy
 msgid "unknown state"
-msgstr "inconnu"
+msgstr "adresse inconnue"
 
-#: src/core/gnunet-core.c:122
+#: src/core/gnunet-core.c:120
 #, 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:144 src/peerinfo-tool/gnunet-peerinfo.c:728
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:157
+#: src/core/gnunet-core.c:155
 msgid "Failed to connect to CORE service!\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2154
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1737
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:188
+#: src/core/gnunet-core.c:185
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:104
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+#: src/core/gnunet-service-core.c:339
+msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:128
-#, c-format
-msgid "Core service of `%4s' ready.\n"
+#: src/core/gnunet-service-core.c:363
+msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:375
-msgid "# send requests dropped (disconnected)"
+#: src/core/gnunet-service-core.c:432
+#, c-format
+msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:490
+#: src/core/gnunet-service-core.c:530
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:536
+#: src/core/gnunet-service-core.c:928
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr ""
+
+#: src/core/gnunet-service-core.c:949
 #, c-format
-msgid "# bytes of messages of type %u received"
+msgid "Core service of `%s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:571
+#: src/core/gnunet-service-core_kx.c:566
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:630
+#: src/core/gnunet-service-core_kx.c:626
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:726
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:786
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:795
+#: src/core/gnunet-service-core_kx.c:819
 msgid "# PING messages transmitted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:870
+#: src/core/gnunet-service-core_kx.c:886
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:877
+#: src/core/gnunet-service-core_kx.c:893
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:916
+#: src/core/gnunet-service-core_kx.c:932
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:927
+#: src/core/gnunet-service-core_kx.c:943
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1029
-#: src/transport/gnunet-service-transport_validation.c:1053
+#: src/core/gnunet-service-core_kx.c:1039
+#: src/transport/gnunet-service-transport_validation.c:1119
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1038
+#: src/core/gnunet-service-core_kx.c:1048
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1067
-#, 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:1093
+#: src/core/gnunet-service-core_kx.c:1106
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1122
+#: src/core/gnunet-service-core_kx.c:1132
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1135
+#: src/core/gnunet-service-core_kx.c:1145
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1206
-#: src/transport/gnunet-service-transport_validation.c:1370
+#: src/core/gnunet-service-core_kx.c:1209
+#: src/transport/gnunet-service-transport_validation.c:1442
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1213
+#: src/core/gnunet-service-core_kx.c:1216
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1218
+#: src/core/gnunet-service-core_kx.c:1221
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1254
+#: src/core/gnunet-service-core_kx.c:1256
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1292
+#: src/core/gnunet-service-core_kx.c:1294
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1303
+#: src/core/gnunet-service-core_kx.c:1305
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1310
+#: src/core/gnunet-service-core_kx.c:1312
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1466
+#: src/core/gnunet-service-core_kx.c:1485
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1474
+#: src/core/gnunet-service-core_kx.c:1493
 #, 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:1477
+#: src/core/gnunet-service-core_kx.c:1496
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1535
-#: src/core/gnunet-service-core_kx.c:1561
+#: src/core/gnunet-service-core_kx.c:1554
+#: src/core/gnunet-service-core_kx.c:1580
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1548
+#: src/core/gnunet-service-core_kx.c:1567
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1590
+#: src/core/gnunet-service-core_kx.c:1609
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1598
+#: src/core/gnunet-service-core_kx.c:1617
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/core/gnunet-service-core_kx.c:1674
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:177
-msgid "# sessions terminated by transport disconnect"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:193
-#: src/core/gnunet-service-core_neighbours.c:355
-msgid "# neighbour entries allocated"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:264
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:438
-#, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_sessions.c:252
-#: src/core/gnunet-service-core_sessions.c:338
-#: src/dht/gnunet-service-dht_neighbours.c:660
-#: src/dht/gnunet-service-dht_neighbours.c:725
-#: src/fs/gnunet-service-fs_cp.c:655 src/fs/gnunet-service-fs_cp.c:1649
-#: src/topology/gnunet-daemon-topology.c:734
-#: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:755
-#: src/transport/gnunet-service-transport_neighbours.c:763
+#: src/core/gnunet-service-core_sessions.c:256
+#: src/core/gnunet-service-core_sessions.c:341
+#: src/dht/gnunet-service-dht_neighbours.c:741
+#: src/dht/gnunet-service-dht_neighbours.c:803
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
+#: src/topology/gnunet-daemon-topology.c:612
+#: src/topology/gnunet-daemon-topology.c:714
+#: src/transport/gnunet-service-transport_neighbours.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:727
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:285
+#: src/core/gnunet-service-core_sessions.c:287
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:404
+#: src/core/gnunet-service-core_sessions.c:407
 msgid "# outdated typemap confirmations received"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:415
+#: src/core/gnunet-service-core_sessions.c:418
 msgid "# valid typemap confirmations received"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:554
-msgid "# messages discarded (expired prior to transmission)"
-msgstr ""
-
 #: src/core/gnunet-service-core_typemap.c:169
 #: src/core/gnunet-service-core_typemap.c:180
 msgid "# type maps received"
@@ -1421,7 +1388,7 @@ msgid "# updates to my type map"
 msgstr ""
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:841
+#: src/datastore/gnunet-service-datastore.c:770
 msgid "# bytes stored"
 msgstr ""
 
@@ -1455,29 +1422,28 @@ msgstr ""
 msgid "# proximity search requests received"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:466
+#: src/datacache/plugin_datacache_heap.c:467
 msgid "Heap datacache running\n"
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:77
 #: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:818
-#: src/datastore/plugin_datastore_mysql.c:834
+#: src/datastore/plugin_datastore_mysql.c:1027
 #: src/datastore/plugin_datastore_sqlite.c:57
-#: src/datastore/plugin_datastore_sqlite.c:65 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/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
+#: src/mysql/mysql.c:42 src/mysql/mysql.c:49
+#: src/namecache/plugin_namecache_postgres.c:53
 #: src/namecache/plugin_namecache_sqlite.c:52
-#: src/namestore/plugin_namestore_postgres.c:52
+#: src/namestore/plugin_namestore_postgres.c:53
 #: src/namestore/plugin_namestore_sqlite.c:52
 #: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/psycstore/plugin_psycstore_mysql.c:62
 #: 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/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:671 src/include/gnunet_common.h:680
+#: src/include/gnunet_common.h:681 src/include/gnunet_common.h:690
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1486,273 +1452,239 @@ msgstr ""
 #: src/datacache/plugin_datacache_sqlite.c:749
 #: src/datastore/plugin_datastore_sqlite.c:409
 #: src/namecache/plugin_namecache_sqlite.c:292
-#: src/namestore/plugin_namestore_sqlite.c:324
+#: src/namestore/plugin_namestore_sqlite.c:343
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:310
-msgid "Failed to transmit request to drop database.\n"
-msgstr ""
+#: src/datastore/datastore_api.c:309
+#, fuzzy
+msgid "DATASTORE disconnected"
+msgstr "Déconnecté de"
 
-#: src/datastore/datastore_api.c:394
-msgid "# queue entry timeouts"
-msgstr ""
+#: src/datastore/datastore_api.c:425
+#, fuzzy
+msgid "Disconnected from DATASTORE"
+msgstr "Déconnecté de"
 
-#: src/datastore/datastore_api.c:443
+#: src/datastore/datastore_api.c:513
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:471
+#: src/datastore/datastore_api.c:543
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:491
-msgid "# Requests dropped from datastore queue"
-msgstr ""
-
-#: src/datastore/datastore_api.c:533
-msgid "# datastore connections (re)created"
-msgstr ""
-
-#: src/datastore/datastore_api.c:621
-msgid "# transmission request failures"
-msgstr ""
-
-#: src/datastore/datastore_api.c:645
-msgid "# bytes sent to datastore"
-msgstr ""
-
-#: src/datastore/datastore_api.c:787
-msgid "Failed to receive status response from database."
-msgstr ""
-
-#: src/datastore/datastore_api.c:801
-msgid "Error reading response from datastore service"
+#: src/datastore/datastore_api.c:680
+msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:813 src/datastore/datastore_api.c:819
-msgid "Invalid error message received from datastore service"
+#: src/datastore/datastore_api.c:754
+msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:823
-msgid "# status messages received"
+#: src/datastore/datastore_api.c:879
+msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:893
+#: src/datastore/datastore_api.c:995
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:959
+#: src/datastore/datastore_api.c:1056
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1020
+#: src/datastore/datastore_api.c:1121
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1080
+#: src/datastore/datastore_api.c:1187
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1144
+#: src/datastore/datastore_api.c:1271
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1248
-msgid "# Results received"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1315
+#: src/datastore/datastore_api.c:1331
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1378
+#: src/datastore/datastore_api.c:1397
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1447
+#: src/datastore/datastore_api.c:1477
 msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:114
+#: src/datastore/gnunet-datastore.c:113
 #, c-format
 msgid "Failed to store item: %s, aborting\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:200
+#: src/datastore/gnunet-datastore.c:199
 #, c-format
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:246
+#: src/datastore/gnunet-datastore.c:244
 msgid ""
 "specifies the configuration to use to access an alternative datastore; will "
 "merge that datastore into our current datastore"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:255
+#: src/datastore/gnunet-datastore.c:253
 msgid "Manipulate GNUnet datastore"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:365
+#: src/datastore/gnunet-service-datastore.c:336
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:439
+#: src/datastore/gnunet-service-datastore.c:416
 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:557
 msgid "# results found"
-msgstr ""
+msgstr "# résultats introuvables"
 
-#: src/datastore/gnunet-service-datastore.c:686
+#: src/datastore/gnunet-service-datastore.c:598
 #, 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:609
 #, 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:615
 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:622
 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:999
-#: src/datastore/gnunet-service-datastore.c:1570
+#: src/datastore/gnunet-service-datastore.c:629
+#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:969
+#: src/datastore/gnunet-service-datastore.c:1668
 msgid "# reserved"
-msgstr ""
+msgstr "# réservé"
 
-#: src/datastore/gnunet-service-datastore.c:780
+#: src/datastore/gnunet-service-datastore.c:702
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:853
+#: src/datastore/gnunet-service-datastore.c:787
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1046
+#: src/datastore/gnunet-service-datastore.c:1017
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1058
+#: src/datastore/gnunet-service-datastore.c:1048
+msgid "# GET KEY requests received"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1061
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1094
+#: src/datastore/gnunet-service-datastore.c:1115
 msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1122
+#: src/datastore/gnunet-service-datastore.c:1146
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1155
+#: src/datastore/gnunet-service-datastore.c:1179
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1180
+#: src/datastore/gnunet-service-datastore.c:1226
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1188
+#: src/datastore/gnunet-service-datastore.c:1235
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1220
+#: src/datastore/gnunet-service-datastore.c:1282
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1264
+#: src/datastore/gnunet-service-datastore.c:1336
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1269
+#: src/datastore/gnunet-service-datastore.c:1342
+#: src/datastore/gnunet-service-datastore.c:1517
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1322
+#: src/datastore/gnunet-service-datastore.c:1396
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1333
+#: src/datastore/gnunet-service-datastore.c:1408
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1402
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/datastore/gnunet-service-datastore.c:1468
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1450
+#: src/datastore/gnunet-service-datastore.c:1524
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1460
+#: src/datastore/gnunet-service-datastore.c:1535
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1598
-#: src/datastore/gnunet-service-datastore.c:1609
-#, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1603
+#: src/datastore/gnunet-service-datastore.c:1705
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1614
+#: src/datastore/gnunet-service-datastore.c:1721
 msgid "# quota"
-msgstr ""
+msgstr "# quota"
 
-#: src/datastore/gnunet-service-datastore.c:1616
+#: src/datastore/gnunet-service-datastore.c:1726
 msgid "# cache size"
-msgstr ""
+msgstr "# taille du cache"
 
-#: src/datastore/gnunet-service-datastore.c:1629
+#: src/datastore/gnunet-service-datastore.c:1742
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1647
-#: src/datastore/gnunet-service-datastore.c:1663
+#: src/datastore/gnunet-service-datastore.c:1760
+#: src/datastore/gnunet-service-datastore.c:1776
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1693
+#: src/datastore/gnunet-service-datastore.c:1808
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
@@ -1760,56 +1692,53 @@ msgstr ""
 msgid "Heap database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:309
+#: src/datastore/plugin_datastore_mysql.c:347
 #: src/datastore/plugin_datastore_sqlite.c:507
 msgid "Data too large"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:328
+#: src/datastore/plugin_datastore_mysql.c:363
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:793
-#, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr ""
-
-#: src/datastore/plugin_datastore_mysql.c:802
+#: src/datastore/plugin_datastore_mysql.c:983
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1036
+#: src/datastore/plugin_datastore_mysql.c:1257
+#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:331
+#: src/datastore/plugin_datastore_postgres.c:345
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:846
+#: src/datastore/plugin_datastore_postgres.c:975
 msgid "Failed to drop table from database.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:882
-#: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:569
+#: src/datastore/plugin_datastore_postgres.c:1012
+#: src/namecache/plugin_namecache_postgres.c:398
+#: src/namestore/plugin_namestore_postgres.c:571
+#: src/psycstore/plugin_psycstore_postgres.c:1721
 msgid "Postgres database running\n"
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:65
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
-#: src/testbed/gnunet-daemon-testbed-underlay.c:58
+#: src/testbed/gnunet-daemon-testbed-underlay.c:59
 #, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:263
 #: src/namecache/plugin_namecache_sqlite.c:193
-#: src/namestore/plugin_namestore_sqlite.c:204
+#: src/namestore/plugin_namestore_sqlite.c:213
 #: src/peerstore/plugin_peerstore_sqlite.c:479
-#: src/psycstore/plugin_psycstore_sqlite.c:329
+#: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
@@ -1831,7 +1760,7 @@ msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1245
 #: src/namecache/plugin_namecache_sqlite.c:580
-#: src/namestore/plugin_namestore_sqlite.c:716
+#: src/namestore/plugin_namestore_sqlite.c:766
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -1839,138 +1768,135 @@ msgstr ""
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:403
-msgid "Failed to connect to the DHT service!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:133
+#: src/dht/gnunet-dht-get.c:155
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
+"Resultat %d, type %d :\n"
+"%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:181
 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:187 src/dht/gnunet-dht-monitor.c:248
 msgid "Failed to connect to DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:173
+#: src/dht/gnunet-dht-get.c:195
 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-get.c:212 src/dht/gnunet-dht-monitor.c:289
 #: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:192
+#: src/dht/gnunet-dht-get.c:215
 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:218 src/dht/gnunet-dht-monitor.c:292
 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:221
 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:224 src/dht/gnunet-dht-put.c:201
 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:961
-#: src/fs/gnunet-search.c:307 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:873
+#: src/dht/gnunet-dht-get.c:227 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-put.c:210 src/fs/gnunet-auto-share.c:780
+#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-search.c:322 src/fs/gnunet-unindex.c:167
+#: src/nse/gnunet-nse-profiler.c:855
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:225
+#: src/dht/gnunet-dht-get.c:248
 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:295
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-monitor.c:320
 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:1161 src/testbed/gnunet-testbed-profiler.c:255
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1418
+#: src/dht/gnunet_dht_profiler.c:1186
 #, fuzzy
 msgid "number of peers to start"
 msgstr "nombre de valeurs"
 
-#: src/dht/gnunet_dht_profiler.c:1421
+#: src/dht/gnunet_dht_profiler.c:1189
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1424 src/nse/gnunet-nse-profiler.c:864
-#: src/testbed/gnunet-testbed-profiler.c:306
+#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
+#: src/testbed/gnunet-testbed-profiler.c:294
 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:1195
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1430
+#: src/dht/gnunet_dht_profiler.c:1198
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1433
+#: src/dht/gnunet_dht_profiler.c:1201
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1436
+#: src/dht/gnunet_dht_profiler.c:1204
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1439
+#: src/dht/gnunet_dht_profiler.c:1207
 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:1225
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:118
+#: src/dht/gnunet-dht-put.c:115
 msgid "PUT request sent with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:118
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
+#: src/dht/gnunet-dht-put.c:121
 msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:151
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:160
+#: src/dht/gnunet-dht-put.c:158
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:176
+#: src/dht/gnunet-dht-put.c:172
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
@@ -1991,255 +1917,193 @@ msgstr ""
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:236
+#: src/dht/gnunet-dht-put.c:232
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172
-msgid "Failed to connect to transport service!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-wdht_clients.c:852
-#: src/dht/gnunet-service-xdht_clients.c:849
+#: src/dht/gnunet-service-dht_clients.c:370
+#: src/dht/gnunet-service-wdht_clients.c:864
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-wdht_clients.c:937
-#: src/dht/gnunet-service-xdht_clients.c:933
+#: src/dht/gnunet-service-dht_clients.c:481
+#: src/dht/gnunet-service-wdht_clients.c:945
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-wdht_clients.c:1003
-#: src/dht/gnunet-service-xdht_clients.c:998
+#: src/dht/gnunet-service-dht_clients.c:620
+#: src/dht/gnunet-service-wdht_clients.c:1011
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-wdht_clients.c:1212
-#: src/dht/gnunet-service-xdht_clients.c:1200
+#: src/dht/gnunet-service-dht_clients.c:847
+#: src/dht/gnunet-service-wdht_clients.c:1220
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1040
-#: src/dht/gnunet-service-wdht_clients.c:505
-#: src/dht/gnunet-service-xdht_clients.c:503
+#: src/dht/gnunet-service-dht_clients.c:1032
+#: src/dht/gnunet-service-wdht_clients.c:510
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1053
-#: src/dht/gnunet-service-wdht_clients.c:519
-#: src/dht/gnunet-service-xdht_clients.c:517
+#: src/dht/gnunet-service-dht_clients.c:1047
+#: src/dht/gnunet-service-wdht_clients.c:524
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1098
-#: src/dht/gnunet-service-wdht_clients.c:561
-#: src/dht/gnunet-service-xdht_clients.c:559
+#: src/dht/gnunet-service-dht_clients.c:1094
+#: src/dht/gnunet-service-wdht_clients.c:566
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1121
-#: src/dht/gnunet-service-wdht_clients.c:584
-#: src/dht/gnunet-service-xdht_clients.c:582
+#: src/dht/gnunet-service-dht_clients.c:1101
+#: src/dht/gnunet-service-wdht_clients.c:589
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1175
-#: src/dht/gnunet-service-dht_clients.c:1218
-#: src/dht/gnunet-service-wdht_clients.c:638
-#: src/dht/gnunet-service-wdht_clients.c:681
-#: src/dht/gnunet-service-xdht_clients.c:636
-#: src/dht/gnunet-service-xdht_clients.c:679
+#: src/dht/gnunet-service-dht_clients.c:1179
+#: src/dht/gnunet-service-wdht_clients.c:643
+#: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1185
-#: src/dht/gnunet-service-wdht_clients.c:648
-#: src/dht/gnunet-service-xdht_clients.c:646
-msgid "Could not pass reply to client, message too big!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-dht_datacache.c:72
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-wdht_datacache.c:107
-#: src/dht/gnunet-service-xdht_datacache.c:91
+#: src/dht/gnunet-service-dht_datacache.c:82
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:184
-#: src/dht/gnunet-service-wdht_datacache.c:216
-#: src/dht/gnunet-service-xdht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:199
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:201
-#: src/dht/gnunet-service-wdht_datacache.c:231
-#: src/dht/gnunet-service-xdht_datacache.c:267
+#: src/dht/gnunet-service-dht_datacache.c:211
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:207
-#: src/dht/gnunet-service-wdht_datacache.c:237
-#: src/dht/gnunet-service-xdht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:217
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:213
-#: src/dht/gnunet-service-wdht_datacache.c:243
-#: src/dht/gnunet-service-xdht_datacache.c:279
+#: src/dht/gnunet-service-dht_datacache.c:223
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:225
-#: src/dht/gnunet-service-wdht_datacache.c:255
-#: src/dht/gnunet-service-xdht_datacache.c:291
+#: src/dht/gnunet-service-dht_datacache.c:235
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:229
-#: src/dht/gnunet-service-wdht_datacache.c:258
-#: src/dht/gnunet-service-xdht_datacache.c:294
+#: src/dht/gnunet-service-dht_datacache.c:239
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:262
-#: src/dht/gnunet-service-wdht_datacache.c:295
-#: src/dht/gnunet-service-xdht_datacache.c:334
+#: src/dht/gnunet-service-dht_datacache.c:276
 msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84 src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:514
-msgid "# Preference updates given to core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:608
+#: src/dht/gnunet-service-dht_neighbours.c:685
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:762
-#: src/dht/gnunet-service-xdht_neighbours.c:6061
-msgid "# Queued messages discarded (peer disconnected)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:792
-#: src/dht/gnunet-service-xdht_neighbours.c:986
-msgid "# Messages dropped (CORE timeout)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:822
-#: src/dht/gnunet-service-xdht_neighbours.c:1018
-msgid "# Bytes transmitted to other peers"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:860
-msgid "# Bytes of bandwidth requested from core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:892
+#: src/dht/gnunet-service-dht_neighbours.c:851
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1096
-#: src/dht/gnunet-service-dht_neighbours.c:1133
+#: src/dht/gnunet-service-dht_neighbours.c:1054
+#: src/dht/gnunet-service-dht_neighbours.c:1091
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1111
-#: src/dht/gnunet-service-dht_neighbours.c:1148
+#: src/dht/gnunet-service-dht_neighbours.c:1071
+#: src/dht/gnunet-service-dht_neighbours.c:1107
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1292
+#: src/dht/gnunet-service-dht_neighbours.c:1255
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1321
+#: src/dht/gnunet-service-dht_neighbours.c:1288
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1331
-#: src/dht/gnunet-service-dht_neighbours.c:1455
-#: src/dht/gnunet-service-dht_neighbours.c:1560
-#: src/dht/gnunet-service-xdht_neighbours.c:1128
-#: src/dht/gnunet-service-xdht_neighbours.c:1197
-#: src/dht/gnunet-service-xdht_neighbours.c:1247
-#: src/dht/gnunet-service-xdht_neighbours.c:1311
-#: src/dht/gnunet-service-xdht_neighbours.c:1378
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1502
-#: src/dht/gnunet-service-xdht_neighbours.c:1564
-#: src/dht/gnunet-service-xdht_neighbours.c:1624
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1427
+#: src/dht/gnunet-service-dht_neighbours.c:1532
+#: src/dht/gnunet-service-xdht_neighbours.c:946
+#: src/dht/gnunet-service-xdht_neighbours.c:1007
+#: src/dht/gnunet-service-xdht_neighbours.c:1047
+#: src/dht/gnunet-service-xdht_neighbours.c:1103
+#: src/dht/gnunet-service-xdht_neighbours.c:1158
+#: src/dht/gnunet-service-xdht_neighbours.c:1208
+#: src/dht/gnunet-service-xdht_neighbours.c:1262
+#: src/dht/gnunet-service-xdht_neighbours.c:1317
+#: src/dht/gnunet-service-xdht_neighbours.c:1370
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1417
+#: src/dht/gnunet-service-dht_neighbours.c:1383
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1444
+#: src/dht/gnunet-service-dht_neighbours.c:1415
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1567
+#: src/dht/gnunet-service-dht_neighbours.c:1547
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1654
+#: src/dht/gnunet-service-dht_neighbours.c:1646
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1657
+#: src/dht/gnunet-service-dht_neighbours.c:1650
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1825
+#: src/dht/gnunet-service-dht_neighbours.c:1854
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1862
 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:2018
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1931
+#: src/dht/gnunet-service-dht_neighbours.c:2022
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1996
+#: src/dht/gnunet-service-dht_neighbours.c:2097
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2010
+#: src/dht/gnunet-service-dht_neighbours.c:2120
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2095
+#: src/dht/gnunet-service-dht_neighbours.c:2222
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2098
+#: src/dht/gnunet-service-dht_neighbours.c:2226
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-wdht_nse.c:59
-#: src/dht/gnunet-service-xdht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59
 msgid "# Network size estimates received"
 msgstr ""
 
@@ -2263,124 +2127,140 @@ msgstr ""
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:327
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:406
+#: src/dht/gnunet-service-dht_routing.c:409
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:424
+#: src/dht/gnunet-service-dht_routing.c:427
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/gnunet-service-wdht_datacache.c:82
-msgid "PUT request received, but have no datacache!\n"
+#: src/dht/gnunet-service-wdht_clients.c:653
+msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1831
-#, c-format
+#: src/dht/gnunet-service-xdht_neighbours.c:1572
+#, fuzzy, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail_length = %d"
 msgstr ""
+"\n"
+"SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1836
-#, c-format
+#: src/dht/gnunet-service-xdht_neighbours.c:1577
+#, fuzzy, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail[%d]=%s"
 msgstr ""
+"\n"
+"SUPU %s, %s, %d"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1856
+#: src/dht/gnunet-service-xdht_neighbours.c:1597
 #, c-format
 msgid ""
 "\n"
 "SUPU************  FRIEND_PEERMAP of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1866
-#, c-format
+#: src/dht/gnunet-service-xdht_neighbours.c:1607
+#, fuzzy, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
 msgstr ""
+"\n"
+"SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1887
+#: src/dht/gnunet-service-xdht_neighbours.c:1628
 #, c-format
 msgid ""
 "\n"
 "SUPU************  FINGER_TABLE of %s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#: src/dht/gnunet-service-xdht_neighbours.c:1637
 #, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1903
-#, c-format
+#: src/dht/gnunet-service-xdht_neighbours.c:1644
+#, fuzzy, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, trail_id[%d]=%s"
 msgstr ""
+"\n"
+"SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1909
-#, c-format
+#: src/dht/gnunet-service-xdht_neighbours.c:1650
+#, fuzzy, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
+"\n"
+"SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3558
+#: src/dht/gnunet-service-xdht_neighbours.c:3366
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3699
-#: src/dht/gnunet-service-xdht_neighbours.c:3937
-#: src/dht/gnunet-service-xdht_neighbours.c:4089
-#: src/dht/gnunet-service-xdht_neighbours.c:4241
-#: src/dht/gnunet-service-xdht_neighbours.c:4422
-#: src/dht/gnunet-service-xdht_neighbours.c:4935
-#: src/dht/gnunet-service-xdht_neighbours.c:5328
-#: src/dht/gnunet-service-xdht_neighbours.c:5421
-#: src/dht/gnunet-service-xdht_neighbours.c:5511
-#: src/dht/gnunet-service-xdht_neighbours.c:5615
-#: src/dht/gnunet-service-xdht_neighbours.c:5759
-#: src/dht/gnunet-service-xdht_neighbours.c:5848
+#: src/dht/gnunet-service-xdht_neighbours.c:3522
+#: src/dht/gnunet-service-xdht_neighbours.c:3743
+#: src/dht/gnunet-service-xdht_neighbours.c:3900
+#: src/dht/gnunet-service-xdht_neighbours.c:4070
+#: src/dht/gnunet-service-xdht_neighbours.c:4281
+#: src/dht/gnunet-service-xdht_neighbours.c:4836
+#: src/dht/gnunet-service-xdht_neighbours.c:5254
+#: src/dht/gnunet-service-xdht_neighbours.c:5365
+#: src/dht/gnunet-service-xdht_neighbours.c:5451
+#: src/dht/gnunet-service-xdht_neighbours.c:5567
+#: src/dht/gnunet-service-xdht_neighbours.c:5712
+#: src/dht/gnunet-service-xdht_neighbours.c:5812
 msgid "# Bytes received from other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:256
+#: src/dht/gnunet-service-xdht_routing.c:261
 #, c-format
 msgid ""
 "\n"
 "SUPU ***PRINTING ROUTING TABLE ***** of =%s"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_routing.c:264
-#, c-format
+#: src/dht/gnunet-service-xdht_routing.c:269
+#, fuzzy, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, trail->trail_id = %s"
 msgstr ""
+"\n"
+"SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_routing.c:267
-#, c-format
+#: src/dht/gnunet-service-xdht_routing.c:272
+#, fuzzy, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, trail->next_hop = %s"
 msgstr ""
+"\n"
+"SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_routing.c:270
-#, c-format
+#: src/dht/gnunet-service-xdht_routing.c:275
+#, fuzzy, c-format
 msgid ""
 "\n"
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
+"\n"
+"SUPU %s, %s, %d,my_identity = %s"
 
 #: src/dht/plugin_block_dht.c:142
 #, c-format
@@ -2406,432 +2286,422 @@ msgstr ""
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:175
+#: src/dns/dnsstub.c:176
 #, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382
 #, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:299
+#: src/dns/dnsstub.c:298
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:368
+#: src/dns/dnsstub.c:367
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:440
+#: src/dns/dnsstub.c:437
 #, 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
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:354
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:366
+#: src/dns/gnunet-dns-monitor.c:365
 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:238
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:251
+#: src/dns/gnunet-dns-redirector.c:250
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:459
+#: src/dns/gnunet-service-dns.c:462
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:606
+#: src/dns/gnunet-service-dns.c:608
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:717
+#: src/dns/gnunet-service-dns.c:738
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:795
+#: src/dns/gnunet-service-dns.c:813
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:910
+#: src/dns/gnunet-service-dns.c:929
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:926
+#: src/dns/gnunet-service-dns.c:945
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:935
+#: src/dns/gnunet-service-dns.c:954
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:945
+#: src/dns/gnunet-service-dns.c:964
+msgid "DNS interceptor got non-DNS packet (dropped)\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:966
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1012
+#: src/dns/gnunet-service-dns.c:1033
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1064 src/exit/gnunet-daemon-exit.c:3615
+#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3643
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1082
+#: src/dns/gnunet-service-dns.c:1091
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:169
+#: src/dv/gnunet-dv.c:166
 msgid "verbose output"
-msgstr ""
+msgstr "sortie verbeuse"
 
-#: src/dv/gnunet-dv.c:178
+#: src/dv/gnunet-dv.c:175
 msgid "Print information about DV state"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:807
+#: src/exit/gnunet-daemon-exit.c:805 src/exit/gnunet-daemon-exit.c:3109
+msgid "# Inbound CADET channels created"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:861
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:858
+#: src/exit/gnunet-daemon-exit.c:914
 msgid "# Bytes transmitted via cadet channels"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:975 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:1446
-#: src/vpn/gnunet-service-vpn.c:1837 src/vpn/gnunet-service-vpn.c:2000
+#: src/exit/gnunet-daemon-exit.c:1033 src/exit/gnunet-daemon-exit.c:2493
+#: src/exit/gnunet-daemon-exit.c:2746 src/vpn/gnunet-service-vpn.c:1455
+#: src/vpn/gnunet-service-vpn.c:1846 src/vpn/gnunet-service-vpn.c:2009
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1012 src/exit/gnunet-daemon-exit.c:2467
-#: src/exit/gnunet-daemon-exit.c:2725 src/vpn/gnunet-service-vpn.c:1502
-#: src/vpn/gnunet-service-vpn.c:1896 src/vpn/gnunet-service-vpn.c:2033
+#: src/exit/gnunet-daemon-exit.c:1070 src/exit/gnunet-daemon-exit.c:2552
+#: src/exit/gnunet-daemon-exit.c:2805 src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1905 src/vpn/gnunet-service-vpn.c:2042
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1052
+#: src/exit/gnunet-daemon-exit.c:1118
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1059
+#: src/exit/gnunet-daemon-exit.c:1126
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1135
+#: src/exit/gnunet-daemon-exit.c:1203
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1209
+#: src/exit/gnunet-daemon-exit.c:1278
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1262
+#: src/exit/gnunet-daemon-exit.c:1331
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1276
+#: src/exit/gnunet-daemon-exit.c:1345
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1302
+#: src/exit/gnunet-daemon-exit.c:1371
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1329
+#: src/exit/gnunet-daemon-exit.c:1398
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1375
+#: src/exit/gnunet-daemon-exit.c:1444
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1383
+#: src/exit/gnunet-daemon-exit.c:1452
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1853
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1878
+#: src/exit/gnunet-daemon-exit.c:1977
 msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1881 src/exit/gnunet-daemon-exit.c:1975
-#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2332
-#: src/exit/gnunet-daemon-exit.c:2582 src/exit/gnunet-daemon-exit.c:2872
-#: src/exit/gnunet-daemon-exit.c:2980
+#: src/exit/gnunet-daemon-exit.c:1981 src/exit/gnunet-daemon-exit.c:2060
+#: src/exit/gnunet-daemon-exit.c:2167 src/exit/gnunet-daemon-exit.c:2417
+#: src/exit/gnunet-daemon-exit.c:2667 src/exit/gnunet-daemon-exit.c:2954
+#: src/exit/gnunet-daemon-exit.c:3057
 msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1915 src/exit/gnunet-daemon-exit.c:3004
-#, c-format
-msgid "No service %s found for %s on port %d!\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1920
-msgid "# TCP requests dropped (no such service)"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1978
+#: src/exit/gnunet-daemon-exit.c:2063
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2085
+#: src/exit/gnunet-daemon-exit.c:2170
 msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2099
+#: src/exit/gnunet-daemon-exit.c:2184
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2161
+#: src/exit/gnunet-daemon-exit.c:2246
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2335
+#: src/exit/gnunet-daemon-exit.c:2420
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2585
+#: src/exit/gnunet-daemon-exit.c:2670
 msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1436
-#: src/vpn/gnunet-service-vpn.c:1994
+#: src/exit/gnunet-daemon-exit.c:2731 src/vpn/gnunet-service-vpn.c:1445
+#: src/vpn/gnunet-service-vpn.c:2003
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1472
-#: src/vpn/gnunet-service-vpn.c:1484 src/vpn/gnunet-service-vpn.c:1884
+#: src/exit/gnunet-daemon-exit.c:2790 src/vpn/gnunet-service-vpn.c:1481
+#: src/vpn/gnunet-service-vpn.c:1493 src/vpn/gnunet-service-vpn.c:1893
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2761
+#: src/exit/gnunet-daemon-exit.c:2841
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2875
+#: src/exit/gnunet-daemon-exit.c:2957
 msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2983
+#: src/exit/gnunet-daemon-exit.c:3060
 msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3009
-msgid "# UDP requests dropped (no such service)"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3047
-msgid "# Inbound CADET channels created"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3271 src/exit/gnunet-daemon-exit.c:3281
+#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3337
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3295 src/exit/gnunet-daemon-exit.c:3303
+#: src/exit/gnunet-daemon-exit.c:3351 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3336
+#: src/exit/gnunet-daemon-exit.c:3400
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3350 src/exit/gnunet-daemon-exit.c:3362
+#: src/exit/gnunet-daemon-exit.c:3414 src/exit/gnunet-daemon-exit.c:3427
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3373
+#: src/exit/gnunet-daemon-exit.c:3439
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3555
-#, c-format
-msgid "`%s' must be installed SUID, EXIT will not work\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3571
+#: src/exit/gnunet-daemon-exit.c:3584
 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:3579
+#: src/exit/gnunet-daemon-exit.c:3592
 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:3586
+#: src/exit/gnunet-daemon-exit.c:3599
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3592
+#: src/exit/gnunet-daemon-exit.c:3605
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3598 src/exit/gnunet-daemon-exit.c:3763
-#: src/pt/gnunet-daemon-pt.c:1247
-msgid "No useful service enabled.  Exiting.\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3710
+#: src/exit/gnunet-daemon-exit.c:3765
 msgid "Must be a number"
-msgstr ""
+msgstr "Doit être un nombre"
 
-#: src/exit/gnunet-daemon-exit.c:3861
-msgid "Daemon to run to provide an IP exit node for the VPN"
+#: src/exit/gnunet-daemon-exit.c:3872
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3884 src/pt/gnunet-daemon-pt.c:1279
+msgid "No useful service enabled.  Exiting.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:4029
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:277
+#: src/fragmentation/defragmentation.c:275
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:470
-#: src/transport/plugin_transport_wlan.c:1515
+#: src/fragmentation/defragmentation.c:468
+#: src/transport/plugin_transport_wlan.c:1528
 msgid "# fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:540
+#: src/fragmentation/defragmentation.c:538
 msgid "# duplicate fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:558
+#: src/fragmentation/defragmentation.c:556
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:235
+#: src/fragmentation/fragmentation.c:240
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:240
+#: src/fragmentation/fragmentation.c:245
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:269
+#: src/fragmentation/fragmentation.c:274
 msgid "# fragments wrap arounds"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:315
+#: src/fragmentation/fragmentation.c:321
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:321
+#: src/fragmentation/fragmentation.c:327
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:444
+#: src/fragmentation/fragmentation.c:451
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:451
+#: src/fragmentation/fragmentation.c:458
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:475
+#: src/fragmentation/fragmentation.c:482
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:499
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:502
+#: src/fs/fs_api.c:510
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:510
+#: src/fs/fs_api.c:518
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1118
+#: src/fs/fs_api.c:1126
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1638
+#: src/fs/fs_api.c:1646
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1652
+#: src/fs/fs_api.c:1660
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2310
+#: src/fs/fs_api.c:2318
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2320
+#: src/fs/fs_api.c:2328
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2448 src/fs/fs_api.c:2696
+#: src/fs/fs_api.c:2456 src/fs/fs_api.c:2703
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2466
+#: src/fs/fs_api.c:2474
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2481 src/fs/fs_api.c:2500 src/fs/fs_api.c:2992
+#: src/fs/fs_api.c:2489 src/fs/fs_api.c:2508 src/fs/fs_api.c:3006
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2686
+#: src/fs/fs_api.c:2693
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2935
+#: src/fs/fs_api.c:2949
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3030
+#: src/fs/fs_api.c:3044
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2840,59 +2710,59 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: 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:328
 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:509 src/fs/fs_download.c:521
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr ""
 
-#: src/fs/fs_download.c:905
+#: src/fs/fs_download.c:926
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:987
+#: src/fs/fs_download.c:1011
 #, 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:1039
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1036
+#: src/fs/fs_download.c:1063
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1046
+#: src/fs/fs_download.c:1075
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1055
+#: src/fs/fs_download.c:1084
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1153
+#: src/fs/fs_download.c:1184
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1944
+#: src/fs/fs_download.c:1838
 msgid "Invalid URI"
-msgstr ""
+msgstr "URI invalide"
 
 #: src/fs/fs_getopt.c:197
 #, c-format
@@ -2901,17 +2771,12 @@ msgid ""
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
-#, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
-msgstr ""
-
-#: src/fs/fs_list_indexed.c:113
-#, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
-msgstr ""
+#: src/fs/fs_list_indexed.c:152
+#, fuzzy, c-format
+msgid "Failed to receive response from `%s' service.\n"
+msgstr "Dernier message reçu de %s\n"
 
-#: src/fs/fs_list_indexed.c:151
+#: src/fs/fs_list_indexed.c:196
 #, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr ""
@@ -2926,98 +2791,94 @@ msgstr ""
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:229
+#: src/fs/fs_namespace.c:232
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:320
+#: src/fs/fs_namespace.c:324
 #, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:466
+#: src/fs/fs_namespace.c:470
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:443
+#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:709 src/fs/fs_publish.c:726 src/fs/fs_publish.c:765
-#: src/fs/fs_publish.c:786 src/fs/fs_publish.c:810 src/fs/fs_publish.c:1060
+#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
+#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:711
-msgid "timeout on index-start request to `fs' service"
+#: src/fs/fs_publish.c:780
+msgid "error on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:723
-msgid "unknown error"
-msgstr ""
-
-#: src/fs/fs_publish.c:767
+#: src/fs/fs_publish.c:825
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:787
+#: src/fs/fs_publish.c:845
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:812
+#: src/fs/fs_publish.c:876
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:835
+#: src/fs/fs_publish.c:902
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:899 src/fs/fs_publish.c:940
+#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1014
+#: src/fs/fs_publish.c:1094
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1022
+#: src/fs/fs_publish.c:1102
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1062
+#: src/fs/fs_publish.c:1142
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1301
+#: src/fs/fs_publish.c:1381
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "pa_stream_new() échoué : %s\n"
 
-#: src/fs/fs_publish.c:1392
+#: src/fs/fs_publish.c:1472
 #, 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:220
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish_ublock.c:243
+#: src/fs/fs_publish_ublock.c:241
 msgid "Internal error."
-msgstr ""
+msgstr "Erreur interne."
 
-#: src/fs/fs_search.c:812 src/fs/fs_search.c:882
+#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
 #, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_search.c:941
+#: src/fs/fs_search.c:966
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3030,45 +2891,37 @@ msgstr ""
 msgid "Failed to read file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:245
-msgid "Unexpected time for a response from `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:253
-msgid "Timeout waiting for `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:261
-msgid "Invalid response from `fs' service."
+#: src/fs/fs_unindex.c:275
+msgid "Error communicating with `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:304
+#: src/fs/fs_unindex.c:328
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:360 src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
 msgid "Failed to get KSKs from directory scan."
 msgstr ""
 
-#: src/fs/fs_unindex.c:368
+#: src/fs/fs_unindex.c:386
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:427
+#: src/fs/fs_unindex.c:445
 #, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:590 src/fs/fs_unindex.c:656
+#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:682
 msgid "Failed to open file for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:708
+#: src/fs/fs_unindex.c:721
 msgid "Failed to compute hash of file."
 msgstr ""
 
@@ -3146,12 +2999,13 @@ msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
 #: src/fs/fs_uri.c:631
+#, fuzzy
 msgid "invalid argument"
-msgstr ""
+msgstr "Argument invalide « %s »\n"
 
 #: src/fs/fs_uri.c:643
 msgid "Unrecognized URI type"
-msgstr ""
+msgstr "Type d’URI non reconnu"
 
 #: src/fs/fs_uri.c:1045 src/fs/fs_uri.c:1072
 msgid "No keywords specified!\n"
@@ -3161,63 +3015,63 @@ msgstr ""
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:237
+#: src/fs/gnunet-auto-share.c:232
 #, c-format
 msgid "Failed to load state: %s\n"
 msgstr ""
 
-#: 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:285 src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:305
 #, c-format
 msgid "Failed to save state to file %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:402
+#: src/fs/gnunet-auto-share.c:407
 #, c-format
 msgid "Publication of `%s' done\n"
-msgstr ""
+msgstr "Publication de « %s » terminée\n"
 
-#: src/fs/gnunet-auto-share.c:490
+#: src/fs/gnunet-auto-share.c:494
 #, c-format
 msgid "Publishing `%s'\n"
-msgstr ""
+msgstr "Publication de « %s »\n"
 
-#: src/fs/gnunet-auto-share.c:499
+#: src/fs/gnunet-auto-share.c:504
 #, c-format
 msgid "Failed to run `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:688
+#: src/fs/gnunet-auto-share.c:713
 #, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:739 src/fs/gnunet-publish.c:908
+#: src/fs/gnunet-auto-share.c:764 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:912
+#: src/fs/gnunet-auto-share.c:768 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:915
+#: src/fs/gnunet-auto-share.c:771 src/fs/gnunet-publish.c:905
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:749 src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-auto-share.c:774 src/fs/gnunet-publish.c:929
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:752 src/fs/gnunet-publish.c:946
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:936
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:772
+#: src/fs/gnunet-auto-share.c:801
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:660
+#: src/fs/gnunet-daemon-fsprofiler.c:648
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
@@ -3280,64 +3134,64 @@ msgstr ""
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:319
-#: src/fs/gnunet-search.c:206 src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
+#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:234
+#: src/fs/gnunet-download.c:233
 msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:734
+#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:247
+#: src/fs/gnunet-download.c:246
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:254
+#: src/fs/gnunet-download.c:253
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:878
-#: src/fs/gnunet-search.c:256 src/fs/gnunet-unindex.c:140
+#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:295
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:310
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:308
+#: src/fs/gnunet-download.c:307
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:298
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:313
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:314
+#: src/fs/gnunet-download.c:313
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:318
+#: src/fs/gnunet-download.c:317
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:322
+#: src/fs/gnunet-download.c:321
 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:324
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:339
+#: src/fs/gnunet-download.c:338
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -3351,256 +3205,273 @@ msgstr ""
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:193
+#: src/fs/gnunet-fs-profiler.c:208
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:196
+#: src/fs/gnunet-fs-profiler.c:211
 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:214
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:223
 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:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:257
+#: src/fs/gnunet-publish.c:239
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:268
+#: src/fs/gnunet-publish.c:246
 #, c-format
 msgid "Publishing `%s' done.\n"
-msgstr ""
+msgstr "Publication de « %s » terminée.\n"
 
-#: src/fs/gnunet-publish.c:273
+#: src/fs/gnunet-publish.c:251
 #, c-format
 msgid "URI is `%s'.\n"
-msgstr ""
+msgstr "L’URI est « %s ».\n"
 
-#: src/fs/gnunet-publish.c:281
-#, c-format
+#: src/fs/gnunet-publish.c:259
+#, fuzzy, c-format
 msgid "Namespace URI is `%s'.\n"
-msgstr ""
+msgstr "L’URI est « %s ».\n"
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:275
 msgid "Starting cleanup after abort\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:306
+#: src/fs/gnunet-publish.c:282
 msgid "Cleanup after abort completed.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:312
+#: src/fs/gnunet-publish.c:288
 msgid "Cleanup after abort failed.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:447
+#: src/fs/gnunet-publish.c:430
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:449
+#: src/fs/gnunet-publish.c:435
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:594
+#: src/fs/gnunet-publish.c:589
 msgid "Could not publish\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:619
+#: src/fs/gnunet-publish.c:614
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:653
+#: src/fs/gnunet-publish.c:648
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:657
+#: src/fs/gnunet-publish.c:652
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:663
+#: src/fs/gnunet-publish.c:658
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:670
+#: src/fs/gnunet-publish.c:665
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:675
+#: src/fs/gnunet-publish.c:670
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:677
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:691
+#: src/fs/gnunet-publish.c:686
 msgid "Internal error scanning directory.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:723
+#: src/fs/gnunet-publish.c:714
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:755
+#: src/fs/gnunet-publish.c:747
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:769
+#: src/fs/gnunet-publish.c:761
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:825
+#: src/fs/gnunet-publish.c:817
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:832
+#: src/fs/gnunet-publish.c:824
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:838
+#: src/fs/gnunet-publish.c:830
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:846 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:210
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:857 src/fs/gnunet-publish.c:865
-#: src/transport/gnunet-transport.c:1928 src/transport/gnunet-transport.c:1958
-#: src/transport/gnunet-transport.c:1989
+#: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
+#: src/transport/gnunet-transport.c:1577 src/transport/gnunet-transport.c:1602
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:919
+#: src/fs/gnunet-publish.c:909
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:923
+#: src/fs/gnunet-publish.c:913
 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:927
+#: src/fs/gnunet-publish.c:917
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:930
+#: src/fs/gnunet-publish.c:920
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:935
+#: src/fs/gnunet-publish.c:925
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:943
+#: src/fs/gnunet-publish.c:933
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:949
+#: src/fs/gnunet-publish.c:939
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:953
+#: src/fs/gnunet-publish.c:943
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:957
+#: src/fs/gnunet-publish.c:947
 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:973
+#: src/fs/gnunet-publish.c:963
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:120
+#: src/fs/gnunet-search.c:127
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:197
+#: src/fs/gnunet-search.c:204
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:246
+#: src/fs/gnunet-search.c:260
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:270
+#: src/fs/gnunet-search.c:284
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:301
+#: src/fs/gnunet-search.c:316
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:304
+#: src/fs/gnunet-search.c:319
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:311
+#: src/fs/gnunet-search.c:326
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:322
+#: src/fs/gnunet-search.c:337
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:274
+#: src/fs/gnunet-service-fs.c:378 src/fs/gnunet-service-fs.c:883
+msgid "# client searches active"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:437
+msgid "# replies received for local clients"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:606
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:595
+#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:719
+#: src/fs/gnunet-service-fs.c:837
+msgid "# client searches received"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:876
+msgid "# client searches updated (merged content seen list)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1047
+#, c-format
+msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1288
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:745 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:1313 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/topology/gnunet-daemon-topology.c:1203
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr ""
@@ -3613,312 +3484,276 @@ msgstr ""
 msgid "# replies received via cadet dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:260
+#: src/fs/gnunet-service-fs_cadet_server.c:258
 msgid "# Blocks transferred via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:361
+#: src/fs/gnunet-service-fs_cadet_server.c:360
 msgid "# queries received via CADET not answered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:441
+#: src/fs/gnunet-service-fs_cadet_server.c:440
 msgid "# queries received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:485
+#: src/fs/gnunet-service-fs_cadet_server.c:484
 msgid "# cadet client connections rejected"
 msgstr ""
 
-#: 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:490
+#: src/fs/gnunet-service-fs_cadet_server.c:530
+#, fuzzy
 msgid "# cadet connections active"
-msgstr ""
+msgstr "# Session TCP active"
 
-#: src/fs/gnunet-service-fs_cp.c:736
+#: src/fs/gnunet-service-fs_cp.c:686
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:740
+#: src/fs/gnunet-service-fs_cp.c:690
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:778
-msgid "# replies transmitted to other peers"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:786
-msgid "# replies dropped"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:812 src/fs/gnunet-service-fs_cp.c:1406
+#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:917
+#: src/fs/gnunet-service-fs_cp.c:818
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:973
+#: src/fs/gnunet-service-fs_cp.c:875
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:981
+#: src/fs/gnunet-service-fs_cp.c:883
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:995
+#: src/fs/gnunet-service-fs_cp.c:897
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1043
+#: src/fs/gnunet-service-fs_cp.c:944
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1111
+#: src/fs/gnunet-service-fs_cp.c:1015
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1136
+#: src/fs/gnunet-service-fs_cp.c:1040
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1146
+#: src/fs/gnunet-service-fs_cp.c:1050
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1223
-msgid "# GET requests received (from other peers)"
+#: src/fs/gnunet-service-fs_cp.c:1148
+msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1258
-msgid "# requests dropped due to initiator not being connected"
+#: src/fs/gnunet-service-fs_cp.c:1205
+msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1279
+#: src/fs/gnunet-service-fs_cp.c:1228
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1290
+#: src/fs/gnunet-service-fs_cp.c:1239
 msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1342
+#: src/fs/gnunet-service-fs_cp.c:1295
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1367
-msgid "# requests dropped due to higher-TTL request"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1404
+#: src/fs/gnunet-service-fs_cp.c:1339
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1843
+#: src/fs/gnunet-service-fs_cp.c:1706
 msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:181
+#: src/fs/gnunet-service-fs_indexing.c:134
+#: src/fs/gnunet-service-fs_indexing.c:195
 #, c-format
 msgid "Could not open `%s'.\n"
-msgstr ""
+msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:142
+#: src/fs/gnunet-service-fs_indexing.c:151
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr ""
 
-#: 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:253
 #, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: 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
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:559
+#: src/fs/gnunet-service-fs_indexing.c:359
 msgid "not indexed"
-msgstr ""
+msgstr "non indexé"
 
-#: src/fs/gnunet-service-fs_indexing.c:574
+#: src/fs/gnunet-service-fs_indexing.c:392
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:201 src/fs/gnunet-service-fs_lc.c:376
-msgid "# client searches active"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_lc.c:259
-msgid "# replies received for local clients"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_lc.c:330
-msgid "# client searches received"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_lc.c:370
-msgid "# client searches updated (merged content seen list)"
+#: src/fs/gnunet-service-fs_indexing.c:515
+#, 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:265
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:400
-msgid "# transmission failed (core has no bandwidth)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:433
-msgid "# query messages sent to other peers"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:484
+#: src/fs/gnunet-service-fs_pe.c:427
 msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:492
+#: src/fs/gnunet-service-fs_pe.c:438
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:552
+#: src/fs/gnunet-service-fs_pe.c:466
+msgid "# query messages sent to other peers"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:536
 msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:560
+#: src/fs/gnunet-service-fs_pe.c:546
 msgid "# requests refreshed"
 msgstr ""
 
-#: 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:606 src/fs/gnunet-service-fs_pe.c:709
+#: src/fs/gnunet-service-fs_pe.c:788
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:311
+#: src/fs/gnunet-service-fs_pr.c:315
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645
+#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:661
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:820
+#: src/fs/gnunet-service-fs_pr.c:842
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:857
+#: src/fs/gnunet-service-fs_pr.c:879
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:866
+#: src/fs/gnunet-service-fs_pr.c:888
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:881
+#: src/fs/gnunet-service-fs_pr.c:903
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:898
+#: src/fs/gnunet-service-fs_pr.c:920
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1028
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1056
+#: src/fs/gnunet-service-fs_pr.c:1078
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1094
+#: src/fs/gnunet-service-fs_pr.c:1116
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1226
+#: src/fs/gnunet-service-fs_pr.c:1247
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1279
+#: src/fs/gnunet-service-fs_pr.c:1299
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1301
+#: src/fs/gnunet-service-fs_pr.c:1320
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1353
+#: src/fs/gnunet-service-fs_pr.c:1372
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1368
+#: src/fs/gnunet-service-fs_pr.c:1387
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1377
+#: src/fs/gnunet-service-fs_pr.c:1396
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1392
+#: src/fs/gnunet-service-fs_pr.c:1411
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1406
+#: src/fs/gnunet-service-fs_pr.c:1425
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1419
+#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1443
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1451 src/fs/gnunet-service-fs_pr.c:1491
-#: src/fs/gnunet-service-fs_pr.c:1660
+#: src/fs/gnunet-service-fs_pr.c:1469 src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1675
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1510
+#: src/fs/gnunet-service-fs_pr.c:1527
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1522
+#: src/fs/gnunet-service-fs_pr.c:1539
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1636
+#: src/fs/gnunet-service-fs_pr.c:1652
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1725
+#: src/fs/gnunet-service-fs_pr.c:1732
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:682
+#: src/fs/gnunet-service-fs_push.c:642
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3936,39 +3771,35 @@ msgstr ""
 msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:130
+#: src/fs/gnunet-unindex.c:129
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:147
+#: src/fs/gnunet-unindex.c:146
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:179
+#: src/fs/gnunet-unindex.c:178
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:393
-msgid "Failed to deserialize lookup reply from GNS service!\n"
-msgstr ""
-
-#: src/gns/gnunet-bcd.c:123
+#: src/gns/gnunet-bcd.c:127
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:760
+#: src/gns/gnunet-bcd.c:357
 #, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+msgid "Invalid port number %u.  Exiting.\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:360
+#: src/gns/gnunet-bcd.c:362
 #, c-format
-msgid "Businesscard HTTP server starts on %llu\n"
+msgid "Businesscard HTTP server starts on %u\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:374
+#: src/gns/gnunet-bcd.c:376
 #, c-format
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr ""
@@ -3981,123 +3812,140 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:234
+#: src/gns/gnunet-dns2gns.c:238
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:406
+#: src/gns/gnunet-dns2gns.c:408
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:422
+#: src/gns/gnunet-dns2gns.c:424
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:430
+#: src/gns/gnunet-dns2gns.c:432
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:708
+#: src/gns/gnunet-dns2gns.c:709
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:734
+#: src/gns/gnunet-dns2gns.c:737
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:756
+#: src/gns/gnunet-dns2gns.c:758
 msgid "No valid GNS zone specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:777
+#: src/gns/gnunet-dns2gns.c:779
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:780
+#: src/gns/gnunet-dns2gns.c:782
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:783
+#: src/gns/gnunet-dns2gns.c:785
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:786
-msgid "UDP port to listen on for inbound DNS requests; default: 53"
+#: src/gns/gnunet-dns2gns.c:788
+msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:789
+#: src/gns/gnunet-dns2gns.c:791
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:802
+#: src/gns/gnunet-dns2gns.c:804
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:215 src/gns/plugin_rest_gns.c:334
+#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:233
+#: src/gns/gnunet-gns.c:295
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:314
+#: src/gns/gnunet-gns.c:376
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:353 src/gns/gnunet-gns-helper-service-w32.c:798
-#: src/gns/plugin_rest_gns.c:459
+#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/plugin_rest_gns.c:472
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:392 src/gns/gnunet-gns-helper-service-w32.c:828
+#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:405
+#: src/gns/gnunet-gns.c:470 src/gns/gnunet-gns.c:500
+#, c-format
+msgid "Reverse key `%s' is not well-formed\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:484
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:455
+#: src/gns/gnunet-gns.c:548
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:458
+#: src/gns/gnunet-gns.c:551
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:461
+#: src/gns/gnunet-gns.c:554
 msgid "Specify timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:464
+#: src/gns/gnunet-gns.c:557
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:467
+#: src/gns/gnunet-gns.c:560
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:470
+#: src/gns/gnunet-gns.c:563
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:484
+#: src/gns/gnunet-gns.c:566
+msgid "Specify the public key of the zone to reverse lookup a name for"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:580
 msgid "GNUnet GNS resolver tool"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:768
+#: src/gns/gnunet-gns-helper-service-w32.c:221
+msgid "Transmission to client failed!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-helper-service-w32.c:260
+msgid "Shutdown in progress, aborting transmission.\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-helper-service-w32.c:766
 #, c-format
 msgid ""
 "Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
@@ -4105,148 +3953,149 @@ msgid ""
 "sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:838
+#: src/gns/gnunet-gns-helper-service-w32.c:836
 #, c-format
 msgid "Failed to connect to identity service\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:485
+#: src/gns/gnunet-gns-import.c:482
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
 #: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:529
-#: src/hostlist/gnunet-daemon-hostlist_client.c:746
-#: src/hostlist/gnunet-daemon-hostlist_client.c:752
-#: src/hostlist/gnunet-daemon-hostlist_client.c:805
-#: src/hostlist/gnunet-daemon-hostlist_client.c:814
-#: src/hostlist/gnunet-daemon-hostlist_client.c:936
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1036
-#: src/transport/plugin_transport_http_client.c:599
-#: src/transport/plugin_transport_http_client.c:617
+#: src/hostlist/gnunet-daemon-hostlist_client.c:569
+#: src/hostlist/gnunet-daemon-hostlist_client.c:787
+#: src/hostlist/gnunet-daemon-hostlist_client.c:793
+#: src/hostlist/gnunet-daemon-hostlist_client.c:845
+#: src/hostlist/gnunet-daemon-hostlist_client.c:854
+#: src/hostlist/gnunet-daemon-hostlist_client.c:965
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
+#: src/transport/plugin_transport_http_client.c:598
+#: src/transport/plugin_transport_http_client.c:616
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:846
+#: src/gns/gnunet-gns-proxy.c:887
 #, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:869
+#: src/gns/gnunet-gns-proxy.c:910
 #, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:892
+#: src/gns/gnunet-gns-proxy.c:933
 #, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:905
+#: src/gns/gnunet-gns-proxy.c:946
 #, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:920
+#: src/gns/gnunet-gns-proxy.c:961
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:930
+#: src/gns/gnunet-gns-proxy.c:971
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:954
+#: src/gns/gnunet-gns-proxy.c:995
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1104
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1634
+#: src/gns/gnunet-gns-proxy.c:1708
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2006
+#: src/gns/gnunet-gns-proxy.c:2167
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2036
+#: src/gns/gnunet-gns-proxy.c:2197
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2210
+#: src/gns/gnunet-gns-proxy.c:2370
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2229 src/rest/gnunet-rest-server.c:529
+#: src/gns/gnunet-gns-proxy.c:2389 src/rest/gnunet-rest-server.c:533
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2551
+#: src/gns/gnunet-gns-proxy.c:2709
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2580
+#: src/gns/gnunet-gns-proxy.c:2738
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2598 src/gns/gnunet-gns-proxy.c:2627
+#: src/gns/gnunet-gns-proxy.c:2756 src/gns/gnunet-gns-proxy.c:2785
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2678
+#: src/gns/gnunet-gns-proxy.c:2836
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3017
+#: src/gns/gnunet-gns-proxy.c:3171
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3057 src/gns/gnunet-service-gns.c:894
+#: src/gns/gnunet-gns-proxy.c:3211 src/gns/gnunet-service-gns.c:1093
+#: src/gns/gnunet-service-gns.c:1149
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3119
+#: src/gns/gnunet-gns-proxy.c:3273
 #, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3160
+#: src/gns/gnunet-gns-proxy.c:3313
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3163
+#: src/gns/gnunet-gns-proxy.c:3316
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3182
+#: src/gns/gnunet-gns-proxy.c:3335
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:935
+#: src/gns/gnunet-service-gns.c:1187
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:943
+#: src/gns/gnunet-service-gns.c:1195
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:976
+#: src/gns/gnunet-service-gns.c:1228
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
@@ -4254,148 +4103,153 @@ msgstr ""
 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:371
 msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:650
+#: src/gns/gnunet-service-gns_resolver.c:648
 #, 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:659
 #, 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:851
 msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:996
+#: src/gns/gnunet-service-gns_resolver.c:993
 #, 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:1354
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1891
+#: src/gns/gnunet-service-gns_resolver.c:1889
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1915
+#: src/gns/gnunet-service-gns_resolver.c:1913
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2197
+#: src/gns/gnunet-service-gns_resolver.c:2195
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2346
+#: src/gns/gnunet-service-gns_resolver.c:2342
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:172
+#: src/gns/plugin_gnsrecord_gns.c:203
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:232
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:222
+#: src/gns/plugin_gnsrecord_gns.c:253
 #, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:245
+#: src/gns/plugin_gnsrecord_gns.c:276
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:280
+#: src/gns/plugin_gnsrecord_gns.c:311
 #, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:422
+#: src/gns/plugin_gnsrecord_gns.c:359
+#, c-format
+msgid "Unable to parse REVERSE record string `%s'\n"
+msgstr ""
+
+#: src/gns/plugin_rest_gns.c:435
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:652
+#: src/gns/plugin_rest_gns.c:717
 msgid "GNS REST API initialized\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:291
+#: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:312
+#: src/gnsrecord/plugin_gnsrecord_dns.c:380
 #, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:334
+#: src/gnsrecord/plugin_gnsrecord_dns.c:402
 #, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:418
+#: src/gnsrecord/plugin_gnsrecord_dns.c:487
 #, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:455
+#: src/gnsrecord/plugin_gnsrecord_dns.c:523
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:474
+#: src/gnsrecord/plugin_gnsrecord_dns.c:542
 #, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:497
+#: src/gnsrecord/plugin_gnsrecord_dns.c:565
 #, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:520
+#: src/gnsrecord/plugin_gnsrecord_dns.c:588
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:535
+#: src/gnsrecord/plugin_gnsrecord_dns.c:603
 #, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:562
+#: src/gnsrecord/plugin_gnsrecord_dns.c:630
 #, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:578
+#: src/gnsrecord/plugin_gnsrecord_dns.c:646
 #, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:595
+#: src/gnsrecord/plugin_gnsrecord_dns.c:663
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:619
-#: src/gnsrecord/plugin_gnsrecord_dns.c:635
+#: src/gnsrecord/plugin_gnsrecord_dns.c:687
+#: src/gnsrecord/plugin_gnsrecord_dns.c:703
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr ""
@@ -4419,1146 +4273,1158 @@ msgstr ""
 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:157 src/hello/gnunet-hello.c:198
 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:173
+#: src/hello/gnunet-hello.c:174
 #, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:208
+#: src/hello/gnunet-hello.c:210
 #, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:216
+#: src/hello/gnunet-hello.c:219
 #, c-format
-msgid "Modified %u addresses \n"
+msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1051
+#: src/hello/hello.c:1103
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1060
+#: src/hello/hello.c:1112
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1070
+#: src/hello/hello.c:1122
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr ""
 
-#: src/hello/hello.c:1080
+#: src/hello/hello.c:1133
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:1098
-#, c-format
+#: src/hello/hello.c:1151
+#, fuzzy, c-format
 msgid "Plugin `%s' not found, skipping address\n"
-msgstr ""
+msgstr "Extension « %s » introuvable\n"
 
-#: src/hello/hello.c:1106
+#: src/hello/hello.c:1159
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1121
+#: src/hello/hello.c:1174
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 
-#: src/hello/hello.c:1194
-#, 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:316
 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:375
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:336
+#: src/hostlist/gnunet-daemon-hostlist.c:380
 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:387
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:359
+#: src/hostlist/gnunet-daemon-hostlist.c:403
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:348
+#: src/hostlist/gnunet-daemon-hostlist_client.c:371
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:369
-#: src/hostlist/gnunet-daemon-hostlist_client.c:399
+#: src/hostlist/gnunet-daemon-hostlist_client.c:392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:437
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
-#: src/hostlist/gnunet-daemon-hostlist_client.c:402
+#: src/hostlist/gnunet-daemon-hostlist_client.c:395
+#: src/hostlist/gnunet-daemon-hostlist_client.c:440
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:390
+#: src/hostlist/gnunet-daemon-hostlist_client.c:413
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:655
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:695
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:685
+#: src/hostlist/gnunet-daemon-hostlist_client.c:725
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:727
+#: src/hostlist/gnunet-daemon-hostlist_client.c:768
 #, 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:867
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:881
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:901
+#: src/hostlist/gnunet-daemon-hostlist_client.c:930
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:907
+#: src/hostlist/gnunet-daemon-hostlist_client.c:936
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:915
+#: src/hostlist/gnunet-daemon-hostlist_client.c:944
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:968
+#: src/hostlist/gnunet-daemon-hostlist_client.c:997
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:976
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1005
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1108
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1660
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1117
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1177
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1193
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1515
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1593
-#: src/transport/plugin_transport_http_client.c:2269
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/transport/plugin_transport_http_client.c:2277
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1622
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 #, 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:182
+#: src/hostlist/gnunet-daemon-hostlist_server.c:176
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:207
+#: src/hostlist/gnunet-daemon-hostlist_server.c:201
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:242
-#: src/hostlist/gnunet-daemon-hostlist_server.c:591
-#: 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:237
+#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/peerinfo-tool/gnunet-peerinfo.c:385
+#: src/peerinfo-tool/gnunet-peerinfo.c:534
+#: src/topology/gnunet-daemon-topology.c:857
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:266
+#: src/hostlist/gnunet-daemon-hostlist_server.c:261
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:283
+#: src/hostlist/gnunet-daemon-hostlist_server.c:278
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:387
+#: src/hostlist/gnunet-daemon-hostlist_server.c:382
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:390
+#: src/hostlist/gnunet-daemon-hostlist_server.c:385
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:404
+#: src/hostlist/gnunet-daemon-hostlist_server.c:397
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:408
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:415
+#: src/hostlist/gnunet-daemon-hostlist_server.c:408
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:418
+#: src/hostlist/gnunet-daemon-hostlist_server.c:411
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:423
+#: src/hostlist/gnunet-daemon-hostlist_server.c:416
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:425
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:486
+#: src/hostlist/gnunet-daemon-hostlist_server.c:466
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:536
-msgid "Advertisement message could not be queued by core\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/transport/gnunet-service-transport.c:2802
+msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:748
-#: src/peerinfo-tool/gnunet-peerinfo.c:736
-#: src/transport/gnunet-service-transport.c:852
-msgid "Could not access PEERINFO service.  Exiting.\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:691
+#, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:772
+#: src/hostlist/gnunet-daemon-hostlist_server.c:703
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:787
+#: src/hostlist/gnunet-daemon-hostlist_server.c:718
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:800
+#: src/hostlist/gnunet-daemon-hostlist_server.c:731
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:813
+#: src/hostlist/gnunet-daemon-hostlist_server.c:748
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:834
+#: src/hostlist/gnunet-daemon-hostlist_server.c:769
 #, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:854
+#: src/hostlist/gnunet-daemon-hostlist_server.c:789
 #, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:894
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, 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:163
 #, c-format
 msgid "Failed to create ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:184
+#: src/identity/gnunet-identity.c:182
 #, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:324
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:327
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:330
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:336
+#: src/identity/gnunet-identity.c:333
 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:336
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:342
+#: src/identity/gnunet-identity.c:339
 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:348
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:338
+#: src/identity/gnunet-service-identity.c:390
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:362
+#: src/identity/gnunet-service-identity.c:412
 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:501
+#: src/identity/gnunet-service-identity.c:773
+#: src/identity/gnunet-service-identity.c:895
 #, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:446
+#: src/identity/gnunet-service-identity.c:508
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:516
+#: src/identity/gnunet-service-identity.c:601
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:647
+#: src/identity/gnunet-service-identity.c:750
 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:789
+#: src/identity/gnunet-service-identity.c:912
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:829
+#: src/identity/gnunet-service-identity.c:946
 #, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:902
+#: src/identity/gnunet-service-identity.c:1004
 #, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:914
+#: src/identity/gnunet-service-identity.c:1014
 #, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/identity/plugin_rest_identity.c:803
+#: src/identity/plugin_rest_identity.c:967
 msgid "Identity REST API initialized\n"
 msgstr ""
 
-#: src/mysql/mysql.c:174
+#: src/identity-provider/gnunet-identity-token.c:66
+msgid "Option `-t' is required\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-identity-token.c:77
+#, c-format
+msgid "Token `%s' is malformed\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-identity-token.c:163
+msgid "GNUid token"
+msgstr ""
+
+#: src/identity-provider/gnunet-identity-token.c:166
+msgid "Print token contents"
+msgstr ""
+
+#: src/identity-provider/plugin_rest_identity_provider.c:1163
+msgid "Identity Token REST API initialized\n"
+msgstr ""
+
+#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
+msgid "This command doesn't do anything yet."
+msgstr ""
+
+#: src/my/my.c:198 src/my/my.c:217
+#, c-format
+msgid "%s failed at %s:%d with error: %s\n"
+msgstr ""
+
+#: src/mysql/mysql.c:180
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/mysql/mysql.c:181
+#: src/mysql/mysql.c:187
 #, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:109
+#: src/namecache/gnunet-namecache.c:107
 #, c-format
 msgid "No records found for `%s'"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:185
+#: src/namecache/gnunet-namecache.c:183
 #, c-format
 msgid "You must specify which zone should be accessed\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:195
-#, c-format
+#: src/namecache/gnunet-namecache.c:193
+#, fuzzy, c-format
 msgid "Invalid public key for zone `%s'\n"
-msgstr ""
+msgstr "fornat invalide : « %s »\n"
 
-#: src/namecache/gnunet-namecache.c:203
+#: src/namecache/gnunet-namecache.c:201
 #, c-format
 msgid "You must specify a name\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1084
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:237
+#: src/namecache/gnunet-namecache.c:233
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1116
+#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1189
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
-#: src/namecache/namecache_api.c:276
+#: src/namecache/namecache_api.c:296
 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:383
+msgid "Error communicating with namecache service"
+msgstr ""
+
+#: src/namecache/plugin_namecache_flat.c:119
+#: src/namecache/plugin_namecache_flat.c:253
+#: src/namestore/plugin_namestore_flat.c:179
+#: src/namestore/plugin_namestore_flat.c:375
+#: src/peerstore/plugin_peerstore_flat.c:379
+#: src/peerstore/plugin_peerstore_flat.c:527
+#, c-format
+msgid "Unable to initialize file: %s.\n"
+msgstr ""
+
+#: src/namecache/plugin_namecache_flat.c:130
+#: src/namestore/plugin_namestore_flat.c:190
+#: src/peerstore/plugin_peerstore_flat.c:394
+#, c-format
+msgid "Unable to get filesize: %s.\n"
+msgstr ""
+
+#: src/namecache/plugin_namecache_flat.c:149
+#: src/namestore/plugin_namestore_flat.c:203
+#: src/peerstore/plugin_peerstore_flat.c:406
+#, fuzzy, c-format
+msgid "Unable to read file: %s.\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/namecache/plugin_namecache_flat.c:408
+msgid "flat plugin running\n"
+msgstr ""
+
+#: src/namecache/plugin_namecache_postgres.c:90
+#: src/namestore/plugin_namestore_postgres.c:97
 msgid "Failed to create indices\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:303
+#: src/namestore/gnunet-namestore.c:301
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:332
-#: src/namestore/plugin_rest_namestore.c:505
+#: src/namestore/gnunet-namestore.c:330
+#: src/namestore/plugin_rest_namestore.c:562
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:339
-#: src/namestore/plugin_rest_namestore.c:514
+#: src/namestore/gnunet-namestore.c:337
+#: src/namestore/plugin_rest_namestore.c:571
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:477 src/namestore/gnunet-namestore.c:485
-#: src/namestore/gnunet-namestore.c:493
+#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
+#: src/namestore/gnunet-namestore.c:535
 #, 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:549 src/namestore/gnunet-namestore.c:561
+#: src/namestore/gnunet-namestore.c:573
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:628
-#: src/namestore/plugin_rest_namestore.c:538
+#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/plugin_rest_namestore.c:597
 #, 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:739
 #, 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:776
+#: src/namestore/plugin_rest_namestore.c:1003
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:791
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:719
-#: src/namestore/gnunet-namestore-fcfsd.c:984
-#: src/namestore/plugin_rest_namestore.c:821
+#: src/namestore/gnunet-namestore.c:802
+#: src/namestore/gnunet-namestore-fcfsd.c:1034
+#: src/namestore/plugin_rest_namestore.c:1016
 msgid "Failed to connect to namestore\n"
 msgstr ""
 
-#: 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:810 src/namestore/gnunet-namestore.c:819
+#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
+#: src/namestore/gnunet-namestore.c:915
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: 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:811 src/namestore/gnunet-namestore.c:820
+#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
 msgid "add"
-msgstr ""
+msgstr "ajouter"
 
-#: src/namestore/gnunet-namestore.c:745
-#: src/namestore/plugin_rest_namestore.c:608
+#: src/namestore/gnunet-namestore.c:829
+#: src/namestore/plugin_rest_namestore.c:671
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:765
-#: src/namestore/plugin_rest_namestore.c:626
-#: src/namestore/plugin_rest_namestore.c:666
+#: src/namestore/gnunet-namestore.c:851
+#: src/namestore/plugin_rest_namestore.c:689
+#: src/namestore/plugin_rest_namestore.c:729
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:801
+#: src/namestore/gnunet-namestore.c:896
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:816
+#: src/namestore/gnunet-namestore.c:916
 msgid "del"
-msgstr ""
+msgstr "supprimer"
 
-#: src/namestore/gnunet-namestore.c:844
+#: src/namestore/gnunet-namestore.c:950
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:868
-#: src/peerinfo-tool/gnunet-peerinfo.c:817
+#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
 #, c-format
 msgid "Invalid URI `%s'\n"
-msgstr ""
+msgstr "URI invalide « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:903
+#: src/namestore/gnunet-namestore.c:1014
 #, c-format
 msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
-#: src/namestore/plugin_rest_namestore.c:851
-#, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:970
-#: src/namestore/plugin_rest_namestore.c:878
+#: src/namestore/gnunet-namestore.c:1051
+#: src/namestore/plugin_rest_namestore.c:1046
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1006
-#: src/namestore/plugin_rest_namestore.c:917
-#, c-format
-msgid "Identity service is not running\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1018
-#: src/namestore/plugin_rest_namestore.c:946
+#: src/namestore/gnunet-namestore.c:1108
+#: src/namestore/plugin_rest_namestore.c:1142
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1135
 msgid "add record"
-msgstr ""
+msgstr "ajouter un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1138
 msgid "delete record"
-msgstr ""
+msgstr "suprimer un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1072
+#: src/namestore/gnunet-namestore.c:1141
 msgid "display records"
-msgstr ""
+msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore.c:1075
+#: src/namestore/gnunet-namestore.c:1144
 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:1147
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1081
+#: src/namestore/gnunet-namestore.c:1150
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1087
+#: src/namestore/gnunet-namestore.c:1156
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1090
+#: src/namestore/gnunet-namestore.c:1159
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1093
+#: src/namestore/gnunet-namestore.c:1162
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1096
+#: src/namestore/gnunet-namestore.c:1165
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1099
+#: src/namestore/gnunet-namestore.c:1168
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1102
+#: src/namestore/gnunet-namestore.c:1171
 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:1174
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:478
+#: src/namestore/gnunet-namestore-fcfsd.c:508
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:505
+#: src/namestore/gnunet-namestore-fcfsd.c:535
 #, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr ""
 
-#: 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:555
+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:585
+#, 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:662
 #, 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:718
 #, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:682
+#: src/namestore/gnunet-namestore-fcfsd.c:734
 #, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:718
+#: src/namestore/gnunet-namestore-fcfsd.c:770
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:726
+#: src/namestore/gnunet-namestore-fcfsd.c:778
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:924
+#: src/namestore/gnunet-namestore-fcfsd.c:974
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:950
+#: src/namestore/gnunet-namestore-fcfsd.c:1000
 msgid "Failed to start HTTP server\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:992
+#: src/namestore/gnunet-namestore-fcfsd.c:1042
 msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1025
+#: src/namestore/gnunet-namestore-fcfsd.c:1074
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:656
+#: src/namestore/gnunet-service-namestore.c:612
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:275
+#: src/namestore/namestore_api.c:379
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:1023
+#: src/namestore/plugin_namestore_flat.c:656
+msgid "flat file database running\n"
+msgstr ""
+
+#: src/namestore/plugin_rest_namestore.c:1187
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:279
+#: src/nat/gnunet-nat.c:159
+msgid "GNUnet NAT traversal autoconfigure daemon"
+msgstr ""
+
+#: src/nat/gnunet-nat-server.c:321
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
+#: src/nat/gnunet-nat-server.c:363
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:179
+#: src/nat/nat_auto.c:385
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:180
+#: src/nat/nat_auto.c:386
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:201
+#: src/nat/nat_auto.c:405
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:249
+#: src/nat/nat_auto.c:437
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:327
+#: src/nat/nat_auto.c:572
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:343
+#: src/nat/nat_auto.c:590
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:406
+#: src/nat/nat_auto.c:681 src/nat/nat_test.c:403
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:724
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:407
+#: src/nat/nat_auto.c:725
 msgid "upnpc not found\n"
-msgstr ""
+msgstr "upnpc introuvable\n"
 
-#: src/nat/nat_auto.c:437
+#: src/nat/nat_auto.c:762
 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/nat_auto.c:774 src/nat/nat_auto.c:834
 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/nat_auto.c:786 src/nat/nat_auto.c:846
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:483
+#: src/nat/nat_auto.c:823
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:867
+#: src/nat/nat.c:1019
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:917
+#: src/nat/nat.c:1070
 #, c-format
 msgid "Failed to start %s\n"
-msgstr ""
+msgstr "Échec du démarrage de %s\n"
 
-#: src/nat/nat.c:1032
+#: src/nat/nat.c:1327
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1102
+#: src/nat/nat.c:1402
 #, c-format
 msgid "Failed to run upnp client for port %u\n"
 msgstr ""
 
-#: src/nat/nat.c:1242
+#: src/nat/nat.c:1546
 msgid "malformed"
-msgstr ""
+msgstr "malformé"
 
-#: src/nat/nat.c:1296
+#: src/nat/nat.c:1600
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP \n"
 msgstr ""
 
-#: src/nat/nat.c:1323 src/nat/nat.c:1335
+#: src/nat/nat.c:1726 src/nat/nat.c:1739
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1473
+#: src/nat/nat.c:1903
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1489
+#: src/nat/nat.c:1919
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:1574
+#: src/nat/nat.c:2010
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:1576
+#: src/nat/nat.c:2012
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:1578
+#: src/nat/nat.c:2014
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:1580
+#: src/nat/nat.c:2016
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:1582
+#: src/nat/nat.c:2018
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:1584
+#: src/nat/nat.c:2020
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat.c:1586
+#: src/nat/nat.c:2022
 msgid "Failed to run `upnpc` command"
 msgstr ""
 
-#: src/nat/nat.c:1588
+#: src/nat/nat.c:2024
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat.c:1590
+#: src/nat/nat.c:2026
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:1592
+#: src/nat/nat.c:2028
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat.c:1594
+#: src/nat/nat.c:2030
 msgid "Failed to run `external-ip` command"
 msgstr ""
 
-#: src/nat/nat.c:1596
+#: src/nat/nat.c:2032
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat.c:1598
+#: src/nat/nat.c:2034
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:1600
+#: src/nat/nat.c:2036
 msgid "Could not determine interface with internal/local network address"
 msgstr ""
 
-#: src/nat/nat.c:1602
+#: src/nat/nat.c:2038
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:1604
+#: src/nat/nat.c:2040
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:1606
+#: src/nat/nat.c:2042
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:1608
+#: src/nat/nat.c:2044
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:1610
+#: src/nat/nat.c:2046
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/nat/nat_mini.c:203
+#: src/nat/nat_mini.c:205
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:609
+#: src/nat/nat_mini.c:611
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:360
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr ""
-
-#: src/nat/nat_test.c:462
+#: src/nat/nat_test.c:518
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:497
+#: src/nat/nat_test.c:568
 msgid "NAT test failed to start NAT library\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:117
-msgid "NSE service is not running\n"
-msgstr ""
-
 #: src/nse/gnunet-nse.c:122
-msgid "Error while checking if NSE service is running or not\n"
-msgstr ""
-
-#: src/nse/gnunet-nse.c:168
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:858
+#: src/nse/gnunet-nse-profiler.c:840
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:861
+#: src/nse/gnunet-nse-profiler.c:843
 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:849
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:870
+#: src/nse/gnunet-nse-profiler.c:852
 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:858
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:885
+#: src/nse/gnunet-nse-profiler.c:867
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1537
-#: src/revocation/gnunet-service-revocation.c:827 src/util/gnunet-scrypt.c:260
+#: src/nse/gnunet-service-nse.c:1536
+#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:215
+#: src/peerinfo/gnunet-service-peerinfo.c:178
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:352
+#: src/peerinfo/gnunet-service-peerinfo.c:310
 #, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:371
-#: src/peerinfo/gnunet-service-peerinfo.c:388
+#: src/peerinfo/gnunet-service-peerinfo.c:331
+#: src/peerinfo/gnunet-service-peerinfo.c:362
 #, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:468
+#: src/peerinfo/gnunet-service-peerinfo.c:446
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:506
+#: src/peerinfo/gnunet-service-peerinfo.c:489
 #, 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:655
 #, c-format
 msgid "Scanning directory `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:668
+#: src/peerinfo/gnunet-service-peerinfo.c:663
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1037
+#: src/peerinfo/gnunet-service-peerinfo.c:1076
 #, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1358
+#: src/peerinfo/gnunet-service-peerinfo.c:1405
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1371
+#: src/peerinfo/gnunet-service-peerinfo.c:1418
 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
-msgid "failed to transmit request (service down?)"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:518
+#: src/peerinfo/peerinfo_api.c:220
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:562 src/peerinfo/peerinfo_api.c:585
-#: src/peerinfo/peerinfo_api.c:602 src/peerinfo/peerinfo_api.c:615
-#: src/peerinfo/peerinfo_api.c:630
-msgid "Received invalid message from `PEERINFO' service."
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:719
-msgid "Timeout transmitting iteration request to `PEERINFO' service."
-msgstr ""
-
-#: src/peerinfo/peerinfo_api_notify.c:268
-#, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:245
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, c-format
 msgid "%sPeer `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
+#: src/peerinfo-tool/gnunet-peerinfo.c:246
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:301
+#: src/peerinfo-tool/gnunet-peerinfo.c:299
 #, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:463
+#: src/peerinfo-tool/gnunet-peerinfo.c:466
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:477
+#: src/peerinfo-tool/gnunet-peerinfo.c:480
 #, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:496
+#: src/peerinfo-tool/gnunet-peerinfo.c:499
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:566
+#: src/peerinfo-tool/gnunet-peerinfo.c:799
 #, c-format
-msgid "Failure adding HELLO: %s\n"
+msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:695
-#, c-format
-msgid "Failed to get my own HELLO from this peer!\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:842
+msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:727
-#, c-format
-msgid "Service `%s' is not running, please start GNUnet\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:845
+msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:841
-#, c-format
-msgid "I am peer `%s'.\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:882
-msgid "don't resolve host names"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:885
-msgid "output only the identity strings"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:888
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:891
+#: src/peerinfo-tool/gnunet-peerinfo.c:851
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:894
+#: src/peerinfo-tool/gnunet-peerinfo.c:854
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:897
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:860
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:903
+#: src/peerinfo-tool/gnunet-peerinfo.c:863
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:917
+#: src/peerinfo-tool/gnunet-peerinfo.c:880
 msgid "Print information about peers."
 msgstr ""
 
@@ -5580,71 +5446,38 @@ msgstr ""
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
 
-#: src/peerstore/gnunet-peerstore.c:92
+#: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:384
-msgid "Malformed iterate request.\n"
-msgstr ""
-
-#: 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
-msgid "Malformed store request from client\n"
-msgstr ""
-
-#: 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
-msgid "Failed to store requested value, database error."
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:557
-msgid "No database backend configured\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:568
-#, c-format
+#: src/peerstore/gnunet-service-peerstore.c:588
+#, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
-msgstr ""
+msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/peerstore/peerstore_api.c:329 src/sensor/sensor_api.c:179
+#: src/peerstore/peerstore_api.c:296
 #, 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:344
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:678
+#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:689
-msgid "Error communicating with `PEERSTORE' service."
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:708
+#: src/peerstore/peerstore_api.c:623
 msgid "Received a malformed response from service."
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:820
-msgid ""
-"Problem receiving a watch response, no way to determine which request.\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:832
+#: src/peerstore/peerstore_api.c:768
 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/psycstore/plugin_psycstore_sqlite.c:282
 #, c-format
 msgid ""
 "Error executing SQL query: %s\n"
@@ -5652,7 +5485,8 @@ msgid ""
 msgstr ""
 
 #: src/peerstore/plugin_peerstore_sqlite.c:422
-#: src/psycstore/plugin_psycstore_sqlite.c:263
+#: src/psycstore/plugin_psycstore_mysql.c:250
+#: src/psycstore/plugin_psycstore_sqlite.c:259
 #, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
@@ -5664,151 +5498,166 @@ msgstr ""
 msgid "Unable to create indices: %s.\n"
 msgstr ""
 
-#: src/postgres/postgres.c:59
+#: src/postgres/postgres.c:67
 #, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
+msgid "`%s:%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/postgres/postgres.c:148
-#, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr ""
+#: src/postgres/postgres.c:195
+#, fuzzy, c-format
+msgid "Unable to initialize Postgres: %s\n"
+msgstr "Résolution de « %s » échouée\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:260
+#: src/psycstore/gnunet-service-psycstore.c:249
 msgid "Failed to store membership information!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:284
+#: src/psycstore/gnunet-service-psycstore.c:271
 msgid "Failed to test membership!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:306
-msgid "Failed to store fragment!\n"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:300
+#, fuzzy
+msgid "Dropping invalid fragment\n"
+msgstr "Argument invalide « %s »\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:311
+#, fuzzy
+msgid "Failed to store fragment\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:362
+#: src/psycstore/gnunet-service-psycstore.c:368
 msgid "Failed to get fragment!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:417
+#: src/psycstore/gnunet-service-psycstore.c:434
 msgid "Failed to get message!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:448
+#: src/psycstore/gnunet-service-psycstore.c:464
 msgid "Failed to get message fragment!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:476
+#: src/psycstore/gnunet-service-psycstore.c:494
 msgid "Failed to get master counters!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:512
-#: src/psycstore/gnunet-service-psycstore.c:585
-msgid "Tried to set invalid state variable name!\n"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:675
+#, fuzzy, c-format
+msgid "Failed to begin modifying state: %d\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:528
-msgid "Failed to begin modifying state!\n"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:685
+#, fuzzy, c-format
+msgid "Failed to modify state: %d\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:551
-#, c-format
-msgid "Unknown operator: %c\n"
+#: src/psycstore/gnunet-service-psycstore.c:693
+msgid "Failed to end modifying state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:561
-msgid "Failed to end modifying state!\n"
+#: src/psycstore/gnunet-service-psycstore.c:730
+msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:599
+#: src/psycstore/gnunet-service-psycstore.c:744
 msgid "Failed to begin synchronizing state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:615
+#: src/psycstore/gnunet-service-psycstore.c:761
 msgid "Failed to end synchronizing state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:635
-#: src/psycstore/gnunet-service-psycstore.c:654
+#: src/psycstore/gnunet-service-psycstore.c:779
+#: src/psycstore/gnunet-service-psycstore.c:795
 msgid "Failed to reset state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:677
-#: src/psycstore/gnunet-service-psycstore.c:728
+#: src/psycstore/gnunet-service-psycstore.c:824
+#: src/psycstore/gnunet-service-psycstore.c:881
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:704
-#: src/psycstore/gnunet-service-psycstore.c:743
+#: src/psycstore/gnunet-service-psycstore.c:851
+#: src/psycstore/gnunet-service-psycstore.c:896
 msgid "Failed to get state variable!\n"
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:60
+#: src/psycstore/plugin_psycstore_mysql.c:281
+#, fuzzy
+msgid "Unable to initialize Mysql.\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/psycstore/plugin_psycstore_mysql.c:291
+#, fuzzy, c-format
+msgid "Failed to run SQL statement `%s'\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:61
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1936
+#: src/psycstore/plugin_psycstore_sqlite.c:1924
 msgid "SQLite database running\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:482
+#: src/pt/gnunet-daemon-pt.c:493
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:488
+#: src/pt/gnunet-daemon-pt.c:499
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:541
+#: src/pt/gnunet-daemon-pt.c:553
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:717
+#: src/pt/gnunet-daemon-pt.c:737
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:723
+#: src/pt/gnunet-daemon-pt.c:744
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:826
+#: src/pt/gnunet-daemon-pt.c:851
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:909
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:888
+#: src/pt/gnunet-daemon-pt.c:914
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:896
+#: src/pt/gnunet-daemon-pt.c:922
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:969
+#: src/pt/gnunet-daemon-pt.c:995
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:985
+#: src/pt/gnunet-daemon-pt.c:1011
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: 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:1294 src/pt/gnunet-daemon-pt.c:1303
+#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
+#: src/pt/gnunet-daemon-pt.c:1345
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1347
+#: src/pt/gnunet-daemon-pt.c:1390
 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/regex/gnunet-daemon-regexprofiler.c:267
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr ""
@@ -5817,648 +5666,542 @@ msgstr ""
 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:1314
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1299
-msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1328
-#: src/regex/gnunet-regex-simulation-profiler.c:622
+#: src/regex/gnunet-regex-profiler.c:1355
+#: src/regex/gnunet-regex-simulation-profiler.c:630
 #, 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:1361
+#: src/regex/gnunet-regex-simulation-profiler.c:638
 #, 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:1368
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1350
+#: src/regex/gnunet-regex-profiler.c:1377
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1370
+#: src/regex/gnunet-regex-profiler.c:1397
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1455
+#: src/regex/gnunet-regex-profiler.c:1482
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1458
+#: src/regex/gnunet-regex-profiler.c:1485
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1461
+#: src/regex/gnunet-regex-profiler.c:1488
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1464
+#: src/regex/gnunet-regex-profiler.c:1491
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1467
+#: src/regex/gnunet-regex-profiler.c:1494
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1479
+#: src/regex/gnunet-regex-profiler.c:1506
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:689
+#: src/regex/gnunet-regex-simulation-profiler.c:696
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:692
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:705
+#: src/regex/gnunet-regex-simulation-profiler.c:712
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api.c:131
+#: src/regex/regex_api_announce.c:152
 #, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:766
+#: src/regex/regex_api_search.c:212
+#, c-format
+msgid "Search string `%s' is too long!\n"
+msgstr ""
+
+#: src/rest/gnunet-rest-server.c:788
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:783
+#: src/rest/gnunet-rest-server.c:805
 msgid "GNUnet REST server"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:126
+#: src/revocation/gnunet-revocation.c:129
 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:131
+#: src/revocation/gnunet-revocation.c:134
 #, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:137
+#: src/revocation/gnunet-revocation.c:140
 msgid "Internal error\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:163
+#: src/revocation/gnunet-revocation.c:166
 #, 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:171
 msgid "Revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:176
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:178
+#: src/revocation/gnunet-revocation.c:181
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:183
+#: src/revocation/gnunet-revocation.c:186
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:294
+#: src/revocation/gnunet-revocation.c:323
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:324
+#: src/revocation/gnunet-revocation.c:352
 #, c-format
 msgid "Ego `%s' not found.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:345
+#: src/revocation/gnunet-revocation.c:373
 #, 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:393
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:375
+#: src/revocation/gnunet-revocation.c:403
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:407
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1159
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:421
+#: src/revocation/gnunet-revocation.c:450
 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:470
 msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:463
+#: src/revocation/gnunet-revocation.c:491
 #, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:488
+#: src/revocation/gnunet-revocation.c:516
 msgid "No action specified. Nothing to do.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:504
+#: src/revocation/gnunet-revocation.c:532
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:507
+#: src/revocation/gnunet-revocation.c:535
 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:538
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:513
+#: src/revocation/gnunet-revocation.c:541
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:427
+#: src/revocation/gnunet-service-revocation.c:456
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:436
+#: src/revocation/gnunet-service-revocation.c:464
 msgid "# revocation messages received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:441
+#: src/revocation/gnunet-service-revocation.c:469
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:445
+#: src/revocation/gnunet-service-revocation.c:473
 msgid "# revocation set unions failed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:454
+#: src/revocation/gnunet-service-revocation.c:482
 msgid "# revocation set unions completed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:493
-#: src/revocation/gnunet-service-revocation.c:759
+#: src/revocation/gnunet-service-revocation.c:519
+#: src/revocation/gnunet-service-revocation.c:765
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:851
+#: src/revocation/gnunet-service-revocation.c:856
 msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:67
-msgid "rps"
+#: src/rps/gnunet-rps.c:177
+msgid "Seed a PeerID"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:221
+#: src/scalarproduct/gnunet-scalarproduct.c:220
 msgid "You must specify at least one message ID to check!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:228
+#: src/scalarproduct/gnunet-scalarproduct.c:227
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:241
+#: src/scalarproduct/gnunet-scalarproduct.c:240
 #, 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:258
 msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:281
+#: src/scalarproduct/gnunet-scalarproduct.c:280
 #, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:299
-#, c-format
+#: src/scalarproduct/gnunet-scalarproduct.c:298
+#, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
-msgstr ""
+msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:326
+#: src/scalarproduct/gnunet-scalarproduct.c:325
 #, c-format
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
+#: src/scalarproduct/gnunet-scalarproduct.c:348
 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:351
 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:354
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
+#: src/scalarproduct/gnunet-scalarproduct.c:363
 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:1415
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1553
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1191
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1259
 msgid "Connect to CADET failed\n"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:296
+#: src/scalarproduct/scalarproduct_api.c:185
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 msgid "dkg start delay"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
 msgid "dkg timeout"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
 msgid "threshold"
-msgstr ""
+msgstr "threshold"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
 msgid "also profile decryption"
 msgstr ""
 
-#: src/sensordashboard/gnunet-service-sensordashboard.c:353
-#, c-format
-msgid "Error trying to send a message to peer `%s'.\n"
-msgstr ""
-
-#: src/sensor/gnunet-sensor.c:162
-msgid "Retrieve information about all defined sensors"
-msgstr ""
-
-#: src/sensor/gnunet-sensor.c:165
-msgid "Retrieve information about a single sensor"
-msgstr ""
-
-#: src/sensor/gnunet-sensor.c:168
-msgid "Force an anomaly on a sensor, use only for testing"
-msgstr ""
-
-#: src/sensor/gnunet-sensor.c:175
-msgid "sensor"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:729
-msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:736
-msgid "Missing or invalid topology file.\n"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:782
-msgid "Number of peers to run"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:784
-msgid "Path to topology file"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:787
-msgid "Change the interval of running sensors to given value"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:790
-msgid "Number of peers to simulate anomalies on"
+#: src/set/gnunet-service-set.c:1991
+msgid "Could not connect to cadet service\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:797
-msgid "Profiler for sensor service"
+#: src/set/gnunet-set-ibf-profiler.c:249
+msgid "number of element in set A-B"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_analysis.c:204
-msgid "Received an invalid sensor value."
+#: src/set/gnunet-set-ibf-profiler.c:252
+msgid "number of element in set B-A"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_analysis.c:295
-msgid "Analysis model not defined in configuration.\n"
+#: src/set/gnunet-set-ibf-profiler.c:255
+msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_analysis.c:304
-#, c-format
-msgid "Could not load analysis model `%s'.\n"
-msgstr ""
+#: src/set/gnunet-set-ibf-profiler.c:258
+msgid "hash num"
+msgstr "numéro de hash"
 
-#: src/sensor/gnunet-service-sensor_analysis.c:312
-msgid "Could not connect to peerstore service.\n"
-msgstr ""
+#: src/set/gnunet-set-ibf-profiler.c:261
+msgid "ibf size"
+msgstr "taille ibz"
 
-#: src/sensor/gnunet-service-sensor_monitoring.c:233
-msgid "Unknown value type expected by sensor, this should not happen.\n"
+#: src/set/gnunet-set-profiler.c:387
+msgid "operation to execute"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_monitoring.c:268
-#, c-format
-msgid "Received an invalid value for sensor `%s': %s\n"
+#: src/social/gnunet-social.c:1146
+msgid "--place missing or invalid.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_monitoring.c:347
-#, c-format
-msgid "Sensor `%s': External process should not be a path, disabling sensor.\n"
+#: src/social/gnunet-social.c:1195
+msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_monitoring.c:370
-#, c-format
-msgid ""
-"Sensor `%s' process `%s' problem: binary doesn't exist or not executable\n"
+#: src/social/gnunet-social.c:1199
+msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_monitoring.c:418
-#, c-format
-msgid "Sensor `%s' execution task already set, this should not happen\n"
+#: src/social/gnunet-social.c:1203
+msgid "create a place"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:828
-msgid "Double creation of proof-of-work, this should not happen.\n"
+#: src/social/gnunet-social.c:1207
+msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:834
-msgid "Failed to create pow and signature block.\n"
+#: src/social/gnunet-social.c:1211
+msgid "enter somebody else's place"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1046
-#, c-format
-msgid "PEERSTORE error: %s.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1151
-#: src/sensor/gnunet-service-sensor_reporting.c:1409
-msgid "Failed to connect to CORE service.\n"
+#: src/social/gnunet-social.c:1215
+msgid "find state matching name prefix"
 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:1219
+msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1398
-msgid "Failed to connect to peerstore service.\n"
+#: src/social/gnunet-social.c:1223
+msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1419
-#: src/sensor/gnunet-service-sensor_update.c:781
-msgid "Failed to connect to CADET service.\n"
+#: src/social/gnunet-social.c:1227
+msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1426
-msgid "Failed to load my private key.\n"
+#: src/social/gnunet-social.c:1231
+msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_update.c:327
-#, c-format
-msgid "Error trying to send a message to update point `%s'.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_update.c:418
-#, c-format
-msgid "Failed to connect to update point `%s'.\n"
+#: src/social/gnunet-social.c:1235
+msgid "search for state matching exact name"
 msgstr ""
 
-#: src/sensor/plugin_sensor_model_gaussian.c:203
-msgid "Missing `TRAINING_WINDOW' value in configuration.\n"
+#: src/social/gnunet-social.c:1239
+msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/sensor/plugin_sensor_model_gaussian.c:221
-msgid "Missing `CONFIDENCE_INTERVAL' value in configuration.\n"
+#: src/social/gnunet-social.c:1243
+msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/sensor/plugin_sensor_model_gaussian.c:229
-msgid "Missing `WEIGHT_INC' value in configuration.\n"
+#: src/social/gnunet-social.c:1247
+msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/sensor/sensor_api.c:296
-msgid "Iterate request canceled due to disconnection.\n"
+#: src/social/gnunet-social.c:1254
+msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/sensor/sensor_api.c:307
-msgid "Force anomaly request canceled due to disconnection.\n"
+#: src/social/gnunet-social.c:1258
+msgid "message body or state value"
 msgstr ""
 
-#: src/sensor/sensor_api.c:374
-msgid "Timeout transmitting iteration request to `SENSOR' service."
+#: src/social/gnunet-social.c:1262
+msgid "name or public key of ego"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:107
-msgid "Error reading sensor version\n"
+#: src/social/gnunet-social.c:1266
+msgid "wait for incoming messages"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:116
-msgid "Invalid sensor version number, format should be major.minor\n"
+#: src/social/gnunet-social.c:1270
+msgid "GNS name"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:131
-msgid "Error reading sensor category\n"
+#: src/social/gnunet-social.c:1274
+msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:164
-msgid "Error reading sensor run interval\n"
+#: src/social/gnunet-social.c:1278
+msgid "name (key) to query from state"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:191
-msgid "Error reading sensor source\n"
+#: src/social/gnunet-social.c:1282
+msgid "method name"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:206
-msgid "Error reading sensor gnunet-statistics source information\n"
-msgstr ""
+#: src/social/gnunet-social.c:1286
+#, fuzzy
+msgid "number of messages to replay from history"
+msgstr "nombre de valeurs"
 
-#: src/sensor/sensor_util_lib.c:218
-msgid "Error reading sensor process name\n"
+#: src/social/gnunet-social.c:1290
+msgid "key address of place"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:233
-msgid "Error reading sensor expected datatype\n"
+#: src/social/gnunet-social.c:1294
+msgid "start message ID for history replay"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:241
-msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
+#: src/social/gnunet-social.c:1298
+msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:299
-#, c-format
-msgid "Failed to access sensor file: %s\n"
+#: src/social/gnunet-social.c:1302
+msgid "end message ID for history replay"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:308
-#, c-format
-msgid "Failed to load sensor definition: %s\n"
+#: src/social/gnunet-social.c:1306
+msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:370
-#, c-format
-msgid "Sensor `%s' already exists with same or newer version\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:387
-#, c-format
-msgid "Error adding new sensor `%s' to global hashmap.\n"
+#: src/social/gnunet-social.c:1316
+msgid ""
+"gnunet-social - Interact with the social service: enter/leave, send/receive "
+"messages, access history and state.\n"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:412
+#: src/statistics/gnunet-service-statistics.c:338
 #, c-format
-msgid "Error loading sensor from file: %s\n"
-msgstr ""
-
-#: src/set/gnunet-service-set.c:1531
-msgid "Could not connect to cadet service\n"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:237
-msgid "number of element in set A-B"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:240
-msgid "number of element in set B-A"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:243
-msgid "number of common elements in A and B"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:246
-msgid "hash num"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:249
-msgid "ibf size"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:298
-msgid "oeration to execute"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:323
+#: src/statistics/gnunet-service-statistics.c:1083
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:434
-#, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:145
+#: src/statistics/gnunet-statistics.c:158
 msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:148
+#: src/statistics/gnunet-statistics.c:161
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:198
+#: src/statistics/gnunet-statistics.c:219
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:204
+#: src/statistics/gnunet-statistics.c:227
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:235
+#: src/statistics/gnunet-statistics.c:270
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:243
+#: src/statistics/gnunet-statistics.c:285
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:321
 #, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr ""
+msgid "Invalid argument `%s'\n"
+msgstr "Argument invalide « %s »\n"
 
-#: src/statistics/gnunet-statistics.c:282
+#: src/statistics/gnunet-statistics.c:339
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:290
+#: src/statistics/gnunet-statistics.c:347
 #, 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
-#, c-format
-msgid "Invalid argument `%s'\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:383
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:386
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:355
+#: src/statistics/gnunet-statistics.c:389
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:358
+#: src/statistics/gnunet-statistics.c:392
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:395
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:398
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:367
+#: src/statistics/gnunet-statistics.c:401
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:379
+#: src/statistics/gnunet-statistics.c:417
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:519
+#: src/statistics/statistics_api.c:753
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: 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
 msgid "Need at least 2 arguments\n"
 msgstr ""
@@ -6474,7 +6217,7 @@ msgstr ""
 #: src/testbed/generate-underlay-topology.c:242
 #, c-format
 msgid "Invalid topology: %s\n"
-msgstr ""
+msgstr "Topologie invalide : %s\n"
 
 #: src/testbed/generate-underlay-topology.c:255
 #, c-format
@@ -6501,12 +6244,12 @@ msgstr ""
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:338
-#: src/testbed/gnunet-testbed-profiler.c:293
+#: src/testbed/generate-underlay-topology.c:339
+#: 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:348
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6530,184 +6273,180 @@ msgid ""
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:323
+#: src/testbed/gnunet-daemon-latency-logger.c:315
 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:50
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:476
+#: 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:728
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/testbed/gnunet-service-testbed_peers.c:1141
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1021
-msgid "Request doesn't fit into a message"
-msgstr ""
-
-#: src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, 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_testbed_mpi_spawn.c:118
 msgid "Waiting for child to exit.\n"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:247
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
 #, c-format
 msgid "Spawning process `%s'\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:296
+#: src/testbed/gnunet-testbed-profiler.c:284
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:299
+#: src/testbed/gnunet-testbed-profiler.c:287
 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:410
+#, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr ""
+
+#: src/testbed/testbed_api_hosts.c:413
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:423
+#: src/testbed/testbed_api_hosts.c:421
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:430
+#: src/testbed/testbed_api_hosts.c:428
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:570
+#: src/testbed/testbed_api_hosts.c:569
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1586
-#, c-format
-msgid "Adding host %u failed with error: %s\n"
-msgstr ""
-
-#: src/testbed/testbed_api_testbed.c:819
+#: src/testbed/testbed_api_testbed.c:818
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:988
+#: src/testbed/testbed_api_testbed.c:986
 #, 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:1052
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1143
+#: src/testbed/testbed_api_testbed.c:1141
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1147
+#: src/testbed/testbed_api_testbed.c:1145
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1185
+#: src/testbed/testbed_api_testbed.c:1183
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1203
+#: src/testbed/testbed_api_testbed.c:1201
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1263
+#: src/testbed/testbed_api_testbed.c:1261
 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:1273
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1299
+#: src/testbed/testbed_api_testbed.c:1297
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1349
+#: src/testbed/testbed_api_testbed.c:1347
 #, 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:1363
 #, 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:1028
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:966
+#: src/testbed/testbed_api_topology.c:1036
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:973
+#: src/testbed/testbed_api_topology.c:1044
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:995
+#: src/testbed/testbed_api_topology.c:1066
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1004
-#: src/testbed/testbed_api_topology.c:1028
+#: src/testbed/testbed_api_topology.c:1075
+#: src/testbed/testbed_api_topology.c:1099
 #, 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:1081
+#: src/testbed/testbed_api_topology.c:1105
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1016
-#: src/testbed/testbed_api_topology.c:1040
+#: src/testbed/testbed_api_topology.c:1087
+#: src/testbed/testbed_api_topology.c:1111
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1145
 #, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr ""
@@ -6717,96 +6456,96 @@ msgstr ""
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:258
+#: src/testing/gnunet-testing.c:253
 #, 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
 msgid "create unique configuration files"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:357
+#: src/testing/gnunet-testing.c:354
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:359
+#: src/testing/gnunet-testing.c:356
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:361
+#: src/testing/gnunet-testing.c:358
 msgid "configuration template"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:363
+#: src/testing/gnunet-testing.c:360
 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:373
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:90
+#: src/testing/list-keys.c:91
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/list-keys.c:93
+#: src/testing/list-keys.c:94
 msgid "skip COUNT number of keys in the beginning"
 msgstr ""
 
-#: src/testing/testing.c:277
+#: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:718
+#: src/testing/testing.c:715
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1157
+#: src/testing/testing.c:1158
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1166
+#: src/testing/testing.c:1167
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 
-#: src/testing/testing.c:1176
+#: src/testing/testing.c:1177
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1189
+#: src/testing/testing.c:1190
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/testing/testing.c:1203
+#: src/testing/testing.c:1204
 #, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1215
+#: src/testing/testing.c:1216
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1240
+#: src/testing/testing.c:1241
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1342
+#: src/testing/testing.c:1343
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1706
+#: src/testing/testing.c:1644
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr ""
@@ -6821,318 +6560,302 @@ msgstr ""
 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:225
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:406
-msgid "# connect requests issued to transport"
+#: src/topology/gnunet-daemon-topology.c:339
+msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:756
-#: src/topology/gnunet-daemon-topology.c:840
+#: src/topology/gnunet-daemon-topology.c:533
+msgid "# HELLO messages gossipped"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:635
+#: src/topology/gnunet-daemon-topology.c:721
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1020
+#: src/topology/gnunet-daemon-topology.c:918
 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:951
 #, 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:958
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1077
+#: src/topology/gnunet-daemon-topology.c:980
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1079
+#: src/topology/gnunet-daemon-topology.c:983
 msgid "# friends in configuration"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1084
+#: src/topology/gnunet-daemon-topology.c:990
 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:996
 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:1478
+#: src/topology/gnunet-daemon-topology.c:1059
+#: src/transport/plugin_transport_wlan.c:1491
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1178
-msgid "# HELLO messages gossipped"
+#: src/topology/gnunet-daemon-topology.c:1233
+msgid "GNUnet topology control"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1323
-msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_ats.c:136
+#: src/transport/gnunet-service-transport_ats.c:141
 msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:286
-#, c-format
-msgid "Adding blacklisting entry for peer `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_blacklist.c:295
-#, c-format
-msgid "Adding blacklisting entry for peer `%s':`%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_blacklist.c:504
-#: src/transport/gnunet-service-transport_blacklist.c:855
-msgid "# disconnects due to blacklist"
+#: src/transport/gnunet-service-transport.c:448
+msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:859
-#, c-format
-msgid "Disallowing connection to peer `%s' on transport %s\n"
+#: src/transport/gnunet-service-transport.c:809
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:231
+#: src/transport/gnunet-service-transport.c:1539
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:385
+#: src/transport/gnunet-service-transport.c:1698
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:480
+#: src/transport/gnunet-service-transport.c:1795
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:818
-msgid "Transport service is lacking key configuration settings. Exiting.\n"
+#: src/transport/gnunet-service-transport.c:2112
+#: src/transport/gnunet-service-transport.c:2584
+msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:481
-msgid "# messages dropped due to slow client"
+#: src/transport/gnunet-service-transport.c:2588
+#, c-format
+msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:783
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/transport/gnunet-service-transport.c:2696
+#, c-format
+msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:827
-msgid "# REQUEST CONNECT messages received"
+#: src/transport/gnunet-service-transport.c:2705
+#, c-format
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:864
-msgid "# REQUEST DISCONNECT messages received"
+#: src/transport/gnunet-service-transport.c:2770
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:188
+#: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:840
+#: src/transport/gnunet-service-transport_neighbours.c:804
+#, fuzzy
 msgid "# session creation failed"
-msgstr ""
+msgstr "# Session TCP active"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1047
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1304
-#: src/transport/gnunet-service-transport_neighbours.c:1761
+#: src/transport/gnunet-service-transport_neighbours.c:1167
+msgid "# disconnects due to quota of 0"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1310
+#: src/transport/gnunet-service-transport_neighbours.c:1763
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1309
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1321
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1375
+#: src/transport/gnunet-service-transport_neighbours.c:1381
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1451
+#: src/transport/gnunet-service-transport_neighbours.c:1457
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1487
+#: src/transport/gnunet-service-transport_neighbours.c:1493
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1495
+#: src/transport/gnunet-service-transport_neighbours.c:1501
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1505
+#: src/transport/gnunet-service-transport_neighbours.c:1511
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1550
+#: src/transport/gnunet-service-transport_neighbours.c:1556
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1559
+#: src/transport/gnunet-service-transport_neighbours.c:1565
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1567
+#: src/transport/gnunet-service-transport_neighbours.c:1573
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1576
+#: src/transport/gnunet-service-transport_neighbours.c:1582
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1581
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1587
+#: src/transport/gnunet-service-transport_neighbours.c:1593
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1658
+#: src/transport/gnunet-service-transport_neighbours.c:1660
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1692
+#: src/transport/gnunet-service-transport_neighbours.c:1694
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1707
+#: src/transport/gnunet-service-transport_neighbours.c:1709
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1827
-#, c-format
+#: src/transport/gnunet-service-transport_neighbours.c:1829
+#, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
-msgstr ""
+msgstr "Résolution de « %s » échouée\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1847
+#: src/transport/gnunet-service-transport_neighbours.c:1849
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1886
+#: src/transport/gnunet-service-transport_neighbours.c:1888
 msgid "# SYN messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1903
-#, c-format
+#: src/transport/gnunet-service-transport_neighbours.c:1905
+#, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
-msgstr ""
+msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1933
+#: src/transport/gnunet-service-transport_neighbours.c:1935
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1998
+#: src/transport/gnunet-service-transport_neighbours.c:2000
 #, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2052
+#: src/transport/gnunet-service-transport_neighbours.c:2054
 msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2069
-#, c-format
+#: src/transport/gnunet-service-transport_neighbours.c:2071
+#, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:2225
-#, c-format
-msgid "Blacklisting disapproved to connect to peer `%s'\n"
-msgstr ""
+msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2352
+#: src/transport/gnunet-service-transport_neighbours.c:2227
 msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2357
+#: src/transport/gnunet-service-transport_neighbours.c:2232
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2726
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3212
+#: src/transport/gnunet-service-transport_neighbours.c:3080
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3220
+#: src/transport/gnunet-service-transport_neighbours.c:3088
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3238
-#: src/transport/gnunet-service-transport_neighbours.c:3262
+#: src/transport/gnunet-service-transport_neighbours.c:3106
+#: src/transport/gnunet-service-transport_neighbours.c:3130
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3274
+#: src/transport/gnunet-service-transport_neighbours.c:3142
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3299
+#: src/transport/gnunet-service-transport_neighbours.c:3167
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3312
+#: src/transport/gnunet-service-transport_neighbours.c:3180
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3506
+#: src/transport/gnunet-service-transport_neighbours.c:3352
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3541
+#: src/transport/gnunet-service-transport_neighbours.c:3388
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3595
-msgid "# SET QUOTA messages ignored (no such peer)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:3624
-msgid "# disconnects due to quota of 0"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:3672
+#: src/transport/gnunet-service-transport_neighbours.c:3476
 msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3679
+#: src/transport/gnunet-service-transport_neighbours.c:3483
 msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3720
+#: src/transport/gnunet-service-transport_neighbours.c:3523
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3727
+#: src/transport/gnunet-service-transport_neighbours.c:3530
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3738
+#: src/transport/gnunet-service-transport_neighbours.c:3541
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3871
+#: src/transport/gnunet-service-transport_neighbours.c:3675
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7160,446 +6883,337 @@ msgstr ""
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:343
+#: src/transport/gnunet-service-transport_validation.c:388
 msgid "# Addresses in validation map"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:450
-#: src/transport/gnunet-service-transport_validation.c:638
-#: src/transport/gnunet-service-transport_validation.c:927
-#: src/transport/gnunet-service-transport_validation.c:1511
+#: src/transport/gnunet-service-transport_validation.c:491
+#: src/transport/gnunet-service-transport_validation.c:677
+#: src/transport/gnunet-service-transport_validation.c:988
+#: src/transport/gnunet-service-transport_validation.c:1590
 msgid "# validations running"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:493
+#: src/transport/gnunet-service-transport_validation.c:532
 msgid "# address records discarded (timeout)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:541
+#: src/transport/gnunet-service-transport_validation.c:580
 msgid "# address records discarded (blacklist)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:629
+#: src/transport/gnunet-service-transport_validation.c:668
 msgid "# PINGs for address validation sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:711
+#: src/transport/gnunet-service-transport_validation.c:748
 msgid "# validations delayed by global throttle"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:748
+#: src/transport/gnunet-service-transport_validation.c:785
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1048
+#: src/transport/gnunet-service-transport_validation.c:1114
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1099
+#: src/transport/gnunet-service-transport_validation.c:1165
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1112
+#: src/transport/gnunet-service-transport_validation.c:1178
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1115
+#: src/transport/gnunet-service-transport_validation.c:1181
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1123
+#: src/transport/gnunet-service-transport_validation.c:1189
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1136
+#: src/transport/gnunet-service-transport_validation.c:1202
 #, 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:1191
+#: src/transport/gnunet-service-transport_validation.c:1257
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1242
+#: src/transport/gnunet-service-transport_validation.c:1308
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1251
+#: src/transport/gnunet-service-transport_validation.c:1317
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1408
+#: src/transport/gnunet-service-transport_validation.c:1480
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1426
+#: src/transport/gnunet-service-transport_validation.c:1498
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1481
+#: src/transport/gnunet-service-transport_validation.c:1553
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-transport.c:518
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:589
-#: src/transport/gnunet-transport-profiler.c:274
+#: src/transport/gnunet-transport.c:528
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:621
+#: src/transport/gnunet-transport.c:572
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:636
+#: src/transport/gnunet-transport.c:585
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:648
+#: src/transport/gnunet-transport.c:597
 msgid "Failed to list connections, timeout occured\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:675 src/transport/gnunet-transport.c:700
+#: src/transport/gnunet-transport.c:622 src/transport/gnunet-transport.c:647
 #, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:680
+#: src/transport/gnunet-transport.c:627
 #, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:685
+#: src/transport/gnunet-transport.c:632
 #, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:690
-#, c-format
+#: src/transport/gnunet-transport.c:637
+#, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
-msgstr ""
+msgstr "Résolution de « %s » échouée\n"
 
-#: src/transport/gnunet-transport.c:695
+#: src/transport/gnunet-transport.c:642
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:820
-#, c-format
-msgid ""
-"Peer `%s' %s %s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:855
-#, c-format
-msgid "Peer `%s' %s `%s' \n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:949 src/transport/gnunet-transport.c:1744
-msgid "Monitor disconnected from transport service. Reconnecting.\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1006
+#: src/transport/gnunet-transport.c:735
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1020
+#: src/transport/gnunet-transport.c:749
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1045
+#: src/transport/gnunet-transport.c:774
+#, fuzzy
 msgid "Failed to start resolver!\n"
-msgstr ""
+msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-transport.c:1091
+#: src/transport/gnunet-transport.c:810
 #, c-format
-msgid "Transmitting %u bytes to %s\n"
+msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1114
-#: src/transport/gnunet-transport-profiler.c:406
-#, c-format
-msgid "Successfully connected to `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1138
+#: src/transport/gnunet-transport.c:844
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1171
-#, c-format
-msgid "Successfully disconnected from `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1194
-#: src/transport/gnunet-transport-profiler.c:434
+#: src/transport/gnunet-transport.c:875
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1219 src/transport/gnunet-transport.c:1245
+#: src/transport/gnunet-transport.c:899 src/transport/gnunet-transport.c:928
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1221
+#: src/transport/gnunet-transport.c:901
 msgid "Connected to"
-msgstr ""
+msgstr "Connecté à"
 
-#: src/transport/gnunet-transport.c:1247
+#: src/transport/gnunet-transport.c:930
 msgid "Disconnected from"
-msgstr ""
+msgstr "Déconnecté de"
 
-#: src/transport/gnunet-transport.c:1271
-#: src/transport/gnunet-transport-profiler.c:458
-#, c-format
-msgid "Received %u bytes from %s\n"
-msgstr ""
+#: src/transport/gnunet-transport.c:965
+#, fuzzy, c-format
+msgid "Received %u bytes\n"
+msgstr "%s message(s) reçu(s)\n"
 
-#: src/transport/gnunet-transport.c:1311
+#: src/transport/gnunet-transport.c:1002
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1323
+#: src/transport/gnunet-transport.c:1014
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1831
-#: src/transport/gnunet-transport-profiler.c:492
-msgid "Failed to send connect request to transport service\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1866
-msgid "Failed to send disconnect request to transport service\n"
+#: src/transport/gnunet-transport.c:1426
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1910
+#: src/transport/gnunet-transport.c:1548
 #, 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:1918
+#: src/transport/gnunet-transport.c:1561
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1937 src/transport/gnunet-transport.c:1967
-#: src/transport/gnunet-transport.c:2000 src/transport/gnunet-transport.c:2026
-#: src/transport/gnunet-transport.c:2085
-#: src/transport/gnunet-transport-profiler.c:578
-msgid "Failed to connect to transport service\n"
+#: src/transport/gnunet-transport.c:1589
+msgid "Failed to connect to transport service for disconnection\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1946 src/transport/gnunet-transport.c:1977
-#: src/transport/gnunet-transport.c:2011
-msgid "Failed to send request to transport service\n"
+#: src/transport/gnunet-transport.c:1595
+msgid "Blacklisting request in place, stop with CTRL-C\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:1618 src/transport/gnunet-transport.c:1648
+#: src/transport/gnunet-transport.c:1701
+msgid "Failed to connect to transport service\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2031
+#: src/transport/gnunet-transport.c:1655
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2133
+#: src/transport/gnunet-transport.c:1725
 msgid "print information for all peers (instead of only connected peers)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2136
+#: src/transport/gnunet-transport.c:1728
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2139
-msgid "connect to a peer"
+#: src/transport/gnunet-transport.c:1731
+msgid "disconnect from a peer"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2142
-msgid "disconnect to a peer"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:2145
-msgid "print information for all pending validations "
-msgstr ""
-
-#: src/transport/gnunet-transport.c:2148
-msgid "print information for all pending validations continuously"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:2151
+#: src/transport/gnunet-transport.c:1734
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2157
+#: src/transport/gnunet-transport.c:1740
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2160
+#: src/transport/gnunet-transport.c:1743
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2163
-#: src/transport/gnunet-transport-profiler.c:638
+#: src/transport/gnunet-transport.c:1746
+#: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2166
+#: src/transport/gnunet-transport.c:1749
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2169
+#: src/transport/gnunet-transport.c:1752
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2172
+#: src/transport/gnunet-transport.c:1755
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2183
-#: src/transport/gnunet-transport-profiler.c:649
+#: src/transport/gnunet-transport.c:1766
+#: src/transport/gnunet-transport-profiler.c:642
 msgid "Direct access to transport service."
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:218
+#: src/transport/gnunet-transport-profiler.c:219
 #, 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
-#, c-format
-msgid "Connected to different peer `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:483
-#, c-format
-msgid "Retrying to connect to `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:508
-#, c-format
-msgid "Denying connection to `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:537
-msgid "Message size too big!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:543
-msgid "No peer identity given\n"
-msgstr ""
-
-#: 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
-#, c-format
-msgid "Trying to receive messages from peer `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:569
-msgid "No operation given\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:623
+#: src/transport/gnunet-transport-profiler.c:616
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:626
+#: src/transport/gnunet-transport-profiler.c:619
 msgid "receive data from peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:629
+#: src/transport/gnunet-transport-profiler.c:622
 msgid "iterations"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:632
+#: src/transport/gnunet-transport-profiler.c:625
 #, fuzzy
 msgid "number of messages to send"
 msgstr "nombre de valeurs"
 
-#: src/transport/gnunet-transport-profiler.c:635
+#: src/transport/gnunet-transport-profiler.c:628
 msgid "message size to use"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1485
+#: src/transport/plugin_transport_http_client.c:1477
 #: src/transport/plugin_transport_http_server.c:2248
-#: src/transport/plugin_transport_http_server.c:3415
-#: src/transport/plugin_transport_tcp.c:2931
-#: src/transport/plugin_transport_tcp.c:2938
+#: src/transport/plugin_transport_http_server.c:3457
+#: src/transport/plugin_transport_tcp.c:3365
+#: src/transport/plugin_transport_tcp.c:3372
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2110
+#: src/transport/plugin_transport_http_client.c:2118
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2159
-#: src/transport/plugin_transport_http_server.c:3149
+#: src/transport/plugin_transport_http_client.c:2167
+#: src/transport/plugin_transport_http_server.c:3172
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2176
-#: src/transport/plugin_transport_http_server.c:3219
+#: src/transport/plugin_transport_http_client.c:2184
+#: src/transport/plugin_transport_http_server.c:3242
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2210
+#: src/transport/plugin_transport_http_client.c:2218
 #, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1734
+#: src/transport/plugin_transport_http_server.c:1729
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -7636,85 +7250,65 @@ msgstr ""
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2617 src/util/service.c:704
-#, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http_server.c:2635 src/util/service.c:723
-#, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr ""
-
 #: src/transport/plugin_transport_http_server.c:2748
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2826
-#: src/transport/plugin_transport_udp.c:3338
+#: src/transport/plugin_transport_http_server.c:2832
+#: src/transport/plugin_transport_udp.c:3600
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2925
+#: src/transport/plugin_transport_http_server.c:2938
 #, c-format
 msgid "IPv4 support is %s\n"
-msgstr ""
+msgstr "Prise en charge d’IPv4 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2940
+#: src/transport/plugin_transport_http_server.c:2953
 #, c-format
 msgid "IPv6 support is %s\n"
-msgstr ""
+msgstr "Prise en charge d’IPv6 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2946
+#: src/transport/plugin_transport_http_server.c:2959
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2957
+#: src/transport/plugin_transport_http_server.c:2970
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2963
+#: src/transport/plugin_transport_http_server.c:2976
 #, c-format
 msgid "Using port %u\n"
-msgstr ""
+msgstr "Utilisation du port %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2977
+#: src/transport/plugin_transport_http_server.c:2995
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2987
-#, c-format
-msgid "Binding to IPv4 address %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http_server.c:3009
+#: src/transport/plugin_transport_http_server.c:3030
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3019
-#, c-format
-msgid "Binding to IPv6 address %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http_server.c:3082
+#: src/transport/plugin_transport_http_server.c:3105
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3103
+#: src/transport/plugin_transport_http_server.c:3126
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3120
+#: src/transport/plugin_transport_http_server.c:3143
 #, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3427
+#: src/transport/plugin_transport_http_server.c:3469
 msgid "Unable to compile URL regex\n"
 msgstr ""
 
@@ -7742,7 +7336,7 @@ msgstr ""
 #: src/transport/plugin_transport_smtp.c:511
 #, c-format
 msgid "SMTP: `%s' failed: %s.\n"
-msgstr ""
+msgstr "SNTP : « %s » échouée : %s.\n"
 
 #: src/transport/plugin_transport_smtp.c:652
 msgid "No email-address specified, can not start SMTP transport.\n"
@@ -7760,101 +7354,96 @@ msgstr ""
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:672
-#: src/transport/plugin_transport_tcp.c:1989
+#: src/transport/plugin_transport_tcp.c:1051
+#: src/transport/plugin_transport_tcp.c:2362
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:855
-#: src/transport/plugin_transport_tcp.c:1081
-#: src/transport/plugin_transport_tcp.c:2259
-#: src/transport/plugin_transport_tcp.c:3050
+#: src/transport/plugin_transport_tcp.c:1234
+#: src/transport/plugin_transport_tcp.c:1458
+#: src/transport/plugin_transport_tcp.c:2633
+#: src/transport/plugin_transport_tcp.c:3490
 msgid "# TCP sessions active"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:897
-#: src/transport/plugin_transport_tcp.c:1063
-#: src/transport/plugin_transport_tcp.c:1187
-#: src/transport/plugin_transport_tcp.c:1260
-#: src/transport/plugin_transport_tcp.c:1360
-#: src/transport/plugin_transport_tcp.c:1385
+msgstr "# Session TCP active"
+
+#: src/transport/plugin_transport_tcp.c:1276
+#: src/transport/plugin_transport_tcp.c:1440
+#: src/transport/plugin_transport_tcp.c:1564
+#: src/transport/plugin_transport_tcp.c:1637
+#: src/transport/plugin_transport_tcp.c:1737
+#: src/transport/plugin_transport_tcp.c:1762
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:900
+#: src/transport/plugin_transport_tcp.c:1279
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1190
+#: src/transport/plugin_transport_tcp.c:1567
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1264
+#: src/transport/plugin_transport_tcp.c:1641
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1659
+#: src/transport/plugin_transport_tcp.c:2032
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1827
+#: src/transport/plugin_transport_tcp.c:2200
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2318
+#: src/transport/plugin_transport_tcp.c:2692
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2509
+#: src/transport/plugin_transport_tcp.c:2883
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2560
-#: src/transport/plugin_transport_tcp.c:2618
+#: src/transport/plugin_transport_tcp.c:2934
+#: src/transport/plugin_transport_tcp.c:2992
+#, fuzzy
 msgid "# TCP server connections active"
-msgstr ""
+msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_tcp.c:2564
+#: src/transport/plugin_transport_tcp.c:2938
 msgid "# TCP server connect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2570
+#: src/transport/plugin_transport_tcp.c:2944
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2572
+#: src/transport/plugin_transport_tcp.c:2946
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2612
+#: src/transport/plugin_transport_tcp.c:2986
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2622
+#: src/transport/plugin_transport_tcp.c:2996
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2865 src/util/service.c:584
-#: src/util/service.c:590
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2881
+#: src/transport/plugin_transport_tcp.c:3315
 msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3038
+#: src/transport/plugin_transport_tcp.c:3478
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3042
+#: src/transport/plugin_transport_tcp.c:3482
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3046
+#: src/transport/plugin_transport_tcp.c:3486
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7863,71 +7452,73 @@ msgstr ""
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:548
+#: 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:569
+#: src/transport/plugin_transport_udp_broadcasting.c:567
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3081
+#: src/transport/plugin_transport_udp.c:3344
 #, 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:3095
+#: src/transport/plugin_transport_udp.c:3358
 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:3414
-#: src/transport/plugin_transport_udp.c:3513
-#, c-format
+#: src/transport/plugin_transport_udp.c:3676
+#: src/transport/plugin_transport_udp.c:3775
+#, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
-msgstr ""
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/transport/plugin_transport_udp.c:3432
+#: src/transport/plugin_transport_udp.c:3694
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3523
+#: src/transport/plugin_transport_udp.c:3785
 msgid "Failed to open UDP sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3594
-#: src/transport/plugin_transport_udp.c:3608
+#: src/transport/plugin_transport_udp.c:3857
+#: src/transport/plugin_transport_udp.c:3871
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3640
+#: src/transport/plugin_transport_udp.c:3903
+#, fuzzy
 msgid "must be valid IPv4 address"
-msgstr ""
+msgstr "adresse invalide"
 
-#: src/transport/plugin_transport_udp.c:3667
+#: src/transport/plugin_transport_udp.c:3930
+#, fuzzy
 msgid "must be valid IPv6 address"
-msgstr ""
+msgstr "adresse invalide"
 
-#: src/transport/plugin_transport_udp.c:3733
+#: src/transport/plugin_transport_udp.c:3996
 msgid "Failed to create UDP network sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1393
+#: src/transport/plugin_transport_unix.c:1403
 #, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1406
+#: src/transport/plugin_transport_unix.c:1416
 #, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1807
+#: src/transport/plugin_transport_unix.c:1816
 msgid "Failed to open UNIX listen socket\n"
 msgstr ""
 
@@ -7940,211 +7531,186 @@ msgid "# Messages defragmented"
 msgstr ""
 
 #: src/transport/plugin_transport_wlan.c:803
-#: src/transport/plugin_transport_wlan.c:890
+#: src/transport/plugin_transport_wlan.c:888
+#, fuzzy
 msgid "# Sessions allocated"
-msgstr ""
+msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_wlan.c:1011
+#: src/transport/plugin_transport_wlan.c:1009
 msgid "# message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1040
+#: src/transport/plugin_transport_wlan.c:1038
 msgid "# messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1171
-#: src/transport/plugin_transport_wlan.c:1264
-#: src/transport/plugin_transport_wlan.c:2268
+#: src/transport/plugin_transport_wlan.c:1167
+#: src/transport/plugin_transport_wlan.c:1258
+#: src/transport/plugin_transport_wlan.c:2280
 msgid "# MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1528
+#: src/transport/plugin_transport_wlan.c:1541
 msgid "# ACKs received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1597
+#: src/transport/plugin_transport_wlan.c:1610
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1703
+#: src/transport/plugin_transport_wlan.c:1714
 msgid "# HELLO beacons sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1820
+#: src/transport/plugin_transport_wlan.c:1831
 msgid "# DATA messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1854
+#: src/transport/plugin_transport_wlan.c:1865
 msgid "# DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2243
+#: src/transport/plugin_transport_wlan.c:2255
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2265
+#: src/transport/plugin_transport_wlan.c:2277
+#, fuzzy
 msgid "# sessions allocated"
-msgstr ""
-
-#: src/transport/transport_api.c:812
-#, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
-msgstr ""
-
-#: src/transport/transport-testing.c:603
-msgid "Failed to initialize testing library!\n"
-msgstr ""
+msgstr "# Session TCP active"
 
 #: src/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
-msgstr ""
+msgstr "Masque érroné : %d\n"
 
-#: src/util/bio.c:170 src/util/bio.c:178
+#: src/util/bio.c:177 src/util/bio.c:185
 #, c-format
 msgid "Error reading `%s': %s"
-msgstr ""
+msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/bio.c:180
+#: src/util/bio.c:187
 msgid "End of file"
-msgstr ""
+msgstr "Fin de fichier"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:244
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:247
+#: src/util/bio.c:254
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:293
+#: src/util/bio.c:300
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:307
+#: src/util/bio.c:314
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:263 src/util/client.c:889 src/util/service.c:621
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/client.c:267 src/util/client.c:894 src/util/service.c:625
-#, c-format
-msgid "Using `%s' instead\n"
-msgstr ""
-
-#: src/util/client.c:362
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
-msgstr ""
-
-#: src/util/client.c:370
+#: src/util/client_new.c:863
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1039
-#, c-format
-msgid "Could not connect to service `%s', configuration broken.\n"
-msgstr ""
-
-#: src/util/client.c:1051
-#, c-format
-msgid "Failure to transmit request to service `%s'\n"
-msgstr ""
-
-#: src/util/common_logging.c:255 src/util/common_logging.c:1035
+#: src/util/common_logging.c:256 src/util/common_logging.c:1129
 msgid "DEBUG"
-msgstr ""
+msgstr "DEBUG"
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1033
+#: src/util/common_logging.c:258 src/util/common_logging.c:1127
 msgid "INFO"
+msgstr "INFO"
+
+#: src/util/common_logging.c:260 src/util/common_logging.c:1125
+msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1031
+#: src/util/common_logging.c:262 src/util/common_logging.c:1123
 msgid "WARNING"
-msgstr ""
+msgstr "AVERTISSEMENT"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1029
+#: src/util/common_logging.c:264 src/util/common_logging.c:1121
 msgid "ERROR"
-msgstr ""
+msgstr "ERREUR"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1037
+#: src/util/common_logging.c:266 src/util/common_logging.c:1131
 msgid "NONE"
-msgstr ""
+msgstr "AUCUN"
 
-#: src/util/common_logging.c:813
+#: src/util/common_logging.c:879
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1038
+#: src/util/common_logging.c:1132
 msgid "INVALID"
-msgstr ""
+msgstr "INVALIDE"
 
-#: src/util/common_logging.c:1154
+#: src/util/common_logging.c:1248
 msgid "unknown address"
-msgstr ""
+msgstr "adresse inconnue"
 
-#: src/util/common_logging.c:1196
+#: src/util/common_logging.c:1290
 msgid "invalid address"
-msgstr ""
+msgstr "adresse invalide"
 
-#: src/util/common_logging.c:1214
+#: src/util/common_logging.c:1308
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1235
+#: src/util/common_logging.c:1329
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr ""
 
-#: src/util/configuration.c:291
+#: src/util/configuration.c:286
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:1028
+#: src/util/configuration.c:344
+#, fuzzy, c-format
+msgid "Error while reading file `%s'\n"
+msgstr "Erreur de lecture : « %s » : %s"
+
+#: src/util/configuration.c:1017
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1147
+#: src/util/configuration.c:1136
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1179
+#: src/util/configuration.c:1169
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1253
+#: src/util/configuration.c:1237
 #, 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:424
+#: src/util/connection.c:441
 #, c-format
 msgid "Access denied to `%s'\n"
 msgstr ""
 
-#: src/util/connection.c:441
+#: src/util/connection.c:458
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
@@ -8209,17 +7775,22 @@ msgstr ""
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:922
+#: src/util/crypto_rsa.c:835
+#, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
+msgstr ""
+
+#: src/util/crypto_rsa.c:1166
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:1221
+#: src/util/disk.c:1245
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/disk.c:1444 src/util/service.c:1328
+#: src/util/disk.c:1486 src/util/service.c:1322 src/util/service_new.c:1371
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
@@ -8284,137 +7855,148 @@ msgstr ""
 msgid "Use %s to get a list of options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:90
+#: src/util/getopt_helpers.c:91
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:274 src/util/getopt_helpers.c:332
+#: src/util/getopt_helpers.c:278 src/util/getopt_helpers.c:336
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:304
+#: src/util/getopt_helpers.c:308
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:111
+#: src/util/gnunet-config.c:124
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/util/gnunet-config.c:137
 #, c-format
 msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:113
+#: src/util/gnunet-config.c:140
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:157
+#: src/util/gnunet-config.c:191
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:184
+#: src/util/gnunet-config.c:228
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:187
+#: src/util/gnunet-config.c:231
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:190
+#: src/util/gnunet-config.c:234
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:193
+#: src/util/gnunet-config.c:237
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:196
+#: src/util/gnunet-config.c:240
 msgid "print available configuration sections"
 msgstr ""
 
-#: src/util/gnunet-config.c:205
+#: src/util/gnunet-config.c:243
+msgid "write configuration file that only contains delta to defaults"
+msgstr ""
+
+#: src/util/gnunet-config.c:252
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:81
+#: src/util/gnunet-ecc.c:84
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:117
+#: src/util/gnunet-ecc.c:120
 #, c-format
 msgid "Generating %u keys like %s, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:130
+#: src/util/gnunet-ecc.c:133
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:171
+#: src/util/gnunet-ecc.c:174
 #, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:181
+#: src/util/gnunet-ecc.c:184
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
+"\n"
+"Terminé !\n"
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:187
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:277
+#: src/util/gnunet-ecc.c:280
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:288
+#: src/util/gnunet-ecc.c:291
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:310
+#: src/util/gnunet-ecc.c:313
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:361
+#: src/util/gnunet-ecc.c:364
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:411
+#: src/util/gnunet-ecc.c:414
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:414
+#: src/util/gnunet-ecc.c:417
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:417
+#: src/util/gnunet-ecc.c:420
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:420
+#: src/util/gnunet-ecc.c:423
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:423
+#: src/util/gnunet-ecc.c:426
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:434
+#: src/util/gnunet-ecc.c:437
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -8426,77 +8008,77 @@ msgstr ""
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:233
+#: src/util/gnunet-scrypt.c:242
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:294
+#: src/util/gnunet-scrypt.c:314
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:297
+#: src/util/gnunet-scrypt.c:317
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:300
+#: src/util/gnunet-scrypt.c:320
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:303
+#: src/util/gnunet-scrypt.c:323
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:315
+#: src/util/gnunet-scrypt.c:336
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:327
+#: src/util/gnunet-service-resolver.c:371
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:400
-#: src/util/gnunet-service-resolver.c:441
+#: src/util/gnunet-service-resolver.c:460
+#: src/util/gnunet-service-resolver.c:512
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:84
+#: src/util/gnunet-uri.c:85
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:89
+#: src/util/gnunet-uri.c:91
 #, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:96
+#: src/util/gnunet-uri.c:98
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:106
+#: src/util/gnunet-uri.c:108
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:168
+#: src/util/gnunet-uri.c:170
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:342
+#: src/util/helper.c:331
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr ""
 
-#: src/util/helper.c:388
+#: src/util/helper.c:382
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:620
+#: src/util/helper.c:601
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
@@ -8506,30 +8088,30 @@ msgstr ""
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1681 src/util/network.c:1857
+#: src/util/network.c:1737 src/util/network.c:1913
 #, 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:501
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:768
+#: src/util/os_installation.c:861
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:828
+#: src/util/os_installation.c:921
 #, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/os_installation.c:838
+#: src/util/os_installation.c:931
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8553,69 +8135,76 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/program.c:246 src/util/service.c:1462
+#: src/util/program.c:244 src/util/service.c:1456 src/util/service_new.c:1801
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/util/program.c:258 src/util/service.c:1477
+#: src/util/program.c:256 src/util/service.c:1471 src/util/service_new.c:1818
 #, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr ""
 
-#: src/util/program.c:263 src/util/service.c:1472
+#: src/util/program.c:261 src/util/service.c:1466 src/util/service_new.c:1812
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
-#: src/util/resolver_api.c:201
+#: src/util/resolver_api.c:204
 #, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
+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:223
 #, 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 ""
 
-#: src/util/resolver_api.c:354
+#: src/util/resolver_api.c:815
 #, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
+msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:361
+#: src/util/resolver_api.c:827
 #, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
+msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1023
-#, c-format
-msgid "Could not resolve our FQDN : %s\n"
+#: src/util/resolver_api.c:1004
+msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/server.c:483
+#: src/util/resolver_api.c:1086 src/util/resolver_api.c:1107
+#: src/util/resolver_api.c:1121
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/util/server.c:478 src/util/service_new.c:1103
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/util/server.c:493
+#: src/util/server.c:488 src/util/service_new.c:1113
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:499
+#: src/util/server.c:494 src/util/service_new.c:1119
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/util/server.c:904
+#: src/util/server.c:894
 #, 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
+#: src/util/service.c:347 src/util/service_new.c:2335
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -8625,386 +8214,400 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:410
+#: src/util/service.c:410 src/util/service_new.c:431
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:448
+#: src/util/service.c:448 src/util/service_new.c:474
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:565
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:656
-#, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:673
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
-msgstr ""
-
-#: src/util/service.c:912
+#: src/util/service.c:912 src/util/service_new.c:1034
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:961 src/util/service.c:979
+#: src/util/service.c:961 src/util/service.c:979 src/util/service_new.c:1186
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1004
+#: src/util/service.c:1004 src/util/service_new.c:1218
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1175
+#: src/util/service.c:1170
 #, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr ""
 
-#: src/util/service.c:1217
+#: src/util/service.c:1211
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1266
+#: src/util/service.c:1260 src/util/service_new.c:1493
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1270
+#: src/util/service.c:1264 src/util/service_new.c:1497
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1274
+#: src/util/service.c:1268 src/util/service_new.c:1501
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1329
+#: src/util/service.c:1323 src/util/service_new.c:1373
 msgid "No such user"
-msgstr ""
+msgstr "Aucun utilisateur trouvé"
 
-#: src/util/service.c:1342
+#: src/util/service.c:1336 src/util/service_new.c:1392
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/util/service.c:1412
+#: src/util/service.c:1406 src/util/service_new.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
+#: src/util/service_new.c:1298
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
+#: src/util/service_new.c:2085
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
+msgstr ""
+
 #: src/util/signal.c:89
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
+#: src/util/socks.c:586
+#, c-format
+msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
+msgstr ""
+
+#: src/util/socks.c:599
+#, c-format
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
+msgstr ""
+
 #: src/util/strings.c:146
 msgid "b"
-msgstr ""
+msgstr "o"
 
-#: src/util/strings.c:437
+#: src/util/strings.c:441
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:565
+#: src/util/strings.c:568
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:662
+#: src/util/strings.c:672
 msgid "µs"
-msgstr ""
+msgstr "µs"
 
-#: src/util/strings.c:666
+#: src/util/strings.c:676
 msgid "forever"
-msgstr ""
+msgstr "perpetuel"
 
-#: src/util/strings.c:668
+#: src/util/strings.c:678
 msgid "0 ms"
-msgstr ""
+msgstr "0 ms"
 
-#: src/util/strings.c:674
+#: src/util/strings.c:684
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
-#: src/util/strings.c:680
+#: src/util/strings.c:690
 msgid "s"
-msgstr ""
+msgstr "s"
 
-#: src/util/strings.c:686
+#: src/util/strings.c:696
 msgid "m"
-msgstr ""
+msgstr "m"
 
-#: src/util/strings.c:692
+#: src/util/strings.c:702
 msgid "h"
-msgstr ""
+msgstr "h"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:709
 msgid "day"
-msgstr ""
+msgstr "jour"
 
-#: src/util/strings.c:701
+#: src/util/strings.c:711
 msgid "days"
-msgstr ""
+msgstr "jours"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:740
 msgid "end of time"
-msgstr ""
+msgstr "fin du temps"
 
-#: src/util/strings.c:1229
+#: src/util/strings.c:1239
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1237
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1243
+#: src/util/strings.c:1253
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1250
+#: src/util/strings.c:1260
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1259
+#: src/util/strings.c:1269
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1465 src/util/strings.c:1481
+#: src/util/strings.c:1475 src/util/strings.c:1491
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1490
+#: src/util/strings.c:1500
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1573 src/util/strings.c:1604 src/util/strings.c:1652
-#: src/util/strings.c:1673
+#: src/util/strings.c:1583 src/util/strings.c:1614 src/util/strings.c:1662
+#: src/util/strings.c:1683
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1630
+#: src/util/strings.c:1640
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1682
+#: src/util/strings.c:1692
 #, c-format
 msgid "Invalid format: `%s'\n"
-msgstr ""
+msgstr "fornat invalide : « %s »\n"
 
-#: src/util/strings.c:1734
+#: src/util/strings.c:1744
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1784
+#: src/util/strings.c:1794
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1815
+#: src/util/strings.c:1825
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:556 src/vpn/gnunet-service-vpn.c:1113
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
 msgid "# Active channels"
-msgstr ""
+msgstr "# Canaux actifs"
 
-#: src/vpn/gnunet-service-vpn.c:632
+#: src/vpn/gnunet-service-vpn.c:629
 msgid "# Bytes given to cadet for transmission"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:670
+#: src/vpn/gnunet-service-vpn.c:667
 msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:781
+#: src/vpn/gnunet-service-vpn.c:783
 msgid "# Cadet channels created"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:809
-msgid "Failed to setup cadet channel!\n"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:1008
+#: src/vpn/gnunet-service-vpn.c:1005
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1133
+#: src/vpn/gnunet-service-vpn.c:1145
 msgid "# Packets dropped (channel not yet online)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1344
+#: src/vpn/gnunet-service-vpn.c:1353
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1365
+#: src/vpn/gnunet-service-vpn.c:1374
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1571
+#: src/vpn/gnunet-service-vpn.c:1580
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1604 src/vpn/gnunet-service-vpn.c:1640
+#: src/vpn/gnunet-service-vpn.c:1613 src/vpn/gnunet-service-vpn.c:1649
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1650
+#: src/vpn/gnunet-service-vpn.c:1659
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1664
+#: src/vpn/gnunet-service-vpn.c:1673
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1746
+#: src/vpn/gnunet-service-vpn.c:1755
 msgid "# ICMP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2086
+#: src/vpn/gnunet-service-vpn.c:2095
 msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2242
+#: src/vpn/gnunet-service-vpn.c:2251
 msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2394
+#: src/vpn/gnunet-service-vpn.c:2403
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2449
+#: src/vpn/gnunet-service-vpn.c:2458
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2491 src/vpn/gnunet-service-vpn.c:2702
+#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2722
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2753
+#: src/vpn/gnunet-service-vpn.c:2771
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3019
+#: src/vpn/gnunet-service-vpn.c:3063
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3043
+#: src/vpn/gnunet-service-vpn.c:3087
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3051
+#: src/vpn/gnunet-service-vpn.c:3095
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3064
+#: src/vpn/gnunet-service-vpn.c:3108
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3077
+#: src/vpn/gnunet-service-vpn.c:3121
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3087
+#: src/vpn/gnunet-service-vpn.c:3131
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
 #: src/vpn/gnunet-vpn.c:147
 msgid "Error creating tunnel\n"
-msgstr ""
+msgstr "Erreur de création du tunnel\n"
 
-#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
+#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:204
 #, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:215
+#: src/vpn/gnunet-vpn.c:216
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:235
+#: src/vpn/gnunet-vpn.c:236
 #, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:255
+#: src/vpn/gnunet-vpn.c:256
 #, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:290
+#: src/vpn/gnunet-vpn.c:291
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:293
+#: src/vpn/gnunet-vpn.c:294
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:297
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:299
+#: src/vpn/gnunet-vpn.c:300
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:303
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:305
+#: src/vpn/gnunet-vpn.c:306
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:308
+#: src/vpn/gnunet-vpn.c:309
 msgid "service is offered via TCP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:311
+#: src/vpn/gnunet-vpn.c:312
 msgid "service is offered via UDP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:324
 msgid "Setup tunnels via VPN."
-msgstr ""
+msgstr "Configurer des tunnels via VPN."
 
-#: src/include/gnunet_common.h:635 src/include/gnunet_common.h:642
-#: src/include/gnunet_common.h:650
+#: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
+#: src/include/gnunet_common.h:660
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:662
+#: src/include/gnunet_common.h:672
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:698
+#: src/include/gnunet_common.h:699 src/include/gnunet_common.h:708
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
+
+#~ msgid "Benchmarking done\n"
+#~ msgstr "Benchmark terminé\n"
+
+#, fuzzy
+#~ msgid "number too large"
+#~ msgstr "nombre de valeurs"
+
+#~ msgid "unknown error"
+#~ msgstr "erreur unconnue."
+
+#, fuzzy
+#~ msgid "Failed to setup cadet channel!\n"
+#~ msgstr "Échec du démarrage de %s\n"