version bump, update ChangeLog, fix make dist

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

diff --git a/po/fr.po b/po/fr.po
index a4df4ae7dd1f9443a2449ff49fc601d25c45b6d4..7b3495dfead9e3dcc91ba6932dcccfe25c967493 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2016-11-27 09:18+0100\n"
+"POT-Creation-Date: 2019-02-28 10:53+0100\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"
@@ -16,120 +16,106 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/gnunet-arm.c:152
+#: src/arm/gnunet-arm.c:156
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:158
+#: src/arm/gnunet-arm.c:162
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:213 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:215
-msgid "Misconfiguration (can not connect to the ARM service)"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:217 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1145
-msgid "ARM API is busy"
-msgstr "API ARM occupé"
-
-#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1147
-msgid "Request timed out"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
 msgid "Unknown request status"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:239 src/testbed/gnunet-service-testbed_peers.c:1165
-#, c-format
-msgid "%s is stopped"
+#: src/arm/gnunet-arm.c:242
+#, fuzzy
+msgid "is stopped"
 msgstr "%s est arrêté"
 
-#: src/arm/gnunet-arm.c:241 src/testbed/gnunet-service-testbed_peers.c:1167
-#, c-format
-msgid "%s is starting"
+#: src/arm/gnunet-arm.c:244
+#, fuzzy
+msgid "is starting"
 msgstr "%s est en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1169
-#, c-format
-msgid "%s is stopping"
+#: src/arm/gnunet-arm.c:246
+#, fuzzy
+msgid "is stopping"
 msgstr "%s est en cours d'arrêt"
 
-#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1171
-#, c-format
-msgid "%s is starting already"
+#: src/arm/gnunet-arm.c:248
+#, fuzzy
+msgid "is starting already"
 msgstr "%s est déjà en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1173
-#, c-format
-msgid "%s is stopping already"
+#: src/arm/gnunet-arm.c:250
+#, fuzzy
+msgid "is stopping already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1175
-#, c-format
-msgid "%s is started already"
+#: src/arm/gnunet-arm.c:252
+#, fuzzy
+msgid "is started already"
 msgstr "%s est déjà démarré"
 
-#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1177
-#, c-format
-msgid "%s is stopped already"
+#: src/arm/gnunet-arm.c:254
+#, fuzzy
+msgid "is stopped already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1179
-#, c-format
-msgid "%s service is not known to ARM"
+#: src/arm/gnunet-arm.c:256
+msgid "service is not known to ARM"
 msgstr ""
 
-#: 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:258
+#, fuzzy
+msgid "service failed to start"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/arm/gnunet-arm.c:257
-#, c-format
-msgid "%s service cannot be started because ARM is shutting down"
+#: src/arm/gnunet-arm.c:260
+msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1185
-#, c-format
-msgid "%.s Unknown result code."
+#: src/arm/gnunet-arm.c:262
+#, fuzzy
+msgid "Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
 
-#: src/arm/gnunet-arm.c:291
+#: src/arm/gnunet-arm.c:295
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
+#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:368
 #, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:375
+#: src/arm/gnunet-arm.c:379
 #, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
 
-#: 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:419
+#, fuzzy, c-format
+msgid "Failed to send a request to start the `%s' service: %s\n"
+msgstr "Dernier message reçu de %s\n"
 
-#: src/arm/gnunet-arm.c:428
+#: src/arm/gnunet-arm.c:429
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr ""
@@ -157,200 +143,213 @@ msgstr ""
 msgid "Running services:\n"
 msgstr "Services en exécution :\n"
 
-#: src/arm/gnunet-arm.c:622
+#: src/arm/gnunet-arm.c:623
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:654
+#: src/arm/gnunet-arm.c:656
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "Arrêté %s.\n"
 
-#: src/arm/gnunet-arm.c:657
+#: src/arm/gnunet-arm.c:659
 #, c-format
 msgid "Starting %s...\n"
 msgstr "En cous de démarrage %s…\n"
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:662
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "En cour d'arrêt %s…\n"
 
-#: src/arm/gnunet-arm.c:674
+#: src/arm/gnunet-arm.c:676
 #, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:756
+#: src/arm/gnunet-arm.c:766
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:758
+#: src/arm/gnunet-arm.c:771
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:760
+#: src/arm/gnunet-arm.c:776
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:762
+#: src/arm/gnunet-arm.c:780
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:765
+#: src/arm/gnunet-arm.c:784
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:768
+#: src/arm/gnunet-arm.c:788
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:792
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:773
+#: src/arm/gnunet-arm.c:796
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:801
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:805
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:809
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:782
+#: src/arm/gnunet-arm.c:813
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:794
+#: src/arm/gnunet-arm.c:828
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
-#: src/util/service.c:565 src/util/service_new.c:612
+#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120
+#: src/transport/plugin_transport_xt.c:1120
+#: src/transport/tcp_service_legacy.c:557 src/util/service.c:1167
 #, 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:637
-#: src/util/service_new.c:643
+#: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
+#: src/transport/plugin_transport_tcp.c:1139
+#: src/transport/plugin_transport_tcp.c:1145
+#: src/transport/plugin_transport_tcp.c:3835
+#: src/transport/plugin_transport_xt.c:1139
+#: src/transport/plugin_transport_xt.c:1145
+#: src/transport/plugin_transport_xt.c:3833
+#: src/transport/tcp_service_legacy.c:576
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1192
+#: src/util/service.c:1198
 #, 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:682
+#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176
+#: src/transport/plugin_transport_xt.c:1176
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506
+#: src/util/service.c:1237
 #, 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:687
+#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180
+#: src/transport/plugin_transport_xt.c:1180
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511
+#: src/util/service.c:1242
 #, 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:723
+#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211
+#: src/transport/plugin_transport_xt.c:1211
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1278
 #, 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:741
+#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228
+#: src/transport/plugin_transport_xt.c:1228
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1296
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: 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:782
+#: src/arm/gnunet-service-arm.c:556
+#: src/transport/plugin_transport_http_server.c:2688
+#: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/plugin_transport_xt.c:1259
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1337
 #, 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:802
+#: src/arm/gnunet-service-arm.c:575
+#: src/transport/plugin_transport_http_server.c:2706
+#: src/transport/plugin_transport_tcp.c:1278
+#: src/transport/plugin_transport_xt.c:1278
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1357
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:932
+#: src/arm/gnunet-service-arm.c:986
 #, c-format
 msgid "Failed to start service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:943
+#: src/arm/gnunet-service-arm.c:997
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1055
+#: src/arm/gnunet-service-arm.c:1109
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1090
+#: src/arm/gnunet-service-arm.c:1144
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1133
+#: src/arm/gnunet-service-arm.c:1187
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1309
+#: src/arm/gnunet-service-arm.c:1346
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1611
+#: src/arm/gnunet-service-arm.c:1651
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1771
+#: src/arm/gnunet-service-arm.c:1812
 msgid "exit"
 msgstr "exit"
 
-#: src/arm/gnunet-service-arm.c:1776
+#: src/arm/gnunet-service-arm.c:1817
 msgid "signal"
 msgstr "signal"
 
-#: src/arm/gnunet-service-arm.c:1781
+#: src/arm/gnunet-service-arm.c:1822
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/arm/gnunet-service-arm.c:1787
+#: src/arm/gnunet-service-arm.c:1828
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1813
+#: src/arm/gnunet-service-arm.c:1854
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1829
+#: src/arm/gnunet-service-arm.c:1870
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -380,33 +379,33 @@ msgid ""
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939
 msgid "solver to use"
 msgstr "solveur utilisé"
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:938
-#: src/ats-tests/gnunet-solver-eval.c:941
+#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3299
-msgid "be verbose"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3302
+#: src/ats/gnunet-ats-solver-eval.c:3306
 msgid "print logging"
 msgstr "afficher le journal"
 
-#: src/ats/gnunet-ats-solver-eval.c:3305
+#: src/ats/gnunet-ats-solver-eval.c:3311
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3308
+#: src/ats/gnunet-ats-solver-eval.c:3316
 msgid "disable normalization"
 msgstr ""
 
+#: src/ats/gnunet-service-ats-new.c:756
+#: src/ats/gnunet-service-ats_plugins.c:451
+#, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr ""
+
 #: src/ats/gnunet-service-ats_plugins.c:304
 #, c-format
 msgid ""
@@ -425,33 +424,35 @@ msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:451
+#: src/ats/plugin_ats2_common.c:90
 #, c-format
-msgid "Failed to initialize solver `%s'!\n"
+msgid ""
+"Could not load %s quota for network `%s': `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
 #: src/ats/plugin_ats_mlp.c:1274
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1869
+#: src/ats/plugin_ats_mlp.c:1870
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1913
+#: src/ats/plugin_ats_mlp.c:1914
 #, c-format
 msgid "Updating address property for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2475
+#: src/ats/plugin_ats_mlp.c:2476
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 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:1141
+#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
+#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
+#: src/ats/plugin_ats_mlp.c:2602 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
@@ -460,27 +461,27 @@ msgstr ""
 msgid "Invalid %s configuration %f \n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/ats/plugin_ats_mlp.c:2670
+#: src/ats/plugin_ats_mlp.c:2671
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2679
+#: src/ats/plugin_ats_mlp.c:2680
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2689
+#: src/ats/plugin_ats_mlp.c:2690
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2698
+#: src/ats/plugin_ats_mlp.c:2699
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
@@ -491,12 +492,12 @@ msgstr ""
 msgid "Invalid %s configuration %f\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/ats-tests/ats-testing.c:441
+#: src/ats-tests/ats-testing.c:422
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:448
+#: src/ats-tests/ats-testing.c:429
 #, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr ""
@@ -510,7 +511,7 @@ msgstr "Arrêter la journalisation\n"
 msgid "Start logging `%s'\n"
 msgstr "Démarrer la journalisation « %s »\n"
 
-#: src/ats-tests/gnunet-ats-sim.c:88
+#: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
@@ -553,7 +554,6 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1476
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
@@ -584,403 +584,434 @@ msgstr ""
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:949
+#: src/ats-tool/gnunet-ats.c:950
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:951
+#: src/ats-tool/gnunet-ats.c:954
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:954
+#: src/ats-tool/gnunet-ats.c:960
 #, fuzzy
 msgid "connect to PEER"
 msgstr "Connecté à"
 
-#: src/ats-tool/gnunet-ats.c:957
+#: src/ats-tool/gnunet-ats.c:964
 msgid "do not resolve IP addresses to hostnames"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:959
+#: src/ats-tool/gnunet-ats.c:969
 msgid "monitor mode"
 msgstr "mode moniteur"
 
-#: src/ats-tool/gnunet-ats.c:961
+#: src/ats-tool/gnunet-ats.c:974
 msgid "set preference for the given peer"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:963
+#: src/ats-tool/gnunet-ats.c:979
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:965
+#: src/ats-tool/gnunet-ats.c:984
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:968
+#: src/ats-tool/gnunet-ats.c:990
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:970
+#: src/ats-tool/gnunet-ats.c:996
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:973
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:1011
 msgid "Print information about ATS state"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:511
-#, c-format
-msgid "Invalid target `%s'\n"
+#: src/auction/gnunet-auction-create.c:163
+msgid "description of the item to be sold"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:787
-#, c-format
-msgid "Invalid peer ID `%s'\n"
+#: src/auction/gnunet-auction-create.c:169
+msgid "mapping of possible prices"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:825
-#, c-format
-msgid "Invalid tunnel owner `%s'\n"
+#: src/auction/gnunet-auction-create.c:175
+msgid "max duration per round"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:181
+msgid "duration until auction starts"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:186
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:193
+msgid "public auction outcome"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:198
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:209
+msgid "create a new auction and start listening for bidders"
+msgstr ""
+
+#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
+#: src/conversation/gnunet-conversation-test.c:254
+#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76
+msgid "help text"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:892
-msgid "You must NOT give a TARGET when using 'request all' options\n"
+#: src/cadet/gnunet-cadet.c:631
+#, c-format
+msgid "Invalid peer ID `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:982
-msgid "provide information about a particular connection"
+#: src/cadet/gnunet-cadet.c:718
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:985
-msgid "activate echo mode"
+#: src/cadet/gnunet-cadet.c:795
+#, c-format
+msgid "Invalid target `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:988
-msgid "dump debug information to STDERR"
+#: src/cadet/gnunet-cadet.c:832
+msgid "No action requested\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:994
-msgid "port to listen to"
+#: src/cadet/gnunet-cadet.c:857
+msgid "Provide information about a particular connection"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:997
-msgid "provide information about a patricular peer"
+#: src/cadet/gnunet-cadet.c:861
+msgid "Activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:1000
-msgid "provide information about all peers"
+#: src/cadet/gnunet-cadet.c:866
+msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:1003
-msgid "provide information about a particular tunnel"
+#: src/cadet/gnunet-cadet.c:871
+msgid "Provide information about a patricular peer"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:1006
-msgid "provide information about all tunnels"
+#: src/cadet/gnunet-cadet.c:875
+msgid "Provide information about all peers"
 msgstr ""
 
-#: src/cadet/gnunet-service-cadet_peer.c:681
-msgid "Wrong CORE service\n"
+#: src/cadet/gnunet-cadet.c:879
+msgid "Provide information about all tunnels"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:499
-#: src/secretsharing/gnunet-secretsharing-profiler.c:607
+#: src/consensus/gnunet-consensus-profiler.c:523
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 msgid "number of peers in consensus"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:502
+#: src/consensus/gnunet-consensus-profiler.c:529
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
 
-#: 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
+#: src/consensus/gnunet-consensus-profiler.c:535
+#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439
+#: src/set/gnunet-set-profiler.c:462
 msgid "number of values"
 msgstr "nombre de valeurs"
 
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:541
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:511
+#: src/consensus/gnunet-consensus-profiler.c:548
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:514
-#: src/set/gnunet-set-profiler.c:390
+#: src/consensus/gnunet-consensus-profiler.c:554
+#: src/set/gnunet-set-profiler.c:480
 msgid "write statistics to file"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:517
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+#: src/consensus/gnunet-consensus-profiler.c:559
+msgid "distribute elements to a static subset of good peers"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:564
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:513
-#: src/conversation/conversation_api_call.c:490
+#: src/conversation/conversation_api.c:515
+#: src/conversation/conversation_api_call.c:494
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:269
+#: src/conversation/gnunet-conversation.c:277
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:294
+#: src/conversation/gnunet-conversation.c:302
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:329
+#: src/conversation/gnunet-conversation.c:337
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:334
+#: src/conversation/gnunet-conversation.c:342
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:352
+#: src/conversation/gnunet-conversation.c:360
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:367
+#: src/conversation/gnunet-conversation.c:375
 msgid "Failed to setup phone (internal error)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:379
+#: src/conversation/gnunet-conversation.c:387
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:401
+#: src/conversation/gnunet-conversation.c:411
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:408
+#: src/conversation/gnunet-conversation.c:418
 #, c-format
 msgid "Connection established to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:415
+#: src/conversation/gnunet-conversation.c:425
 #, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:433
 #, fuzzy, c-format
 msgid "Call to `%s' terminated\n"
 msgstr "Appel terminé\n"
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/conversation/gnunet-conversation.c:442
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:438
+#: src/conversation/gnunet-conversation.c:448
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:443
+#: src/conversation/gnunet-conversation.c:453
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:512
+#: src/conversation/gnunet-conversation.c:524
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Commande « %s » inconnue\n"
 
-#: src/conversation/gnunet-conversation.c:528
-#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:540
+#: src/conversation/gnunet-conversation.c:554
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:535
-#: src/conversation/gnunet-conversation.c:592
+#: src/conversation/gnunet-conversation.c:547
+#: src/conversation/gnunet-conversation.c:603
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:550
-#: src/conversation/gnunet-conversation.c:605
+#: src/conversation/gnunet-conversation.c:562
+#: src/conversation/gnunet-conversation.c:616
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:572
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:627
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:633
+#: src/conversation/gnunet-conversation.c:644
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:663
+#: src/conversation/gnunet-conversation.c:675
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
+#: src/conversation/gnunet-conversation.c:699
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:691
+#: src/conversation/gnunet-conversation.c:704
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:697
-#: src/conversation/gnunet-conversation.c:721
+#: src/conversation/gnunet-conversation.c:710
+#: src/conversation/gnunet-conversation.c:734
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:702
+#: src/conversation/gnunet-conversation.c:715
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/conversation/gnunet-conversation.c:724
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:716
+#: src/conversation/gnunet-conversation.c:729
 #, c-format
-msgid "We are calling `%s', his phone should be ringing.\n"
+msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:735
+#: src/conversation/gnunet-conversation.c:748
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:741
+#: src/conversation/gnunet-conversation.c:754
 #, c-format
 msgid "#%u: `%s'\n"
 msgstr "#%u : « %s »\n"
 
-#: src/conversation/gnunet-conversation.c:769
-#: src/conversation/gnunet-conversation.c:784
+#: src/conversation/gnunet-conversation.c:783
+#: src/conversation/gnunet-conversation.c:798
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:817
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:831
+#: src/conversation/gnunet-conversation.c:847
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:840
+#: src/conversation/gnunet-conversation.c:854
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:849
+#: src/conversation/gnunet-conversation.c:863
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:866
+#: src/conversation/gnunet-conversation.c:880
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:901
+#: src/conversation/gnunet-conversation.c:915
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:909
+#: src/conversation/gnunet-conversation.c:923
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:926
+#: src/conversation/gnunet-conversation.c:940
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/conversation/gnunet-conversation.c:966
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:954
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:956
+#: src/conversation/gnunet-conversation.c:970
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/conversation/gnunet-conversation.c:972
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:960
+#: src/conversation/gnunet-conversation.c:974
 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:962
+#: src/conversation/gnunet-conversation.c:976
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:964
+#: src/conversation/gnunet-conversation.c:978
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:966
+#: src/conversation/gnunet-conversation.c:980
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:968
+#: src/conversation/gnunet-conversation.c:982
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1172
+#: src/conversation/gnunet-conversation.c:1198
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1185
+#: src/conversation/gnunet-conversation.c:1211
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1220
+#: src/conversation/gnunet-conversation.c:1249
 msgid "You must specify the NAME of an ego to use\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1244
+#: src/conversation/gnunet-conversation.c:1273
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1270
-msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+#: src/conversation/gnunet-conversation.c:1302
+msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1307
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1299
+#: src/conversation/gnunet-conversation.c:1336
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:119
+#: src/conversation/gnunet-conversation-test.c:120
 #, c-format
 msgid ""
 "\n"
@@ -995,154 +1026,154 @@ msgid ""
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:210
+#: src/conversation/gnunet-conversation-test.c:216
 #, 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:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
-msgid "help text"
-msgstr ""
-
-#: src/conversation/gnunet_gst.c:630
-#: src/conversation/gnunet-helper-audio-playback-gst.c:357
+#: src/conversation/gnunet_gst.c:622
+#: src/conversation/gnunet-helper-audio-playback-gst.c:361
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:320
+#: src/conversation/gnunet-helper-audio-playback.c:325
 #, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "pa_stream_write() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:608
+#: src/conversation/gnunet-helper-audio-playback.c:627
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:633
-#: src/conversation/gnunet-helper-audio-record.c:545
+#: src/conversation/gnunet-helper-audio-playback.c:653
+#: src/conversation/gnunet-helper-audio-record.c:563
 msgid "Connection established.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:638
-#: src/conversation/gnunet-helper-audio-record.c:550
+#: src/conversation/gnunet-helper-audio-playback.c:658
+#: src/conversation/gnunet-helper-audio-record.c:568
 #, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "pa_stream_new() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:652
+#: src/conversation/gnunet-helper-audio-playback.c:672
 #, 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:665
-#: src/conversation/gnunet-helper-audio-record.c:576
+#: src/conversation/gnunet-helper-audio-playback.c:685
+#: src/conversation/gnunet-helper-audio-record.c:594
 #, c-format
 msgid "Connection failure: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:686
-#: src/conversation/gnunet-helper-audio-record.c:599
+#: src/conversation/gnunet-helper-audio-playback.c:706
+#: src/conversation/gnunet-helper-audio-record.c:617
 msgid "Wrong Spec\n"
 msgstr "Spécification incorrecte\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:692
-#: src/conversation/gnunet-helper-audio-record.c:605
+#: src/conversation/gnunet-helper-audio-playback.c:712
+#: src/conversation/gnunet-helper-audio-record.c:623
 msgid "pa_mainloop_new() failed.\n"
 msgstr "pa_mainloop_new() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:706
-#: src/conversation/gnunet-helper-audio-record.c:620
+#: src/conversation/gnunet-helper-audio-playback.c:726
+#: src/conversation/gnunet-helper-audio-record.c:638
 msgid "pa_context_new() failed.\n"
 msgstr "pa_context_new() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:713
-#: src/conversation/gnunet-helper-audio-record.c:626
+#: src/conversation/gnunet-helper-audio-playback.c:733
+#: src/conversation/gnunet-helper-audio-record.c:644
 #, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "pa_context_connect() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:719
-#: src/conversation/gnunet-helper-audio-record.c:632
+#: src/conversation/gnunet-helper-audio-playback.c:739
+#: src/conversation/gnunet-helper-audio-record.c:650
 msgid "pa_mainloop_run() failed.\n"
 msgstr "pa_mainloop_run() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:789
+#: src/conversation/gnunet-helper-audio-playback.c:818
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:344
+#: src/conversation/gnunet-helper-audio-record.c:353
 #, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
 msgstr "opus_encode_float() échoué : %s. Annulation\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:420
+#: src/conversation/gnunet-helper-audio-record.c:432
 #, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr "pa_stream_peek() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:458
+#: src/conversation/gnunet-helper-audio-record.c:474
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:483
+#: src/conversation/gnunet-helper-audio-record.c:500
 msgid "Stream successfully created.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:488
+#: src/conversation/gnunet-helper-audio-record.c:505
 #, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "pa_stream_get_buffer_attr() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:496
+#: src/conversation/gnunet-helper-audio-record.c:513
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:500
+#: src/conversation/gnunet-helper-audio-record.c:517
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:507
+#: src/conversation/gnunet-helper-audio-record.c:524
 #, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:516
+#: src/conversation/gnunet-helper-audio-record.c:533
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:563
+#: src/conversation/gnunet-helper-audio-record.c:581
 #, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr "pa_stream_connect_record() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:676
+#: src/conversation/gnunet-helper-audio-record.c:695
 msgid "ogg_stream_init() failed.\n"
 msgstr "ogg_stream_init() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:721
+#: src/conversation/gnunet-helper-audio-record.c:740
 #, c-format
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr ""
 
+#: src/conversation/gnunet-service-conversation.c:1305
+#, c-format
+msgid "Could not open line, port %s already in use!\n"
+msgstr ""
+
 #: src/conversation/microphone.c:121
 msgid "Could not start record audio helper\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:71
+#: src/conversation/plugin_gnsrecord_conversation.c:72
 #, c-format
 msgid "PHONE version %u not supported\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:133
-#: src/conversation/plugin_gnsrecord_conversation.c:147
+#: src/conversation/plugin_gnsrecord_conversation.c:135
+#: src/conversation/plugin_gnsrecord_conversation.c:149
 #, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr ""
@@ -1199,537 +1230,708 @@ msgstr ""
 msgid "Failed to connect to CORE service!\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1677
+#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:185
+#: src/core/gnunet-core.c:186
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:339
+#: src/core/gnunet-service-core.c:347
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:363
+#: src/core/gnunet-service-core.c:371
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:432
+#: src/core/gnunet-service-core.c:443
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:530
+#: src/core/gnunet-service-core.c:541
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:928
+#: src/core/gnunet-service-core.c:879
+#, c-format
+msgid "# messages of type %u discarded (client busy)"
+msgstr ""
+
+#: src/core/gnunet-service-core.c:988
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:949
+#: src/core/gnunet-service-core.c:1009
 #, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:566
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:626
+#: src/core/gnunet-service-core_kx.c:677
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:726
+#: src/core/gnunet-service-core_kx.c:779
+msgid "# PAYLOAD dropped (out of order)"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:829
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:786
+#: src/core/gnunet-service-core_kx.c:891
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:819
+#: src/core/gnunet-service-core_kx.c:925
 msgid "# PING messages transmitted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:886
+#: src/core/gnunet-service-core_kx.c:992
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:893
-msgid "# ephemeral keys received"
+#: src/core/gnunet-service-core_kx.c:1005
+msgid "# duplicate ephemeral keys ignored"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1040
+msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:932
+#: src/core/gnunet-service-core_kx.c:1054
 #, c-format
 msgid ""
-"Ephemeral key message from peer `%s' rejected as its validity range does not "
-"match our system time (%llu not in [%llu,%llu]).\n"
+"EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
+"our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:943
-msgid "# EPHEMERAL_KEY messages received"
+#: src/core/gnunet-service-core_kx.c:1060
+msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1039
-#: src/transport/gnunet-service-transport_validation.c:1119
+#: src/core/gnunet-service-core_kx.c:1080
+msgid "# valid ephemeral keys received"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1180
+#: src/transport/gnunet-service-transport_validation.c:1129
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1048
+#: src/core/gnunet-service-core_kx.c:1189
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1106
+#: src/core/gnunet-service-core_kx.c:1248
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1132
+#: src/core/gnunet-service-core_kx.c:1274
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1145
+#: src/core/gnunet-service-core_kx.c:1287
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1209
-#: src/transport/gnunet-service-transport_validation.c:1442
+#: src/core/gnunet-service-core_kx.c:1351
+#: src/transport/gnunet-service-transport_validation.c:1462
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1216
+#: src/core/gnunet-service-core_kx.c:1358
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1363
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1256
+#: src/core/gnunet-service-core_kx.c:1398
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1294
+#: src/core/gnunet-service-core_kx.c:1436
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1305
+#: src/core/gnunet-service-core_kx.c:1447
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1312
+#: src/core/gnunet-service-core_kx.c:1454
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1485
+#: src/core/gnunet-service-core_kx.c:1642
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1493
+#: src/core/gnunet-service-core_kx.c:1650
 #, 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:1496
+#: src/core/gnunet-service-core_kx.c:1653
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1554
-#: src/core/gnunet-service-core_kx.c:1580
+#: src/core/gnunet-service-core_kx.c:1742
+#: src/core/gnunet-service-core_kx.c:1768
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1567
+#: src/core/gnunet-service-core_kx.c:1755
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1609
+#: src/core/gnunet-service-core_kx.c:1797
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1617
+#: src/core/gnunet-service-core_kx.c:1805
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1674
-msgid "# PAYLOAD dropped (out of order)"
-msgstr ""
-
-#: src/core/gnunet-service-core_sessions.c:256
-#: src/core/gnunet-service-core_sessions.c:341
+#: src/core/gnunet-service-core_sessions.c:260
+#: src/core/gnunet-service-core_sessions.c:350
 #: 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
+#: src/dht/gnunet-service-dht_neighbours.c:804
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1521
+#: src/topology/gnunet-daemon-topology.c:617
+#: src/topology/gnunet-daemon-topology.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:720
+#: src/transport/gnunet-service-transport_neighbours.c:728
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:287
+#: src/core/gnunet-service-core_sessions.c:296
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:407
+#: src/core/gnunet-service-core_sessions.c:416
 msgid "# outdated typemap confirmations received"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:418
+#: src/core/gnunet-service-core_sessions.c:433
 msgid "# valid typemap confirmations received"
 msgstr ""
 
 #: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:180
+#: src/core/gnunet-service-core_typemap.c:181
 msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:210
+#: src/core/gnunet-service-core_typemap.c:212
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:770
+#: src/credential/credential_misc.c:88
+#, c-format
+msgid "Unable to parse CRED record string `%s'\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:994
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:280
+#: src/credential/gnunet-credential.c:434
+#, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:361
+#: src/credential/gnunet-credential.c:423
+#, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:372
+#: src/credential/gnunet-credential.c:444
+#, fuzzy, c-format
+msgid "Failed to connect to CREDENTIAL\n"
+msgstr "Impossible d’ouvrir « %s ».\n"
+
+#: src/credential/gnunet-credential.c:379
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:387
+#, c-format
+msgid "ego required\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:403
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:414
+#, c-format
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:451
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:504
+#, c-format
+msgid "Issuer ego required\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:516
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:536
+msgid "create credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:540
+msgid "verify credential against attribute"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:545
+msgid "The public key of the subject to lookup the credential for"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:550
+msgid "The name of the credential presented by the subject"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:555
+msgid "The public key of the authority to verify the credential against"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:560
+msgid "The ego to use"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:565
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:570
+msgid "The time to live for the credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:574
+msgid "collect credentials"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:588
+msgid "GNUnet credential resolver tool"
+msgstr ""
+
+#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:185
+#: src/gns/gnunet-gns-helper-service-w32.c:727
+#, c-format
+msgid "Failed to connect to GNS\n"
+msgstr ""
+
+#: src/credential/gnunet-service-credential.c:1144
+#: src/namestore/gnunet-namestore.c:1019
+#: src/namestore/gnunet-namestore-fcfsd.c:1138
+#, c-format
+msgid "Failed to connect to namestore\n"
+msgstr ""
+
+#: src/credential/plugin_gnsrecord_credential.c:186
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/datacache/datacache.c:119 src/datacache/datacache.c:311
+#: src/datastore/gnunet-service-datastore.c:757
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:123 src/datacache/datacache.c:298
+#: src/datacache/datacache.c:123 src/datacache/datacache.c:315
 msgid "# items stored"
 msgstr ""
 
-#: src/datacache/datacache.c:202
+#: src/datacache/datacache.c:206
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:213
+#: src/datacache/datacache.c:217
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:329
+#: src/datacache/datacache.c:345
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:339
+#: src/datacache/datacache.c:355
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/datacache.c:367
+#: src/datacache/datacache.c:385
 msgid "# requests for random value received"
 msgstr ""
 
-#: src/datacache/datacache.c:399
+#: src/datacache/datacache.c:417
 msgid "# proximity search requests received"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:467
+#: src/datacache/plugin_datacache_heap.c:553
 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:1027
-#: src/datastore/plugin_datastore_sqlite.c:57
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:127
+#: src/datastore/plugin_datastore_mysql.c:892
+#: src/datastore/plugin_datastore_sqlite.c:58
+#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:81 src/my/my.c:93
 #: 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:53
-#: src/namestore/plugin_namestore_sqlite.c:52
-#: src/peerstore/plugin_peerstore_sqlite.c:50
-#: src/psycstore/plugin_psycstore_mysql.c:62
+#: src/namestore/plugin_namestore_sqlite.c:53
+#: src/peerstore/plugin_peerstore_sqlite.c:52
+#: src/reclaim/plugin_reclaim_sqlite.c:52
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:681 src/include/gnunet_common.h:690
+#: src/include/gnunet_common.h:819 src/include/gnunet_common.h:828
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 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:343
+#: src/datacache/plugin_datacache_sqlite.c:863
+#: src/datastore/plugin_datastore_sqlite.c:508
+#: src/namecache/plugin_namecache_sqlite.c:229
+#: src/namestore/plugin_namestore_sqlite.c:265
+#: src/reclaim/plugin_reclaim_sqlite.c:336
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:309
+#: src/datastore/datastore_api.c:348
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "Déconnecté de"
 
-#: src/datastore/datastore_api.c:425
+#: src/datastore/datastore_api.c:468
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "Déconnecté de"
 
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:569
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:599
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:680
+#: src/datastore/datastore_api.c:760
 msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:754
+#: src/datastore/datastore_api.c:814
 msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:879
+#: src/datastore/datastore_api.c:920
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:995
+#: src/datastore/datastore_api.c:1034
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1056
+#: src/datastore/datastore_api.c:1095
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1121
+#: src/datastore/datastore_api.c:1160
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1187
-msgid "# UPDATE requests executed"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1271
+#: src/datastore/datastore_api.c:1238
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1298
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1397
+#: src/datastore/datastore_api.c:1360
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1477
+#: src/datastore/datastore_api.c:1441
 msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:113
+#: src/datastore/gnunet-datastore.c:189
+#, c-format
+msgid "Dumped %<PRIu64> records\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:217 src/datastore/gnunet-datastore.c:229
+#, c-format
+msgid "Short write to file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:261
+msgid "Error queueing datastore GET operation\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:287 src/datastore/gnunet-datastore.c:412
+#, fuzzy, c-format
+msgid "Unable to open dump file: %s\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/datastore/gnunet-datastore.c:326
 #, c-format
 msgid "Failed to store item: %s, aborting\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:199
+#: src/datastore/gnunet-datastore.c:340
 #, c-format
-msgid "Cannot use the same configuration for source and destination\n"
+msgid "Inserted %<PRIu64> records\n"
 msgstr ""
 
-#: 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"
+#: src/datastore/gnunet-datastore.c:349 src/datastore/gnunet-datastore.c:363
+#, c-format
+msgid "Short read from file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:389
+msgid "Error queueing datastore PUT operation\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:432
+msgid "Input file is not of a supported format\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:253
+#: src/datastore/gnunet-datastore.c:458
+msgid "Failed connecting to the datastore.\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:470
+#, c-format
+msgid "Please choose at least one operation: %s, %s\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:493
+msgid "Dump all records from the datastore"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:497
+msgid "Insert records into the datastore"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:502
+msgid "File to dump or insert"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:511
 msgid "Manipulate GNUnet datastore"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:336
+#: src/datastore/gnunet-service-datastore.c:338
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:416
+#: src/datastore/gnunet-service-datastore.c:420
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:557
+#: src/datastore/gnunet-service-datastore.c:562
 msgid "# results found"
 msgstr "# résultats introuvables"
 
-#: src/datastore/gnunet-service-datastore.c:598
+#: src/datastore/gnunet-service-datastore.c:603
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:609
+#: src/datastore/gnunet-service-datastore.c:614
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:615
+#: src/datastore/gnunet-service-datastore.c:620
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:622
+#: src/datastore/gnunet-service-datastore.c:627
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: 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
+#: src/datastore/gnunet-service-datastore.c:634
+#: src/datastore/gnunet-service-datastore.c:689
+#: src/datastore/gnunet-service-datastore.c:837
+#: src/datastore/gnunet-service-datastore.c:1469
 msgid "# reserved"
 msgstr "# réservé"
 
-#: src/datastore/gnunet-service-datastore.c:702
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:787
+#: src/datastore/gnunet-service-datastore.c:773
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1017
+#: src/datastore/gnunet-service-datastore.c:876
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:907
 msgid "# GET KEY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1061
+#: src/datastore/gnunet-service-datastore.c:920
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1115
-msgid "# UPDATE requests received"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:956
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1179
+#: src/datastore/gnunet-service-datastore.c:989
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1226
+#: src/datastore/gnunet-service-datastore.c:1036
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1235
+#: src/datastore/gnunet-service-datastore.c:1043
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1282
+#: src/datastore/gnunet-service-datastore.c:1088
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1336
+#: src/datastore/gnunet-service-datastore.c:1137
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1342
-#: src/datastore/gnunet-service-datastore.c:1517
+#: src/datastore/gnunet-service-datastore.c:1143
+#: src/datastore/gnunet-service-datastore.c:1318
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1396
+#: src/datastore/gnunet-service-datastore.c:1197
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1408
+#: src/datastore/gnunet-service-datastore.c:1209
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1468
+#: src/datastore/gnunet-service-datastore.c:1269
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1524
+#: src/datastore/gnunet-service-datastore.c:1325
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1535
+#: src/datastore/gnunet-service-datastore.c:1336
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1705
+#: src/datastore/gnunet-service-datastore.c:1506
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1721
+#: src/datastore/gnunet-service-datastore.c:1522
 msgid "# quota"
 msgstr "# quota"
 
-#: src/datastore/gnunet-service-datastore.c:1726
+#: src/datastore/gnunet-service-datastore.c:1527
 msgid "# cache size"
 msgstr "# taille du cache"
 
-#: src/datastore/gnunet-service-datastore.c:1742
+#: src/datastore/gnunet-service-datastore.c:1543
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1760
-#: src/datastore/gnunet-service-datastore.c:1776
+#: src/datastore/gnunet-service-datastore.c:1561
+#: src/datastore/gnunet-service-datastore.c:1577
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1808
+#: src/datastore/gnunet-service-datastore.c:1609
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_heap.c:826
+#: src/datastore/plugin_datastore_heap.c:893
 msgid "Heap database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:347
-#: src/datastore/plugin_datastore_sqlite.c:507
-msgid "Data too large"
+#: src/datastore/plugin_datastore_mysql.c:371
+#: src/datastore/plugin_datastore_mysql.c:423
+#: src/datastore/plugin_datastore_mysql.c:1075
+msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:363
-msgid "MySQL statement run failure"
+#: src/datastore/plugin_datastore_mysql.c:410
+#: src/datastore/plugin_datastore_sqlite.c:678
+msgid "Data too large"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:983
+#: src/datastore/plugin_datastore_mysql.c:848
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1257
-#: src/psycstore/plugin_psycstore_mysql.c:1936
+#: src/datastore/plugin_datastore_mysql.c:1180
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:345
+#: src/datastore/plugin_datastore_postgres.c:280
+#: src/datastore/plugin_datastore_postgres.c:897
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:975
+#: src/datastore/plugin_datastore_postgres.c:858
 msgid "Failed to drop table from database.\n"
 msgstr ""
 
-#: 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
+#: src/datastore/plugin_datastore_postgres.c:956
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:65
+#: src/datastore/plugin_datastore_sqlite.c:66
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
 #: src/testbed/gnunet-daemon-testbed-underlay.c:59
@@ -1737,41 +1939,42 @@ msgstr ""
 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:213
-#: src/peerstore/plugin_peerstore_sqlite.c:479
-#: src/psycstore/plugin_psycstore_sqlite.c:325
+#: src/datastore/plugin_datastore_sqlite.c:271
+#: src/namecache/plugin_namecache_sqlite.c:173
+#: src/namestore/plugin_namestore_sqlite.c:206
+#: src/peerstore/plugin_peerstore_sqlite.c:535
+#: src/reclaim/plugin_reclaim_sqlite.c:212
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:688
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+#: src/datastore/plugin_datastore_sqlite.c:629
+msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1185
+#: src/datastore/plugin_datastore_sqlite.c:1327
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1205
+#: src/datastore/plugin_datastore_sqlite.c:1361
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1245
-#: src/namecache/plugin_namecache_sqlite.c:580
-#: src/namestore/plugin_namestore_sqlite.c:766
+#: src/datastore/plugin_datastore_sqlite.c:1405
+#: src/namecache/plugin_namecache_sqlite.c:557
+#: src/namestore/plugin_namestore_sqlite.c:751
+#: src/reclaim/plugin_reclaim_sqlite.c:711
 msgid "Sqlite database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:260
+#: src/datastore/plugin_datastore_template.c:253
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:155
+#: src/dht/gnunet-dht-get.c:158
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1780,331 +1983,316 @@ msgstr ""
 "Resultat %d, type %d :\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:181
+#: src/dht/gnunet-dht-get.c:159
+#, fuzzy, c-format
+msgid "Result %d, type %d:\n"
+msgstr ""
+"Resultat %d, type %d :\n"
+"%.*s\n"
+
+#: src/dht/gnunet-dht-get.c:204
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:187 src/dht/gnunet-dht-monitor.c:248
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257
 msgid "Failed to connect to DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:195
-msgid "Issueing DHT GET with key"
+#: src/dht/gnunet-dht-get.c:219
+msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307
 #: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:215
+#: src/dht/gnunet-dht-get.c:253
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:218 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:263
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: 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:248
+#: src/dht/gnunet-dht-get.c:280
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:295
+#: src/dht/gnunet-dht-monitor.c:319
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:320
+#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372
+#: src/nse/gnunet-nse-profiler.c:878
+msgid "be verbose (print progress information)"
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:337
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161
-#: src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1186
+#: src/dht/gnunet_dht_profiler.c:949 src/rps/gnunet-rps-profiler.c:2959
 #, fuzzy
 msgid "number of peers to start"
 msgstr "nombre de valeurs"
 
-#: src/dht/gnunet_dht_profiler.c:1189
-msgid ""
-"maximum number of times we try to search for successor circle formation (0 "
-"for R5N)"
+#: src/dht/gnunet_dht_profiler.c:954
+msgid "number of PUTs to perform per peer"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
-#: src/testbed/gnunet-testbed-profiler.c:294
+#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
+#: src/testbed/gnunet-testbed-profiler.c:300
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1195
+#: src/dht/gnunet_dht_profiler.c:964
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1198
+#: src/dht/gnunet_dht_profiler.c:969
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1201
+#: src/dht/gnunet_dht_profiler.c:974
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1204
+#: src/dht/gnunet_dht_profiler.c:979
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: 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:1225
-msgid "Measure quality and performance of the DHT service."
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:115
-msgid "PUT request sent with key"
+#: src/dht/gnunet_dht_profiler.c:984
+msgid "chance that a peer is selected at random for PUTs"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:118
-msgid "Timeout sending PUT request!\n"
+#: src/dht/gnunet_dht_profiler.c:989
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
-msgid "PUT request not confirmed!\n"
+#: src/dht/gnunet_dht_profiler.c:1009
+msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:151
+#: src/dht/gnunet-dht-put.c:134
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:158
-#, c-format
-msgid "Could not connect to %s service!\n"
-msgstr ""
+#: src/dht/gnunet-dht-put.c:142
+#, fuzzy
+msgid "Could not connect to DHT service!\n"
+msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/dht/gnunet-dht-put.c:172
+#: src/dht/gnunet-dht-put.c:153
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:193
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:207
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:211
+msgid "use DHT's record route option"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:216
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:232
+#: src/dht/gnunet-dht-put.c:233
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:370
-#: src/dht/gnunet-service-wdht_clients.c:864
+#: src/dht/gnunet-service-dht_clients.c:369
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:481
-#: src/dht/gnunet-service-wdht_clients.c:945
+#: src/dht/gnunet-service-dht_clients.c:483
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:620
-#: src/dht/gnunet-service-wdht_clients.c:1011
+#: src/dht/gnunet-service-dht_clients.c:616
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:847
-#: src/dht/gnunet-service-wdht_clients.c:1220
+#: src/dht/gnunet-service-dht_clients.c:842
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1032
-#: src/dht/gnunet-service-wdht_clients.c:510
+#: src/dht/gnunet-service-dht_clients.c:1027
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1047
-#: src/dht/gnunet-service-wdht_clients.c:524
+#: src/dht/gnunet-service-dht_clients.c:1042
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1094
-#: src/dht/gnunet-service-wdht_clients.c:566
+#: src/dht/gnunet-service-dht_clients.c:1088
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1101
-#: src/dht/gnunet-service-wdht_clients.c:589
+#: src/dht/gnunet-service-dht_clients.c:1095
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1179
-#: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:693
+#: src/dht/gnunet-service-dht_clients.c:1173
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:72
+#: src/dht/gnunet-service-dht_datacache.c:73
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:82
+#: src/dht/gnunet-service-dht_datacache.c:83
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:199
+#: src/dht/gnunet-service-dht_datacache.c:207
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:211
+#: src/dht/gnunet-service-dht_datacache.c:219
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:217
+#: src/dht/gnunet-service-dht_datacache.c:225
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:223
+#: src/dht/gnunet-service-dht_datacache.c:231
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:235
+#: src/dht/gnunet-service-dht_datacache.c:243
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:239
+#: src/dht/gnunet-service-dht_datacache.c:247
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:276
+#: src/dht/gnunet-service-dht_datacache.c:282
 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:86
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:685
+#: src/dht/gnunet-service-dht_neighbours.c:679
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:852
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1054
-#: src/dht/gnunet-service-dht_neighbours.c:1091
+#: src/dht/gnunet-service-dht_neighbours.c:1055
+#: src/dht/gnunet-service-dht_neighbours.c:1098
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1071
-#: src/dht/gnunet-service-dht_neighbours.c:1107
+#: src/dht/gnunet-service-dht_neighbours.c:1072
+#: src/dht/gnunet-service-dht_neighbours.c:1114
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1255
+#: src/dht/gnunet-service-dht_neighbours.c:1271
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1288
+#: src/dht/gnunet-service-dht_neighbours.c:1304
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: 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
+#: src/dht/gnunet-service-dht_neighbours.c:1315
+#: src/dht/gnunet-service-dht_neighbours.c:1455
+#: src/dht/gnunet-service-dht_neighbours.c:1558
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1383
+#: src/dht/gnunet-service-dht_neighbours.c:1400
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1415
+#: src/dht/gnunet-service-dht_neighbours.c:1443
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1547
+#: src/dht/gnunet-service-dht_neighbours.c:1573
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1646
-msgid "# P2P PUT requests received"
+#: src/dht/gnunet-service-dht_neighbours.c:1676
+msgid "# Expired PUTs discarded"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1650
+#: src/dht/gnunet-service-dht_neighbours.c:1684
+msgid "# P2P PUT requests received"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1688
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1854
+#: src/dht/gnunet-service-dht_neighbours.c:1914
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1862
+#: src/dht/gnunet-service-dht_neighbours.c:1922
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2018
+#: src/dht/gnunet-service-dht_neighbours.c:2084
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2022
+#: src/dht/gnunet-service-dht_neighbours.c:2088
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2097
+#: src/dht/gnunet-service-dht_neighbours.c:2153
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2120
+#: src/dht/gnunet-service-dht_neighbours.c:2174
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2222
+#: src/dht/gnunet-service-dht_neighbours.c:2351
+msgid "# Expired results discarded"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:2367
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2226
+#: src/dht/gnunet-service-dht_neighbours.c:2371
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
@@ -2112,231 +2300,69 @@ msgstr ""
 msgid "# Network size estimates received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:223
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:227
+#: src/dht/gnunet-service-dht_routing.c:237
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:233
+#: src/dht/gnunet-service-dht_routing.c:243
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:239
+#: src/dht/gnunet-service-dht_routing.c:249
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:251
+#: src/dht/gnunet-service-dht_routing.c:261
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:327
+#: src/dht/gnunet-service-dht_routing.c:339
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:409
+#: src/dht/gnunet-service-dht_routing.c:415
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:427
+#: src/dht/gnunet-service-dht_routing.c:437
 msgid "# DHT requests combined"
 msgstr ""
 
-#: 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: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: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:1597
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FRIEND_PEERMAP of %s"
-msgstr ""
-
-#: 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:1628
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FINGER_TABLE of %s"
-msgstr ""
-
-#: 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: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: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:3366
-msgid "# FINGERS_COUNT"
-msgstr ""
-
-#: 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:261
-#, c-format
-msgid ""
-"\n"
-"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
-msgstr ""
-
-#: 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: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: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
+#: src/dht/plugin_block_dht.c:189
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:149
+#: src/dht/plugin_block_dht.c:198
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:159
+#: src/dht/plugin_block_dht.c:209
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:254
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr ""
-
-#: src/dns/dnsparser.c:818
-#, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:176
-#, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr ""
-
-#: 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:298
-#, c-format
-msgid "Sent DNS request to %s\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:367
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:437
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:351
+#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:354
-msgid "only monitor DNS replies"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:365
+#: src/dns/gnunet-dns-monitor.c:370
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:235
+#: src/dns/gnunet-dns-redirector.c:237
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:238
+#: src/dns/gnunet-dns-redirector.c:243
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:250
+#: src/dns/gnunet-dns-redirector.c:256
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
@@ -2344,252 +2370,244 @@ msgstr ""
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:608
+#: src/dns/gnunet-service-dns.c:610
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:738
+#: src/dns/gnunet-service-dns.c:740
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:813
+#: src/dns/gnunet-service-dns.c:815
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:929
+#: src/dns/gnunet-service-dns.c:930
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:945
+#: src/dns/gnunet-service-dns.c:946
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:955
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:964
+#: src/dns/gnunet-service-dns.c:965
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:966
+#: src/dns/gnunet-service-dns.c:967
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1033
+#: src/dns/gnunet-service-dns.c:1034
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3643
+#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1091
+#: src/dns/gnunet-service-dns.c:1092
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:166
-msgid "verbose output"
-msgstr "sortie verbeuse"
-
-#: src/dv/gnunet-dv.c:175
-msgid "Print information about DV state"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:805 src/exit/gnunet-daemon-exit.c:3109
-msgid "# Inbound CADET channels created"
+#: src/exit/gnunet-daemon-exit.c:960
+msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:861
-#, c-format
-msgid "Got duplicate service records for `%s:%u'\n"
+#: src/exit/gnunet-daemon-exit.c:1061
+msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:914
-msgid "# Bytes transmitted via cadet channels"
+#: src/exit/gnunet-daemon-exit.c:1340
+msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: 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)"
+#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572
+#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701
+#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953
+#: src/exit/gnunet-daemon-exit.c:2207
+msgid "# Bytes received from CADET"
 msgstr ""
 
-#: 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)"
+#: src/exit/gnunet-daemon-exit.c:1467
+msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1118
-msgid "# ICMP packets dropped (not allowed)"
+#: src/exit/gnunet-daemon-exit.c:1575
+msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1126
-msgid "ICMP Packet dropped, have no matching connection information\n"
+#: src/exit/gnunet-daemon-exit.c:1615
+msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1203
-msgid "UDP Packet dropped, have no matching connection information\n"
+#: src/exit/gnunet-daemon-exit.c:1704
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1278
-msgid "TCP Packet dropped, have no matching connection information\n"
+#: src/exit/gnunet-daemon-exit.c:1788
+msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1331
-msgid "# Packets received from TUN"
+#: src/exit/gnunet-daemon-exit.c:1825
+msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1345
-msgid "# Bytes received from TUN"
+#: src/exit/gnunet-daemon-exit.c:1956
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1371
-msgid "IPv4 packet options received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279
+#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828
+#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
+msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1398
-#, c-format
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338
+#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887
+#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
+msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1444
-#, c-format
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:2210
+msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1452
-#, c-format
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985
+#: src/vpn/gnunet-service-vpn.c:2096
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1853
-msgid "# TCP packets sent via TUN"
+#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875
+#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1977
-msgid "# TCP service creation requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068
+msgid "# Inbound CADET channels created"
 msgstr ""
 
-#: 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"
+#: src/exit/gnunet-daemon-exit.c:2522
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2063
-msgid "# TCP IP-exit creation requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2541
+msgid "# Messages transmitted via cadet channels"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2170
-msgid "# TCP data requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2719
+msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2184
-msgid "# TCP DATA requests dropped (no session)"
+#: src/exit/gnunet-daemon-exit.c:2727
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2246
-msgid "# ICMP packets sent via TUN"
+#: src/exit/gnunet-daemon-exit.c:2801
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2420
-msgid "# ICMP IP-exit requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2873
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2670
-msgid "# ICMP service requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2921
+msgid "# Packets received from TUN"
 msgstr ""
 
-#: 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)"
+#: src/exit/gnunet-daemon-exit.c:2935
+msgid "# Bytes received from TUN"
 msgstr ""
 
-#: 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)"
+#: src/exit/gnunet-daemon-exit.c:2961
+msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2841
-msgid "# UDP packets sent via TUN"
+#: src/exit/gnunet-daemon-exit.c:2988
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2957
-msgid "# UDP IP-exit requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:3034
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3060
-msgid "# UDP service requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:3042
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3337
+#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3351 src/exit/gnunet-daemon-exit.c:3359
+#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3400
+#: src/exit/gnunet-daemon-exit.c:3318
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3414 src/exit/gnunet-daemon-exit.c:3427
+#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3439
+#: src/exit/gnunet-daemon-exit.c:3357
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3584
+#: src/exit/gnunet-daemon-exit.c:3501
 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:3592
+#: src/exit/gnunet-daemon-exit.c:3509
 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:3599
+#: src/exit/gnunet-daemon-exit.c:3516
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3605
+#: src/exit/gnunet-daemon-exit.c:3522
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3765
+#: src/exit/gnunet-daemon-exit.c:3690
 msgid "Must be a number"
 msgstr "Doit être un nombre"
 
-#: src/exit/gnunet-daemon-exit.c:3872
+#: src/exit/gnunet-daemon-exit.c:3805
 #, 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
+#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4029
+#: src/exit/gnunet-daemon-exit.c:3966
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2598,7 +2616,7 @@ msgid "# acknowledgements sent for fragment"
 msgstr ""
 
 #: src/fragmentation/defragmentation.c:468
-#: src/transport/plugin_transport_wlan.c:1528
+#: src/transport/plugin_transport_wlan.c:1554
 msgid "# fragments received"
 msgstr ""
 
@@ -2630,15 +2648,15 @@ msgstr ""
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:455
+#: src/fragmentation/fragmentation.c:456
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:462
+#: src/fragmentation/fragmentation.c:463
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:486
+#: src/fragmentation/fragmentation.c:487
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
@@ -2667,109 +2685,115 @@ msgstr ""
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1660
+#: src/fs/fs_api.c:1662
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2318
+#: src/fs/fs_api.c:2322
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2328
+#: src/fs/fs_api.c:2332
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2456 src/fs/fs_api.c:2703
+#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2474
+#: src/fs/fs_api.c:2478
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2489 src/fs/fs_api.c:2508 src/fs/fs_api.c:3006
+#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2693
+#: src/fs/fs_api.c:2696
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2949
+#: src/fs/fs_api.c:2959
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3044
+#: src/fs/fs_api.c:3054
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:208
+#: src/fs/fs_directory.c:213
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:308
+#: src/fs/fs_download.c:310
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:328
+#: src/fs/fs_download.c:335
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
+#: src/fs/fs_download.c:347
+#, c-format
+msgid ""
+"Failed to access full directroy contents of `%s' for recursive download\n"
+msgstr ""
+
+#: src/fs/fs_download.c:534 src/fs/fs_download.c:546
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr ""
 
-#: src/fs/fs_download.c:926
+#: src/fs/fs_download.c:956
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1011
+#: src/fs/fs_download.c:1047
 #, 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:1039
+#: src/fs/fs_download.c:1075
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1063
+#: src/fs/fs_download.c:1099
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1111
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1084
+#: src/fs/fs_download.c:1120
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1184
+#: src/fs/fs_download.c:1220
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1838
+#: src/fs/fs_download.c:1885
 msgid "Invalid URI"
 msgstr "URI invalide"
 
-#: src/fs/fs_getopt.c:197
+#: src/fs/fs_getopt.c:235
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2786,7 +2810,7 @@ msgstr "Dernier message reçu de %s\n"
 msgid "Failed to not connect to `%s' service.\n"
 msgstr ""
 
-#: src/fs/fs_misc.c:126
+#: src/fs/fs_misc.c:128
 #, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
@@ -2815,57 +2839,62 @@ msgstr ""
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: 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
+#: src/fs/fs_publish.c:725
+#, fuzzy, c-format
+msgid "Can not index file `%s': %s.\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/fs/fs_publish.c:782 src/fs/fs_publish.c:827 src/fs/fs_publish.c:848
+#: src/fs/fs_publish.c:878 src/fs/fs_publish.c:1144
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:780
+#: src/fs/fs_publish.c:784
 msgid "error on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:825
+#: src/fs/fs_publish.c:829
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:845
+#: src/fs/fs_publish.c:849
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:876
+#: src/fs/fs_publish.c:880
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:902
+#: src/fs/fs_publish.c:906
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
+#: src/fs/fs_publish.c:995 src/fs/fs_publish.c:1031
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1094
+#: src/fs/fs_publish.c:1098
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1102
+#: src/fs/fs_publish.c:1106
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1142
+#: src/fs/fs_publish.c:1146
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1381
+#: src/fs/fs_publish.c:1385
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "pa_stream_new() échoué : %s\n"
 
-#: src/fs/fs_publish.c:1472
+#: src/fs/fs_publish.c:1476
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2878,12 +2907,12 @@ msgstr ""
 msgid "Internal error."
 msgstr "Erreur interne."
 
-#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
+#: src/fs/fs_search.c:822 src/fs/fs_search.c:892
 #, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_search.c:966
+#: src/fs/fs_search.c:979
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2900,123 +2929,123 @@ msgstr ""
 msgid "Error communicating with `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:328
+#: src/fs/fs_unindex.c:326
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
+#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388
 msgid "Failed to get KSKs from directory scan."
 msgstr ""
 
-#: src/fs/fs_unindex.c:386
+#: src/fs/fs_unindex.c:384
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:445
+#: src/fs/fs_unindex.c:443
 #, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:682
+#: src/fs/fs_unindex.c:665
 msgid "Failed to open file for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:721
+#: src/fs/fs_unindex.c:704
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:223
+#: src/fs/fs_uri.c:234
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:282
+#: src/fs/fs_uri.c:293
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:300
+#: src/fs/fs_uri.c:311
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:307
+#: src/fs/fs_uri.c:318
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:376
+#: src/fs/fs_uri.c:388
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:417
+#: src/fs/fs_uri.c:429
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:432
+#: src/fs/fs_uri.c:444
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:511
+#: src/fs/fs_uri.c:523
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:526
+#: src/fs/fs_uri.c:538
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:536
+#: src/fs/fs_uri.c:548
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:556
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:564
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:558
+#: src/fs/fs_uri.c:570
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:576
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:573
+#: src/fs/fs_uri.c:585
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:579
+#: src/fs/fs_uri.c:591
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:597
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:609
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:643
 #, fuzzy
 msgid "invalid argument"
 msgstr "Argument invalide « %s »\n"
 
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:655
 msgid "Unrecognized URI type"
 msgstr "Type d’URI non reconnu"
 
-#: src/fs/fs_uri.c:1045 src/fs/fs_uri.c:1072
+#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1078
+#: src/fs/fs_uri.c:1092
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3052,27 +3081,27 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:764 src/fs/gnunet-publish.c:898
+#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:903
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:768 src/fs/gnunet-publish.c:902
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:907
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:771 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:912
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:774 src/fs/gnunet-publish.c:929
+#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:936
+#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:955
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:801
+#: src/fs/gnunet-auto-share.c:813
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -3113,116 +3142,116 @@ msgstr ""
 msgid "Display contents of a GNUnet directory"
 msgstr ""
 
-#: src/fs/gnunet-download.c:137
+#: src/fs/gnunet-download.c:139
 #, c-format
 msgid "Starting download `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:147
+#: src/fs/gnunet-download.c:149
 msgid "<unknown time>"
 msgstr ""
 
-#: src/fs/gnunet-download.c:157
+#: src/fs/gnunet-download.c:158
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:184
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:194
+#: src/fs/gnunet-download.c:201
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
+#: src/fs/gnunet-search.c:215 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:246
 msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726
+#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:727
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:264
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:273
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:872
+#: src/fs/gnunet-search.c:273 src/fs/gnunet-unindex.c:139
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:310
+#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:315
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:307
+#: src/fs/gnunet-download.c:344
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:313
+#: src/fs/gnunet-download.c:354
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:317
+#: src/fs/gnunet-download.c:359
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:321
+#: src/fs/gnunet-download.c:364
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:368
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:338
+#: src/fs/gnunet-download.c:386
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:117
+#: src/fs/gnunet-fs.c:119
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:127
+#: src/fs/gnunet-fs.c:130
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/fs/gnunet-fs-profiler.c:217
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:214
+#: src/fs/gnunet-fs-profiler.c:223
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:223
+#: src/fs/gnunet-fs-profiler.c:233
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
@@ -3273,138 +3302,138 @@ msgstr ""
 msgid "Keywords for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:589
+#: src/fs/gnunet-publish.c:590
 msgid "Could not publish\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:614
+#: src/fs/gnunet-publish.c:615
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:648
+#: src/fs/gnunet-publish.c:649
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-publish.c:653
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:659
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:665
+#: src/fs/gnunet-publish.c:666
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:670
+#: src/fs/gnunet-publish.c:671
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:677
+#: src/fs/gnunet-publish.c:678
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:686
-msgid "Internal error scanning directory.\n"
+#: src/fs/gnunet-publish.c:687
+msgid "Error scanning directory.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:714
+#: src/fs/gnunet-publish.c:715
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:749
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:761
+#: src/fs/gnunet-publish.c:763
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:817
+#: src/fs/gnunet-publish.c:819
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:824
+#: src/fs/gnunet-publish.c:826
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:830
+#: src/fs/gnunet-publish.c:832
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:210
+#: src/fs/gnunet-publish.c:840 src/vpn/gnunet-vpn.c:210
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1517 src/transport/gnunet-transport.c:1542
+#: src/fs/gnunet-publish.c:851 src/fs/gnunet-publish.c:859
+#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:909
+#: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:913
+#: src/fs/gnunet-publish.c:922
 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:917
+#: src/fs/gnunet-publish.c:928
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:932
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:925
+#: src/fs/gnunet-publish.c:938
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:933
+#: src/fs/gnunet-publish.c:949
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-publish.c:959
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:943
+#: src/fs/gnunet-publish.c:965
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:947
+#: src/fs/gnunet-publish.c:971
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:963
+#: src/fs/gnunet-publish.c:989
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3413,174 +3442,174 @@ msgstr ""
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:204
+#: src/fs/gnunet-search.c:207
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:260
+#: src/fs/gnunet-search.c:263
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:284
+#: src/fs/gnunet-search.c:287
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:316
+#: src/fs/gnunet-search.c:324
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:319
+#: src/fs/gnunet-search.c:329
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:335
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:337
+#: src/fs/gnunet-search.c:351
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:378 src/fs/gnunet-service-fs.c:883
+#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:437
+#: src/fs/gnunet-service-fs.c:436
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:606
+#: src/fs/gnunet-service-fs.c:605
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
+#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:837
+#: src/fs/gnunet-service-fs.c:836
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:876
+#: src/fs/gnunet-service-fs.c:875
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1047
+#: src/fs/gnunet-service-fs.c:1040
 #, 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
+#: src/fs/gnunet-service-fs.c:1280
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1313 src/hostlist/gnunet-daemon-hostlist.c:355
-#: src/topology/gnunet-daemon-topology.c:1203
+#: src/fs/gnunet-service-fs.c:1305 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/topology/gnunet-daemon-topology.c:1202
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_client.c:494
+#: src/fs/gnunet-service-fs_cadet_client.c:370
 msgid "# replies received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_client.c:508
+#: src/fs/gnunet-service-fs_cadet_client.c:384
 msgid "# replies received via cadet dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:258
-msgid "# Blocks transferred via cadet"
+#: src/fs/gnunet-service-fs_cadet_server.c:265
+msgid "# queries received via CADET not answered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:360
-msgid "# queries received via CADET not answered"
+#: src/fs/gnunet-service-fs_cadet_server.c:320
+msgid "# Blocks transferred via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:440
+#: src/fs/gnunet-service-fs_cadet_server.c:346
 msgid "# queries received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:484
+#: src/fs/gnunet-service-fs_cadet_server.c:388
 msgid "# cadet client connections rejected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:490
-#: src/fs/gnunet-service-fs_cadet_server.c:530
+#: src/fs/gnunet-service-fs_cadet_server.c:395
+#: src/fs/gnunet-service-fs_cadet_server.c:435
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# Session TCP active"
 
-#: src/fs/gnunet-service-fs_cp.c:686
+#: src/fs/gnunet-service-fs_cp.c:685
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:690
+#: src/fs/gnunet-service-fs_cp.c:689
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
+#: src/fs/gnunet-service-fs_cp.c:722 src/fs/gnunet-service-fs_cp.c:1344
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:818
+#: src/fs/gnunet-service-fs_cp.c:817
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:875
+#: src/fs/gnunet-service-fs_cp.c:874
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:883
+#: src/fs/gnunet-service-fs_cp.c:882
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:897
+#: src/fs/gnunet-service-fs_cp.c:896
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:944
+#: src/fs/gnunet-service-fs_cp.c:943
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1015
+#: src/fs/gnunet-service-fs_cp.c:1014
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1040
+#: src/fs/gnunet-service-fs_cp.c:1039
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1050
+#: src/fs/gnunet-service-fs_cp.c:1049
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1148
+#: src/fs/gnunet-service-fs_cp.c:1147
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1205
+#: src/fs/gnunet-service-fs_cp.c:1204
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1228
+#: src/fs/gnunet-service-fs_cp.c:1227
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1239
+#: src/fs/gnunet-service-fs_cp.c:1240
 msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1295
+#: src/fs/gnunet-service-fs_cp.c:1296
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1339
+#: src/fs/gnunet-service-fs_cp.c:1340
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1706
+#: src/fs/gnunet-service-fs_cp.c:1707
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3600,25 +3629,25 @@ msgstr ""
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:331
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:355
+#: src/fs/gnunet-service-fs_indexing.c:357
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:359
+#: src/fs/gnunet-service-fs_indexing.c:361
 msgid "not indexed"
 msgstr "non indexé"
 
-#: src/fs/gnunet-service-fs_indexing.c:392
+#: src/fs/gnunet-service-fs_indexing.c:394
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:515
+#: src/fs/gnunet-service-fs_indexing.c:518
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3654,111 +3683,110 @@ msgstr ""
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:315
+#: src/fs/gnunet-service-fs_pr.c:330
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:661
+#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:842
+#: src/fs/gnunet-service-fs_pr.c:858
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:879
+#: src/fs/gnunet-service-fs_pr.c:894
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:888
+#: src/fs/gnunet-service-fs_pr.c:903
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:918
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:920
+#: src/fs/gnunet-service-fs_pr.c:935
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1050
+#: src/fs/gnunet-service-fs_pr.c:1065
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1078
+#: src/fs/gnunet-service-fs_pr.c:1093
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1116
+#: src/fs/gnunet-service-fs_pr.c:1131
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1247
+#: src/fs/gnunet-service-fs_pr.c:1262
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1299
+#: src/fs/gnunet-service-fs_pr.c:1314
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1320
+#: src/fs/gnunet-service-fs_pr.c:1335
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1372
+#: src/fs/gnunet-service-fs_pr.c:1395
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1454
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1509
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1387
+#: src/fs/gnunet-service-fs_pr.c:1524
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1396
+#: src/fs/gnunet-service-fs_pr.c:1548
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1411
-msgid "# requested DBLOCK or IBLOCK not found"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:1425
+#: src/fs/gnunet-service-fs_pr.c:1562
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1438
+#: src/fs/gnunet-service-fs_pr.c:1583
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1443
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: 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:1527
+#: src/fs/gnunet-service-fs_pr.c:1626
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1539
+#: src/fs/gnunet-service-fs_pr.c:1639
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1652
+#: src/fs/gnunet-service-fs_pr.c:1693
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1732
+#: src/fs/gnunet-service-fs_pr.c:1749
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:642
+#: src/fs/gnunet-service-fs_push.c:646
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3789,6 +3817,10 @@ msgstr ""
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
+#: src/gns/gns_tld_api.c:348
+msgid "Expected a base32-encoded public zone key\n"
+msgstr ""
+
 #: src/gns/gnunet-bcd.c:127
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
@@ -3809,390 +3841,316 @@ msgstr ""
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:519
+#: src/gns/gnunet-bcd.c:523
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:536
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:238
+#: src/gns/gnunet-dns2gns.c:203
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:408
+#: src/gns/gnunet-dns2gns.c:405
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:421
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:432
+#: src/gns/gnunet-dns2gns.c:429
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:709
-msgid "No ego configured for `dns2gns` subsystem\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:737
+#: src/gns/gnunet-dns2gns.c:588
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:758
-msgid "No valid GNS zone specified!\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:688
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
-msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
+#: src/gns/gnunet-dns2gns.c:693
+msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:785
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+#: src/gns/gnunet-dns2gns.c:710
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:788
-msgid "UDP port to listen on for inbound DNS requests; default: 2853"
+#: src/gns/gnunet-gns-benchmark.c:582
+msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:791
-msgid "Public key of the GNS zone to use (overrides default)"
+#: src/gns/gnunet-gns-benchmark.c:587
+msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:804
-msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+#: src/gns/gnunet-gns-benchmark.c:591
+msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
+#: src/gns/gnunet-gns.c:199
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:295
-#, c-format
-msgid "Please specify name to lookup!\n"
+#: src/gns/gnunet-gns.c:233
+msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:376
-#, c-format
-msgid "Ego for `%s' not found, cannot perform lookup.\n"
+#: src/gns/gnunet-gns.c:238
+msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
-#: src/gns/plugin_rest_gns.c:472
-#, c-format
+#: src/gns/gnunet-gns.c:242
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:258
+msgid "GNUnet GNS resolver tool"
+msgstr ""
+
+#: src/gns/gnunet-gns-helper-service-w32.c:602
+msgid "Not ready to process requests, lacking ego data\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-helper-service-w32.c:701
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns-helper-service-w32.c:739
 #, c-format
-msgid "Failed to connect to GNS\n"
+msgid "Failed to connect to identity service\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:470 src/gns/gnunet-gns.c:500
-#, c-format
-msgid "Reverse key `%s' is not well-formed\n"
+#: src/gns/gnunet-gns-import.c:452
+msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns.c:484
+#: src/gns/gnunet-gns-proxy.c:118
+#: src/hostlist/gnunet-daemon-hostlist_client.c:535
+#: src/hostlist/gnunet-daemon-hostlist_client.c:753
+#: src/hostlist/gnunet-daemon-hostlist_client.c:759
+#: src/hostlist/gnunet-daemon-hostlist_client.c:811
+#: src/hostlist/gnunet-daemon-hostlist_client.c:820
+#: src/hostlist/gnunet-daemon-hostlist_client.c:931
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
+#: src/transport/plugin_transport_http_client.c:598
+#: src/transport/plugin_transport_http_client.c:616
 #, c-format
-msgid "Public key `%s' is not well-formed\n"
+msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:548
-msgid "Lookup a record for the given name"
+#: src/gns/gnunet-gns-proxy.c:980
+#, c-format
+msgid "Unsupported CURL TLS backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:551
-msgid "Specify the type of the record to lookup"
+#: src/gns/gnunet-gns-proxy.c:1005
+#, c-format
+msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:554
-msgid "Specify timeout for the lookup"
+#: src/gns/gnunet-gns-proxy.c:1026
+#, c-format
+msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:557
-msgid "No unneeded output"
+#: src/gns/gnunet-gns-proxy.c:1041
+#, c-format
+msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: 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:563
-msgid "Specify the name of the ego of the zone to lookup the record in"
-msgstr ""
-
-#: 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: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 "
-"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
-"sh?\n"
-msgstr ""
-
-#: 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: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: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:887
-#, c-format
-msgid "Unsupported CURL SSL backend %d\n"
-msgstr ""
-
-#: 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:933
-#, c-format
-msgid "Failed to initialize DANE: %s\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:946
-#, c-format
-msgid "Failed to parse DANE record: %s\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:1056
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:1066
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:1090
 #, c-format
-msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1221
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1708
+#: src/gns/gnunet-gns-proxy.c:2122
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2167
+#: src/gns/gnunet-gns-proxy.c:2643
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2197
+#: src/gns/gnunet-gns-proxy.c:2675
 #, c-format
-msgid "Unable to import certificate %s\n"
+msgid "Unable to import certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2370
+#: src/gns/gnunet-gns-proxy.c:2876
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2389 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2898 src/rest/gnunet-rest-server.c:658
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2709
+#: src/gns/gnunet-gns-proxy.c:3234
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2738
+#: src/gns/gnunet-gns-proxy.c:3263
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: 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:2836
+#: src/gns/gnunet-gns-proxy.c:3346
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3171
-msgid "No ego configured for `shorten-zone`\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3211 src/gns/gnunet-service-gns.c:1093
-#: src/gns/gnunet-service-gns.c:1149
+#: src/gns/gnunet-gns-proxy.c:3636
 #, c-format
-msgid "No ego configured for `%s`\n"
+msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: 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:3313
+#: src/gns/gnunet-gns-proxy.c:3764
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3316
+#: src/gns/gnunet-gns-proxy.c:3769
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3335
+#: src/gns/gnunet-gns-proxy.c:3773
+msgid "disable use of IPv6"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3799
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1187
-msgid "Failed to connect to the namestore!\n"
+#: src/gns/gnunet-service-gns.c:506
+msgid "Properly base32-encoded public key required"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1195
+#: src/gns/gnunet-service-gns.c:542
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1228
+#: src/gns/gnunet-service-gns.c:561
+#: src/zonemaster/gnunet-service-zonemaster.c:875
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:263
+#: src/gns/gnunet-service-gns_interceptor.c:259
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:371
+#: src/gns/gnunet-service-gns_interceptor.c:366
 msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:648
+#: src/gns/gnunet-service-gns_resolver.c:700
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:659
+#: src/gns/gnunet-service-gns_resolver.c:711
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:851
+#: src/gns/gnunet-service-gns_resolver.c:914
 msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:993
+#: src/gns/gnunet-service-gns_resolver.c:1095
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1354
+#: src/gns/gnunet-service-gns_resolver.c:1365
+#, c-format
+msgid "VPN returned empty result for `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1806
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:1849
+#, c-format
+msgid "GNS lookup failed (zero records found for `%s')\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2264
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1913
+#: src/gns/gnunet-service-gns_resolver.c:2287
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2195
+#: src/gns/gnunet-service-gns_resolver.c:2450
 #, c-format
-msgid "Zone %s was revoked, resolution fails\n"
+msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2342
+#: src/gns/gnunet-service-gns_resolver.c:2585
 #, c-format
-msgid "Hostname `%s' is not well-formed, resolution fails\n"
+msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:203
+#: src/gns/plugin_gnsrecord_gns.c:181
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:232
+#: src/gns/plugin_gnsrecord_gns.c:212
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:253
+#: src/gns/plugin_gnsrecord_gns.c:233
 #, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:276
+#: src/gns/plugin_gnsrecord_gns.c:258
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:311
+#: src/gns/plugin_gnsrecord_gns.c:294
 #, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr ""
 
-#: 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:717
-msgid "GNS REST API initialized\n"
-msgstr ""
-
 #: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4298,33 +4256,33 @@ msgstr ""
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1103
+#: src/hello/hello.c:1110
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1112
+#: src/hello/hello.c:1119
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1122
+#: src/hello/hello.c:1129
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr ""
 
-#: src/hello/hello.c:1133
+#: src/hello/hello.c:1140
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:1151
+#: src/hello/hello.c:1158
 #, fuzzy, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr "Extension « %s » introuvable\n"
 
-#: src/hello/hello.c:1159
+#: src/hello/hello.c:1166
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1174
+#: src/hello/hello.c:1181
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
@@ -4335,172 +4293,172 @@ msgid ""
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:375
+#: src/hostlist/gnunet-daemon-hostlist.c:376
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:380
+#: src/hostlist/gnunet-daemon-hostlist.c:381
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:385
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:387
+#: src/hostlist/gnunet-daemon-hostlist.c:390
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:403
+#: src/hostlist/gnunet-daemon-hostlist.c:406
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:371
+#: src/hostlist/gnunet-daemon-hostlist_client.c:349
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:392
-#: src/hostlist/gnunet-daemon-hostlist_client.c:437
+#: src/hostlist/gnunet-daemon-hostlist_client.c:370
+#: src/hostlist/gnunet-daemon-hostlist_client.c:403
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:395
-#: src/hostlist/gnunet-daemon-hostlist_client.c:440
+#: src/hostlist/gnunet-daemon-hostlist_client.c:373
+#: src/hostlist/gnunet-daemon-hostlist_client.c:406
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:413
+#: src/hostlist/gnunet-daemon-hostlist_client.c:391
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:695
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
+#: src/hostlist/gnunet-daemon-hostlist_client.c:661
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:691
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:768
+#: src/hostlist/gnunet-daemon-hostlist_client.c:734
 #, 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:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:930
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:936
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:944
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:997
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1005
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1515
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
-#: src/transport/plugin_transport_http_client.c:2277
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
+#: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4518,7 +4476,7 @@ msgstr ""
 #: 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
+#: src/topology/gnunet-daemon-topology.c:862
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -4570,7 +4528,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2802
+#: src/transport/gnunet-service-transport.c:2827
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -4612,123 +4570,99 @@ msgstr ""
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:163
+#: src/identity/gnunet-identity.c:179
 #, c-format
 msgid "Failed to create ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:182
+#: src/identity/gnunet-identity.c:201
 #, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:324
+#: src/identity/gnunet-identity.c:356
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:362
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:367
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:373
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:336
+#: src/identity/gnunet-identity.c:378
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:384
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:348
+#: src/identity/gnunet-identity.c:398
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:390
+#: src/identity/gnunet-service-identity.c:391
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:412
+#: src/identity/gnunet-service-identity.c:416
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:501
-#: src/identity/gnunet-service-identity.c:773
-#: src/identity/gnunet-service-identity.c:895
+#: src/identity/gnunet-service-identity.c:507
+#: src/identity/gnunet-service-identity.c:790
+#: src/identity/gnunet-service-identity.c:918
 #, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:508
+#: src/identity/gnunet-service-identity.c:515
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:601
+#: src/identity/gnunet-service-identity.c:610
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:750
+#: src/identity/gnunet-service-identity.c:765
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:789
-#: src/identity/gnunet-service-identity.c:912
+#: src/identity/gnunet-service-identity.c:808
+#: src/identity/gnunet-service-identity.c:936
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:946
+#: src/identity/gnunet-service-identity.c:971
 #, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1004
+#: src/identity/gnunet-service-identity.c:1029
 #, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1014
+#: src/identity/gnunet-service-identity.c:1039
 #, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/identity/plugin_rest_identity.c:967
-msgid "Identity REST API initialized\n"
-msgstr ""
-
-#: 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/json/json.c:123
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/my/my.c:198 src/my/my.c:217
+#: src/my/my.c:196 src/my/my.c:215
 #, c-format
 msgid "%s failed at %s:%d with error: %s\n"
 msgstr ""
@@ -4748,7 +4682,7 @@ msgstr ""
 msgid "No records found for `%s'"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:454
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4768,15 +4702,15 @@ msgstr "fornat invalide : « %s »\n"
 msgid "You must specify a name\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1575
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:233
+#: src/namecache/gnunet-namecache.c:238
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1189
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1632
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
@@ -4788,524 +4722,630 @@ msgstr ""
 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/namecache/plugin_namecache_flat.c:121
+#: src/namecache/plugin_namecache_flat.c:255
+#: src/namestore/plugin_namestore_heap.c:179
+#: src/namestore/plugin_namestore_heap.c:412
 #: src/peerstore/plugin_peerstore_flat.c:379
-#: src/peerstore/plugin_peerstore_flat.c:527
+#: src/peerstore/plugin_peerstore_flat.c:538
 #, 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/namecache/plugin_namecache_flat.c:132
+#: src/namestore/plugin_namestore_heap.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/namecache/plugin_namecache_flat.c:151
+#: src/namestore/plugin_namestore_heap.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
+#: src/namecache/plugin_namecache_flat.c:410
 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/namecache/plugin_namecache_sqlite.c:183
+#: src/namecache/plugin_namecache_sqlite.c:197
+#: src/namestore/plugin_namestore_sqlite.c:219
+#: src/namestore/plugin_namestore_sqlite.c:230
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/namestore/gnunet-namestore.c:301
+#: src/namestore/gnunet-namestore.c:341
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:562
+#: src/namestore/gnunet-namestore.c:371
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:571
+#: src/namestore/gnunet-namestore.c:378
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
-#: src/namestore/gnunet-namestore.c:535
+#: src/namestore/gnunet-namestore.c:660 src/namestore/gnunet-namestore.c:668
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
-#: src/namestore/gnunet-namestore.c:573
+#: src/namestore/gnunet-namestore.c:682 src/namestore/gnunet-namestore.c:694
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-#: src/namestore/plugin_rest_namestore.c:597
+#: src/namestore/gnunet-namestore.c:707
+#, c-format
+msgid ""
+"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:837
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:739
+#: src/namestore/gnunet-namestore.c:878
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: 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:965
+#, fuzzy, c-format
+msgid "Failed to replace records: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/namestore/gnunet-namestore.c:791
+#: src/namestore/gnunet-namestore.c:1009
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: 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: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
+#: src/namestore/gnunet-namestore.c:1032 src/namestore/gnunet-namestore.c:1065
+#: src/namestore/gnunet-namestore.c:1074 src/namestore/gnunet-namestore.c:1093
+#: src/namestore/gnunet-namestore.c:1116 src/namestore/gnunet-namestore.c:1148
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820
-#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
+#: src/namestore/gnunet-namestore.c:1033
+msgid "replace"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1066 src/namestore/gnunet-namestore.c:1075
+#: src/namestore/gnunet-namestore.c:1094 src/namestore/gnunet-namestore.c:1118
 msgid "add"
 msgstr "ajouter"
 
-#: src/namestore/gnunet-namestore.c:829
-#: src/namestore/plugin_rest_namestore.c:671
+#: src/namestore/gnunet-namestore.c:1084
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:851
-#: src/namestore/plugin_rest_namestore.c:689
-#: src/namestore/plugin_rest_namestore.c:729
+#: src/namestore/gnunet-namestore.c:1106
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:896
+#: src/namestore/gnunet-namestore.c:1129
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1149
 msgid "del"
 msgstr "supprimer"
 
-#: src/namestore/gnunet-namestore.c:950
+#: src/namestore/gnunet-namestore.c:1192
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:979
+#: src/namestore/gnunet-namestore.c:1221
 #: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI invalide « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:1014
+#: src/namestore/gnunet-namestore.c:1249
 #, c-format
 msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1051
-#: src/namestore/plugin_rest_namestore.c:1046
+#: src/namestore/gnunet-namestore.c:1289
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1108
-#: src/namestore/plugin_rest_namestore.c:1142
+#: src/namestore/gnunet-namestore.c:1341
+#, c-format
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1357
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1135
+#: src/namestore/gnunet-namestore.c:1407
+msgid "Empty record line argument is not allowed.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1423
+#, c-format
+msgid "Invalid expiration time `%s' (must be without unit)\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1435 src/namestore/gnunet-namestore.c:1453
+#: src/namestore/gnunet-namestore.c:1470
+#, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1444
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Commande « %s » inconnue\n"
+
+#: src/namestore/gnunet-namestore.c:1484
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/namestore/gnunet-namestore.c:1548
 msgid "add record"
 msgstr "ajouter un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1138
+#: src/namestore/gnunet-namestore.c:1552
 msgid "delete record"
 msgstr "suprimer un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1141
+#: src/namestore/gnunet-namestore.c:1556
 msgid "display records"
 msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore.c:1144
+#: src/namestore/gnunet-namestore.c:1561
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1566
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1150
+#: src/namestore/gnunet-namestore.c:1570
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1156
+#: src/namestore/gnunet-namestore.c:1580
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1585
+msgid ""
+"set record set to values given by (possibly multiple) RECORDLINES; can be "
+"specified multiple times"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1590
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1162
+#: src/namestore/gnunet-namestore.c:1595
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1165
+#: src/namestore/gnunet-namestore.c:1600
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1604
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1171
+#: src/namestore/gnunet-namestore.c:1608
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1174
+#: src/namestore/gnunet-namestore.c:1613
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:508
+#: src/namestore/gnunet-namestore-fcfsd.c:549
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:535
+#: src/namestore/gnunet-namestore-fcfsd.c:576
 #, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:555
+#: src/namestore/gnunet-namestore-fcfsd.c:597
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:585
+#: src/namestore/gnunet-namestore-fcfsd.c:629
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:662
+#: src/namestore/gnunet-namestore-fcfsd.c:689
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:718
+#: src/namestore/gnunet-namestore-fcfsd.c:777
 #, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:734
+#: src/namestore/gnunet-namestore-fcfsd.c:796
 #, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:770
+#: src/namestore/gnunet-namestore-fcfsd.c:832
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:778
+#: src/namestore/gnunet-namestore-fcfsd.c:841
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:974
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1000
+#: src/namestore/gnunet-namestore-fcfsd.c:1099
 msgid "Failed to start HTTP server\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1042
+#: src/namestore/gnunet-namestore-fcfsd.c:1147
 msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1074
+#: src/namestore/gnunet-namestore-fcfsd.c:1173
+msgid "name of the zone that is to be managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1192
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:612
+#: src/namestore/gnunet-service-namestore.c:900
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:379
+#: src/namestore/gnunet-zoneimport.c:2038
+msgid "size to use for the main hash map"
+msgstr ""
+
+#: src/namestore/gnunet-zoneimport.c:2043
+msgid "minimum expiration time we assume for imported records"
+msgstr ""
+
+#: src/namestore/namestore_api.c:391
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:656
-msgid "flat file database running\n"
+#: src/namestore/plugin_namestore_heap.c:773
+msgid "heap file database running\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:1187
-msgid "Namestore REST API initialized\n"
+#: src/nat-auto/gnunet-nat-auto.c:193
+msgid "Suggested configuration changes:\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:159
-msgid "GNUnet NAT traversal autoconfigure daemon"
+#: src/nat-auto/gnunet-nat-auto.c:219
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:226
+#, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:345
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:351
+msgid "section name providing the configuration for the adapter"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:459
+msgid "use TCP"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:464
+msgid "use UDP"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:366
+msgid "write configuration file (for autoconfiguration)"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:378
+msgid "GNUnet NAT traversal autoconfiguration"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:403
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681
+#: src/nat-auto/nat_auto_api_test.c:409
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:518
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:568
+#: src/nat-auto/nat_auto_api_test.c:575
+msgid "NAT test failed to start NAT library\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto.c:342
+msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
 #, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
+msgid "Detected external IP `%s'\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590
+#, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725
+msgid "upnpc not found\n"
+msgstr "upnpc introuvable\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:363
-msgid "GNUnet NAT traversal test helper daemon"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_api.c:880 src/nat/nat.c:2010
+#: src/nat-auto/nat_auto_api.c:76
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat_api.c:882 src/nat/nat.c:2012
-msgid "Internal Failure (IPC, ...)"
+#: src/nat-auto/nat_auto_api.c:78
+msgid "IPC failure"
 msgstr ""
 
-#: src/nat/nat_api.c:884 src/nat/nat.c:2014
+#: src/nat-auto/nat_auto_api.c:80
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat_api.c:886 src/nat/nat.c:2016
+#: src/nat-auto/nat_auto_api.c:82
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat_api.c:888 src/nat/nat.c:2018
+#: src/nat-auto/nat_auto_api.c:84
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat_api.c:890 src/nat/nat.c:2020
+#: src/nat-auto/nat_auto_api.c:86
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat_api.c:892 src/nat/nat.c:2022
+#: src/nat-auto/nat_auto_api.c:88
 msgid "Failed to run `upnpc` command"
 msgstr ""
 
-#: src/nat/nat_api.c:894 src/nat/nat.c:2024
+#: src/nat-auto/nat_auto_api.c:90
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat_api.c:896 src/nat/nat.c:2026
+#: src/nat-auto/nat_auto_api.c:92
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat_api.c:898 src/nat/nat.c:2028
+#: src/nat-auto/nat_auto_api.c:94
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat_api.c:900 src/nat/nat.c:2030
+#: src/nat-auto/nat_auto_api.c:96
 msgid "Failed to run `external-ip` command"
 msgstr ""
 
-#: src/nat/nat_api.c:902 src/nat/nat.c:2032
+#: src/nat-auto/nat_auto_api.c:98
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat_api.c:904 src/nat/nat.c:2034
+#: src/nat-auto/nat_auto_api.c:100
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat_api.c:906 src/nat/nat.c:2036
+#: src/nat-auto/nat_auto_api.c:102
 msgid "Could not determine interface with internal/local network address"
 msgstr ""
 
-#: src/nat/nat_api.c:908 src/nat/nat.c:2038
+#: src/nat-auto/nat_auto_api.c:104
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat_api.c:910 src/nat/nat.c:2040
+#: src/nat-auto/nat_auto_api.c:106
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat_api.c:912 src/nat/nat.c:2042
+#: src/nat-auto/nat_auto_api.c:108
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat_api.c:914 src/nat/nat.c:2044
+#: src/nat-auto/nat_auto_api.c:110
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat_api.c:916 src/nat/nat.c:2046
+#: src/nat-auto/nat_auto_api.c:112
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/nat/nat_auto.c:385
-msgid "NAT traversal with ICMP Server succeeded.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:386
-msgid "NAT traversal with ICMP Server failed.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:405
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:437
-#, c-format
-msgid "Detected external IP `%s'\n"
-msgstr ""
+#: src/nat-auto/nat_auto_api_test.c:481
+#, fuzzy, c-format
+msgid "Failed to find valid PORT in section `%s'\n"
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/nat/nat_auto.c:572
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
-msgstr ""
+#: src/nat-auto/nat_auto_api_test.c:526
+#, fuzzy, c-format
+msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/nat/nat_auto.c:590
-#, c-format
-msgid "Detected internal network address `%s'.\n"
+#: src/nat/gnunet-nat.c:437
+msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/nat_auto.c:681 src/nat/nat_test.c:403
-msgid "Failed to connect to `gnunet-nat-server'\n"
+#: src/nat/gnunet-nat.c:443
+msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/nat_auto.c:724
-msgid "upnpc found, enabling its use\n"
+#: src/nat/gnunet-nat.c:449
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
 msgstr ""
 
-#: src/nat/nat_auto.c:725
-msgid "upnpc not found\n"
-msgstr "upnpc introuvable\n"
-
-#: src/nat/nat_auto.c:762
-msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+#: src/nat/gnunet-nat.c:454
+msgid "enable STUN processing"
 msgstr ""
 
-#: 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"
+#: src/nat/gnunet-nat.c:469
+msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/nat/nat_auto.c:786 src/nat/nat_auto.c:846
-msgid "No working gnunet-helper-nat-server found\n"
+#: src/nat/gnunet-nat.c:481
+msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:823
-msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
+#: src/nat/gnunet-service-nat.c:1339
+#, c-format
+msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/nat.c:1019
+#: src/nat/gnunet-service-nat.c:1349
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/nat.c:1070
+#: src/nat/gnunet-service-nat.c:1365
 #, c-format
-msgid "Failed to start %s\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/nat/nat.c:1327
-msgid "Error while running upnp client:\n"
+msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/nat.c:1402
+#: src/nat/gnunet-service-nat.c:1376
 #, c-format
-msgid "Failed to run upnp client for port %u\n"
+msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/nat.c:1546
-msgid "malformed"
-msgstr "malformé"
+#: src/nat/gnunet-service-nat.c:1841
+msgid "Connection reversal request failed\n"
+msgstr ""
 
-#: src/nat/nat.c:1600
+#: src/nat/gnunet-service-nat.c:1914
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
-"disabling UPnP \n"
+"disabling UPnP\n"
 msgstr ""
 
-#: src/nat/nat.c:1726 src/nat/nat.c:1739
+#: src/nat/gnunet-service-nat_helper.c:186
 #, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
-msgstr ""
-
-#: src/nat/nat.c:1903
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:1919
+#: src/nat/gnunet-service-nat_helper.c:273
 #, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
-msgstr ""
+msgid "Failed to start %s\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/nat/nat_mini.c:205
+#: src/nat/gnunet-service-nat_mini.c:196
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:611
+#: src/nat/gnunet-service-nat_mini.c:656
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: 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:568
-msgid "NAT test failed to start NAT library\n"
-msgstr ""
-
 #: src/nse/gnunet-nse.c:122
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:840
+#: src/nse/gnunet-nse-profiler.c:849
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:843
+#: src/nse/gnunet-nse-profiler.c:854
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:849
+#: src/nse/gnunet-nse-profiler.c:866
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:852
+#: src/nse/gnunet-nse-profiler.c:873
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:858
+#: src/nse/gnunet-nse-profiler.c:884
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:867
+#: src/nse/gnunet-nse-profiler.c:893
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1536
-#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
+#: src/nse/gnunet-service-nse.c:1534
+#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5314,48 +5354,48 @@ msgstr ""
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:310
+#: src/peerinfo/gnunet-service-peerinfo.c:313
 #, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:331
-#: src/peerinfo/gnunet-service-peerinfo.c:362
+#: src/peerinfo/gnunet-service-peerinfo.c:334
+#: src/peerinfo/gnunet-service-peerinfo.c:365
 #, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:446
+#: src/peerinfo/gnunet-service-peerinfo.c:449
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:489
+#: src/peerinfo/gnunet-service-peerinfo.c:492
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:655
+#: src/peerinfo/gnunet-service-peerinfo.c:659
 #, c-format
 msgid "Scanning directory `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:663
+#: src/peerinfo/gnunet-service-peerinfo.c:667
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1076
+#: src/peerinfo/gnunet-service-peerinfo.c:1100
 #, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1405
+#: src/peerinfo/gnunet-service-peerinfo.c:1438
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1418
+#: src/peerinfo/gnunet-service-peerinfo.c:1451
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
@@ -5374,6 +5414,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:299
+#: src/rest-plugins/plugin_rest_peerinfo.c:501
 #, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr ""
@@ -5398,39 +5439,39 @@ msgstr ""
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:842
+#: src/peerinfo-tool/gnunet-peerinfo.c:843
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:845
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:848
+#: src/peerinfo-tool/gnunet-peerinfo.c:852
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:851
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:854
+#: src/peerinfo-tool/gnunet-peerinfo.c:862
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:857
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:860
+#: src/peerinfo-tool/gnunet-peerinfo.c:873
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:863
+#: src/peerinfo-tool/gnunet-peerinfo.c:879
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:880
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 msgid "Print information about peers."
 msgstr ""
 
@@ -5456,212 +5497,161 @@ msgstr ""
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:588
+#: src/peerstore/gnunet-service-peerstore.c:598
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: 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:344
-msgid "timeout"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
+#: src/peerstore/peerstore_api.c:605 src/peerstore/peerstore_api.c:657
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:623
+#: src/peerstore/peerstore_api.c:671
 msgid "Received a malformed response from service."
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:768
+#: src/peerstore/peerstore_api.c:807
 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:282
+#: src/peerstore/plugin_peerstore_sqlite.c:453
 #, c-format
 msgid ""
 "Error executing SQL query: %s\n"
 "  %s\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:422
-#: src/psycstore/plugin_psycstore_mysql.c:250
-#: src/psycstore/plugin_psycstore_sqlite.c:259
+#: src/peerstore/plugin_peerstore_sqlite.c:488
 #, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
 "  %s\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:504
+#: src/peerstore/plugin_peerstore_sqlite.c:570
 #, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr ""
 
-#: src/postgres/postgres.c:67
+#: src/pq/pq_prepare.c:84
 #, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s\n"
+msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
 msgstr ""
 
-#: src/postgres/postgres.c:195
-#, fuzzy, c-format
-msgid "Unable to connect to Postgres database '%s': %s\n"
-msgstr "Résolution de « %s » échouée\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:249
-msgid "Failed to store membership information!\n"
+#: src/pt/gnunet-daemon-pt.c:423
+msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:271
-msgid "Failed to test membership!\n"
+#: src/pt/gnunet-daemon-pt.c:429
+msgid "# DNS requests mapped to VPN"
 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:368
-msgid "Failed to get fragment!\n"
+#: src/pt/gnunet-daemon-pt.c:483
+msgid "# DNS records modified"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:434
-msgid "Failed to get message!\n"
+#: src/pt/gnunet-daemon-pt.c:667
+msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:464
-msgid "Failed to get message fragment!\n"
+#: src/pt/gnunet-daemon-pt.c:674
+msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:494
-msgid "Failed to get master counters!\n"
+#: src/pt/gnunet-daemon-pt.c:712
+msgid "# DNS requests dropped (timeout)"
 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: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:693
-msgid "Failed to end modifying state!\n"
+#: src/pt/gnunet-daemon-pt.c:768
+msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:730
-msgid "Tried to set invalid state variable name!\n"
+#: src/pt/gnunet-daemon-pt.c:773
+msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:744
-msgid "Failed to begin synchronizing state!\n"
+#: src/pt/gnunet-daemon-pt.c:781
+msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:761
-msgid "Failed to end synchronizing state!\n"
+#: src/pt/gnunet-daemon-pt.c:876
+msgid "# DNS replies received"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:779
-#: src/psycstore/gnunet-service-psycstore.c:795
-msgid "Failed to reset state!\n"
+#: src/pt/gnunet-daemon-pt.c:893
+msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:824
-#: src/psycstore/gnunet-service-psycstore.c:881
-msgid "Tried to get invalid state variable name!\n"
+#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228
+#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253
+#: src/pt/gnunet-daemon-pt.c:1262
+#, c-format
+msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:851
-#: src/psycstore/gnunet-service-psycstore.c:896
-msgid "Failed to get state variable!\n"
+#: src/pt/gnunet-daemon-pt.c:1307
+msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: 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
+#: src/reclaim/gnunet-reclaim.c:467
 #, c-format
-msgid "`%s' failed at %s:%d with error: %s (%d)\n"
-msgstr ""
-
-#: src/psycstore/plugin_psycstore_sqlite.c:1924
-msgid "SQLite database running\n"
+msgid "Ego is required\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:493
-msgid "Failed to pack DNS request.  Dropping.\n"
+#: src/reclaim/gnunet-reclaim.c:475
+#, c-format
+msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:499
-msgid "# DNS requests mapped to VPN"
+#: src/reclaim/gnunet-reclaim.c:483
+#, c-format
+msgid "Requesting party key is required!\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:553
-msgid "# DNS records modified"
+#: src/reclaim/gnunet-reclaim.c:506
+msgid "Add attribute"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:737
-msgid "# DNS replies intercepted"
+#: src/reclaim/gnunet-reclaim.c:512
+msgid "Attribute value"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:744
-msgid "Failed to parse DNS request.  Dropping.\n"
+#: src/reclaim/gnunet-reclaim.c:517
+msgid "Ego"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:851
-msgid "# DNS requests dropped (timeout)"
+#: src/reclaim/gnunet-reclaim.c:522
+msgid "Audience (relying party)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:909
-msgid "# DNS requests intercepted"
+#: src/reclaim/gnunet-reclaim.c:526
+msgid "List attributes for Ego"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:914
-msgid "# DNS requests dropped (DNS cadet channel down)"
+#: src/reclaim/gnunet-reclaim.c:531
+msgid "Issue a ticket"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:922
-msgid "# DNS requests dropped (malformed)"
+#: src/reclaim/gnunet-reclaim.c:536
+msgid "Consume a ticket"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:995
-msgid "# DNS replies received"
+#: src/reclaim/gnunet-reclaim.c:541
+msgid "Revoke a ticket"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1011
-msgid "# DNS replies dropped (too late?)"
+#: src/reclaim/gnunet-reclaim.c:546
+msgid "Type of attribute"
 msgstr ""
 
-#: 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"
+#: src/reclaim/gnunet-reclaim.c:551
+msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1390
-msgid "Daemon to run to perform IP protocol translation to GNUnet"
-msgstr ""
+#: src/reclaim/reclaim_api.c:436
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Échec du démarrage de %s\n"
 
 #: src/regex/gnunet-daemon-regexprofiler.c:267
 #, c-format
@@ -5672,68 +5662,68 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1314
+#: src/regex/gnunet-regex-profiler.c:1386
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1355
+#: src/regex/gnunet-regex-profiler.c:1427
 #: 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:1361
+#: src/regex/gnunet-regex-profiler.c:1433
 #: 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:1368
+#: src/regex/gnunet-regex-profiler.c:1440
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1377
+#: src/regex/gnunet-regex-profiler.c:1449
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1397
+#: src/regex/gnunet-regex-profiler.c:1469
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1482
+#: src/regex/gnunet-regex-profiler.c:1557
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1485
+#: src/regex/gnunet-regex-profiler.c:1563
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1488
+#: src/regex/gnunet-regex-profiler.c:1569
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1491
+#: src/regex/gnunet-regex-profiler.c:1576
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1494
+#: src/regex/gnunet-regex-profiler.c:1582
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1506
+#: src/regex/gnunet-regex-profiler.c:1595
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:696
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:699
+#: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:712
+#: src/regex/gnunet-regex-simulation-profiler.c:719
 msgid "Profiler for regex library"
 msgstr ""
 
@@ -5747,14 +5737,43 @@ msgstr ""
 msgid "Search string `%s' is too long!\n"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:788
+#: src/rest/gnunet-rest-server.c:927
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:805
+#: src/rest/gnunet-rest-server.c:944
 msgid "GNUnet REST server"
 msgstr ""
 
+#: src/rest-plugins/plugin_rest_copying.c:209
+msgid "COPYING REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_credential.c:1128
+msgid "GNS REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_gns.c:452
+msgid "Gns REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_identity.c:1297
+msgid "Identity REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_namestore.c:1079
+msgid "Namestore REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_openid_connect.c:2279
+#: src/rest-plugins/plugin_rest_reclaim.c:1079
+msgid "Identity Provider REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_peerinfo.c:796
+msgid "Peerinfo REST API initialized\n"
+msgstr ""
+
 #: src/revocation/gnunet-revocation.c:129
 #, c-format
 msgid "Key `%s' is valid\n"
@@ -5814,7 +5833,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1159
+#: src/revocation/gnunet-revocation.c:437
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
@@ -5837,58 +5856,82 @@ msgstr ""
 msgid "No action specified. Nothing to do.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:532
+#: src/revocation/gnunet-revocation.c:535
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:535
+#: src/revocation/gnunet-revocation.c:541
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:538
+#: src/revocation/gnunet-revocation.c:546
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:541
+#: src/revocation/gnunet-revocation.c:552
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:456
+#: src/revocation/gnunet-service-revocation.c:459
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:464
+#: src/revocation/gnunet-service-revocation.c:468
 msgid "# revocation messages received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:469
+#: src/revocation/gnunet-service-revocation.c:473
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:473
+#: src/revocation/gnunet-service-revocation.c:477
 msgid "# revocation set unions failed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:482
+#: src/revocation/gnunet-service-revocation.c:486
 msgid "# revocation set unions completed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:519
-#: src/revocation/gnunet-service-revocation.c:765
+#: src/revocation/gnunet-service-revocation.c:525
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:856
+#: src/revocation/gnunet-service-revocation.c:867
 msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:177
+#: src/rps/gnunet-rps.c:260
 msgid "Seed a PeerID"
 msgstr ""
 
+#: src/rps/gnunet-rps.c:264
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:268
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2964
+msgid "duration of the profiling"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2969
+msgid "timeout for the profiling"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2974
+#, fuzzy
+msgid "number of PeerIDs to request"
+msgstr "nombre de valeurs"
+
+#: src/rps/gnunet-rps-profiler.c:2990
+msgid "Measure quality and performance of the RPS service."
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:220
 msgid "You must specify at least one message ID to check!\n"
 msgstr ""
@@ -5923,29 +5966,30 @@ msgstr "Impossible d’ouvrir « %s ».\n"
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:357
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:363
 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:354
+#: src/scalarproduct/gnunet-scalarproduct.c:369
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:363
+#: src/scalarproduct/gnunet-scalarproduct.c:379
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: 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
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 msgid "Connect to CADET failed\n"
 msgstr ""
 
@@ -5953,254 +5997,177 @@ msgstr ""
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
 msgid "dkg start delay"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "dkg timeout"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+#: src/secretsharing/gnunet-secretsharing-profiler.c:628
 msgid "threshold"
 msgstr "threshold"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+#: src/secretsharing/gnunet-secretsharing-profiler.c:633
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1991
-msgid "Could not connect to cadet service\n"
-msgstr ""
+#: src/set/gnunet-service-set.c:2008
+#, fuzzy
+msgid "Could not connect to CADET service\n"
+msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:249
+#: src/set/gnunet-set-ibf-profiler.c:252
 msgid "number of element in set A-B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:252
+#: src/set/gnunet-set-ibf-profiler.c:258
 msgid "number of element in set B-A"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:255
+#: src/set/gnunet-set-ibf-profiler.c:264
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:258
+#: src/set/gnunet-set-ibf-profiler.c:270
 msgid "hash num"
 msgstr "numéro de hash"
 
-#: src/set/gnunet-set-ibf-profiler.c:261
+#: src/set/gnunet-set-ibf-profiler.c:276
 msgid "ibf size"
 msgstr "taille ibz"
 
-#: src/set/gnunet-set-profiler.c:387
-msgid "operation to execute"
-msgstr ""
-
-#: src/social/gnunet-social.c:1146
-msgid "--place missing or invalid.\n"
-msgstr ""
-
-#: src/social/gnunet-social.c:1195
-msgid "assign --name in state to --data"
-msgstr ""
-
-#: src/social/gnunet-social.c:1199
-msgid "say good-bye and leave somebody else's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1203
-msgid "create a place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1207
-msgid "destroy a place we were hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1211
-msgid "enter somebody else's place"
+#: src/set/gnunet-set-profiler.c:444
+msgid "use byzantine mode"
 msgstr ""
 
-#: src/social/gnunet-social.c:1215
-msgid "find state matching name prefix"
+#: src/set/gnunet-set-profiler.c:450
+msgid "force sending full set"
 msgstr ""
 
-#: src/social/gnunet-social.c:1219
-msgid "replay history of messages up to the given --limit"
+#: src/set/gnunet-set-profiler.c:456
+msgid "number delta operation"
 msgstr ""
 
-#: src/social/gnunet-social.c:1223
-msgid "reconnect to a previously created place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1227
-msgid "publish something to a place we are hosting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1231
-msgid "reconnect to a previously entered place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1235
-msgid "search for state matching exact name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1239
-msgid "submit something to somebody's place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1243
-msgid "list of egos and subscribed places"
-msgstr ""
-
-#: src/social/gnunet-social.c:1247
-msgid "extract and replay history between message IDs --start and --until"
-msgstr ""
-
-#: src/social/gnunet-social.c:1254
-msgid "application ID to use when connecting"
-msgstr ""
-
-#: src/social/gnunet-social.c:1258
-msgid "message body or state value"
-msgstr ""
-
-#: src/social/gnunet-social.c:1262
-msgid "name or public key of ego"
-msgstr ""
-
-#: src/social/gnunet-social.c:1266
-msgid "wait for incoming messages"
-msgstr ""
-
-#: src/social/gnunet-social.c:1270
-msgid "GNS name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1274
-msgid "peer ID for --guest-enter"
-msgstr ""
-
-#: src/social/gnunet-social.c:1278
-msgid "name (key) to query from state"
-msgstr ""
-
-#: src/social/gnunet-social.c:1282
-msgid "method name"
-msgstr ""
-
-#: src/social/gnunet-social.c:1286
-#, fuzzy
-msgid "number of messages to replay from history"
-msgstr "nombre de valeurs"
-
-#: src/social/gnunet-social.c:1290
-msgid "key address of place"
-msgstr ""
-
-#: src/social/gnunet-social.c:1294
-msgid "start message ID for history replay"
+#: src/set/gnunet-set-profiler.c:468
+msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1298
-msgid "respond to entry requests by admitting all guests"
+#: src/set/gnunet-set-profiler.c:474
+msgid "element size"
 msgstr ""
 
-#: src/social/gnunet-social.c:1302
-msgid "end message ID for history replay"
+#: src/sq/sq.c:54
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
 msgstr ""
 
-#: src/social/gnunet-social.c:1306
-msgid "respond to entry requests by refusing all guests"
+#: src/sq/sq.c:61
+msgid "Failure in sqlite3_reset (!)\n"
 msgstr ""
 
-#: 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/sq/sq.c:139
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr "Échec du démarrage de %s\n"
 
 #: src/statistics/gnunet-service-statistics.c:338
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:1083
+#: src/statistics/gnunet-service-statistics.c:1086
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:158
+#: src/statistics/gnunet-statistics.c:409
+#: src/statistics/gnunet-statistics.c:450
 msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:161
+#: src/statistics/gnunet-statistics.c:412
+#: src/statistics/gnunet-statistics.c:453
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:219
+#: src/statistics/gnunet-statistics.c:528
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:227
+#: src/statistics/gnunet-statistics.c:536
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:270
+#: src/statistics/gnunet-statistics.c:579
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:285
+#: src/statistics/gnunet-statistics.c:594
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:321
+#: src/statistics/gnunet-statistics.c:729
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Argument invalide « %s »\n"
 
-#: src/statistics/gnunet-statistics.c:339
+#: src/statistics/gnunet-statistics.c:747
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:347
+#: src/statistics/gnunet-statistics.c:755
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:383
+#: src/statistics/gnunet-statistics.c:786
+#, c-format
+msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:819
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:386
+#: src/statistics/gnunet-statistics.c:824
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:389
+#: src/statistics/gnunet-statistics.c:830
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:392
+#: src/statistics/gnunet-statistics.c:836
+msgid "use as csv separator"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:842
+msgid "path to the folder containing the testbed data"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:847
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:395
+#: src/statistics/gnunet-statistics.c:852
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:398
+#: src/statistics/gnunet-statistics.c:858
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:401
+#: src/statistics/gnunet-statistics.c:864
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:417
+#: src/statistics/gnunet-statistics.c:881
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
@@ -6250,12 +6217,12 @@ msgstr ""
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:339
-#: src/testbed/gnunet-testbed-profiler.c:281
+#: src/testbed/generate-underlay-topology.c:342
+#: src/testbed/gnunet-testbed-profiler.c:282
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:348
+#: src/testbed/generate-underlay-topology.c:352
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6283,19 +6250,19 @@ msgstr ""
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:249
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
-#: 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
+#: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:469
+#: src/testbed/gnunet-daemon-testbed-underlay.c:471
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
@@ -6305,15 +6272,61 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1141
-msgid "Misconfiguration (can't connect to the ARM service)"
+#: src/testbed/gnunet-service-testbed_peers.c:1159
+#, c-format
+msgid "%s is stopped"
+msgstr "%s est arrêté"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1161
+#, c-format
+msgid "%s is starting"
+msgstr "%s est en cours de démarrage"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1163
+#, c-format
+msgid "%s is stopping"
+msgstr "%s est en cours d'arrêt"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1165
+#, c-format
+msgid "%s is starting already"
+msgstr "%s est déjà en cours de démarrage"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1167
+#, c-format
+msgid "%s is stopping already"
+msgstr "%s est déjà arrêté"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1169
+#, c-format
+msgid "%s is started already"
+msgstr "%s est déjà démarré"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1171
+#, c-format
+msgid "%s is stopped already"
+msgstr "%s est déjà arrêté"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1173
+#, c-format
+msgid "%s service is not known to ARM"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1175
+#, c-format
+msgid "%s service failed to start"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
+#: src/testbed/gnunet-service-testbed_peers.c:1179
+#, c-format
+msgid "%.s Unknown result code."
+msgstr "%.s Code d'erreur inconnu"
+
 #: src/testbed/gnunet_testbed_mpi_spawn.c:118
 msgid "Waiting for child to exit.\n"
 msgstr ""
@@ -6323,11 +6336,11 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:287
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:287
+#: src/testbed/gnunet-testbed-profiler.c:291
 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 "
@@ -6467,40 +6480,36 @@ msgstr ""
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:352
+#: src/testing/gnunet-testing.c:354
 msgid "create unique configuration files"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:354
+#: src/testing/gnunet-testing.c:359
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:356
+#: src/testing/gnunet-testing.c:365
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:358
+#: src/testing/gnunet-testing.c:372
 msgid "configuration template"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:360
+#: src/testing/gnunet-testing.c:378
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:373
+#: src/testing/gnunet-testing.c:391
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:91
+#: src/testing/list-keys.c:89
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/list-keys.c:94
-msgid "skip COUNT number of keys in the beginning"
-msgstr ""
-
 #: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
@@ -6511,113 +6520,113 @@ msgstr ""
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1161
 #, 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:1167
+#: src/testing/testing.c:1170
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1180
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1193
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1207
 #, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1219
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1241
+#: src/testing/testing.c:1244
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1343
+#: src/testing/testing.c:1346
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1644
+#: src/testing/testing.c:1649
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr ""
 
-#: src/topology/friends.c:100
+#: src/topology/friends.c:126
 #, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr ""
 
-#: src/topology/friends.c:154
+#: src/topology/friends.c:180
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:225
+#: src/topology/gnunet-daemon-topology.c:230
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:339
+#: src/topology/gnunet-daemon-topology.c:344
 msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:533
+#: src/topology/gnunet-daemon-topology.c:538
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:635
-#: src/topology/gnunet-daemon-topology.c:721
+#: src/topology/gnunet-daemon-topology.c:640
+#: src/topology/gnunet-daemon-topology.c:726
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:918
+#: src/topology/gnunet-daemon-topology.c:923
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:956
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:963
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:985
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:988
 msgid "# friends in configuration"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:995
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:1001
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1059
-#: src/transport/plugin_transport_wlan.c:1491
+#: src/topology/gnunet-daemon-topology.c:1054
+#: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr ""
 
@@ -6625,243 +6634,269 @@ msgstr ""
 msgid "GNUnet topology control"
 msgstr ""
 
+#: src/transport/gnunet-communicator-tcp.c:2329
+#: src/transport/gnunet-communicator-udp.c:2883
+#: src/transport/gnunet-service-tng.c:4747
+#: src/transport/gnunet-service-transport.c:2795
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
+msgstr ""
+
+#: src/transport/gnunet-communicator-tcp.c:2393
+msgid "GNUnet TCP communicator"
+msgstr ""
+
+#: src/transport/gnunet-communicator-udp.c:2954
+msgid "GNUnet UDP communicator"
+msgstr ""
+
+#: src/transport/gnunet-communicator-unix.c:802
+msgid ""
+"Maximum number of UNIX connections exceeded, dropping incoming message\n"
+msgstr ""
+
+#: src/transport/gnunet-communicator-unix.c:1073
+#: src/transport/plugin_transport_unix.c:1403
+#, c-format
+msgid "Cannot create path to `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-communicator-unix.c:1162
+msgid "GNUnet UNIX domain socket communicator"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_ats.c:141
 msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:448
+#: src/transport/gnunet-service-transport.c:452
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:809
+#: src/transport/gnunet-service-transport.c:826
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1539
+#: src/transport/gnunet-service-transport.c:1563
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1698
+#: src/transport/gnunet-service-transport.c:1723
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1795
+#: src/transport/gnunet-service-transport.c:1820
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2112
-#: src/transport/gnunet-service-transport.c:2584
+#: src/transport/gnunet-service-transport.c:2137
+#: src/transport/gnunet-service-transport.c:2609
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2588
+#: src/transport/gnunet-service-transport.c:2613
 #, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2696
+#: src/transport/gnunet-service-transport.c:2721
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2705
+#: src/transport/gnunet-service-transport.c:2730
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: 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:195
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:804
+#: src/transport/gnunet-service-transport_neighbours.c:805
 #, fuzzy
 msgid "# session creation failed"
 msgstr "# Session TCP active"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1053
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1167
+#: src/transport/gnunet-service-transport_neighbours.c:1176
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1310
-#: src/transport/gnunet-service-transport_neighbours.c:1763
+#: src/transport/gnunet-service-transport_neighbours.c:1324
+#: src/transport/gnunet-service-transport_neighbours.c:1785
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1329
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1321
+#: src/transport/gnunet-service-transport_neighbours.c:1335
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1381
+#: src/transport/gnunet-service-transport_neighbours.c:1395
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1457
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1493
+#: src/transport/gnunet-service-transport_neighbours.c:1515
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1501
+#: src/transport/gnunet-service-transport_neighbours.c:1523
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1511
+#: src/transport/gnunet-service-transport_neighbours.c:1533
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1556
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1565
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1573
+#: src/transport/gnunet-service-transport_neighbours.c:1595
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1582
+#: src/transport/gnunet-service-transport_neighbours.c:1604
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1587
+#: src/transport/gnunet-service-transport_neighbours.c:1609
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1593
+#: src/transport/gnunet-service-transport_neighbours.c:1615
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1660
+#: src/transport/gnunet-service-transport_neighbours.c:1682
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1694
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1709
+#: src/transport/gnunet-service-transport_neighbours.c:1731
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1829
+#: src/transport/gnunet-service-transport_neighbours.c:1854
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1849
+#: src/transport/gnunet-service-transport_neighbours.c:1874
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1913
 msgid "# SYN messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1905
+#: src/transport/gnunet-service-transport_neighbours.c:1930
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1935
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2000
+#: src/transport/gnunet-service-transport_neighbours.c:2028
 #, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2054
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2071
+#: src/transport/gnunet-service-transport_neighbours.c:2099
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2227
+#: src/transport/gnunet-service-transport_neighbours.c:2262
 msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2232
+#: src/transport/gnunet-service-transport_neighbours.c:2267
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2598
+#: src/transport/gnunet-service-transport_neighbours.c:2654
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3080
+#: src/transport/gnunet-service-transport_neighbours.c:3139
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3147
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3106
-#: src/transport/gnunet-service-transport_neighbours.c:3130
+#: src/transport/gnunet-service-transport_neighbours.c:3165
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3167
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3180
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3352
+#: src/transport/gnunet-service-transport_neighbours.c:3412
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3388
+#: src/transport/gnunet-service-transport_neighbours.c:3448
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3476
+#: src/transport/gnunet-service-transport_neighbours.c:3536
 msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3483
+#: src/transport/gnunet-service-transport_neighbours.c:3543
 msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3523
+#: src/transport/gnunet-service-transport_neighbours.c:3583
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3530
+#: src/transport/gnunet-service-transport_neighbours.c:3590
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3541
+#: src/transport/gnunet-service-transport_neighbours.c:3601
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3675
+#: src/transport/gnunet-service-transport_neighbours.c:3736
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -6895,8 +6930,8 @@ msgstr ""
 
 #: 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
+#: src/transport/gnunet-service-transport_validation.c:997
+#: src/transport/gnunet-service-transport_validation.c:1610
 msgid "# validations running"
 msgstr ""
 
@@ -6920,226 +6955,208 @@ msgstr ""
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1114
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1165
+#: src/transport/gnunet-service-transport_validation.c:1175
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1178
+#: src/transport/gnunet-service-transport_validation.c:1188
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1181
+#: src/transport/gnunet-service-transport_validation.c:1191
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1189
+#: src/transport/gnunet-service-transport_validation.c:1199
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1202
+#: src/transport/gnunet-service-transport_validation.c:1212
 #, 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:1257
+#: src/transport/gnunet-service-transport_validation.c:1267
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1308
+#: src/transport/gnunet-service-transport_validation.c:1318
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1317
+#: src/transport/gnunet-service-transport_validation.c:1327
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1480
+#: src/transport/gnunet-service-transport_validation.c:1500
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1498
+#: src/transport/gnunet-service-transport_validation.c:1518
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1553
+#: src/transport/gnunet-service-transport_validation.c:1573
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:486
+#: src/transport/gnunet-service-transport_validation.c:1628
+msgid "# HELLOs given to peerinfo"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:496
+#: src/transport/gnunet-transport.c:423
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:540
+#: src/transport/gnunet-transport.c:467
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:553
+#: src/transport/gnunet-transport.c:480
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:565
-msgid "Failed to list connections, timeout occured\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:588
-#, c-format
-msgid "NAT plugin `%s' reports: %s\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:675
-msgid "No transport plugins configured, peer will never communicate\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:689
-#, c-format
-msgid "No port configured for plugin `%s', cannot test it\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:714
+#: src/transport/gnunet-transport.c:494
 #, fuzzy
-msgid "Failed to start resolver!\n"
-msgstr "Échec du démarrage de %s\n"
+msgid "Failed to list connections, timeout occurred\n"
+msgstr "fornat invalide : « %s »\n"
 
-#: src/transport/gnunet-transport.c:750
+#: src/transport/gnunet-transport.c:527
 #, c-format
 msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:784
+#: src/transport/gnunet-transport.c:561
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:815
+#: src/transport/gnunet-transport.c:592
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:839 src/transport/gnunet-transport.c:868
+#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:841
+#: src/transport/gnunet-transport.c:618
 msgid "Connected to"
 msgstr "Connecté à"
 
-#: src/transport/gnunet-transport.c:870
+#: src/transport/gnunet-transport.c:647
 msgid "Disconnected from"
 msgstr "Déconnecté de"
 
-#: src/transport/gnunet-transport.c:905
+#: src/transport/gnunet-transport.c:682
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "%s message(s) reçu(s)\n"
 
-#: src/transport/gnunet-transport.c:942
+#: src/transport/gnunet-transport.c:719
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:954
+#: src/transport/gnunet-transport.c:731
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1366
+#: src/transport/gnunet-transport.c:1144
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1488
+#: src/transport/gnunet-transport.c:1251
 #, 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:1501
+#: src/transport/gnunet-transport.c:1264
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1529
+#: src/transport/gnunet-transport.c:1294
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1535
+#: src/transport/gnunet-transport.c:1300
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1558 src/transport/gnunet-transport.c:1588
-#: src/transport/gnunet-transport.c:1641
+#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355
+#: src/transport/gnunet-transport.c:1408
 msgid "Failed to connect to transport service\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:1362
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1665
+#: src/transport/gnunet-transport.c:1433
 msgid "print information for all peers (instead of only connected peers)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1668
+#: src/transport/gnunet-transport.c:1437
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1671
+#: src/transport/gnunet-transport.c:1441
 msgid "disconnect from a peer"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1674
+#: src/transport/gnunet-transport.c:1445
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1680
+#: src/transport/gnunet-transport.c:1453
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1683
+#: src/transport/gnunet-transport.c:1457
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1686
-#: src/transport/gnunet-transport-profiler.c:631
+#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport-profiler.c:641
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1689
+#: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1692
+#: src/transport/gnunet-transport.c:1471
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1695
-msgid "test transport configuration (involves external server)"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1706
-#: src/transport/gnunet-transport-profiler.c:642
+#: src/transport/gnunet-transport.c:1482
+#: src/transport/gnunet-transport-profiler.c:652
 msgid "Direct access to transport service."
 msgstr ""
 
@@ -7148,153 +7165,156 @@ msgstr ""
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:616
+#: src/transport/gnunet-transport-profiler.c:617
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:619
+#: src/transport/gnunet-transport-profiler.c:621
 msgid "receive data from peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:622
+#: src/transport/gnunet-transport-profiler.c:626
 msgid "iterations"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:625
+#: src/transport/gnunet-transport-profiler.c:631
 #, fuzzy
 msgid "number of messages to send"
 msgstr "nombre de valeurs"
 
-#: src/transport/gnunet-transport-profiler.c:628
+#: src/transport/gnunet-transport-profiler.c:636
 msgid "message size to use"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1477
-#: src/transport/plugin_transport_http_server.c:2248
-#: src/transport/plugin_transport_http_server.c:3457
-#: src/transport/plugin_transport_tcp.c:3365
-#: src/transport/plugin_transport_tcp.c:3372
+#: src/transport/plugin_transport_http_client.c:1474
+#: src/transport/plugin_transport_http_server.c:2312
+#: src/transport/plugin_transport_http_server.c:3530
+#: src/transport/plugin_transport_tcp.c:3901
+#: src/transport/plugin_transport_tcp.c:3908
+#: src/transport/plugin_transport_xt.c:3899
+#: src/transport/plugin_transport_xt.c:3906
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2118
+#: src/transport/plugin_transport_http_client.c:2115
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2167
-#: src/transport/plugin_transport_http_server.c:3172
+#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_server.c:3245
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2184
-#: src/transport/plugin_transport_http_server.c:3242
+#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_server.c:3315
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2218
+#: src/transport/plugin_transport_http_client.c:2215
 #, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1729
+#: src/transport/plugin_transport_http_server.c:1756
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1966
+#: src/transport/plugin_transport_http_server.c:2028
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1974
+#: src/transport/plugin_transport_http_server.c:2036
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2124
+#: src/transport/plugin_transport_http_server.c:2186
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2147
+#: src/transport/plugin_transport_http_server.c:2209
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:2338
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2583
+#: src/transport/plugin_transport_http_server.c:2654
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2748
+#: src/transport/plugin_transport_http_server.c:2819
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2832
-#: src/transport/plugin_transport_udp.c:3600
+#: src/transport/plugin_transport_http_server.c:2905
+#: src/transport/plugin_transport_udp.c:3627
+#: src/transport/plugin_transport_xu.c:2049
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2938
+#: src/transport/plugin_transport_http_server.c:3011
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "Prise en charge d’IPv4 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2953
+#: src/transport/plugin_transport_http_server.c:3026
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "Prise en charge d’IPv6 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2959
+#: src/transport/plugin_transport_http_server.c:3032
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2970
+#: src/transport/plugin_transport_http_server.c:3043
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2976
+#: src/transport/plugin_transport_http_server.c:3049
 #, c-format
 msgid "Using port %u\n"
 msgstr "Utilisation du port %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2995
+#: src/transport/plugin_transport_http_server.c:3068
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3030
+#: src/transport/plugin_transport_http_server.c:3103
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3105
+#: src/transport/plugin_transport_http_server.c:3178
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3126
+#: src/transport/plugin_transport_http_server.c:3199
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3143
+#: src/transport/plugin_transport_http_server.c:3216
 #, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3469
+#: src/transport/plugin_transport_http_server.c:3542
 msgid "Unable to compile URL regex\n"
 msgstr ""
 
@@ -7340,165 +7360,191 @@ msgstr ""
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1051
-#: src/transport/plugin_transport_tcp.c:2362
+#: src/transport/plugin_transport_tcp.c:1557
+#: src/transport/plugin_transport_tcp.c:2883
+#: src/transport/plugin_transport_xt.c:1553
+#: src/transport/plugin_transport_xt.c:2879
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: 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
+#: src/transport/plugin_transport_tcp.c:1740
+#: src/transport/plugin_transport_tcp.c:1964
+#: src/transport/plugin_transport_tcp.c:3147
+#: src/transport/plugin_transport_tcp.c:4024
+#: src/transport/plugin_transport_xt.c:1736
+#: src/transport/plugin_transport_xt.c:1960
+#: src/transport/plugin_transport_xt.c:3143
 msgid "# TCP sessions active"
 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
+#: src/transport/plugin_transport_tcp.c:1782
+#: src/transport/plugin_transport_tcp.c:1946
+#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2143
+#: src/transport/plugin_transport_tcp.c:2243
+#: src/transport/plugin_transport_tcp.c:2268
+#: src/transport/plugin_transport_xt.c:1778
+#: src/transport/plugin_transport_xt.c:1942
+#: src/transport/plugin_transport_xt.c:2066
+#: src/transport/plugin_transport_xt.c:2139
+#: src/transport/plugin_transport_xt.c:2239
+#: src/transport/plugin_transport_xt.c:2264
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1279
+#: src/transport/plugin_transport_tcp.c:1785
+#: src/transport/plugin_transport_xt.c:1781
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:2073
+#: src/transport/plugin_transport_xt.c:2069
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1641
+#: src/transport/plugin_transport_tcp.c:2147
+#: src/transport/plugin_transport_xt.c:2143
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/plugin_transport_tcp.c:2545
+#: src/transport/plugin_transport_xt.c:2541
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2200
+#: src/transport/plugin_transport_tcp.c:2721
+#: src/transport/plugin_transport_xt.c:2717
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2692
+#: src/transport/plugin_transport_tcp.c:3213
+#: src/transport/plugin_transport_xt.c:3209
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2883
+#: src/transport/plugin_transport_tcp.c:3419
+#: src/transport/plugin_transport_xt.c:3415
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2934
-#: src/transport/plugin_transport_tcp.c:2992
+#: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_tcp.c:3528
+#: src/transport/plugin_transport_xt.c:3466
+#: src/transport/plugin_transport_xt.c:3524
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_tcp.c:2938
+#: src/transport/plugin_transport_tcp.c:3474
+#: src/transport/plugin_transport_xt.c:3470
 msgid "# TCP server connect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2944
+#: src/transport/plugin_transport_tcp.c:3480
+#: src/transport/plugin_transport_xt.c:3476
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2946
+#: src/transport/plugin_transport_tcp.c:3482
+#: src/transport/plugin_transport_xt.c:3478
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2986
+#: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_xt.c:3518
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2996
+#: src/transport/plugin_transport_tcp.c:3532
+#: src/transport/plugin_transport_xt.c:3528
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3315
+#: src/transport/plugin_transport_tcp.c:3851
+#: src/transport/plugin_transport_xt.c:3849
 msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3478
+#: src/transport/plugin_transport_tcp.c:4012
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3482
+#: src/transport/plugin_transport_tcp.c:4016
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3486
+#: src/transport/plugin_transport_tcp.c:4020
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:170
+#: src/transport/plugin_transport_udp_broadcasting.c:168
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:546
+#: src/transport/plugin_transport_udp_broadcasting.c:548
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:567
+#: src/transport/plugin_transport_udp_broadcasting.c:565
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3344
+#: src/transport/plugin_transport_udp.c:3371
 #, 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:3358
+#: src/transport/plugin_transport_udp.c:3385
 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:3676
-#: src/transport/plugin_transport_udp.c:3775
+#: src/transport/plugin_transport_udp.c:3703
+#: src/transport/plugin_transport_udp.c:3802
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/transport/plugin_transport_udp.c:3694
+#: src/transport/plugin_transport_udp.c:3721
+#: src/transport/plugin_transport_xu.c:2143
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3785
+#: src/transport/plugin_transport_udp.c:3812
 msgid "Failed to open UDP sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3857
-#: src/transport/plugin_transport_udp.c:3871
+#: src/transport/plugin_transport_udp.c:3883
+#: src/transport/plugin_transport_udp.c:3897
+#: src/transport/plugin_transport_xu.c:2301
+#: src/transport/plugin_transport_xu.c:2315
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3903
+#: src/transport/plugin_transport_udp.c:3929
+#: src/transport/plugin_transport_xu.c:2347
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "adresse invalide"
 
-#: src/transport/plugin_transport_udp.c:3930
+#: src/transport/plugin_transport_udp.c:3956
+#: src/transport/plugin_transport_xu.c:2374
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "adresse invalide"
 
-#: src/transport/plugin_transport_udp.c:3996
+#: src/transport/plugin_transport_udp.c:4020
 msgid "Failed to create UDP network sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1403
-#, c-format
-msgid "Cannot create path to `%s'\n"
-msgstr ""
-
 #: src/transport/plugin_transport_unix.c:1416
 #, c-format
 msgid "Cannot bind to `%s'\n"
@@ -7508,277 +7554,475 @@ msgstr ""
 msgid "Failed to open UNIX listen socket\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:742
+#: src/transport/plugin_transport_wlan.c:768
 msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:762
+#: src/transport/plugin_transport_wlan.c:788
 msgid "# Messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:803
-#: src/transport/plugin_transport_wlan.c:888
+#: src/transport/plugin_transport_wlan.c:829
+#: src/transport/plugin_transport_wlan.c:914
 #, fuzzy
 msgid "# Sessions allocated"
 msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_wlan.c:1009
+#: src/transport/plugin_transport_wlan.c:1035
 msgid "# message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1038
+#: src/transport/plugin_transport_wlan.c:1064
 msgid "# messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1167
-#: src/transport/plugin_transport_wlan.c:1258
-#: src/transport/plugin_transport_wlan.c:2280
+#: src/transport/plugin_transport_wlan.c:1193
+#: src/transport/plugin_transport_wlan.c:1284
+#: src/transport/plugin_transport_wlan.c:2305
 msgid "# MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1541
+#: src/transport/plugin_transport_wlan.c:1567
 msgid "# ACKs received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1610
+#: src/transport/plugin_transport_wlan.c:1636
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1714
+#: src/transport/plugin_transport_wlan.c:1740
 msgid "# HELLO beacons sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1831
+#: src/transport/plugin_transport_wlan.c:1856
 msgid "# DATA messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1865
+#: src/transport/plugin_transport_wlan.c:1890
 msgid "# DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2255
+#: src/transport/plugin_transport_wlan.c:2280
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2277
+#: src/transport/plugin_transport_wlan.c:2302
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# Session TCP active"
 
-#: src/tun/regex.c:134
+#: src/transport/plugin_transport_xt.c:4010
 #, c-format
-msgid "Bad mask: %d\n"
-msgstr "Masque érroné : %d\n"
+msgid "XT transport listening on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4014
+msgid "XT transport not listening on any port (client only)\n"
+msgstr ""
 
-#: src/util/bio.c:177 src/util/bio.c:185
+#: src/transport/plugin_transport_xt.c:4018
+#, c-format
+msgid "XT transport advertises itself as being on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4022
+#, fuzzy
+msgid "# XT sessions active"
+msgstr "# Session TCP active"
+
+#: src/transport/plugin_transport_xu.c:1237
+#, c-format
+msgid ""
+"XU could not transmit message to `%s': Network seems down, please check your "
+"network configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xu.c:1251
+msgid ""
+"XU could not transmit IPv6 message! Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xu.c:2125
+#: src/transport/plugin_transport_xu.c:2224
+#, fuzzy, c-format
+msgid "Failed to bind XU socket to %s: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/transport/plugin_transport_xu.c:2234
+#, fuzzy
+msgid "Failed to open XU sockets\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/transport/plugin_transport_xu.c:2398
+#, fuzzy
+msgid "Failed to create XU network sockets\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/transport/tcp_connection_legacy.c:452
+#, c-format
+msgid "Access denied to `%s'\n"
+msgstr ""
+
+#: src/transport/tcp_connection_legacy.c:469
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
+msgstr ""
+
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1666
+#, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr ""
+
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1676
+#, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr ""
+
+#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1682
+#, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr ""
+
+#: src/transport/tcp_server_legacy.c:890
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:870
+#, c-format
+msgid "Unknown address family %d\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:346
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:994
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:1037
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1597
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:953
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1750
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1783
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1161
+#, c-format
+msgid "Failed to start `%s' at `%s'\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1202
+#, c-format
+msgid "Service `%s' runs at %s\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:2057
+msgid "Service process failed to initialize\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:2061
+msgid "Service process could not initialize server function\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:2065
+msgid "Service process failed to report status\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1535
+#: src/util/service.c:1935
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1937
+msgid "No such user"
+msgstr "Aucun utilisateur trouvé"
+
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1956
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:2318
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:2382
+#: src/util/service.c:2397
+#, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:2409
+msgid "Malformed configuration, exit ...\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1463
+#, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr ""
+
+#: src/transport/transport_api2_communication.c:764
+msgid "Dropped backchanel message: handler not provided by communicator\n"
+msgstr ""
+
+#: src/util/bio.c:181 src/util/bio.c:189
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:191
 msgid "End of file"
 msgstr "Fin de fichier"
 
-#: src/util/bio.c:244
+#: src/util/bio.c:248
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:258
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:300
+#: src/util/bio.c:306
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:314
+#: src/util/bio.c:328
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client_new.c:864
+#: src/util/client.c:734
+msgid "not a valid filename"
+msgstr ""
+
+#: src/util/client.c:925
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:256 src/util/common_logging.c:1129
+#: src/util/common_logging.c:259 src/util/common_logging.c:1162
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1127
+#: src/util/common_logging.c:261 src/util/common_logging.c:1160
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1125
+#: src/util/common_logging.c:263 src/util/common_logging.c:1158
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1123
+#: src/util/common_logging.c:265 src/util/common_logging.c:1156
 msgid "WARNING"
 msgstr "AVERTISSEMENT"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1121
+#: src/util/common_logging.c:267 src/util/common_logging.c:1154
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1131
+#: src/util/common_logging.c:269 src/util/common_logging.c:1164
 msgid "NONE"
 msgstr "AUCUN"
 
-#: src/util/common_logging.c:879
+#: src/util/common_logging.c:633 src/util/common_logging.c:663
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
+
+#: src/util/common_logging.c:898
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1132
+#: src/util/common_logging.c:1165
 msgid "INVALID"
 msgstr "INVALIDE"
 
-#: src/util/common_logging.c:1248
+#: src/util/common_logging.c:1458
 msgid "unknown address"
 msgstr "adresse inconnue"
 
-#: src/util/common_logging.c:1290
+#: src/util/common_logging.c:1500
 msgid "invalid address"
 msgstr "adresse invalide"
 
-#: src/util/common_logging.c:1308
+#: src/util/common_logging.c:1518
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1329
+#: src/util/common_logging.c:1539
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr ""
 
-#: src/util/configuration.c:286
+#: src/util/configuration.c:331
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:344
+#: src/util/configuration.c:398
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/configuration.c:1017
+#: src/util/configuration.c:1016
+msgid "Not a valid relative time specification"
+msgstr ""
+
+#: src/util/configuration.c:1105
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1136
+#: src/util/configuration.c:1224
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1169
+#: src/util/configuration.c:1257
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1237
+#: src/util/configuration.c:1325
 #, 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:441
-#, c-format
-msgid "Access denied to `%s'\n"
-msgstr ""
-
-#: src/util/connection.c:458
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
-msgstr ""
-
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:756
+#: src/util/crypto_ecc.c:904
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:806
+#: src/util/crypto_ecc.c:963
 #, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:880
+#: src/util/crypto_ecc.c:1042
 #, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:937
+#: src/util/crypto_ecc.c:1103
 #, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:122 src/util/crypto_ecc_setup.c:160
-#: src/util/crypto_ecc_setup.c:278 src/util/crypto_ecc_setup.c:316
+#: src/util/crypto_ecc_setup.c:123 src/util/crypto_ecc_setup.c:162
+#: src/util/crypto_ecc_setup.c:305 src/util/crypto_ecc_setup.c:352
 #, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:127 src/util/crypto_ecc_setup.c:283
+#: src/util/crypto_ecc_setup.c:129 src/util/crypto_ecc_setup.c:311
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:164 src/util/crypto_ecc_setup.c:320
+#: src/util/crypto_ecc_setup.c:166 src/util/crypto_ecc_setup.c:356
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:194 src/util/crypto_ecc_setup.c:350
+#: src/util/crypto_ecc_setup.c:196 src/util/crypto_ecc_setup.c:398
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:198 src/util/crypto_ecc_setup.c:354
+#: src/util/crypto_ecc_setup.c:201 src/util/crypto_ecc_setup.c:402
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:413
+#: src/util/crypto_ecc_setup.c:468
 msgid "Could not load peer's private key\n"
 msgstr ""
 
-#: src/util/crypto_random.c:284
+#: src/util/crypto_random.c:306
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:835
+#: src/util/crypto_rsa.c:850
 #, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1166
+#: src/util/crypto_rsa.c:1189
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:1245
+#: src/util/disk.c:1265
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/disk.c:1486 src/util/service.c:1322 src/util/service_new.c:1379
+#: src/util/dnsparser.c:264
 #, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr ""
+
+#: src/util/dnsparser.c:954
+#, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr ""
+
+#: src/util/dnsstub.c:231
+#, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr ""
+
+#: src/util/dnsstub.c:362
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
+#: src/util/dnsstub.c:509
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/util/dnsstub.c:515
+#, c-format
+msgid "Sent DNS request to %s\n"
 msgstr ""
 
 #: src/util/getopt.c:568
@@ -7836,98 +8080,149 @@ msgstr ""
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:933
+#: src/util/getopt.c:947
 #, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:91
+#: src/util/getopt.c:962
+#, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:70
+msgid "print the version number"
+msgstr ""
+
+#: src/util/getopt_helpers.c:116
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:278 src/util/getopt_helpers.c:336
+#: src/util/getopt_helpers.c:204
+msgid "print this help"
+msgstr ""
+
+#: src/util/getopt_helpers.c:282
+msgid "be verbose"
+msgstr ""
+
+#: src/util/getopt_helpers.c:423
+msgid "configure logging to use LOGLEVEL"
+msgstr ""
+
+#: src/util/getopt_helpers.c:503
+msgid "configure logging to write logs to FILENAME"
+msgstr ""
+
+#: src/util/getopt_helpers.c:525
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/util/getopt_helpers.c:564 src/util/getopt_helpers.c:770
+#: src/util/getopt_helpers.c:839
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:308
+#: src/util/getopt_helpers.c:629
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:124
+#: src/util/getopt_helpers.c:695
+#, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:760
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number \n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:846
+#, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:932
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:160
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/gnunet-config.c:137
+#: src/util/gnunet-config.c:173
 #, c-format
-msgid "--section argument is required\n"
+msgid "%s or %s argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:140
+#: src/util/gnunet-config.c:181
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:232
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:228
+#: src/util/gnunet-config.c:286
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:231
+#: src/util/gnunet-config.c:291
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:296
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:237
+#: src/util/gnunet-config.c:301
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:240
+#: src/util/gnunet-config.c:305
 msgid "print available configuration sections"
 msgstr ""
 
-#: src/util/gnunet-config.c:243
+#: src/util/gnunet-config.c:309
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:322
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:84
+#: src/util/gnunet-ecc.c:94
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:120
+#: src/util/gnunet-ecc.c:130
 #, c-format
 msgid "Generating %u keys like %s, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:133
+#: src/util/gnunet-ecc.c:143
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:174
+#: src/util/gnunet-ecc.c:184
 #, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:194
 #, c-format
 msgid ""
 "\n"
@@ -7936,61 +8231,69 @@ msgstr ""
 "\n"
 "Terminé !\n"
 
-#: src/util/gnunet-ecc.c:187
+#: src/util/gnunet-ecc.c:197
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:280
+#: src/util/gnunet-ecc.c:290
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:291
+#: src/util/gnunet-ecc.c:305
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:313
+#: src/util/gnunet-ecc.c:334
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:364
+#: src/util/gnunet-ecc.c:391
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:414
+#: src/util/gnunet-ecc.c:456
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:417
+#: src/util/gnunet-ecc.c:461
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:420
+#: src/util/gnunet-ecc.c:466
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:423
+#: src/util/gnunet-ecc.c:470
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:426
+#: src/util/gnunet-ecc.c:474
+msgid "print the private key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:478
+msgid "print the public key in HEX format"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:482
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:498
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:149
+#: src/util/gnunet-resolver.c:168
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:160
+#: src/util/gnunet-resolver.c:179
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
@@ -7999,35 +8302,28 @@ msgstr ""
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:314
+#: src/util/gnunet-scrypt.c:317
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:317
+#: src/util/gnunet-scrypt.c:322
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:320
+#: src/util/gnunet-scrypt.c:327
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:323
+#: src/util/gnunet-scrypt.c:332
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:336
+#: src/util/gnunet-scrypt.c:345
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:371
-#, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr ""
-
-#: 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"
+#: src/util/gnunet-service-resolver.c:1424
+msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
 #: src/util/gnunet-uri.c:85
@@ -8054,50 +8350,55 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:331
+#: src/util/helper.c:335
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr ""
 
-#: src/util/helper.c:382
+#: src/util/helper.c:386
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:601
+#: src/util/helper.c:606
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
 
-#: src/util/network.c:137
+#: src/util/network.c:136
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1735 src/util/network.c:1911
+#: src/util/network.c:1794 src/util/network.c:1978
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:501
+#: src/util/os_installation.c:509
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:861
+#: src/util/os_installation.c:881
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:921
+#: src/util/os_installation.c:922
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+
+#: src/util/os_installation.c:953
 #, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/os_installation.c:931
+#: src/util/os_installation.c:963
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8121,385 +8422,307 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/program.c:244 src/util/service.c:1456 src/util/service_new.c:1809
-#, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr ""
+#: src/util/program.c:283
+#, fuzzy, c-format
+msgid "Unreadable or malformed configuration file `%s', exit ...\n"
+msgstr "fornat invalide : « %s »\n"
 
-#: src/util/program.c:256 src/util/service.c:1471 src/util/service_new.c:1826
+#: src/util/program.c:301
 #, c-format
-msgid "Could not access configuration file `%s'\n"
+msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/util/program.c:261 src/util/service.c:1466 src/util/service_new.c:1820
-msgid "Malformed configuration, exit ...\n"
-msgstr ""
+#: src/util/program.c:318
+#, fuzzy
+msgid "Unreadable or malformed configuration, exit ...\n"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/util/regex.c:134
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr "Masque érroné : %d\n"
 
-#: src/util/resolver_api.c:204
+#: src/util/resolver_api.c:218
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:223
+#: src/util/resolver_api.c:239
 #, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
 "resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:815
+#: src/util/resolver_api.c:875
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:827
+#: src/util/resolver_api.c:888
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1004
+#: src/util/resolver_api.c:1073
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1086 src/util/resolver_api.c:1107
-#: src/util/resolver_api.c:1121
+#: src/util/resolver_api.c:1160 src/util/resolver_api.c:1183
+#: src/util/resolver_api.c:1197
 #, 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:1111
-#, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr ""
-
-#: src/util/server.c:488 src/util/service_new.c:1121
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr ""
-
-#: src/util/server.c:494 src/util/service_new.c:1127
-#, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr ""
-
-#: src/util/server.c:894
+#: src/util/service.c:674
 #, 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_new.c:2343
-#, c-format
-msgid "Unknown address family %d\n"
-msgstr ""
-
-#: src/util/service.c:354
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
-msgstr ""
-
-#: src/util/service.c:410 src/util/service_new.c:439
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:448 src/util/service_new.c:482
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:912 src/util/service_new.c:1042
-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_new.c:1194
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
-
-#: src/util/service.c:1004 src/util/service_new.c:1226
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-
-#: src/util/service.c:1170
-#, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr ""
-
-#: src/util/service.c:1211
-#, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr ""
-
-#: src/util/service.c:1260 src/util/service_new.c:1501
-msgid "Service process failed to initialize\n"
-msgstr ""
-
-#: src/util/service.c:1264 src/util/service_new.c:1505
-msgid "Service process could not initialize server function\n"
-msgstr ""
-
-#: src/util/service.c:1268 src/util/service_new.c:1509
-msgid "Service process failed to report status\n"
-msgstr ""
-
-#: src/util/service.c:1323 src/util/service_new.c:1381
-msgid "No such user"
-msgstr "Aucun utilisateur trouvé"
-
-#: src/util/service.c:1336 src/util/service_new.c:1400
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr ""
-
-#: src/util/service.c:1406 src/util/service_new.c:1737
-msgid "do daemonize (detach from terminal)"
+"`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service_new.c:1306
+#: src/util/service.c:1862
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/service_new.c:2093
-#, 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
+#: src/util/socks.c:597
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:599
+#: src/util/socks.c:616
 #, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:146
+#: src/util/strings.c:176
 msgid "b"
 msgstr "o"
 
-#: src/util/strings.c:441
+#: src/util/strings.c:475
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:568
+#: src/util/strings.c:602
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:672
+#: src/util/strings.c:706
 msgid "µs"
 msgstr "µs"
 
-#: src/util/strings.c:676
+#: src/util/strings.c:710
 msgid "forever"
 msgstr "perpetuel"
 
-#: src/util/strings.c:678
+#: src/util/strings.c:712
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:684
+#: src/util/strings.c:718
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:690
+#: src/util/strings.c:724
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:696
+#: src/util/strings.c:730
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:702
+#: src/util/strings.c:736
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:709
+#: src/util/strings.c:743
 msgid "day"
 msgstr "jour"
 
-#: src/util/strings.c:711
+#: src/util/strings.c:745
 msgid "days"
 msgstr "jours"
 
-#: src/util/strings.c:740
+#: src/util/strings.c:774
 msgid "end of time"
 msgstr "fin du temps"
 
-#: src/util/strings.c:1239
+#: src/util/strings.c:1277
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1247
+#: src/util/strings.c:1285
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1253
+#: src/util/strings.c:1291
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1260
+#: src/util/strings.c:1301
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1269
+#: src/util/strings.c:1310
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1475 src/util/strings.c:1491
+#: src/util/strings.c:1586 src/util/strings.c:1602
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1500
+#: src/util/strings.c:1611
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1583 src/util/strings.c:1614 src/util/strings.c:1662
-#: src/util/strings.c:1683
+#: src/util/strings.c:1696 src/util/strings.c:1728 src/util/strings.c:1777
+#: src/util/strings.c:1798
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1640
+#: src/util/strings.c:1754
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1692
+#: src/util/strings.c:1807
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/strings.c:1744
+#: src/util/strings.c:1860
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1794
+#: src/util/strings.c:1914
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1825
+#: src/util/strings.c:1945
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
+#: src/util/time.c:828 src/util/time.c:860
+#, c-format
+msgid "Failed to map `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/util/time.c:866
+#, c-format
+msgid ""
+"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807
 msgid "# Active channels"
 msgstr "# Canaux actifs"
 
-#: src/vpn/gnunet-service-vpn.c:629
-msgid "# Bytes given to cadet for transmission"
+#: src/vpn/gnunet-service-vpn.c:599
+msgid "# Messages dropped in cadet queue (overflow)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:753
+msgid "# ICMP packets received from cadet"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1096
+msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:667
-msgid "# Bytes dropped in cadet queue (overflow)"
+#: src/vpn/gnunet-service-vpn.c:1255
+msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:783
+#: src/vpn/gnunet-service-vpn.c:1467
 msgid "# Cadet channels created"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1005
+#: src/vpn/gnunet-service-vpn.c:1687
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1145
+#: src/vpn/gnunet-service-vpn.c:1826
 msgid "# Packets dropped (channel not yet online)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1353
+#: src/vpn/gnunet-service-vpn.c:2006
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1374
+#: src/vpn/gnunet-service-vpn.c:2027
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1580
+#: src/vpn/gnunet-service-vpn.c:2235
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1613 src/vpn/gnunet-service-vpn.c:1649
+#: src/vpn/gnunet-service-vpn.c:2268 src/vpn/gnunet-service-vpn.c:2304
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1659
+#: src/vpn/gnunet-service-vpn.c:2314
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1673
+#: src/vpn/gnunet-service-vpn.c:2328
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1755
-msgid "# ICMP packets received from cadet"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:2095
-msgid "# UDP packets received from cadet"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:2251
-msgid "# TCP packets received from cadet"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:2403
+#: src/vpn/gnunet-service-vpn.c:2367
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2458
+#: src/vpn/gnunet-service-vpn.c:2422
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2722
+#: src/vpn/gnunet-service-vpn.c:2464 src/vpn/gnunet-service-vpn.c:2686
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2771
+#: src/vpn/gnunet-service-vpn.c:2735
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3063
+#: src/vpn/gnunet-service-vpn.c:2998
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3087
+#: src/vpn/gnunet-service-vpn.c:3022
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3095
+#: src/vpn/gnunet-service-vpn.c:3030
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3108
+#: src/vpn/gnunet-service-vpn.c:3043
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3121
+#: src/vpn/gnunet-service-vpn.c:3056
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3131
+#: src/vpn/gnunet-service-vpn.c:3066
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8532,62 +8755,177 @@ msgstr ""
 msgid "`%s' is not a valid IP address.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:291
+#: src/vpn/gnunet-vpn.c:292
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:294
+#: src/vpn/gnunet-vpn.c:297
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:297
+#: src/vpn/gnunet-vpn.c:303
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:300
+#: src/vpn/gnunet-vpn.c:309
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:303
+#: src/vpn/gnunet-vpn.c:315
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:306
+#: src/vpn/gnunet-vpn.c:321
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:326
 msgid "service is offered via TCP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:312
+#: src/vpn/gnunet-vpn.c:331
 msgid "service is offered via UDP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:324
+#: src/vpn/gnunet-vpn.c:344
 msgid "Setup tunnels via VPN."
 msgstr "Configurer des tunnels via VPN."
 
-#: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
-#: src/include/gnunet_common.h:660
+#: src/zonemaster/gnunet-service-zonemaster.c:838
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
+msgid "Failed to connect to the namestore!\n"
+msgstr ""
+
+#: src/include/gnunet_common.h:773 src/include/gnunet_common.h:780
+#: src/include/gnunet_common.h:790
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d. Aborting.\n"
+msgstr "opus_encode_float() échoué : %s. Annulation\n"
+
+#: src/include/gnunet_common.h:798
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:672
+#: src/include/gnunet_common.h:810
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:699 src/include/gnunet_common.h:708
+#: src/include/gnunet_common.h:837 src/include/gnunet_common.h:846
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Failed to start NAT test for plugin `%s'\n"
+#~ msgid "Dropping invalid fragment\n"
+#~ msgstr "Argument invalide « %s »\n"
+
+#, fuzzy
+#~ msgid "Failed to store fragment\n"
+#~ msgstr "Échec du démarrage de %s\n"
+
+#, fuzzy
+#~ msgid "Failed to begin modifying state: %d\n"
+#~ msgstr "Échec du démarrage de %s\n"
+
+#, fuzzy
+#~ msgid "Failed to modify state: %d\n"
+#~ msgstr "Échec du démarrage de %s\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Mysql.\n"
+#~ msgstr "Résolution de « %s » échouée\n"
+
+#, fuzzy
+#~ msgid "Failed to run SQL statement `%s'\n"
+#~ msgstr "Échec du démarrage de %s\n"
+
+#, fuzzy
+#~ msgid "number of messages to replay from history"
+#~ msgstr "nombre de valeurs"
+
+#, fuzzy
+#~ msgid "Unable to connect to Postgres database '%s': %s\n"
 #~ msgstr "Résolution de « %s » échouée\n"
 
+#~ msgid "ARM API is busy"
+#~ msgstr "API ARM occupé"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,trail_length = %d"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,trail[%d]=%s"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d, trail_id[%d]=%s"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,trail[%d] = %s "
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d, trail->trail_id = %s"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d, trail->next_hop = %s"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d, trail->prev_hop = %s"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+
+#~ msgid "verbose output"
+#~ msgstr "sortie verbeuse"
+
+#~ msgid "malformed"
+#~ msgstr "malformé"
+
+#, fuzzy
+#~ msgid "Failed to start resolver!\n"
+#~ msgstr "Échec du démarrage de %s\n"
+
 #~ msgid "Benchmarking done\n"
 #~ msgstr "Benchmark terminé\n"