gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r36774 - gnunet/po


From: gnunet
Subject: [GNUnet-SVN] r36774 - gnunet/po
Date: Thu, 24 Dec 2015 04:44:01 +0100

Author: grothoff
Date: 2015-12-24 04:44:00 +0100 (Thu, 24 Dec 2015)
New Revision: 36774

Modified:
   gnunet/po/fr.po
Log:
new French translation

Modified: gnunet/po/fr.po
===================================================================
--- gnunet/po/fr.po     2015-12-24 03:43:24 UTC (rev 36773)
+++ gnunet/po/fr.po     2015-12-24 03:44:00 UTC (rev 36774)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2015-10-11 21:29+0200\n"
-"PO-Revision-Date: 2015-03-24 01:41+0100\n"
+"POT-Creation-Date: 2014-04-08 11:11+0200\n"
+"PO-Revision-Date: 2015-12-24 01:20+0100\n"
 "Last-Translator: Stéphane  Aulery <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
 "Language: fr\n"
@@ -21,8 +21,7 @@
 msgstr ""
 
 #: src/arm/arm_monitor_api.c:321
-msgid ""
-"Monitoring client was disconnected from arm service, trying to reconnect.\n"
+msgid "Monitoring client was disconnected from arm service, trying to 
reconnect.\n"
 msgstr ""
 
 #: src/arm/gnunet-arm.c:164
@@ -49,7 +48,7 @@
 
 #: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "ARM API is busy"
-msgstr ""
+msgstr "API ARM occupé"
 
 #: src/arm/gnunet-arm.c:224
 msgid "Request does not fit into a message"
@@ -168,7 +167,7 @@
 
 #: src/arm/gnunet-arm.c:530
 msgid "Running services:\n"
-msgstr ""
+msgstr "Services en exécution :\n"
 
 #: src/arm/gnunet-arm.c:612
 #, c-format
@@ -247,213 +246,211 @@
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:279
+#: src/arm/gnunet-service-arm.c:266
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:315
+#: src/arm/gnunet-service-arm.c:302
 msgid "Could not send list result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:542
+#: src/arm/gnunet-service-arm.c:529
 #, c-format
 msgid "Failed to start service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:553
+#: src/arm/gnunet-service-arm.c:540
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:653
+#: src/arm/gnunet-service-arm.c:639
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:677
+#: src/arm/gnunet-service-arm.c:661
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:713
+#: src/arm/gnunet-service-arm.c:695
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:853
+#: src/arm/gnunet-service-arm.c:831
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1123
+#: src/arm/gnunet-service-arm.c:1100
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1281
+#: src/arm/gnunet-service-arm.c:1193
 msgid "exit"
 msgstr "exit"
 
-#: src/arm/gnunet-service-arm.c:1286
+#: src/arm/gnunet-service-arm.c:1198
 msgid "signal"
 msgstr "signal"
 
-#: src/arm/gnunet-service-arm.c:1291
+#: src/arm/gnunet-service-arm.c:1203
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/arm/gnunet-service-arm.c:1297
+#: src/arm/gnunet-service-arm.c:1209
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1319
+#: src/arm/gnunet-service-arm.c:1231
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1334
+#: src/arm/gnunet-service-arm.c:1246
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
+#: src/arm/gnunet-service-arm.c:1500
+#, c-format
+msgid "Starting default services `%s'\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1511
+#, c-format
+msgid "Default service `%s' not configured correctly!\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1524
+msgid "No default services configured, GNUnet will not really start right 
now.\n"
+msgstr ""
+
 #: src/arm/mockup-service.c:41
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2778 src/ats/gnunet-ats-solver-eval.c:2819
+#: src/ats/ats_api_performance.c:468
 #, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
+msgid "Received %s message\n"
+msgstr "%s message(s) reçu(s)\n"
+
+#: src/ats/ats_api_performance.c:511
+#, c-format
+msgid "Received last message for %s \n"
+msgstr "Dernier message reçu de %s\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:2199 src/ats/gnunet-ats-solver-eval.c:2233
+#: src/ats/gnunet-service-ats_addresses.c:1980
+#: src/ats/gnunet-service-ats_addresses.c:2024
+#, c-format
+msgid "Could not load quota for network `%s':  `%s', assigning default 
bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2796
+#: src/ats/gnunet-ats-solver-eval.c:2205
+#: src/ats/gnunet-service-ats_addresses.c:1987
 #, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
+msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2837
+#: src/ats/gnunet-ats-solver-eval.c:2212
+#: src/ats/gnunet-service-ats_addresses.c:1995
 #, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
+msgid "No outbound quota configured for network `%s', assigning default 
bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3290 src/ats-tests/gnunet-solver-eval.c:918
+#: src/ats/gnunet-ats-solver-eval.c:2239
+#: src/ats/gnunet-service-ats_addresses.c:2031
+#, c-format
+msgid "Inbound quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2246
+#: src/ats/gnunet-service-ats_addresses.c:2039
+#, c-format
+msgid "No outbound quota configure for network `%s', assigning default 
bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2671
+#: src/ats-tests/gnunet-solver-eval.c:919
 msgid "solver to use"
 msgstr "solveur utilisé"
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:921
-#: src/ats-tests/gnunet-solver-eval.c:924
+#: src/ats/gnunet-ats-solver-eval.c:2674 src/ats/gnunet-ats-solver-eval.c:2677
+#: src/ats-tests/gnunet-solver-eval.c:922
+#: src/ats-tests/gnunet-solver-eval.c:925
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-msgid "be verbose"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3299
+#: src/ats/gnunet-ats-solver-eval.c:2680
 msgid "print logging"
 msgstr "afficher le journal"
 
-#: src/ats/gnunet-ats-solver-eval.c:3302
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3305
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:305
+#: src/ats/gnunet-service-ats_addresses.c:2217
 #, c-format
-msgid ""
-"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
+msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:315
+#: src/ats/gnunet-service-ats_addresses.c:2220
 #, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
+msgid "Failed to initialize solver `%s'!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:360
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+#: src/ats/gnunet-service-ats_addresses.c:2243
+msgid "Failed to initialize solver!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:452
-#, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1274
+#: src/ats/plugin_ats_mlp.c:892
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1869
+#: src/ats/plugin_ats_mlp.c:1329
 #, 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:1376
 #, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
+msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2475
-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_ril.c:2613 src/ats/plugin_ats_ril.c:2630
-#: src/ats/plugin_ats_ril.c:2647 src/ats/plugin_ats_ril.c:2664
-#: src/ats/plugin_ats_ril.c:2681 src/ats/plugin_ats_ril.c:2698
-#: src/ats/plugin_ats_ril.c:2715 src/ats/plugin_ats_ril.c:2732
+#: src/ats/plugin_ats_mlp.c:2122
 #, c-format
-msgid "Invalid %s configuration %f \n"
+msgid "Adjusting inconsistent outbound quota configuration for network `%s', 
is %llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2670
+#: src/ats/plugin_ats_mlp.c:2131
 #, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is "
-"%llu must be at least %llu\n"
+msgid "Adjusting inconsistent inbound 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:2142
 #, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
+msgid "Adjusting outbound quota configuration for network `%s'from %llu to 
%.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2689
+#: src/ats/plugin_ats_mlp.c:2150
 #, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgid "Adjusting inbound quota configuration for network `%s' from %llu to 
%.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2698
+#: src/ats/plugin_ats_mlp.c:2161
 #, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1164
+#: src/ats/plugin_ats_proportional.c:1511
 #, c-format
-msgid "Invalid %s configuration %f\n"
+msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr ""
 
 #: src/ats-tests/ats-testing.c:72
 msgid "Benchmarking done\n"
-msgstr ""
+msgstr "Benchmark terminé\n"
 
 #: src/ats-tests/ats-testing.c:105
 #, c-format
@@ -484,15 +481,15 @@
 msgid "Could not connect master [%u] and slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:634
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:671
 msgid "Initialization failed, shutdown\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:834
+#: src/ats-tests/ats-testing-log.c:842
 msgid "Stop logging\n"
 msgstr "Arrêter la journalisation\n"
 
-#: src/ats-tests/ats-testing-log.c:885
+#: src/ats-tests/ats-testing-log.c:893
 #, c-format
 msgid "Start logging `%s'\n"
 msgstr "Démarrer la journalisation « %s »\n"
@@ -499,475 +496,392 @@
 
 #: src/ats-tests/gnunet-ats-sim.c:86
 #, c-format
-msgid ""
-"Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
-"= %u KiB/s\n"
+msgid "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u 
sec. = %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:289
+#: src/ats-tool/gnunet-ats.c:169
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:293
+#: src/ats-tool/gnunet-ats.c:171
 #, c-format
-msgid "ATS returned stat_results for %u addresses\n"
+msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:366
+#: src/ats-tool/gnunet-ats.c:232
 #, c-format
-msgid ""
-"Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
-"s, %s\n"
+msgid "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u 
Bytes/s, %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:373
-msgid "active "
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:373
-msgid "inactive "
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:483
+#: src/ats-tool/gnunet-ats.c:413
 #, c-format
-msgid "Removed address of peer `%s' with plugin `%s'\n"
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:676
-#, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:708 src/namestore/gnunet-namestore.c:700
-#: src/namestore/plugin_rest_namestore.c:850
-#: src/transport/gnunet-transport.c:1890
-#: src/transport/gnunet-transport-profiler.c:531
+#: src/ats-tool/gnunet-ats.c:433 src/core/gnunet-core.c:163
+#: src/namestore/gnunet-namestore.c:550 src/transport/gnunet-transport.c:1246
 #, c-format
 msgid "Service `%s' is not running\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:722 src/transport/gnunet-transport.c:1899
-#: src/transport/gnunet-transport-profiler.c:549
+#: src/ats-tool/gnunet-ats.c:445 src/transport/gnunet-transport.c:1255
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:732
+#: src/ats-tool/gnunet-ats.c:454
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:754 src/ats-tool/gnunet-ats.c:780
-#: src/ats-tool/gnunet-ats.c:808 src/ats-tool/gnunet-ats.c:854
+#: src/ats-tool/gnunet-ats.c:470 src/ats-tool/gnunet-ats.c:489
+#: src/ats-tool/gnunet-ats.c:506 src/ats-tool/gnunet-ats.c:543
+#, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:766 src/ats-tool/gnunet-ats.c:792
+#: src/ats-tool/gnunet-ats.c:478 src/ats-tool/gnunet-ats.c:495
+#, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:820
+#: src/ats-tool/gnunet-ats.c:515
+#, c-format
 msgid "No preference type given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:827
+#: src/ats-tool/gnunet-ats.c:520
+#, c-format
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:845
+#: src/ats-tool/gnunet-ats.c:536
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:916
+#: src/ats-tool/gnunet-ats.c:594
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:918
+#: src/ats-tool/gnunet-ats.c:596
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:921
+#: src/ats-tool/gnunet-ats.c:599
 msgid "do not resolve IP addresses to hostnames"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:923
+#: src/ats-tool/gnunet-ats.c:601
 msgid "monitor mode"
-msgstr ""
+msgstr "mode moniteur"
 
-#: src/ats-tool/gnunet-ats.c:925
+#: src/ats-tool/gnunet-ats.c:603
 msgid "set preference for the given peer"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:927
+#: src/ats-tool/gnunet-ats.c:605
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:929
+#: src/ats-tool/gnunet-ats.c:607
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:932
+#: src/ats-tool/gnunet-ats.c:610
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:934
+#: src/ats-tool/gnunet-ats.c:612
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:937
+#: src/ats-tool/gnunet-ats.c:615
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:944
+#: src/ats-tool/gnunet-ats.c:622
 msgid "Print information about ATS state"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:460
-#, c-format
-msgid "Invalid target `%s'\n"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:737
-#, c-format
-msgid "Invalid peer ID `%s'\n"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:780
-#, c-format
-msgid "Invalid tunnel owner `%s'\n"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:846
-msgid "You must NOT give a TARGET when using 'request all' options\n"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:943
-msgid "provide information about a particular connection"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:946
-msgid "activate echo mode"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:949
-msgid "dump debug information to STDERR"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:955
-msgid "port to listen to (default; 0)"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:958
-msgid "provide information about a patricular peer"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:961
-msgid "provide information about all peers"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:964
-msgid "provide information about a particular tunnel"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:967
-msgid "provide information about all tunnels"
-msgstr ""
-
-#: src/cadet/gnunet-service-cadet_peer.c:543
-msgid "Wrong CORE service\n"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-profiler.c:478
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/consensus/gnunet-consensus-profiler.c:437
+#: src/secretsharing/gnunet-secretsharing-profiler.c:535
 msgid "number of peers in consensus"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:481
-msgid ""
-"how many peers (random selection without replacement) receive one value?"
+#: src/consensus/gnunet-consensus-profiler.c:440
+msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:484
-#: src/set/gnunet-set-profiler.c:356 src/set/gnunet-set-profiler.c:359
-#: src/set/gnunet-set-profiler.c:362
+#: src/consensus/gnunet-consensus-profiler.c:443
+#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
+#: src/set/gnunet-set-profiler.c:292
 msgid "number of values"
 msgstr "nombre de valeurs"
 
-#: src/consensus/gnunet-consensus-profiler.c:487
+#: src/consensus/gnunet-consensus-profiler.c:446
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:490
+#: src/consensus/gnunet-consensus-profiler.c:449
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:493
-#: src/secretsharing/gnunet-secretsharing-profiler.c:625
+#: src/consensus/gnunet-consensus-profiler.c:452
+#: src/secretsharing/gnunet-secretsharing-profiler.c:550
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:493
-#: src/conversation/conversation_api_call.c:475
+#: src/conversation/conversation_api.c:557
+#: src/conversation/conversation_api_call.c:470
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/conversation_api.c:617
-#, fuzzy
-msgid "number too large"
-msgstr "nombre de valeurs"
-
-#: src/conversation/gnunet-conversation.c:269
+#: src/conversation/gnunet-conversation.c:264
 #, c-format
-msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
+msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:294
+#: src/conversation/gnunet-conversation.c:286
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:329
+#: src/conversation/gnunet-conversation.c:319
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:334
+#: src/conversation/gnunet-conversation.c:324
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:352
+#: src/conversation/gnunet-conversation.c:342
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:366
+#: src/conversation/gnunet-conversation.c:356
 msgid "Failed to setup phone (internal error)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:378
+#: src/conversation/gnunet-conversation.c:368
 #, c-format
-msgid ""
-"Phone active on line %u.  Type `/help' for a list of available commands\n"
+msgid "Phone active on line %u.  Type `/help' for a list of available 
commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:400
+#: src/conversation/gnunet-conversation.c:390
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:407
+#: src/conversation/gnunet-conversation.c:397
 #, c-format
 msgid "Connection established to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:414
+#: src/conversation/gnunet-conversation.c:404
 #, c-format
 msgid "Failed to resolve `%s'\n"
-msgstr ""
+msgstr "Résolution de « %s » échouée\n"
 
-#: src/conversation/gnunet-conversation.c:422
-#, c-format
-msgid "Call to `%s' terminated\n"
-msgstr ""
+#: src/conversation/gnunet-conversation.c:411
+msgid "Call terminated\n"
+msgstr "Appel terminé\n"
 
-#: src/conversation/gnunet-conversation.c:431
+#: src/conversation/gnunet-conversation.c:417
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:437
+#: src/conversation/gnunet-conversation.c:423
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:442
+#: src/conversation/gnunet-conversation.c:428
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:511
+#: src/conversation/gnunet-conversation.c:495
 #, c-format
 msgid "Unknown command `%s'\n"
-msgstr ""
+msgstr "Commande « %s » inconnue\n"
 
-#: src/conversation/gnunet-conversation.c:527
-#: src/conversation/gnunet-conversation.c:541
+#: src/conversation/gnunet-conversation.c:511
+#: src/conversation/gnunet-conversation.c:525
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:534
-#: src/conversation/gnunet-conversation.c:591
+#: src/conversation/gnunet-conversation.c:518
+#: src/conversation/gnunet-conversation.c:575
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:549
-#: src/conversation/gnunet-conversation.c:604
+#: src/conversation/gnunet-conversation.c:533
+#: src/conversation/gnunet-conversation.c:588
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:559
+#: src/conversation/gnunet-conversation.c:544
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:615
+#: src/conversation/gnunet-conversation.c:599
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:632
+#: src/conversation/gnunet-conversation.c:616
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:662
+#: src/conversation/gnunet-conversation.c:647
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:685
+#: src/conversation/gnunet-conversation.c:670
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:675
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:696
-#: src/conversation/gnunet-conversation.c:720
+#: src/conversation/gnunet-conversation.c:681
+#: src/conversation/gnunet-conversation.c:705
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:701
-msgid ""
-"We had an internal error setting up our phone line. You can still make "
-"calls.\n"
+#: src/conversation/gnunet-conversation.c:686
+msgid "We had an internal error setting up our phone line. You can still make 
calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:710
+#: src/conversation/gnunet-conversation.c:695
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:715
+#: src/conversation/gnunet-conversation.c:700
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/conversation/gnunet-conversation.c:719
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:740
+#: src/conversation/gnunet-conversation.c:725
 #, c-format
 msgid "#%u: `%s'\n"
 msgstr "#%u : « %s »\n"
 
+#: src/conversation/gnunet-conversation.c:753
 #: src/conversation/gnunet-conversation.c:768
-#: src/conversation/gnunet-conversation.c:783
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:816
-#: src/conversation/gnunet-conversation.c:832
+#: src/conversation/gnunet-conversation.c:801
+#: src/conversation/gnunet-conversation.c:817
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:839
+#: src/conversation/gnunet-conversation.c:824
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:848
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:865
+#: src/conversation/gnunet-conversation.c:850
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:900
+#: src/conversation/gnunet-conversation.c:885
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:908
+#: src/conversation/gnunet-conversation.c:893
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:925
+#: src/conversation/gnunet-conversation.c:910
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:937
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:939
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
+#: src/conversation/gnunet-conversation.c:941
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:957
+#: src/conversation/gnunet-conversation.c:943
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:959
-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."
+#: src/conversation/gnunet-conversation.c:945
+msgid "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume 
incoming calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/conversation/gnunet-conversation.c:947
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:963
+#: src/conversation/gnunet-conversation.c:949
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:965
+#: src/conversation/gnunet-conversation.c:951
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:967
+#: src/conversation/gnunet-conversation.c:953
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1175
+#: src/conversation/gnunet-conversation.c:1151
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1188
+#: src/conversation/gnunet-conversation.c:1164
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1223
+#: src/conversation/gnunet-conversation.c:1199
 msgid "You must specify the NAME of an ego to use\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1247
+#: src/conversation/gnunet-conversation.c:1223
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1249
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1276
+#: src/conversation/gnunet-conversation.c:1252
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1302
+#: src/conversation/gnunet-conversation.c:1276
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -982,87 +896,83 @@
 #, c-format
 msgid ""
 "\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
+"We are now playing your recording back.  If you can hear it, your audio 
settings are working..."
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:215
 #, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
+msgid "We will now be recording you for %s. After that time, the recording 
will be played back to you..."
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:248
 #: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
-#: src/sensordashboard/gnunet-sensordashboard.c:70
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:318
+#: src/conversation/gnunet-helper-audio-playback.c:305
 #, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "pa_stream_write() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:602
+#: src/conversation/gnunet-helper-audio-playback.c:587
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:627
+#: src/conversation/gnunet-helper-audio-playback.c:612
 #: src/conversation/gnunet-helper-audio-record.c:545
 msgid "Connection established.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:632
+#: src/conversation/gnunet-helper-audio-playback.c:617
 #: src/conversation/gnunet-helper-audio-record.c:550
 #, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "pa_stream_new() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:646
+#: src/conversation/gnunet-helper-audio-playback.c:631
 #, 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:659
+#: src/conversation/gnunet-helper-audio-playback.c:644
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, c-format
 msgid "Connection failure: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:680
+#: src/conversation/gnunet-helper-audio-playback.c:665
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr "Spécification incorrecte\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:686
+#: src/conversation/gnunet-helper-audio-playback.c:671
 #: src/conversation/gnunet-helper-audio-record.c:605
 msgid "pa_mainloop_new() failed.\n"
 msgstr "pa_mainloop_new() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:700
+#: src/conversation/gnunet-helper-audio-playback.c:685
 #: src/conversation/gnunet-helper-audio-record.c:620
 msgid "pa_context_new() failed.\n"
 msgstr "pa_context_new() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:707
+#: src/conversation/gnunet-helper-audio-playback.c:692
 #: src/conversation/gnunet-helper-audio-record.c:626
 #, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "pa_context_connect() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:713
+#: src/conversation/gnunet-helper-audio-playback.c:698
 #: src/conversation/gnunet-helper-audio-record.c:632
 msgid "pa_mainloop_run() failed.\n"
 msgstr "pa_mainloop_run() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:783
+#: src/conversation/gnunet-helper-audio-playback.c:768
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:357
+#: src/conversation/gnunet-helper-audio-playback-gst.c:325
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1124,19 +1034,18 @@
 msgid "Failed to allocate %d bytes for second packet\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:853
-msgid "Cadet audio channel not ready; audio data dropped\n"
+#: src/conversation/gnunet-service-conversation.c:841
+msgid "Mesh audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:944
+#: src/conversation/gnunet-service-conversation.c:932
 #, c-format
-msgid ""
-"No available phone for incoming call on line %u, sending HANG_UP signal\n"
+msgid "No available phone for incoming call on line %u, sending HANG_UP 
signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1351
+#: src/conversation/gnunet-service-conversation.c:1338
 #, c-format
-msgid "Received incoming Cadet channel on port %u\n"
+msgid "Received incoming channel on port %u\n"
 msgstr ""
 
 #: src/conversation/microphone.c:121
@@ -1152,314 +1061,283 @@
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/core_api.c:726
+#: src/core/core_api.c:767
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:92
-msgid "fresh connection"
+#: src/core/gnunet-core.c:80
+#, c-format
+msgid "Peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:95
-msgid "key sent"
+#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
+#: src/transport/gnunet-transport.c:910 src/transport/gnunet-transport.c:930
+#, c-format
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:98
-msgid "key received"
-msgstr ""
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:911
+msgid "Connected to"
+msgstr "Connecté à"
 
-#: src/core/gnunet-core.c:101
-msgid "connection established"
-msgstr ""
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:931
+msgid "Disconnected from"
+msgstr "Déconnecté de"
 
-#: src/core/gnunet-core.c:104
-msgid "rekeying"
-msgstr ""
-
-#: src/core/gnunet-core.c:107
-msgid "disconnected"
-msgstr ""
-
-#: src/core/gnunet-core.c:114
-msgid "Connection to CORE service lost (reconnecting)"
-msgstr ""
-
-#: src/core/gnunet-core.c:117
-#, fuzzy
-msgid "unknown state"
-msgstr "inconnu"
-
-#: src/core/gnunet-core.c:122
+#: src/core/gnunet-core.c:211 src/peerinfo-tool/gnunet-peerinfo.c:694
 #, c-format
-msgid "%24s: %-30s %4s (timeout in %6s)\n"
-msgstr ""
-
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:795
-#, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:157
-msgid "Failed to connect to CORE service!\n"
-msgstr ""
-
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2154
+#: src/core/gnunet-core.c:233 src/transport/gnunet-transport.c:1486
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:188
+#: src/core/gnunet-core.c:244
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:104
+#: src/core/gnunet-service-core.c:105
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:128
+#: src/core/gnunet-service-core.c:126
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:379
+#: src/core/gnunet-service-core_clients.c:370
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:497
+#: src/core/gnunet-service-core_clients.c:480
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:562
+#: src/core/gnunet-service-core_clients.c:526
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:571
+#: src/core/gnunet-service-core_kx.c:535
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:630
+#: src/core/gnunet-service-core_kx.c:586
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:719
+#: src/core/gnunet-service-core_kx.c:673
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:713
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:795
-msgid "# PING messages transmitted"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:870
+#: src/core/gnunet-service-core_kx.c:810
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:877
+#: src/core/gnunet-service-core_kx.c:816
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:916
+#: src/core/gnunet-service-core_kx.c:850
 #, 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"
+msgid "Ephemeral key message from peer `%s' rejected as its validity range 
does not match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:927
+#: src/core/gnunet-service-core_kx.c:861
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1029
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/core/gnunet-service-core_kx.c:951
+#: src/transport/gnunet-service-transport_validation.c:1016
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1038
+#: src/core/gnunet-service-core_kx.c:959
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1067
+#: src/core/gnunet-service-core_kx.c:986
 #, c-format
-msgid ""
-"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
-"%s'\n"
+msgid "Received PING from `%s' for different identity: I am `%s', PONG 
identity: `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1093
+#: src/core/gnunet-service-core_kx.c:1003
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1122
+#: src/core/gnunet-service-core_kx.c:1029
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1135
+#: src/core/gnunet-service-core_kx.c:1039
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1206
-#: src/transport/gnunet-service-transport_validation.c:1392
+#: src/core/gnunet-service-core_kx.c:1096
+#: src/transport/gnunet-service-transport_validation.c:1328
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1213
+#: src/core/gnunet-service-core_kx.c:1102
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1218
+#: src/core/gnunet-service-core_kx.c:1107
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1254
+#: src/core/gnunet-service-core_kx.c:1137
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1292
+#: src/core/gnunet-service-core_kx.c:1171
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1303
+#: src/core/gnunet-service-core_kx.c:1181
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1310
+#: src/core/gnunet-service-core_kx.c:1188
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1466
+#: src/core/gnunet-service-core_kx.c:1328
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1474
+#: src/core/gnunet-service-core_kx.c:1335
 #, c-format
-msgid ""
-"Session to peer `%s' went down due to key expiration (should not happen)\n"
+msgid "Session to peer `%s' went down due to key expiration (should not 
happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1477
+#: src/core/gnunet-service-core_kx.c:1338
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1535
-#: src/core/gnunet-service-core_kx.c:1561
+#: src/core/gnunet-service-core_kx.c:1383
+#: src/core/gnunet-service-core_kx.c:1408
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1548
+#: src/core/gnunet-service-core_kx.c:1395
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1590
+#: src/core/gnunet-service-core_kx.c:1437
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1598
+#: src/core/gnunet-service-core_kx.c:1445
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/core/gnunet-service-core_kx.c:1480
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:183
+#: src/core/gnunet-service-core_neighbours.c:168
 msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:199
-#: src/core/gnunet-service-core_neighbours.c:384
+#: src/core/gnunet-service-core_neighbours.c:184
+#: src/core/gnunet-service-core_neighbours.c:335
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:291
+#: src/core/gnunet-service-core_neighbours.c:252
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:470
+#: src/core/gnunet-service-core_neighbours.c:418
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:253
-#: src/core/gnunet-service-core_sessions.c:339
-#: src/dht/gnunet-service-dht_neighbours.c:660
-#: src/dht/gnunet-service-dht_neighbours.c:725
-#: src/fs/gnunet-service-fs_cp.c:655 src/fs/gnunet-service-fs_cp.c:1649
-#: src/topology/gnunet-daemon-topology.c:734
-#: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:755
-#: src/transport/gnunet-service-transport_neighbours.c:763
+#: src/core/gnunet-service-core_sessions.c:216
+#: src/core/gnunet-service-core_sessions.c:288
+#: src/dht/gnunet-service-dht_neighbours.c:662
+#: src/dht/gnunet-service-dht_neighbours.c:727
+#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
+#: src/topology/gnunet-daemon-topology.c:707
+#: src/topology/gnunet-daemon-topology.c:808
+#: src/transport/gnunet-service-transport_neighbours.c:917
+#: src/transport/gnunet-service-transport_neighbours.c:1141
+#: src/transport/gnunet-service-transport_neighbours.c:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3438
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:286
+#: src/core/gnunet-service-core_sessions.c:255
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:405
-msgid "# outdated typemap confirmations received"
+#: src/core/gnunet-service-core_sessions.c:426
+msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:416
-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:110
+#: src/core/gnunet-service-core_typemap.c:121
 msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:210
+#: src/core/gnunet-service-core_typemap.c:151
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:866
+#: src/datacache/datacache.c:115 src/datacache/datacache.c:266
+#: src/datastore/gnunet-service-datastore.c:838
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:123 src/datacache/datacache.c:298
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:268
 msgid "# items stored"
 msgstr ""
 
-#: src/datacache/datacache.c:202
+#: src/datacache/datacache.c:143 src/datacache/datacache.c:150
+#: src/datastore/gnunet-service-datastore.c:1487
+#: src/datastore/gnunet-service-datastore.c:1498
 #, c-format
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr ""
+
+#: src/datacache/datacache.c:184
+#, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:213
+#: src/datacache/datacache.c:192
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:329
+#: src/datacache/datacache.c:295
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:339
+#: src/datacache/datacache.c:304
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/datacache.c:367
-msgid "# requests for random value received"
+#: src/datacache/plugin_datacache_heap.c:406
+msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/datacache/datacache.c:399
-msgid "# proximity search requests received"
+#: src/datacache/plugin_datacache_postgres.c:392
+msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:466
-msgid "Heap datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_sqlite.c:77
-#: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:818
-#: src/datastore/plugin_datastore_mysql.c:834
-#: src/datastore/plugin_datastore_sqlite.c:57
-#: src/datastore/plugin_datastore_sqlite.c:65 src/mysql/mysql.c:41
+#: src/datacache/plugin_datacache_sqlite.c:69
+#: src/datacache/plugin_datacache_sqlite.c:72
+#: src/datastore/plugin_datastore_mysql.c:806
+#: src/datastore/plugin_datastore_mysql.c:820
+#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namecache/plugin_namecache_postgres.c:52
@@ -1466,106 +1344,121 @@
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:52
-#: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
-#: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:671 src/include/gnunet_common.h:680
-#: src/scalarproduct/scalarproduct.h:35
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:50
 #, 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:324
+#: src/datacache/plugin_datacache_sqlite.c:450
+msgid "Sqlite datacache running\n"
+msgstr ""
+
+#: src/datacache/plugin_datacache_sqlite.c:484
+#: src/datastore/plugin_datastore_sqlite.c:404
+#: src/namecache/plugin_namecache_sqlite.c:295
+#: src/namestore/plugin_namestore_sqlite.c:327
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
+#: src/datacache/plugin_datacache_sqlite.c:491
+#, c-format
+msgid "Failed to close statement %p: %d\n"
+msgstr ""
+
+#: src/datacache/plugin_datacache_template.c:125
+msgid "Template datacache running\n"
+msgstr ""
+
 #: src/datastore/datastore_api.c:310
 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:395
+#: src/datastore/datastore_api.c:394
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:450
+#: src/datastore/datastore_api.c:443
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:478
+#: src/datastore/datastore_api.c:471
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:498
+#: src/datastore/datastore_api.c:491
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/datastore/datastore_api.c:540
+#: src/datastore/datastore_api.c:533
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:628
+#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
 msgid "# transmission request failures"
 msgstr ""
 
-#: src/datastore/datastore_api.c:652
+#: src/datastore/datastore_api.c:638
 msgid "# bytes sent to datastore"
 msgstr ""
 
-#: src/datastore/datastore_api.c:794
+#: src/datastore/datastore_api.c:770
 msgid "Failed to receive status response from database."
 msgstr ""
 
-#: src/datastore/datastore_api.c:808
+#: src/datastore/datastore_api.c:784
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:820 src/datastore/datastore_api.c:826
+#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
 msgid "Invalid error message received from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:830
+#: src/datastore/datastore_api.c:806
 msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:909
+#: src/datastore/datastore_api.c:876
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:975
+#: src/datastore/datastore_api.c:944
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1036
+#: src/datastore/datastore_api.c:1005
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1096
+#: src/datastore/datastore_api.c:1065
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1160
+#: src/datastore/datastore_api.c:1129
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1264
+#: src/datastore/datastore_api.c:1174
+msgid "Failed to receive response from database.\n"
+msgstr ""
+
+#: src/datastore/datastore_api.c:1233
 msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1300
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1394
+#: src/datastore/datastore_api.c:1363
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1463
+#: src/datastore/datastore_api.c:1424
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1580,9 +1473,7 @@
 msgstr ""
 
 #: src/datastore/gnunet-datastore.c:246
-msgid ""
-"specifies the configuration to use to access an alternative datastore; will "
-"merge that datastore into our current datastore"
+msgid "specifies the configuration to use to access an alternative datastore; 
will merge that datastore into our current datastore"
 msgstr ""
 
 #: src/datastore/gnunet-datastore.c:255
@@ -1589,210 +1480,178 @@
 msgid "Manipulate GNUnet datastore"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:372
+#: src/datastore/gnunet-service-datastore.c:351
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:447
+#: src/datastore/gnunet-service-datastore.c:425
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:505
+#: src/datastore/gnunet-service-datastore.c:483
 #: src/gns/gnunet-gns-helper-service-w32.c:223
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:536
+#: src/datastore/gnunet-service-datastore.c:514
 #: src/gns/gnunet-gns-helper-service-w32.c:262
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:652
+#: src/datastore/gnunet-service-datastore.c:630
 msgid "# results found"
-msgstr ""
+msgstr "# résultats introuvables"
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:673
 #, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
-"%llu bytes\n"
+msgid "Insufficient space (%llu bytes are available) to satisfy `%s' request 
for %llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:707
+#: src/datastore/gnunet-service-datastore.c:684
 #, c-format
-msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+msgid "The requested amount (%llu bytes) is larger than the cache size (%llu 
bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
-msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+#: src/datastore/gnunet-service-datastore.c:688
+msgid "Insufficient space to satisfy request and requested amount is larger 
than cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:717
+#: src/datastore/gnunet-service-datastore.c:694
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:723
-#: src/datastore/gnunet-service-datastore.c:779
-#: src/datastore/gnunet-service-datastore.c:1035
-#: src/datastore/gnunet-service-datastore.c:1630
+#: src/datastore/gnunet-service-datastore.c:699
+#: src/datastore/gnunet-service-datastore.c:751
+#: src/datastore/gnunet-service-datastore.c:964
+#: src/datastore/gnunet-service-datastore.c:1421
 msgid "# reserved"
-msgstr ""
+msgstr "# réservé"
 
-#: src/datastore/gnunet-service-datastore.c:793
+#: src/datastore/gnunet-service-datastore.c:764
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:879
+#: src/datastore/gnunet-service-datastore.c:850
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1088
+#: src/datastore/gnunet-service-datastore.c:1010
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1101
+#: src/datastore/gnunet-service-datastore.c:1022
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1141
+#: src/datastore/gnunet-service-datastore.c:1050
 msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1170
+#: src/datastore/gnunet-service-datastore.c:1080
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1204
+#: src/datastore/gnunet-service-datastore.c:1113
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1233
+#: src/datastore/gnunet-service-datastore.c:1138
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1244
+#: src/datastore/gnunet-service-datastore.c:1146
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1277
+#: src/datastore/gnunet-service-datastore.c:1178
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1321
+#: src/datastore/gnunet-service-datastore.c:1220
 #, c-format
-msgid ""
-"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1326
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
-msgid "New payload: %lld\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1379
-#, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1390
+#: src/datastore/gnunet-service-datastore.c:1290
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1459
-#: src/datastore/gnunet-service-datastore.c:1522
-msgid "Bloomfilter construction complete.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1509
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1519
-msgid "Plugin does not support get_keys function. Please fix!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1661
-#: src/datastore/gnunet-service-datastore.c:1673
+#: src/datastore/gnunet-service-datastore.c:1492
 #, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1667
-#, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1679
+#: src/datastore/gnunet-service-datastore.c:1503
 msgid "# quota"
-msgstr ""
+msgstr "# quota"
 
-#: src/datastore/gnunet-service-datastore.c:1681
+#: src/datastore/gnunet-service-datastore.c:1505
 msgid "# cache size"
-msgstr ""
+msgstr "# taille du cache"
 
-#: src/datastore/gnunet-service-datastore.c:1696
+#: src/datastore/gnunet-service-datastore.c:1518
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1714
-#: src/datastore/gnunet-service-datastore.c:1730
+#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1552
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1760
+#: src/datastore/gnunet-service-datastore.c:1582
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_heap.c:826
-msgid "Heap database running\n"
+#: src/datastore/gnunet-service-datastore.c:1611
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:309
-#: src/datastore/plugin_datastore_sqlite.c:507
-msgid "Data too large"
+#: src/datastore/gnunet-service-datastore.c:1616
+msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:328
-msgid "MySQL statement run failure"
+#: src/datastore/gnunet-service-datastore.c:1619
+msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:793
+#: src/datastore/plugin_datastore_heap.c:820
+msgid "Heap database running\n"
+msgstr ""
+
+#: src/datastore/plugin_datastore_mysql.c:783
 #, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:802
+#: src/datastore/plugin_datastore_mysql.c:791
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1036
+#: src/datastore/plugin_datastore_mysql.c:1022
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:331
-msgid "Postgress exec failure"
-msgstr ""
-
-#: src/datastore/plugin_datastore_postgres.c:846
+#: src/datastore/plugin_datastore_postgres.c:824
 msgid "Failed to drop table from database.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:882
+#: src/datastore/plugin_datastore_postgres.c:860
 #: src/namecache/plugin_namecache_postgres.c:414
 #: src/namestore/plugin_namestore_postgres.c:569
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:65
+#: src/datastore/plugin_datastore_sqlite.c:57
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
 #: src/testbed/gnunet-daemon-testbed-underlay.c:58
@@ -1800,41 +1659,38 @@
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:263
+#: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
-#: src/peerstore/plugin_peerstore_sqlite.c:479
-#: src/psycstore/plugin_psycstore_sqlite.c:325
+#: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:688
+#: src/datastore/plugin_datastore_sqlite.c:663
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1185
+#: src/datastore/plugin_datastore_sqlite.c:1156
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1205
+#: src/datastore/plugin_datastore_sqlite.c:1175
 #, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+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:716
+#: src/datastore/plugin_datastore_sqlite.c:1215
+#: src/namecache/plugin_namecache_sqlite.c:583
+#: src/namestore/plugin_namestore_sqlite.c:719
 msgid "Sqlite database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:260
+#: src/datastore/plugin_datastore_template.c:257
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:403
+#: src/dht/dht_api.c:376
 msgid "Failed to connect to the DHT service!\n"
 msgstr ""
 
@@ -1844,6 +1700,8 @@
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
+"Resultat %d, type %d :\n"
+"%.*s\n"
 
 #: src/dht/gnunet-dht-get.c:159
 msgid "Must provide key for DHT GET!\n"
@@ -1879,9 +1737,9 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:794
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:954
-#: src/fs/gnunet-search.c:306 src/fs/gnunet-unindex.c:167
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
+#: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
 msgstr ""
@@ -1898,51 +1756,6 @@
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1393 src/testbed/gnunet-testbed-profiler.c:267
-#, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1418
-#, fuzzy
-msgid "number of peers to start"
-msgstr "nombre de valeurs"
-
-#: src/dht/gnunet_dht_profiler.c:1421
-msgid ""
-"maximum number of times we try to search for successor circle formation (0 "
-"for R5N)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1424 src/nse/gnunet-nse-profiler.c:864
-#: src/testbed/gnunet-testbed-profiler.c:306
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1427
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1430
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1433
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1436
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1439
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1457
-msgid "Measure quality and performance of the DHT service."
-msgstr ""
-
 #: src/dht/gnunet-dht-put.c:118
 msgid "PUT request sent with key"
 msgstr ""
@@ -1989,412 +1802,300 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
 msgid "Failed to connect to transport service!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-wdht_clients.c:852
-#: src/dht/gnunet-service-xdht_clients.c:849
+#: src/dht/gnunet-service-xdht_clients.c:838
 msgid "# GET requests from clients injected"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-wdht_clients.c:937
-#: src/dht/gnunet-service-xdht_clients.c:933
+#: src/dht/gnunet-service-xdht_clients.c:927
 msgid "# PUT requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-wdht_clients.c:1003
-#: src/dht/gnunet-service-xdht_clients.c:998
+#: src/dht/gnunet-service-xdht_clients.c:1013
 msgid "# GET requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-wdht_clients.c:1212
-#: src/dht/gnunet-service-xdht_clients.c:1200
+#: src/dht/gnunet-service-xdht_clients.c:1214
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1040
-#: src/dht/gnunet-service-wdht_clients.c:505
-#: src/dht/gnunet-service-xdht_clients.c:503
+#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-xdht_clients.c:498
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1053
-#: src/dht/gnunet-service-wdht_clients.c:519
-#: src/dht/gnunet-service-xdht_clients.c:517
+#: src/dht/gnunet-service-dht_clients.c:1052
+#: src/dht/gnunet-service-xdht_clients.c:511
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1098
-#: src/dht/gnunet-service-wdht_clients.c:561
-#: src/dht/gnunet-service-xdht_clients.c:559
+#: src/dht/gnunet-service-dht_clients.c:1089
+#: src/dht/gnunet-service-xdht_clients.c:548
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1121
-#: src/dht/gnunet-service-wdht_clients.c:584
-#: src/dht/gnunet-service-xdht_clients.c:582
+#: src/dht/gnunet-service-dht_clients.c:1112
+#: src/dht/gnunet-service-xdht_clients.c:571
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1175
-#: src/dht/gnunet-service-dht_clients.c:1218
-#: src/dht/gnunet-service-wdht_clients.c:638
-#: src/dht/gnunet-service-wdht_clients.c:681
-#: src/dht/gnunet-service-xdht_clients.c:636
-#: src/dht/gnunet-service-xdht_clients.c:679
+#: src/dht/gnunet-service-dht_clients.c:1166
+#: src/dht/gnunet-service-dht_clients.c:1209
+#: src/dht/gnunet-service-xdht_clients.c:625
+#: src/dht/gnunet-service-xdht_clients.c:668
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1185
-#: src/dht/gnunet-service-wdht_clients.c:648
-#: src/dht/gnunet-service-xdht_clients.c:646
+#: src/dht/gnunet-service-dht_clients.c:1176
+#: src/dht/gnunet-service-xdht_clients.c:635
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:68
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-wdht_datacache.c:107
-#: src/dht/gnunet-service-xdht_datacache.c:91
+#: src/dht/gnunet-service-xdht_datacache.c:78
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:184
-#: src/dht/gnunet-service-wdht_datacache.c:216
-#: src/dht/gnunet-service-xdht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:165
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:201
-#: src/dht/gnunet-service-wdht_datacache.c:231
-#: src/dht/gnunet-service-xdht_datacache.c:267
+#: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:176
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:207
-#: src/dht/gnunet-service-wdht_datacache.c:237
-#: src/dht/gnunet-service-xdht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:182
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:213
-#: src/dht/gnunet-service-wdht_datacache.c:243
-#: src/dht/gnunet-service-xdht_datacache.c:279
+#: src/dht/gnunet-service-dht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:188
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:225
-#: src/dht/gnunet-service-wdht_datacache.c:255
-#: src/dht/gnunet-service-xdht_datacache.c:291
+#: src/dht/gnunet-service-dht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:200
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:229
-#: src/dht/gnunet-service-wdht_datacache.c:258
-#: src/dht/gnunet-service-xdht_datacache.c:294
+#: src/dht/gnunet-service-dht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:203
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:262
-#: src/dht/gnunet-service-wdht_datacache.c:295
-#: src/dht/gnunet-service-xdht_datacache.c:334
+#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:234
 msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:84 src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84
+#: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:514
+#: src/dht/gnunet-service-dht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:608
+#: src/dht/gnunet-service-dht_neighbours.c:610
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:762
-#: src/dht/gnunet-service-xdht_neighbours.c:6061
+#: src/dht/gnunet-service-dht_neighbours.c:764
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:792
-#: src/dht/gnunet-service-xdht_neighbours.c:986
-msgid "# Messages dropped (CORE timeout)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:822
-#: src/dht/gnunet-service-xdht_neighbours.c:1018
+#: src/dht/gnunet-service-dht_neighbours.c:819
+#: src/dht/gnunet-service-xdht_neighbours.c:703
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:868
+#: src/dht/gnunet-service-dht_neighbours.c:857
+#: src/dht/gnunet-service-xdht_neighbours.c:742
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:900
+#: src/dht/gnunet-service-dht_neighbours.c:889
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1104
-#: src/dht/gnunet-service-dht_neighbours.c:1141
+#: src/dht/gnunet-service-dht_neighbours.c:1093
+#: src/dht/gnunet-service-dht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1119
-#: src/dht/gnunet-service-dht_neighbours.c:1156
+#: src/dht/gnunet-service-dht_neighbours.c:1108
+#: src/dht/gnunet-service-dht_neighbours.c:1145
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1300
+#: src/dht/gnunet-service-dht_neighbours.c:1287
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1329
+#: src/dht/gnunet-service-dht_neighbours.c:1316
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1339
-#: src/dht/gnunet-service-dht_neighbours.c:1463
-#: src/dht/gnunet-service-dht_neighbours.c:1568
-#: src/dht/gnunet-service-xdht_neighbours.c:1128
-#: src/dht/gnunet-service-xdht_neighbours.c:1197
-#: src/dht/gnunet-service-xdht_neighbours.c:1247
-#: src/dht/gnunet-service-xdht_neighbours.c:1311
-#: src/dht/gnunet-service-xdht_neighbours.c:1378
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1502
-#: src/dht/gnunet-service-xdht_neighbours.c:1564
-#: src/dht/gnunet-service-xdht_neighbours.c:1624
+#: src/dht/gnunet-service-dht_neighbours.c:1323
+#: src/dht/gnunet-service-dht_neighbours.c:1440
+#: src/dht/gnunet-service-dht_neighbours.c:1543
+#: src/dht/gnunet-service-xdht_neighbours.c:794
+#: src/dht/gnunet-service-xdht_neighbours.c:860
+#: src/dht/gnunet-service-xdht_neighbours.c:919
+#: src/dht/gnunet-service-xdht_neighbours.c:981
+#: src/dht/gnunet-service-xdht_neighbours.c:1041
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1425
+#: src/dht/gnunet-service-dht_neighbours.c:1405
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1452
+#: src/dht/gnunet-service-dht_neighbours.c:1432
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1575
+#: src/dht/gnunet-service-dht_neighbours.c:1550
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1662
+#: src/dht/gnunet-service-dht_neighbours.c:1636
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1665
+#: src/dht/gnunet-service-dht_neighbours.c:1639
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1803
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1841
+#: src/dht/gnunet-service-dht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1936
+#: src/dht/gnunet-service-dht_neighbours.c:1904
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1939
+#: src/dht/gnunet-service-dht_neighbours.c:1907
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2004
+#: src/dht/gnunet-service-dht_neighbours.c:1961
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2018
+#: src/dht/gnunet-service-dht_neighbours.c:1975
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2103
+#: src/dht/gnunet-service-dht_neighbours.c:2052
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2106
+#: src/dht/gnunet-service-dht_neighbours.c:2055
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-wdht_nse.c:59
-#: src/dht/gnunet-service-xdht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59
 msgid "# Network size estimates received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:227
+#: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:233
+#: src/dht/gnunet-service-dht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:239
+#: src/dht/gnunet-service-dht_routing.c:232
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:251
+#: src/dht/gnunet-service-dht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:317
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:406
+#: src/dht/gnunet-service-dht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:424
+#: src/dht/gnunet-service-dht_routing.c:417
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/gnunet-service-wdht_datacache.c:82
-msgid "PUT request received, but have no datacache!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1831
+#: src/dht/gnunet-service-xdht_neighbours.c:1398
 #, c-format
 msgid ""
 "\n"
-"SUPU %s, %s, %d,trail_length = %d"
+"SUPU %s, %s, %d,my_identity = %s"
 msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1836
-#, c-format
-msgid ""
 "\n"
-"SUPU %s, %s, %d,trail[%d]=%s"
-msgstr ""
+"SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1856
+#: src/dht/gnunet-service-xdht_neighbours.c:1514
+#: src/dht/gnunet-service-xdht_neighbours.c:1524
+#: src/dht/gnunet-service-xdht_neighbours.c:1530
+#: src/dht/gnunet-service-xdht_neighbours.c:1536
+#: src/dht/gnunet-service-xdht_neighbours.c:1545
 #, c-format
 msgid ""
 "\n"
-"SUPU************  FRIEND_PEERMAP of %s"
+"SUPU %s, %s, %d"
 msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1866
-#, c-format
-msgid ""
 "\n"
-"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
-msgstr ""
+"SUPU %s, %s, %d"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1887
+#: src/dht/plugin_block_dht.c:138
 #, c-format
-msgid ""
-"\n"
-"SUPU************  FINGER_TABLE of %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1896
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1903
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail_id[%d]=%s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1909
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d] = %s "
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:3558
-msgid "# FINGERS_COUNT"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:3699
-#: src/dht/gnunet-service-xdht_neighbours.c:3937
-#: src/dht/gnunet-service-xdht_neighbours.c:4089
-#: src/dht/gnunet-service-xdht_neighbours.c:4241
-#: src/dht/gnunet-service-xdht_neighbours.c:4422
-#: src/dht/gnunet-service-xdht_neighbours.c:4935
-#: src/dht/gnunet-service-xdht_neighbours.c:5328
-#: src/dht/gnunet-service-xdht_neighbours.c:5421
-#: src/dht/gnunet-service-xdht_neighbours.c:5511
-#: src/dht/gnunet-service-xdht_neighbours.c:5615
-#: src/dht/gnunet-service-xdht_neighbours.c:5759
-#: src/dht/gnunet-service-xdht_neighbours.c:5848
-msgid "# Bytes received from other peers"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_routing.c:256
-#, c-format
-msgid ""
-"\n"
-"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_routing.c:264
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->trail_id = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_routing.c:267
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->next_hop = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_routing.c:270
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->prev_hop = %s"
-msgstr ""
-
-#: src/dht/plugin_block_dht.c:142
-#, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:149
+#: src/dht/plugin_block_dht.c:145
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:159
+#: src/dht/plugin_block_dht.c:155
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:254
+#: src/dns/dnsparser.c:257
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:818
+#: src/dns/dnsparser.c:856
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
@@ -2424,15 +2125,15 @@
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:352
+#: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:366
+#: src/dns/gnunet-dns-monitor.c:369
 msgid "Monitor DNS queries."
 msgstr ""
 
@@ -2448,383 +2149,493 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:459
+#: src/dns/gnunet-service-dns.c:456
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:606
+#: src/dns/gnunet-service-dns.c:603
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:717
+#: src/dns/gnunet-service-dns.c:714
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:795
+#: src/dns/gnunet-service-dns.c:792
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:910
+#: src/dns/gnunet-service-dns.c:907
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:926
+#: src/dns/gnunet-service-dns.c:923
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:935
+#: src/dns/gnunet-service-dns.c:932
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:945
+#: src/dns/gnunet-service-dns.c:942
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1012
+#: src/dns/gnunet-service-dns.c:1009
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1064 src/exit/gnunet-daemon-exit.c:3615
-msgid "need a valid IPv4 or IPv6 address\n"
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3514
+#, c-format
+msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1082
-#, c-format
-msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3571
+msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
 #: src/dv/gnunet-dv.c:169
 msgid "verbose output"
-msgstr ""
+msgstr "sortie verbeuse"
 
 #: src/dv/gnunet-dv.c:178
 msgid "Print information about DV state"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:807
+#: src/exit/gnunet-daemon-exit.c:802
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:858
-msgid "# Bytes transmitted via cadet channels"
+#: src/exit/gnunet-daemon-exit.c:853
+msgid "# Bytes transmitted via mesh channels"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:975 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:1446
-#: src/vpn/gnunet-service-vpn.c:1837 src/vpn/gnunet-service-vpn.c:2000
+#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
+#: src/exit/gnunet-daemon-exit.c:2654 src/vpn/gnunet-service-vpn.c:1407
+#: src/vpn/gnunet-service-vpn.c:1797 src/vpn/gnunet-service-vpn.c:1960
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1012 src/exit/gnunet-daemon-exit.c:2467
-#: src/exit/gnunet-daemon-exit.c:2725 src/vpn/gnunet-service-vpn.c:1502
-#: src/vpn/gnunet-service-vpn.c:1896 src/vpn/gnunet-service-vpn.c:2033
+#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2456
+#: src/exit/gnunet-daemon-exit.c:2713 src/vpn/gnunet-service-vpn.c:1463
+#: src/vpn/gnunet-service-vpn.c:1856 src/vpn/gnunet-service-vpn.c:1993
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1052
+#: src/exit/gnunet-daemon-exit.c:1047
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1059
+#: src/exit/gnunet-daemon-exit.c:1054
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1135
+#: src/exit/gnunet-daemon-exit.c:1130
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1209
+#: src/exit/gnunet-daemon-exit.c:1204
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1262
+#: src/exit/gnunet-daemon-exit.c:1256
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1276
+#: src/exit/gnunet-daemon-exit.c:1270
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1302
+#: src/exit/gnunet-daemon-exit.c:1296
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1329
+#: src/exit/gnunet-daemon-exit.c:1323
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1375
+#: src/exit/gnunet-daemon-exit.c:1369
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1383
+#: src/exit/gnunet-daemon-exit.c:1377
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1759
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1878
-msgid "# TCP service creation requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:1872
+msgid "# TCP service creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1881 src/exit/gnunet-daemon-exit.c:1975
-#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2332
-#: src/exit/gnunet-daemon-exit.c:2582 src/exit/gnunet-daemon-exit.c:2872
-#: src/exit/gnunet-daemon-exit.c:2980
-msgid "# Bytes received from CADET"
+#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1968
+#: src/exit/gnunet-daemon-exit.c:2073 src/exit/gnunet-daemon-exit.c:2321
+#: src/exit/gnunet-daemon-exit.c:2570 src/exit/gnunet-daemon-exit.c:2859
+#: src/exit/gnunet-daemon-exit.c:2966
+msgid "# Bytes received from MESH"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1915 src/exit/gnunet-daemon-exit.c:3004
+#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
 #, c-format
 msgid "No service %s found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1920
+#: src/exit/gnunet-daemon-exit.c:1914
 msgid "# TCP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1978
-msgid "# TCP IP-exit creation requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:1971
+msgid "# TCP IP-exit creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2085
-msgid "# TCP data requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2076
+msgid "# TCP data requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2099
+#: src/exit/gnunet-daemon-exit.c:2090
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2161
+#: src/exit/gnunet-daemon-exit.c:2150
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2335
-msgid "# ICMP IP-exit requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2324
+msgid "# ICMP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2585
-msgid "# ICMP service requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2573
+msgid "# ICMP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1436
-#: src/vpn/gnunet-service-vpn.c:1994
+#: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397
+#: src/vpn/gnunet-service-vpn.c:1954
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1472
-#: src/vpn/gnunet-service-vpn.c:1484 src/vpn/gnunet-service-vpn.c:1884
+#: src/exit/gnunet-daemon-exit.c:2698 src/vpn/gnunet-service-vpn.c:1433
+#: src/vpn/gnunet-service-vpn.c:1445 src/vpn/gnunet-service-vpn.c:1844
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2761
+#: src/exit/gnunet-daemon-exit.c:2748
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2875
-msgid "# UDP IP-exit requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2862
+msgid "# UDP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2983
-msgid "# UDP service requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2969
+msgid "# UDP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3009
+#: src/exit/gnunet-daemon-exit.c:2995
 msgid "# UDP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3047
-msgid "# Inbound CADET channels created"
+#: src/exit/gnunet-daemon-exit.c:3031
+msgid "# Inbound MESH channels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3271 src/exit/gnunet-daemon-exit.c:3281
+#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3295 src/exit/gnunet-daemon-exit.c:3303
+#: src/exit/gnunet-daemon-exit.c:3259 src/exit/gnunet-daemon-exit.c:3267
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3336
+#: src/exit/gnunet-daemon-exit.c:3300
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3350 src/exit/gnunet-daemon-exit.c:3362
+#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3373
+#: src/exit/gnunet-daemon-exit.c:3337
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3555
-#, c-format
-msgid "`%s' must be installed SUID, EXIT will not work\n"
+#: src/exit/gnunet-daemon-exit.c:3527
+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:3571
-msgid ""
-"This system does not support IPv4, will disable IPv4 functions despite them "
-"being enabled in the configuration\n"
+#: src/exit/gnunet-daemon-exit.c:3535
+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:3579
-msgid ""
-"This system does not support IPv6, will disable IPv6 functions despite them "
-"being enabled in the configuration\n"
+#: src/exit/gnunet-daemon-exit.c:3542
+msgid "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use 
ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3586
-msgid ""
-"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
-"ENABLE_IPv4=YES\n"
+#: src/exit/gnunet-daemon-exit.c:3548
+msgid "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use 
ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3592
-msgid ""
-"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
-"ENABLE_IPv6=YES\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3598 src/exit/gnunet-daemon-exit.c:3763
+#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
 #: src/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3710
+#: src/exit/gnunet-daemon-exit.c:3664
 msgid "Must be a number"
-msgstr ""
+msgstr "Doit être un nombre"
 
-#: src/exit/gnunet-daemon-exit.c:3861
+#: src/exit/gnunet-daemon-exit.c:3813
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:277
+#: src/experimentation/gnunet-daemon-experimentation.c:55
+msgid "Experimentation daemon shutting down ...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:77
+msgid "Experimentation daemon starting ...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:83
+msgid "Failed to create statistics!\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:120
+msgid "GNUnet experimentation daemon"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
+#, c-format
+msgid "Experiment `%s': Experiment signature is invalid\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
+#, c-format
+msgid "Adding experiment `%s' running from `%s' to `%s' every %llu sec. for 
%llu sec. \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
+#, c-format
+msgid "Experiment `%s': Issuer missing\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
+#, c-format
+msgid "Experiment `%s': Issuer invalid\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
+#, c-format
+msgid "Experiment `%s': Issuer not accepted!\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
+#, c-format
+msgid "Experiment `%s': Version missing or invalid \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
+#, c-format
+msgid "Experiment `%s': Required capabilities missing \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
+#, c-format
+msgid "Experiment `%s': Required capabilities invalid \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
+#, c-format
+msgid "Failed to parse file `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
+msgid "No valid experiment issuers configured! Set value to public keys of 
issuers! Exiting.\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
+msgid "Invalid value for public key\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
+#, c-format
+msgid "Cannot read experiments file `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
+#, c-format
+msgid "Cannot send message to peer `%s' for experiment `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
+#, c-format
+msgid "Sending experimentation request to peer %s\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
+#, c-format
+msgid "Added peer `%s' as active node\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
+#, c-format
+msgid "Connected to peer %s\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
+#, c-format
+msgid "Disconnected from peer %s\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
+msgid "Failed to connect to CORE service!\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
+#, c-format
+msgid "Peer `%s' did not respond to request for experiment `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
+#, c-format
+msgid "Starting inbound experiment `%s' with peer `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
+#, c-format
+msgid "Starting outbound experiment `%s' with peer `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
+#, c-format
+msgid "Received %s message from peer %s for experiment `%s'\n"
+msgstr ""
+
+#: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:470
-#: src/transport/plugin_transport_wlan.c:1534
+#: src/fragmentation/defragmentation.c:456
 msgid "# fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:540
+#: src/fragmentation/defragmentation.c:521
 msgid "# duplicate fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:558
+#: src/fragmentation/defragmentation.c:534
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:235
+#: src/fragmentation/fragmentation.c:208
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:240
+#: src/fragmentation/fragmentation.c:211
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:269
+#: src/fragmentation/fragmentation.c:237
 msgid "# fragments wrap arounds"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:315
+#: src/fragmentation/fragmentation.c:281
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:321
+#: src/fragmentation/fragmentation.c:284
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:444
+#: src/fragmentation/fragmentation.c:405
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:451
+#: src/fragmentation/fragmentation.c:411
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:475
+#: src/fragmentation/fragmentation.c:435
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:495
+#: src/fs/fs_api.c:465
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:506
+#: src/fs/fs_api.c:474
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:514
+#: src/fs/fs_api.c:480
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1122
+#: src/fs/fs_api.c:1066
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1642
+#: src/fs/fs_api.c:1571
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1656
+#: src/fs/fs_api.c:1585
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2314
+#: src/fs/fs_api.c:2242
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2324
+#: src/fs/fs_api.c:2252
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2452 src/fs/fs_api.c:2700
+#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2619
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2470
+#: src/fs/fs_api.c:2395
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2485 src/fs/fs_api.c:2504 src/fs/fs_api.c:2996
+#: src/fs/fs_api.c:2409 src/fs/fs_api.c:2428 src/fs/fs_api.c:2911
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2690
+#: src/fs/fs_api.c:2610
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2939
+#: src/fs/fs_api.c:2855
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3034
+#: src/fs/fs_api.c:2949
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2834,9 +2645,7 @@
 msgstr ""
 
 #: src/fs/fs_download.c:322
-msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
+msgid "Recursive downloads of directories larger than 4 GB are not supported 
on 32-bit systems\n"
 msgstr ""
 
 #: src/fs/fs_download.c:342
@@ -2855,9 +2664,7 @@
 
 #: src/fs/fs_download.c:987
 #, c-format
-msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)"
+msgid "Internal error or bogus download URI (expected %u bytes at depth %u and 
offset %llu/%llu, got %u bytes)"
 msgstr ""
 
 #: src/fs/fs_download.c:1013
@@ -2885,13 +2692,11 @@
 
 #: src/fs/fs_download.c:1944
 msgid "Invalid URI"
-msgstr ""
+msgstr "URI invalide"
 
-#: src/fs/fs_getopt.c:197
+#: src/fs/fs_getopt.c:192
 #, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+msgid "Unknown metadata type in metadata option `%s'.  Using metadata type 
`unknown' instead.\n"
 msgstr ""
 
 #: src/fs/fs_list_indexed.c:90
@@ -2933,280 +2738,260 @@
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:441
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:707 src/fs/fs_publish.c:724 src/fs/fs_publish.c:763
-#: src/fs/fs_publish.c:784 src/fs/fs_publish.c:808 src/fs/fs_publish.c:1058
+#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
+#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:709
+#: src/fs/fs_publish.c:669
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:721
+#: src/fs/fs_publish.c:681
 msgid "unknown error"
-msgstr ""
+msgstr "erreur unconnue."
 
-#: src/fs/fs_publish.c:765
+#: src/fs/fs_publish.c:725
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:785
+#: src/fs/fs_publish.c:745
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:810
+#: src/fs/fs_publish.c:770
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:833
+#: src/fs/fs_publish.c:793
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:897 src/fs/fs_publish.c:938
-msgid "Can not create LOC URI. Will continue with CHK instead.\n"
-msgstr ""
-
-#: src/fs/fs_publish.c:1012
+#: src/fs/fs_publish.c:862
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1020
+#: src/fs/fs_publish.c:868
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1060
+#: src/fs/fs_publish.c:915
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1299
-#, fuzzy, c-format
-msgid "Datastore failure: %s"
-msgstr "pa_stream_new() échoué : %s\n"
+#: src/fs/fs_publish.c:1151
+#, c-format
+msgid "Insufficient space for publishing: %s"
+msgstr ""
 
-#: src/fs/fs_publish.c:1390
+#: src/fs/fs_publish.c:1243
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:224
+#: src/fs/fs_publish_ksk.c:219
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish_ublock.c:243
+#: src/fs/fs_publish_ublock.c:219
 msgid "Internal error."
-msgstr ""
+msgstr "Erreur interne."
 
-#: src/fs/fs_search.c:812 src/fs/fs_search.c:882
+#: src/fs/fs_search.c:813
 #, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_search.c:941
+#: src/fs/fs_search.c:872
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:59
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:68
+#: src/fs/fs_unindex.c:64
 msgid "Failed to read file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:245
+#: src/fs/fs_unindex.c:234
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:253
+#: src/fs/fs_unindex.c:242
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:261
+#: src/fs/fs_unindex.c:250
 msgid "Invalid response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:304
+#: src/fs/fs_unindex.c:291
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:360 src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:347 src/fs/fs_unindex.c:359
 msgid "Failed to get KSKs from directory scan."
 msgstr ""
 
-#: src/fs/fs_unindex.c:368
+#: src/fs/fs_unindex.c:355
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:427
+#: src/fs/fs_unindex.c:414
 #, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:590 src/fs/fs_unindex.c:656
+#: src/fs/fs_unindex.c:562 src/fs/fs_unindex.c:626
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:639
 msgid "Failed to open file for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:708
+#: src/fs/fs_unindex.c:673
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:223
+#: src/fs/fs_uri.c:222
 #, no-c-format
-msgid "Malformed KSK URI (`%' must be followed by HEX number)"
+msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_uri.c:282
+#: src/fs/fs_uri.c:281
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:300
-msgid "Malformed KSK URI (`++' not allowed)"
+#: src/fs/fs_uri.c:299
+msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:307
-msgid "Malformed KSK URI (quotes not balanced)"
+#: src/fs/fs_uri.c:306
+msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
 #: src/fs/fs_uri.c:376
-msgid "Malformed SKS URI (wrong syntax)"
+msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:417
-msgid "Malformed CHK URI (wrong syntax)"
+#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
+msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:432
-msgid "Malformed CHK URI (failed to decode CHK)"
+#: src/fs/fs_uri.c:512 src/fs/fs_uri.c:580
+msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:511
-msgid "LOC URI malformed (wrong syntax)"
+#: src/fs/fs_uri.c:527 src/fs/fs_uri.c:537
+msgid "LOC URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:526
-msgid "LOC URI malformed (no CHK)"
-msgstr ""
-
-#: src/fs/fs_uri.c:536
-msgid "LOC URI malformed (missing LOC)"
-msgstr ""
-
-#: src/fs/fs_uri.c:544
-msgid "LOC URI malformed (wrong syntax for public key)"
-msgstr ""
-
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:545 src/fs/fs_uri.c:553
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:558
-msgid "LOC URI malformed (could not find signature)"
+#: src/fs/fs_uri.c:559
+msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
-msgid "LOC URI malformed (wrong syntax for signature)"
+#: src/fs/fs_uri.c:565 src/fs/fs_uri.c:574
+msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:573
-msgid "LOC URI malformed (could not decode signature)"
+#: src/fs/fs_uri.c:586
+msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:579
-msgid "LOC URI malformed (wrong syntax for expiration time)"
+#: src/fs/fs_uri.c:598
+msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
-msgid "LOC URI malformed (could not parse expiration time)"
-msgstr ""
+#: src/fs/fs_uri.c:636
+msgid "Unrecognized URI type"
+msgstr "Type d’URI non reconnu"
 
-#: src/fs/fs_uri.c:597
-msgid "LOC URI malformed (signature failed validation)"
+#: src/fs/fs_uri.c:860
+msgid "Lacking key configuration settings.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:631
-msgid "invalid argument"
+#: src/fs/fs_uri.c:866
+#, c-format
+msgid "Could not access hostkey file `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:643
-msgid "Unrecognized URI type"
-msgstr ""
-
-#: src/fs/fs_uri.c:1045 src/fs/fs_uri.c:1072
+#: src/fs/fs_uri.c:1050 src/fs/fs_uri.c:1077
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1078
+#: src/fs/fs_uri.c:1083
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:237
+#: src/fs/gnunet-auto-share.c:236
 #, c-format
 msgid "Failed to load state: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:290 src/fs/gnunet-auto-share.c:300
-#: src/fs/gnunet-auto-share.c:310
+#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
+#: src/fs/gnunet-auto-share.c:309
 #, c-format
 msgid "Failed to save state to file %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:415
+#: src/fs/gnunet-auto-share.c:401
 #, c-format
 msgid "Publication of `%s' done\n"
-msgstr ""
+msgstr "Publication de « %s » terminée\n"
 
-#: src/fs/gnunet-auto-share.c:504
+#: src/fs/gnunet-auto-share.c:488
 #, c-format
 msgid "Publishing `%s'\n"
-msgstr ""
+msgstr "Publication de « %s »\n"
 
-#: src/fs/gnunet-auto-share.c:514
+#: src/fs/gnunet-auto-share.c:497
 #, c-format
 msgid "Failed to run `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:725
+#: src/fs/gnunet-auto-share.c:686
 #, c-format
-msgid ""
-"You must specify one and only one directory name for automatic publication.\n"
+msgid "You must specify one and only one directory name for automatic 
publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:778 src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:782 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:785 src/fs/gnunet-publish.c:908
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:788 src/fs/gnunet-publish.c:932
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:791 src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:815
+#: src/fs/gnunet-auto-share.c:770
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -3214,36 +2999,36 @@
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:105
+#: src/fs/gnunet-directory.c:94
 #, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:108
+#: src/fs/gnunet-directory.c:97
 #, c-format
 msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:143
+#: src/fs/gnunet-directory.c:132
 msgid "You must specify a filename to inspect.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:156
+#: src/fs/gnunet-directory.c:145
 #, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:165
+#: src/fs/gnunet-directory.c:154
 #, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:194
+#: src/fs/gnunet-directory.c:183
 msgid "Display contents of a GNUnet directory"
 msgstr ""
 
@@ -3258,9 +3043,7 @@
 
 #: src/fs/gnunet-download.c:157
 #, c-format
-msgid ""
-"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
-"download\n"
+msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to 
download\n"
 msgstr ""
 
 #: src/fs/gnunet-download.c:179
@@ -3273,67 +3056,65 @@
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:297
-#: src/fs/gnunet-search.c:205 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:234
 msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:728
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:247
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:254
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:872
-#: src/fs/gnunet-search.c:255 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
+#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:294
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:307
+#: src/fs/gnunet-download.c:308
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:297
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:313
+#: src/fs/gnunet-download.c:314
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:317
+#: src/fs/gnunet-download.c:318
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:321
+#: src/fs/gnunet-download.c:322
 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:325
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:338
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+#: src/fs/gnunet-download.c:339
+msgid "Download files from GNUnet using a GNUnet CHK or LOC URI 
(gnunet://fs/chk/...)"
 msgstr ""
 
 #: src/fs/gnunet-fs.c:117
@@ -3360,355 +3141,288 @@
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:221 src/fs/gnunet-publish.c:233
+#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:241
+#: src/fs/gnunet-publish.c:250
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:248
+#: src/fs/gnunet-publish.c:260
 #, c-format
 msgid "Publishing `%s' done.\n"
-msgstr ""
+msgstr "Publication de « %s » terminée.\n"
 
-#: src/fs/gnunet-publish.c:253
+#: src/fs/gnunet-publish.c:264
 #, c-format
 msgid "URI is `%s'.\n"
-msgstr ""
+msgstr "L’URI est « %s ».\n"
 
-#: src/fs/gnunet-publish.c:261
-#, c-format
-msgid "Namespace URI is `%s'.\n"
+#: src/fs/gnunet-publish.c:283
+msgid "Cleanup after abort complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:277
-msgid "Starting cleanup after abort\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:284
-msgid "Cleanup after abort completed.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:290
-msgid "Cleanup after abort failed.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:432
+#: src/fs/gnunet-publish.c:401
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:437
+#: src/fs/gnunet-publish.c:403
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:591
+#: src/fs/gnunet-publish.c:542
 msgid "Could not publish\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:616
+#: src/fs/gnunet-publish.c:565
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:650
+#: src/fs/gnunet-publish.c:598
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:654
+#: src/fs/gnunet-publish.c:600
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:660
+#: src/fs/gnunet-publish.c:605
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:667
+#: src/fs/gnunet-publish.c:610
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-publish.c:614
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:618
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:688
+#: src/fs/gnunet-publish.c:625
 msgid "Internal error scanning directory.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:716
+#: src/fs/gnunet-publish.c:656
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:749
+#: src/fs/gnunet-publish.c:682
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:763
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
+#: src/fs/gnunet-publish.c:695
+msgid "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs 
installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:819
+#: src/fs/gnunet-publish.c:747
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:826
+#: src/fs/gnunet-publish.c:754
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:832
+#: src/fs/gnunet-publish.c:760
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:840 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:851 src/fs/gnunet-publish.c:859
-#: src/transport/gnunet-transport.c:1928 src/transport/gnunet-transport.c:1958
-#: src/transport/gnunet-transport.c:1989
+#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
+#: src/transport/gnunet-transport.c:1284 src/transport/gnunet-transport.c:1314
+#: src/transport/gnunet-transport.c:1344
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:912
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
+#: src/fs/gnunet-publish.c:835
+msgid "print list of extracted keywords that would be used, but do not perform 
upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:916
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
+#: src/fs/gnunet-publish.c:839
+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:920
+#: src/fs/gnunet-publish.c:843
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:923
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
+#: src/fs/gnunet-publish.c:846
+msgid "do not index, perform full insertion (stores entire file in encrypted 
form in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:928
-msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
+#: src/fs/gnunet-publish.c:851
+msgid "specify ID of an updated version to be published in the future (for 
namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:936
+#: src/fs/gnunet-publish.c:859
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:942
-msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
+#: src/fs/gnunet-publish.c:865
+msgid "only simulate the process but do not do any actual publishing (useful 
to compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:946
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
+#: src/fs/gnunet-publish.c:869
+msgid "set the ID of this version of the publication (for namespace insertions 
only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:950
-msgid ""
-"URI to be published (can be used instead of passing a file to add keywords "
-"to the file with the respective URI)"
+#: src/fs/gnunet-publish.c:873
+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:966
+#: src/fs/gnunet-publish.c:889
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:120
+#: src/fs/gnunet-search.c:114
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:197
+#: src/fs/gnunet-search.c:191
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:245
+#: src/fs/gnunet-search.c:240
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:269
+#: src/fs/gnunet-search.c:264
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:300
+#: src/fs/gnunet-search.c:295
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:303
+#: src/fs/gnunet-search.c:298
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:310
+#: src/fs/gnunet-search.c:305
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:321
+#: src/fs/gnunet-search.c:316
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:274
+#: src/fs/gnunet-service-fs.c:271
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:595
+#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:719
-msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs.c:745 src/hostlist/gnunet-daemon-hostlist.c:311
-#: src/sensordashboard/gnunet-service-sensordashboard.c:864
-#: src/sensordashboard/gnunet-service-sensordashboard.c:872
-#: src/topology/gnunet-daemon-topology.c:1287
-#: src/topology/gnunet-daemon-topology.c:1294
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
+#: src/topology/gnunet-daemon-topology.c:1254
+#: src/topology/gnunet-daemon-topology.c:1261
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_client.c:494
-msgid "# replies received via cadet"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cadet_client.c:508
-msgid "# replies received via cadet dropped"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cadet_server.c:260
-msgid "# Blocks transferred via cadet"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cadet_server.c:361
-msgid "# queries received via CADET not answered"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cadet_server.c:441
-msgid "# queries received via cadet"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cadet_server.c:485
-msgid "# cadet client connections rejected"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cadet_server.c:491
-#: src/fs/gnunet-service-fs_cadet_server.c:531
-msgid "# cadet connections active"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:736
+#: src/fs/gnunet-service-fs_cp.c:682
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:740
+#: src/fs/gnunet-service-fs_cp.c:686
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:778
+#: src/fs/gnunet-service-fs_cp.c:721
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:786
+#: src/fs/gnunet-service-fs_cp.c:727
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:812 src/fs/gnunet-service-fs_cp.c:1406
+#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:917
+#: src/fs/gnunet-service-fs_cp.c:845
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:973
+#: src/fs/gnunet-service-fs_cp.c:898
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:981
+#: src/fs/gnunet-service-fs_cp.c:906
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:995
+#: src/fs/gnunet-service-fs_cp.c:920
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1043
+#: src/fs/gnunet-service-fs_cp.c:958
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1111
+#: src/fs/gnunet-service-fs_cp.c:1026
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1136
+#: src/fs/gnunet-service-fs_cp.c:1051
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1146
+#: src/fs/gnunet-service-fs_cp.c:1061
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1223
+#: src/fs/gnunet-service-fs_cp.c:1139
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1258
+#: src/fs/gnunet-service-fs_cp.c:1173
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1279
+#: src/fs/gnunet-service-fs_cp.c:1195
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1290
-msgid "# requests dropped due to full reply queue"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1342
+#: src/fs/gnunet-service-fs_cp.c:1246
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1367
+#: src/fs/gnunet-service-fs_cp.c:1270
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1404
+#: src/fs/gnunet-service-fs_cp.c:1299
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1843
+#: src/fs/gnunet-service-fs_cp.c:1670
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3716,7 +3430,7 @@
 #: src/fs/gnunet-service-fs_indexing.c:181
 #, c-format
 msgid "Could not open `%s'.\n"
-msgstr ""
+msgstr "Impossible d’ouvrir « %s ».\n"
 
 #: src/fs/gnunet-service-fs_indexing.c:142
 #, c-format
@@ -3725,9 +3439,7 @@
 
 #: src/fs/gnunet-service-fs_indexing.c:237
 #, c-format
-msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
+msgid "Index request received for file `%s' is already indexed as `%s'.  
Permitting anyway.\n"
 msgstr ""
 
 #: src/fs/gnunet-service-fs_indexing.c:275
@@ -3751,7 +3463,7 @@
 
 #: src/fs/gnunet-service-fs_indexing.c:559
 msgid "not indexed"
-msgstr ""
+msgstr "non indexé"
 
 #: src/fs/gnunet-service-fs_indexing.c:574
 #, c-format
@@ -3758,22 +3470,51 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:201 src/fs/gnunet-service-fs_lc.c:376
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:259
+#: src/fs/gnunet-service-fs_lc.c:256
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:330
+#: src/fs/gnunet-service-fs_lc.c:327
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:370
+#: src/fs/gnunet-service-fs_lc.c:362
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
+#: src/fs/gnunet-service-fs_mesh_client.c:484
+msgid "# replies received via mesh"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_client.c:498
+msgid "# replies received via mesh dropped"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_server.c:260
+msgid "# Blocks transferred via mesh"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_server.c:352
+msgid "# queries received via mesh not answered"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_server.c:432
+msgid "# queries received via mesh"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_server.c:476
+msgid "# mesh client connections rejected"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_server.c:482
+#: src/fs/gnunet-service-fs_mesh_server.c:522
+msgid "# mesh connections active"
+msgstr ""
+
 #: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""
@@ -3815,103 +3556,103 @@
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:820
+#: src/fs/gnunet-service-fs_pr.c:814
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:857
+#: src/fs/gnunet-service-fs_pr.c:844
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:866
+#: src/fs/gnunet-service-fs_pr.c:853
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:881
+#: src/fs/gnunet-service-fs_pr.c:867
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:898
+#: src/fs/gnunet-service-fs_pr.c:880
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1028
+#: src/fs/gnunet-service-fs_pr.c:1001
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1056
+#: src/fs/gnunet-service-fs_pr.c:1029
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1094
+#: src/fs/gnunet-service-fs_pr.c:1064
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1226
-msgid "# Replies received from CADET"
+#: src/fs/gnunet-service-fs_pr.c:1192
+msgid "# Replies received from MESH"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1279
+#: src/fs/gnunet-service-fs_pr.c:1244
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1301
+#: src/fs/gnunet-service-fs_pr.c:1264
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1353
+#: src/fs/gnunet-service-fs_pr.c:1311
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1368
+#: src/fs/gnunet-service-fs_pr.c:1326
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1377
+#: src/fs/gnunet-service-fs_pr.c:1335
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1392
+#: src/fs/gnunet-service-fs_pr.c:1350
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1406
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1419
+#: src/fs/gnunet-service-fs_pr.c:1377
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1382
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1451 src/fs/gnunet-service-fs_pr.c:1491
-#: src/fs/gnunet-service-fs_pr.c:1660
+#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1590
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1510
+#: src/fs/gnunet-service-fs_pr.c:1467
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1522
+#: src/fs/gnunet-service-fs_pr.c:1478
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1636
+#: src/fs/gnunet-service-fs_pr.c:1566
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1725
+#: src/fs/gnunet-service-fs_pr.c:1651
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:682
+#: src/fs/gnunet-service-fs_push.c:631
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3929,16 +3670,16 @@
 msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:129
+#: src/fs/gnunet-unindex.c:130
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:146
+#: src/fs/gnunet-unindex.c:147
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:178
+#: src/fs/gnunet-unindex.c:179
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
@@ -3951,7 +3692,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:759
+#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
@@ -3974,128 +3715,117 @@
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:234
+#: src/gns/gnunet-dns2gns.c:228
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:406
+#: src/gns/gnunet-dns2gns.c:400
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:422
+#: src/gns/gnunet-dns2gns.c:416
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:430
+#: src/gns/gnunet-dns2gns.c:424
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:708
+#: src/gns/gnunet-dns2gns.c:701
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:734
+#: src/gns/gnunet-dns2gns.c:727
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:756
+#: src/gns/gnunet-dns2gns.c:749
 msgid "No valid GNS zone specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:777
+#: src/gns/gnunet-dns2gns.c:770
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:780
+#: src/gns/gnunet-dns2gns.c:773
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:783
+#: src/gns/gnunet-dns2gns.c:776
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:786
-msgid "UDP port to listen on for inbound DNS requests; default: 2853"
+#: src/gns/gnunet-dns2gns.c:779
+msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:789
+#: src/gns/gnunet-dns2gns.c:782
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:802
+#: src/gns/gnunet-dns2gns.c:795
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:215 src/gns/plugin_rest_gns.c:334
+#: src/gns/gnunet-gns.c:227
 #, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:233
-#, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:314
+#: src/gns/gnunet-gns.c:308
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:353 src/gns/gnunet-gns-helper-service-w32.c:798
-#: src/gns/plugin_rest_gns.c:459
+#: src/gns/gnunet-gns.c:347 src/gns/gnunet-gns-helper-service-w32.c:798
 #, c-format
-msgid ""
-"Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
-"gns-import.sh?\n"
+msgid "Ego for `gns-master' not found, cannot perform lookup.  Did you run 
gnunet-gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:392 src/gns/gnunet-gns-helper-service-w32.c:828
+#: src/gns/gnunet-gns.c:386 src/gns/gnunet-gns-helper-service-w32.c:828
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:405
+#: src/gns/gnunet-gns.c:399
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:455
+#: src/gns/gnunet-gns.c:449
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:458
+#: src/gns/gnunet-gns.c:452
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:461
+#: src/gns/gnunet-gns.c:455
 msgid "Specify timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:464
+#: src/gns/gnunet-gns.c:458
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:467
+#: src/gns/gnunet-gns.c:461
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:470
+#: src/gns/gnunet-gns.c:464
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:484
+#: src/gns/gnunet-gns.c:478
 msgid "GNUnet GNS resolver tool"
 msgstr ""
 
 #: src/gns/gnunet-gns-helper-service-w32.c:768
 #, c-format
-msgid ""
-"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
-"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
-"sh?\n"
+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:838
@@ -4103,146 +3833,146 @@
 msgid "Failed to connect to identity service\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:485
+#: src/gns/gnunet-gns-import.c:479
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:529
-#: src/hostlist/gnunet-daemon-hostlist_client.c:746
-#: src/hostlist/gnunet-daemon-hostlist_client.c:752
-#: src/hostlist/gnunet-daemon-hostlist_client.c:805
-#: src/hostlist/gnunet-daemon-hostlist_client.c:814
-#: src/hostlist/gnunet-daemon-hostlist_client.c:936
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1036
-#: src/transport/plugin_transport_http_client.c:599
-#: src/transport/plugin_transport_http_client.c:617
+#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
+#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
+#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
+#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
+#: src/hostlist/hostlist-client.c:968
+#: src/transport/plugin_transport_http_client.c:1062
+#: src/transport/plugin_transport_http_client.c:1077
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:846
+#: src/gns/gnunet-gns-proxy.c:833
 #, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:869
+#: src/gns/gnunet-gns-proxy.c:856
 #, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:892
+#: src/gns/gnunet-gns-proxy.c:879
 #, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:905
+#: src/gns/gnunet-gns-proxy.c:892
 #, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:920
+#: src/gns/gnunet-gns-proxy.c:907
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:930
+#: src/gns/gnunet-gns-proxy.c:917
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:954
+#: src/gns/gnunet-gns-proxy.c:941
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1086
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1634
+#: src/gns/gnunet-gns-proxy.c:1602
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2006
+#: src/gns/gnunet-gns-proxy.c:1973
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2036
+#: src/gns/gnunet-gns-proxy.c:2003
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2210
+#: src/gns/gnunet-gns-proxy.c:2177
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2229 src/rest/gnunet-rest-server.c:548
+#: src/gns/gnunet-gns-proxy.c:2196
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2551
+#: src/gns/gnunet-gns-proxy.c:2504
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2580
+#: src/gns/gnunet-gns-proxy.c:2533
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2598 src/gns/gnunet-gns-proxy.c:2627
+#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2678
+#: src/gns/gnunet-gns-proxy.c:2631
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3017
+#: src/gns/gnunet-gns-proxy.c:2970
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3057 src/gns/gnunet-service-gns.c:894
+#: src/gns/gnunet-gns-proxy.c:3010
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3119
+#: src/gns/gnunet-gns-proxy.c:3072
 #, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3160
+#: src/gns/gnunet-gns-proxy.c:3113
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3163
+#: src/gns/gnunet-gns-proxy.c:3116
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3182
+#: src/gns/gnunet-gns-proxy.c:3135
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:935
+#: src/gns/gnunet-service-gns.c:862
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:943
+#: src/gns/gnunet-service-gns.c:870
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:976
+#: src/gns/gnunet-service-gns.c:903
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
+#: src/gns/gnunet-service-gns.c:919
+msgid "valid public key required"
+msgstr ""
+
 #: src/gns/gnunet-service-gns_interceptor.c:263
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
@@ -4251,498 +3981,436 @@
 msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:650
-#, c-format
-msgid "Protocol `%s' unknown, skipping labels.\n"
-msgstr ""
-
-#: src/gns/gnunet-service-gns_resolver.c:661
-#, c-format
-msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
-msgstr ""
-
-#: src/gns/gnunet-service-gns_resolver.c:854
+#: src/gns/gnunet-service-gns_resolver.c:816
 msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:996
+#: src/gns/gnunet-service-gns_resolver.c:958
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1356
+#: src/gns/gnunet-service-gns_resolver.c:1317
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1891
+#: src/gns/gnunet-service-gns_resolver.c:1817
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1915
+#: src/gns/gnunet-service-gns_resolver.c:1841
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2197
+#: src/gns/gnunet-service-gns_resolver.c:2123
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2346
+#: src/gns/gnunet-service-gns_resolver.c:2272
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:172
+#: src/gns/plugin_gnsrecord_gns.c:151
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:180
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:222
+#: src/gns/plugin_gnsrecord_gns.c:201
 #, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:245
+#: src/gns/plugin_gnsrecord_gns.c:217
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:280
+#: src/gnsrecord/plugin_gnsrecord_dns.c:293
 #, c-format
-msgid "Unable to parse BOX record string `%s'\n"
-msgstr ""
-
-#: src/gns/plugin_rest_gns.c:422
-msgid "Ego for not found, cannot perform lookup.\n"
-msgstr ""
-
-#: src/gns/plugin_rest_gns.c:696
-msgid "GNS REST API initialized\n"
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:359
-#, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:380
+#: src/gnsrecord/plugin_gnsrecord_dns.c:314
 #, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:402
+#: src/gnsrecord/plugin_gnsrecord_dns.c:336
 #, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:486
+#: src/gnsrecord/plugin_gnsrecord_dns.c:420
 #, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:522
+#: src/gnsrecord/plugin_gnsrecord_dns.c:452
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:541
+#: src/gnsrecord/plugin_gnsrecord_dns.c:471
 #, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:564
+#: src/gnsrecord/plugin_gnsrecord_dns.c:494
 #, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:587
+#: src/gnsrecord/plugin_gnsrecord_dns.c:514
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:602
+#: src/gnsrecord/plugin_gnsrecord_dns.c:529
 #, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:629
+#: src/gnsrecord/plugin_gnsrecord_dns.c:549
 #, c-format
-msgid "Unable to parse SRV record `%s'\n"
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:645
-#, c-format
-msgid "Failed to serialize SRV record with target `%s'\n"
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:662
-#, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:686
-#: src/gnsrecord/plugin_gnsrecord_dns.c:702
+#: src/gnsrecord/plugin_gnsrecord_dns.c:567
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:126
+#: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:132
+#: src/hello/gnunet-hello.c:129
 #, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:140
+#: src/hello/gnunet-hello.c:137
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:147
+#: src/hello/gnunet-hello.c:144
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:198
+#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:174
+#: src/hello/gnunet-hello.c:170
 #, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:210
+#: src/hello/gnunet-hello.c:195
 #, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:218
+#: src/hello/gnunet-hello.c:203
 #, c-format
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:1139
+#: src/hello/hello.c:944
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1148
+#: src/hello/hello.c:953
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1158
+#: src/hello/hello.c:963
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr ""
 
-#: src/hello/hello.c:1169
+#: src/hello/hello.c:973
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:1187
+#: src/hello/hello.c:990
 #, c-format
-msgid "Plugin `%s' not found, skipping address\n"
-msgstr ""
+msgid "Plugin `%s' not found\n"
+msgstr "Extension « %s » introuvable\n"
 
-#: src/hello/hello.c:1195
+#: src/hello/hello.c:999
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1210
+#: src/hello/hello.c:1018
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:274
-msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
+#: src/hostlist/gnunet-daemon-hostlist.c:259
+msgid "None of the functions for the hostlist daemon were enabled.  I have no 
reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:331
+#: src/hostlist/gnunet-daemon-hostlist.c:308
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:336
-msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
+#: src/hostlist/gnunet-daemon-hostlist.c:313
+msgid "bootstrap using hostlists (it is highly recommended that you always use 
this option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:339
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:343
+#: src/hostlist/gnunet-daemon-hostlist.c:320
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:359
+#: src/hostlist/gnunet-daemon-hostlist.c:335
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:348
+#: src/hostlist/hostlist-client.c:288
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:369
-#: src/hostlist/gnunet-daemon-hostlist_client.c:399
+#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
-#: src/hostlist/gnunet-daemon-hostlist_client.c:402
+#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:390
+#: src/hostlist/hostlist-client.c:330
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:655
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:685
+#: src/hostlist/hostlist-client.c:622
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:727
+#: src/hostlist/hostlist-client.c:664
 #, c-format
-msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
+msgid "Advertised hostlist with URI `%s' could not be downloaded. Advertised 
URI gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:867
+#: src/hostlist/hostlist-client.c:802
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:881
+#: src/hostlist/hostlist-client.c:816
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:901
+#: src/hostlist/hostlist-client.c:836
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:907
+#: src/hostlist/hostlist-client.c:842
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:915
+#: src/hostlist/hostlist-client.c:850
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:968
+#: src/hostlist/hostlist-client.c:903
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:976
+#: src/hostlist/hostlist-client.c:911
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1108
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1660
+#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1117
+#: src/hostlist/hostlist-client.c:1049
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1177
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1193
+#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
+#: src/hostlist/hostlist-client.c:1280
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
+#: src/hostlist/hostlist-client.c:1285
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
+#: src/hostlist/hostlist-client.c:1296
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/hostlist-client.c:1329
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
+#: src/hostlist/hostlist-client.c:1331
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/hostlist-client.c:1376
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
+#: src/hostlist/hostlist-client.c:1381
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/hostlist/hostlist-client.c:1417
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1593
-#: src/transport/plugin_transport_http_client.c:2287
-#, c-format
-msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1622
+#: src/hostlist/hostlist-client.c:1471
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
+#: src/hostlist/hostlist-client.c:1483
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
+#: src/hostlist/hostlist-client.c:1495
 #, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+msgid "Since learning is not enabled on this peer, hostlist file `%s' was 
removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:182
+#: src/hostlist/hostlist-client.c:1499
+#, c-format
+msgid "Hostlist file `%s' could not be removed\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:137
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:207
+#: src/hostlist/hostlist-server.c:161
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:243
-#: src/hostlist/gnunet-daemon-hostlist_server.c:590
-#: src/peerinfo-tool/gnunet-peerinfo.c:391
-#: src/peerinfo-tool/gnunet-peerinfo.c:540
-#: src/topology/gnunet-daemon-topology.c:952
+#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
+#: src/peerinfo-tool/gnunet-peerinfo.c:350
+#: src/peerinfo-tool/gnunet-peerinfo.c:419
+#: src/peerinfo-tool/gnunet-peerinfo.c:490
+#: src/topology/gnunet-daemon-topology.c:925
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:267
+#: src/hostlist/hostlist-server.c:210
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:284
+#: src/hostlist/hostlist-server.c:224
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:388
+#: src/hostlist/hostlist-server.c:268
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:391
+#: src/hostlist/hostlist-server.c:271
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:403
+#: src/hostlist/hostlist-server.c:284
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:407
+#: src/hostlist/hostlist-server.c:288
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:414
+#: src/hostlist/hostlist-server.c:296
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/hostlist-server.c:299
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:422
+#: src/hostlist/hostlist-server.c:303
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:424
+#: src/hostlist/hostlist-server.c:304
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:485
+#: src/hostlist/hostlist-server.c:346
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:535
+#: src/hostlist/hostlist-server.c:390
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:747
-#: src/peerinfo-tool/gnunet-peerinfo.c:745
-#: src/transport/gnunet-service-transport.c:860
+#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
+#: src/transport/gnunet-service-transport.c:1114
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:771
+#: src/hostlist/hostlist-server.c:576
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:786
+#: src/hostlist/hostlist-server.c:590
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:799
-msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:812
-msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:833
+#: src/hostlist/hostlist-server.c:630
 #, c-format
-msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:853
+#: src/hostlist/hostlist-server.c:673
 #, c-format
-msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:893
-#, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
@@ -4769,8 +4437,7 @@
 msgstr ""
 
 #: src/identity/gnunet-identity.c:336
-msgid ""
-"set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
+msgid "set default identity to EGO for a subsystem SUBSYSTEM (use together 
with -s)"
 msgstr ""
 
 #: src/identity/gnunet-identity.c:339
@@ -4778,8 +4445,7 @@
 msgstr ""
 
 #: src/identity/gnunet-identity.c:342
-msgid ""
-"set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
+msgid "set default identity to EGO for a subsystem SUBSYSTEM (use together 
with -e)"
 msgstr ""
 
 #: src/identity/gnunet-identity.c:351
@@ -4833,22 +4499,53 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/identity/plugin_rest_identity.c:925
-msgid "Identity REST API initialized\n"
+#: src/mesh/gnunet-mesh.c:357
+#, c-format
+msgid "Invalid target `%s'\n"
 msgstr ""
 
-#: src/identity-token/gnunet-identity-token.c:101
-msgid "GNUid token"
+#: src/mesh/gnunet-mesh.c:607
+#, c-format
+msgid "Invalid peer ID `%s'\n"
 msgstr ""
 
-#: src/identity-token/gnunet-identity-token.c:104
-msgid "Print token contents"
+#: src/mesh/gnunet-mesh.c:650
+#, c-format
+msgid "Invalid tunnel owner `%s'\n"
 msgstr ""
 
-#: src/identity-token/plugin_rest_identity_token.c:1067
-msgid "Identity Token REST API initialized\n"
+#: src/mesh/gnunet-mesh.c:716
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
 msgstr ""
 
+#: src/mesh/gnunet-mesh.c:807
+msgid "provide information about a particular connection"
+msgstr ""
+
+#: src/mesh/gnunet-mesh.c:810
+msgid "activate echo mode"
+msgstr ""
+
+#: src/mesh/gnunet-mesh.c:816
+msgid "port to listen to (default; 0)"
+msgstr ""
+
+#: src/mesh/gnunet-mesh.c:819 src/mesh/gnunet-mesh.c:822
+msgid "provide information about all peers"
+msgstr ""
+
+#: src/mesh/gnunet-mesh.c:825
+msgid "provide information about a particular tunnel"
+msgstr ""
+
+#: src/mesh/gnunet-mesh.c:828
+msgid "provide information about all tunnels"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh_peer.c:390
+msgid "Wrong CORE service\n"
+msgstr ""
+
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -4874,9 +4571,9 @@
 msgid "You must specify which zone should be accessed\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:195
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695
 #, c-format
-msgid "Invalid public key for zone `%s'\n"
+msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
 #: src/namecache/gnunet-namecache.c:203
@@ -4884,7 +4581,7 @@
 msgid "You must specify a name\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1084
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4892,7 +4589,7 @@
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1116
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
@@ -4900,30 +4597,6 @@
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:236
-#: src/namestore/plugin_namestore_flat.c:183
-#: src/namestore/plugin_namestore_flat.c:342
-#, c-format
-msgid "Unable to initialize file: %s.\n"
-msgstr ""
-
-#: src/namecache/plugin_namecache_flat.c:130
-#: src/namestore/plugin_namestore_flat.c:194
-#, c-format
-msgid "Unable to get filesize: %s.\n"
-msgstr ""
-
-#: src/namecache/plugin_namecache_flat.c:142
-#: src/namestore/plugin_namestore_flat.c:206
-#, fuzzy, c-format
-msgid "Unable to read file: %s.\n"
-msgstr "pa_stream_new() échoué : %s\n"
-
-#: src/namecache/plugin_namecache_flat.c:391
-msgid "flat plugin running\n"
-msgstr ""
-
 #: src/namecache/plugin_namecache_postgres.c:89
 #: src/namestore/plugin_namestore_postgres.c:96
 msgid "Failed to create indices\n"
@@ -4935,239 +4608,198 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:332
-#: src/namestore/plugin_rest_namestore.c:517
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:339
-#: src/namestore/plugin_rest_namestore.c:526
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:477 src/namestore/gnunet-namestore.c:485
-#: src/namestore/gnunet-namestore.c:493
+#: src/namestore/gnunet-namestore.c:558
 #, c-format
-msgid "A %s record exists already under `%s', no other records can be added.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:507 src/namestore/gnunet-namestore.c:519
-#: src/namestore/gnunet-namestore.c:531
-#, c-format
-msgid "Records already exist under `%s', cannot add `%s' record.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:628
-#: src/namestore/plugin_rest_namestore.c:550
-#, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:667
-#, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:708
-#, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:719
-#: src/namestore/gnunet-namestore-fcfsd.c:984
-#: src/namestore/plugin_rest_namestore.c:859
+#: src/namestore/gnunet-namestore.c:569
+#: src/namestore/gnunet-namestore-fcfsd.c:970
 msgid "Failed to connect to namestore\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:727 src/namestore/gnunet-namestore.c:736
-#: src/namestore/gnunet-namestore.c:753 src/namestore/gnunet-namestore.c:775
-#: src/namestore/gnunet-namestore.c:815
+#: src/namestore/gnunet-namestore.c:577 src/namestore/gnunet-namestore.c:586
+#: src/namestore/gnunet-namestore.c:603 src/namestore/gnunet-namestore.c:625
+#: src/namestore/gnunet-namestore.c:665
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:728 src/namestore/gnunet-namestore.c:737
-#: src/namestore/gnunet-namestore.c:754 src/namestore/gnunet-namestore.c:776
+#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
+#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
 msgid "add"
-msgstr ""
+msgstr "ajouter"
 
-#: src/namestore/gnunet-namestore.c:745
-#: src/namestore/plugin_rest_namestore.c:620
+#: src/namestore/gnunet-namestore.c:595
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:765
-#: src/namestore/plugin_rest_namestore.c:638
-#: src/namestore/plugin_rest_namestore.c:678
+#: src/namestore/gnunet-namestore.c:615
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:801
+#: src/namestore/gnunet-namestore.c:651
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:816
+#: src/namestore/gnunet-namestore.c:666
 msgid "del"
-msgstr ""
+msgstr "supprimer"
 
-#: src/namestore/gnunet-namestore.c:844
+#: src/namestore/gnunet-namestore.c:715
+#: src/peerinfo-tool/gnunet-peerinfo.c:723
 #, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:868 src/peerinfo-tool/gnunet-peerinfo.c:826
-#, c-format
 msgid "Invalid URI `%s'\n"
-msgstr ""
+msgstr "URI invalide « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:903
+#: src/namestore/gnunet-namestore.c:750
 #, c-format
 msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
-#: src/namestore/plugin_rest_namestore.c:889
+#: src/namestore/gnunet-namestore.c:790
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:970
-#: src/namestore/plugin_rest_namestore.c:916
+#: src/namestore/gnunet-namestore.c:817
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1006
-#: src/namestore/plugin_rest_namestore.c:956
+#: src/namestore/gnunet-namestore.c:853
 #, c-format
 msgid "Identity service is not running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1018
-#: src/namestore/plugin_rest_namestore.c:999
+#: src/namestore/gnunet-namestore.c:865
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1066
+#: src/namestore/gnunet-namestore.c:913
 msgid "add record"
-msgstr ""
+msgstr "ajouter un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:916
 msgid "delete record"
-msgstr ""
+msgstr "suprimer un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1072
+#: src/namestore/gnunet-namestore.c:919
 msgid "display records"
-msgstr ""
+msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore.c:1075
-msgid ""
-"expiration time for record to use (for adding only), \"never\" is possible"
+#: src/namestore/gnunet-namestore.c:922
+msgid "expiration time for record to use (for adding only), \"never\" is 
possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1078
+#: src/namestore/gnunet-namestore.c:925
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1081
+#: src/namestore/gnunet-namestore.c:928
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1087
+#: src/namestore/gnunet-namestore.c:934
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1090
+#: src/namestore/gnunet-namestore.c:937
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1093
+#: src/namestore/gnunet-namestore.c:940
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1096
+#: src/namestore/gnunet-namestore.c:943
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1099
+#: src/namestore/gnunet-namestore.c:946
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1102
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
+#: src/namestore/gnunet-namestore.c:949
+msgid "create shadow record (only valid if all other records of the same type 
have expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1105
+#: src/namestore/gnunet-namestore.c:952
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:478
+#: src/namestore/gnunet-namestore-fcfsd.c:464
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:505
+#: src/namestore/gnunet-namestore-fcfsd.c:491
 #, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:539
+#: src/namestore/gnunet-namestore-fcfsd.c:525
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:548
+#: src/namestore/gnunet-namestore-fcfsd.c:534
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:610
+#: src/namestore/gnunet-namestore-fcfsd.c:596
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:666
+#: src/namestore/gnunet-namestore-fcfsd.c:652
 #, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:682
+#: src/namestore/gnunet-namestore-fcfsd.c:668
 #, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:718
+#: src/namestore/gnunet-namestore-fcfsd.c:704
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:726
+#: src/namestore/gnunet-namestore-fcfsd.c:712
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:924
+#: src/namestore/gnunet-namestore-fcfsd.c:910
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:950
+#: src/namestore/gnunet-namestore-fcfsd.c:936
 msgid "Failed to start HTTP server\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:992
+#: src/namestore/gnunet-namestore-fcfsd.c:978
 msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1025
+#: src/namestore/gnunet-namestore-fcfsd.c:1011
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:656
+#: src/namestore/gnunet-service-namestore.c:655
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
@@ -5176,18 +4808,6 @@
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:628
-msgid "flat file database running\n"
-msgstr ""
-
-#: src/namestore/plugin_rest_namestore.c:1083
-msgid "Namestore REST API initialized\n"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:159
-msgid "GNUnet NAT traversal autoconfigure daemon"
-msgstr ""
-
 #: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
@@ -5197,198 +4817,129 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:393
+#: src/nat/nat_auto.c:170
+msgid "NAT traversal with ICMP Server timed out.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:203
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:394
+#: src/nat/nat_auto.c:204
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:415
+#: src/nat/nat_auto.c:225
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:447
+#: src/nat/nat_auto.c:274
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:579
+#: src/nat/nat_auto.c:344
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:597
+#: src/nat/nat_auto.c:360
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:669 src/nat/nat_test.c:360
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:719
+#: src/nat/nat_auto.c:413
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:720
+#: src/nat/nat_auto.c:414
 msgid "upnpc not found\n"
-msgstr ""
+msgstr "upnpc introuvable\n"
 
-#: src/nat/nat_auto.c:752
-msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+#: src/nat/nat_auto.c:447
+msgid "gnunet-helper-nat-server found, testing it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:760 src/nat/nat_auto.c:808
-msgid "test_icmp_server not possible, as we are not behind NAT\n"
+#: src/nat/nat_auto.c:448
+msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:768 src/nat/nat_auto.c:816
-msgid "No working gnunet-helper-nat-server found\n"
+#: src/nat/nat_auto.c:482
+msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:801
-msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
+#: src/nat/nat_auto.c:483
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
-#: src/nat/nat.c:1026
+#: src/nat/nat.c:867
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:1076
+#: src/nat/nat.c:917
 #, c-format
 msgid "Failed to start %s\n"
-msgstr ""
+msgstr "Échec du démarrage de %s\n"
 
-#: src/nat/nat.c:1327
-msgid "Error while running upnp client:\n"
-msgstr ""
-
-#: src/nat/nat.c:1402
-#, c-format
-msgid "Failed to run upnp client for port %u\n"
-msgstr ""
-
-#: src/nat/nat.c:1546
+#: src/nat/nat.c:1205
 msgid "malformed"
-msgstr ""
+msgstr "malformé"
 
-#: src/nat/nat.c:1600
-msgid ""
-"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
-"disabling UPnP \n"
-msgstr ""
-
-#: src/nat/nat.c:1739 src/nat/nat.c:1752
+#: src/nat/nat.c:1276 src/nat/nat.c:1288
 #, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
+msgid "Configuration requires `%s', but binary is not installed properly (SUID 
bit not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1907
+#: src/nat/nat.c:1426
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1923
+#: src/nat/nat.c:1442
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:2010
-msgid "Operation Successful"
+#: src/nat/nat_mini.c:155
+msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:2012
-msgid "Internal Failure (IPC, ...)"
+#: src/nat/nat_mini.c:175
+msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat.c:2014
-msgid "Failure in network subsystem, check permissions."
+#: src/nat/nat_mini.c:201
+msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat.c:2016
-msgid "Encountered timeout while performing operation"
-msgstr ""
-
-#: src/nat/nat.c:2018
-msgid "detected that we are offline"
-msgstr ""
-
-#: src/nat/nat.c:2020
-msgid "`upnpc` command not found"
-msgstr ""
-
-#: src/nat/nat.c:2022
+#: src/nat/nat_mini.c:366
 msgid "Failed to run `upnpc` command"
 msgstr ""
 
-#: src/nat/nat.c:2024
+#: src/nat/nat_mini.c:512
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat.c:2026
+#: src/nat/nat_mini.c:540
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:2028
-msgid "`external-ip' command not found"
+#: src/nat/nat_mini.c:604
+msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat.c:2030
-msgid "Failed to run `external-ip` command"
+#: src/nat/nat_mini.c:608
+msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat.c:2032
-msgid "`external-ip' command output invalid"
+#: src/nat/nat_test.c:351
+msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/nat.c:2034
-msgid "no valid address was returned by `external-ip'"
-msgstr ""
-
-#: src/nat/nat.c:2036
-msgid "Could not determine interface with internal/local network address"
-msgstr ""
-
-#: src/nat/nat.c:2038
-msgid "No functioning gnunet-helper-nat-server installation found"
-msgstr ""
-
-#: src/nat/nat.c:2040
-msgid "NAT test could not be initialized"
-msgstr ""
-
-#: src/nat/nat.c:2042
-msgid "NAT test timeout reached"
-msgstr ""
-
-#: src/nat/nat.c:2044
-msgid "could not register NAT"
-msgstr ""
-
-#: src/nat/nat.c:2046
-msgid "No working gnunet-helper-nat-client installation found"
-msgstr ""
-
-#: src/nat/nat_mini.c:203
-msgid "`external-ip' command not found\n"
-msgstr ""
-
-#: src/nat/nat_mini.c:609
-msgid "`upnpc' command not found\n"
-msgstr ""
-
-#: src/nat/nat_test.c:462
+#: src/nat/nat_test.c:423
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:497
-msgid "NAT test failed to start NAT library\n"
-msgstr ""
-
 #: src/nse/gnunet-nse.c:117
 msgid "NSE service is not running\n"
 msgstr ""
@@ -5409,6 +4960,10 @@
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
+#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
 #: src/nse/gnunet-nse-profiler.c:867
 msgid "name of the file for writing the main results"
 msgstr ""
@@ -5425,8 +4980,8 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1541
-#: src/revocation/gnunet-service-revocation.c:848 src/util/gnunet-scrypt.c:260
+#: src/nse/gnunet-service-nse.c:1517
+#: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5440,65 +4995,64 @@
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:372
-#: src/peerinfo/gnunet-service-peerinfo.c:401
+#: src/peerinfo/gnunet-service-peerinfo.c:371
+#: src/peerinfo/gnunet-service-peerinfo.c:388
 #, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:481
+#: src/peerinfo/gnunet-service-peerinfo.c:466
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:519
+#: src/peerinfo/gnunet-service-peerinfo.c:503
 #, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgid "File `%s' in directory `%s' does not match naming convention. 
Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:675
+#: src/peerinfo/gnunet-service-peerinfo.c:653
 #, c-format
 msgid "Scanning directory `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:681
+#: src/peerinfo/gnunet-service-peerinfo.c:658
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1053
+#: src/peerinfo/gnunet-service-peerinfo.c:994
 #, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1374
+#: src/peerinfo/gnunet-service-peerinfo.c:1287
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1387
+#: src/peerinfo/gnunet-service-peerinfo.c:1298
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:237
+#: src/peerinfo/peerinfo_api.c:236
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:363
+#: src/peerinfo/peerinfo_api.c:356
 msgid "failed to transmit request (service down?)"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:518
+#: src/peerinfo/peerinfo_api.c:506
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:562 src/peerinfo/peerinfo_api.c:585
-#: src/peerinfo/peerinfo_api.c:602 src/peerinfo/peerinfo_api.c:615
-#: src/peerinfo/peerinfo_api.c:630
+#: src/peerinfo/peerinfo_api.c:547 src/peerinfo/peerinfo_api.c:566
+#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
+#: src/peerinfo/peerinfo_api.c:603
 msgid "Received invalid message from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:719
+#: src/peerinfo/peerinfo_api.c:678
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr ""
 
@@ -5507,194 +5061,110 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:245
+#: src/peerinfo-tool/gnunet-peerinfo.c:232
 #, c-format
 msgid "%sPeer `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:305
+#: src/peerinfo-tool/gnunet-peerinfo.c:428
 #, c-format
-msgid "Failure: Cannot convert address to string for peer `%s'\n"
+msgid "Failure: Did not receive %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:472
+#: src/peerinfo-tool/gnunet-peerinfo.c:436
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:486
+#: src/peerinfo-tool/gnunet-peerinfo.c:445
 #, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:505
+#: src/peerinfo-tool/gnunet-peerinfo.c:458
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:575
+#: src/peerinfo-tool/gnunet-peerinfo.c:522
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:704
+#: src/peerinfo-tool/gnunet-peerinfo.c:633
 #, c-format
-msgid "Failed to get my own HELLO from this peer!\n"
+msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:736
+#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
 #, c-format
-msgid "Service `%s' is not running, please start GNUnet\n"
+msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:850
+#: src/peerinfo-tool/gnunet-peerinfo.c:745
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:891
+#: src/peerinfo-tool/gnunet-peerinfo.c:789
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:894
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:897
+#: src/peerinfo-tool/gnunet-peerinfo.c:795
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:798
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:903
+#: src/peerinfo-tool/gnunet-peerinfo.c:801
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:906
+#: src/peerinfo-tool/gnunet-peerinfo.c:804
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:909
+#: src/peerinfo-tool/gnunet-peerinfo.c:807
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:912
+#: src/peerinfo-tool/gnunet-peerinfo.c:810
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:926
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
 msgid "Print information about peers."
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:168
+#: src/transport/gnunet-service-transport_plugins.c:128
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:173
+#: src/transport/gnunet-service-transport_plugins.c:133
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:208
+#: src/transport/gnunet-service-transport_plugins.c:165
 #, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
 
-#: src/peerstore/gnunet-peerstore.c:92
-msgid "peerstore"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:384
-msgid "Malformed iterate request.\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:391
-msgid "Sub system not supplied in client iterate request.\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:451
-msgid "Malformed store request from client\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:459
-msgid "Full key not supplied in client store request\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:478
-msgid "Failed to store requested value, database error."
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:557
-msgid "No database backend configured\n"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:568
-#, c-format
-msgid "Could not load database backend `%s'\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:329 src/sensor/sensor_api.c:179
-#, c-format
-msgid "Received an error notification from MQ of type: %d\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:375
-msgid "timeout"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:678
-msgid "Unexpected iteration response, this should not happen.\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:689
-msgid "Error communicating with `PEERSTORE' service."
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:708
-msgid "Received a malformed response from service."
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:820
-msgid ""
-"Problem receiving a watch response, no way to determine which request.\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:832
-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
-#, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
-msgstr ""
-
-#: src/peerstore/plugin_peerstore_sqlite.c:422
-#: src/psycstore/plugin_psycstore_sqlite.c:259
-#, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
-msgstr ""
-
-#: src/peerstore/plugin_peerstore_sqlite.c:504
-#, c-format
-msgid "Unable to create indices: %s.\n"
-msgstr ""
-
 #: src/postgres/postgres.c:59
 #, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
@@ -5705,81 +5175,95 @@
 msgid "Unable to initialize Postgres: %s"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:261
+#: src/psycstore/gnunet-service-psycstore.c:200
 msgid "Failed to store membership information!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:285
+#: src/psycstore/gnunet-service-psycstore.c:224
 msgid "Failed to test membership!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:307
+#: src/psycstore/gnunet-service-psycstore.c:246
 msgid "Failed to store fragment!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:365
+#: src/psycstore/gnunet-service-psycstore.c:272
 msgid "Failed to get fragment!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:423
+#: src/psycstore/gnunet-service-psycstore.c:299
 msgid "Failed to get message!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:454
+#: src/psycstore/gnunet-service-psycstore.c:328
 msgid "Failed to get message fragment!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:482
+#: src/psycstore/gnunet-service-psycstore.c:356
 msgid "Failed to get master counters!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:664
-#, c-format
-msgid "Failed to begin modifying state: %d\n"
+#: src/psycstore/gnunet-service-psycstore.c:392
+#: src/psycstore/gnunet-service-psycstore.c:465
+msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:674
+#: src/psycstore/gnunet-service-psycstore.c:408
+msgid "Failed to begin modifying state!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:431
 #, c-format
-msgid "Failed to modify state: %d\n"
+msgid "Unknown operator: %c\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:682
+#: src/psycstore/gnunet-service-psycstore.c:441
 msgid "Failed to end modifying state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:713
-msgid "Tried to set invalid state variable name!\n"
-msgstr ""
-
-#: src/psycstore/gnunet-service-psycstore.c:727
+#: src/psycstore/gnunet-service-psycstore.c:479
 msgid "Failed to begin synchronizing state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:744
+#: src/psycstore/gnunet-service-psycstore.c:495
 msgid "Failed to end synchronizing state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:764
-#: src/psycstore/gnunet-service-psycstore.c:783
+#: src/psycstore/gnunet-service-psycstore.c:515
+#: src/psycstore/gnunet-service-psycstore.c:534
 msgid "Failed to reset state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:806
-#: src/psycstore/gnunet-service-psycstore.c:857
+#: src/psycstore/gnunet-service-psycstore.c:557
+#: src/psycstore/gnunet-service-psycstore.c:608
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:833
-#: src/psycstore/gnunet-service-psycstore.c:872
+#: src/psycstore/gnunet-service-psycstore.c:584
+#: src/psycstore/gnunet-service-psycstore.c:623
 msgid "Failed to get state variable!\n"
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:61
+#: src/psycstore/plugin_psycstore_sqlite.c:60
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1924
+#: src/psycstore/plugin_psycstore_sqlite.c:253
+#, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr ""
+
+#: src/psycstore/plugin_psycstore_sqlite.c:276
+#, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr ""
+
+#: src/psycstore/plugin_psycstore_sqlite.c:1796
 msgid "SQLite database running\n"
 msgstr ""
 
@@ -5812,7 +5296,7 @@
 msgstr ""
 
 #: src/pt/gnunet-daemon-pt.c:888
-msgid "# DNS requests dropped (DNS cadet channel down)"
+msgid "# DNS requests dropped (DNS mesh channel down)"
 msgstr ""
 
 #: src/pt/gnunet-daemon-pt.c:896
@@ -5845,7 +5329,7 @@
 msgstr ""
 
 #: src/regex/gnunet-daemon-regexprofiler.c:380
-msgid "Daemon to announce regular expressions for the peer using cadet."
+msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1288
@@ -5922,14 +5406,6 @@
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:806
-msgid "listen on specified port (default: 7776)"
-msgstr ""
-
-#: src/rest/gnunet-rest-server.c:823
-msgid "GNUnet REST server"
-msgstr ""
-
 #: src/revocation/gnunet-revocation.c:126
 #, c-format
 msgid "Key `%s' is valid\n"
@@ -5995,8 +5471,7 @@
 msgstr ""
 
 #: src/revocation/gnunet-revocation.c:421
-msgid ""
-"Testing and revoking at the same time is not allowed, only executing test.\n"
+msgid "Testing and revoking at the same time is not allowed, only executing 
test.\n"
 msgstr ""
 
 #: src/revocation/gnunet-revocation.c:441
@@ -6017,9 +5492,7 @@
 msgstr ""
 
 #: src/revocation/gnunet-revocation.c:507
-msgid ""
-"revoke the private key associated for the the private key associated with "
-"the ego NAME "
+msgid "revoke the private key associated for the the private key associated 
with the ego NAME "
 msgstr ""
 
 #: src/revocation/gnunet-revocation.c:510
@@ -6030,459 +5503,349 @@
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:481
-msgid "# unsupported revocations received via set union"
+#: src/revocation/gnunet-service-revocation.c:272
+msgid "Duplicate revocation received from peer. Ignored.\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:490
-msgid "# revocation messages received via set union"
-msgstr ""
-
-#: src/revocation/gnunet-service-revocation.c:495
+#: src/revocation/gnunet-service-revocation.c:434
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:499
-msgid "# revocation set unions failed"
-msgstr ""
-
-#: src/revocation/gnunet-service-revocation.c:508
-msgid "# revocation set unions completed"
-msgstr ""
-
-#: src/revocation/gnunet-service-revocation.c:547
-#: src/revocation/gnunet-service-revocation.c:780
+#: src/revocation/gnunet-service-revocation.c:486
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:872
+#: src/revocation/gnunet-service-revocation.c:812
 msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:67
-msgid "rps"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:221
+#: src/scalarproduct/gnunet-scalarproduct.c:225
 msgid "You must specify at least one message ID to check!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:228
+#: src/scalarproduct/gnunet-scalarproduct.c:232
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:241
-#, c-format
-msgid ""
-"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
-"valid peer identifier.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:239
+msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:259
-msgid "Need elements to compute the scalarproduct, got none.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:251
+#, c-format
+msgid "Tried to set initiator mode, as peer ID was given. However, `%s' is not 
a valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:281
+#: src/scalarproduct/gnunet-scalarproduct.c:278
+#: src/scalarproduct/gnunet-scalarproduct.c:314
 #, c-format
-msgid "Malformed input, could not parse `%s'\n"
+msgid "Could not convert `%s' to int32_t.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:299
-#, c-format
-msgid "Could not convert `%s' to int64_t.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:286
+msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:326
+#: src/scalarproduct/gnunet-scalarproduct.c:346
 #, c-format
-msgid "Failed to initiate computation, were all keys unique?\n"
+msgid "Could not convert `%s' to integer.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
-msgid ""
-"A comma separated list of elements to compare as vector with our remote peer."
+#: src/scalarproduct/gnunet-scalarproduct.c:407
+msgid "A comma separated list of elements to compare as vector with our remote 
peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:353
-msgid ""
-"[Optional] peer to calculate our scalarproduct with. If this parameter is "
-"not given, the service will wait for a remote peer to compute the request."
+#: src/scalarproduct/gnunet-scalarproduct.c:410
+msgid "A comma separated mask to select which elements should actually be 
compared."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:356
+#: src/scalarproduct/gnunet-scalarproduct.c:413
+msgid "[Optional] peer to calculate our scalarproduct with. If this parameter 
is not given, the service will wait for a remote peer to compute the request."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:416
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
+#: src/scalarproduct/gnunet-scalarproduct.c:425
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1419
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1549
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1193
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1252
-msgid "Connect to CADET failed\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:541
+#, c-format
+msgid "Client (%p) disconnected from us.\n"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:296
-msgid "Keys given to SCALARPRODUCT not unique!\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:613
+#: src/scalarproduct/gnunet-service-scalarproduct.c:702
+#, c-format
+msgid "Could not send message to client (%p)!\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
-msgid "dkg start delay"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:619
+#, c-format
+msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
-msgid "dkg timeout"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:712
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
-msgid "threshold"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:766
+#: src/scalarproduct/gnunet-service-scalarproduct.c:855
+msgid "Could not send service-response message via mesh!)\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
-msgid "also profile decryption"
-msgstr ""
-
-#: src/sensordashboard/gnunet-service-sensordashboard.c:353
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1028
 #, c-format
-msgid "Error trying to send a message to peer `%s'.\n"
+msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor.c:162
-msgid "Retrieve information about all defined sensors"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1099
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1208
+msgid "Transmitting service request.\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor.c:165
-msgid "Retrieve information about a single sensor"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1108
+msgid "Could not send service-request multipart message to channel!\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor.c:168
-msgid "Force an anomaly on a sensor, use only for testing"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1147
+#, c-format
+msgid "Successfully created new channel to peer (%s)!\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor.c:175
-msgid "sensor"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1217
+msgid "Could not send message to channel!\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:729
-msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1274
+msgid "Too short message received from client!\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:736
-msgid "Missing or invalid topology file.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1287
+msgid "Invalid message received from client, session information incorrect!\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:782
-msgid "Number of peers to run"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1298
+#, c-format
+msgid "Duplicate session information received, cannot create new session with 
key `%s'\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:784
-msgid "Path to topology file"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1318
+#, c-format
+msgid "Got client-request-session with key %s, preparing channel to remote 
service.\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor-profiler.c:787
-msgid "Change the interval of running sensors to given value"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:790
-msgid "Number of peers to simulate anomalies on"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:797
-msgid "Profiler for sensor service"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_analysis.c:204
-msgid "Received an invalid sensor value."
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_analysis.c:295
-msgid "Analysis model not defined in configuration.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_analysis.c:304
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1354
 #, c-format
-msgid "Could not load analysis model `%s'.\n"
+msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_analysis.c:312
-msgid "Could not connect to peerstore service.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_monitoring.c:233
-msgid "Unknown value type expected by sensor, this should not happen.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_monitoring.c:268
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1399
 #, c-format
-msgid "Received an invalid value for sensor `%s': %s\n"
+msgid "Got client-responder-session with key %s and a matching 
service-request-session set, processing.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_monitoring.c:347
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1409
 #, c-format
-msgid "Sensor `%s': External process should not be a path, disabling sensor.\n"
+msgid "Got client-responder-session with key %s but NO matching 
service-request-session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_monitoring.c:370
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1439
 #, c-format
-msgid ""
-"Sensor `%s' process `%s' problem: binary doesn't exist or not executable\n"
+msgid "New incoming channel from peer %s.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_monitoring.c:418
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1471
 #, c-format
-msgid "Sensor `%s' execution task already set, this should not happen\n"
+msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:828
-msgid "Double creation of proof-of-work, this should not happen.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_reporting.c:834
-msgid "Failed to create pow and signature block.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1046
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1672
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1814
 #, c-format
-msgid "PEERSTORE error: %s.\n"
+msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_reporting.c:1151
-#: src/sensor/gnunet-service-sensor_reporting.c:1409
-msgid "Failed to connect to CORE service.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1158
-msgid "Peer identity received from CORE init doesn't match ours.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1398
-msgid "Failed to connect to peerstore service.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1419
-#: src/sensor/gnunet-service-sensor_update.c:781
-msgid "Failed to connect to CADET service.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1426
-msgid "Failed to load my private key.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_update.c:327
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1681
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1821
 #, c-format
-msgid "Error trying to send a message to update point `%s'.\n"
+msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor_update.c:418
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1771
 #, c-format
-msgid "Failed to connect to update point `%s'.\n"
+msgid "Got message with duplicate session key (`%s'), ignoring service 
request.\n"
 msgstr ""
 
-#: src/sensor/plugin_sensor_model_gaussian.c:203
-msgid "Missing `TRAINING_WINDOW' value in configuration.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2014
+msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/sensor/plugin_sensor_model_gaussian.c:221
-msgid "Missing `CONFIDENCE_INTERVAL' value in configuration.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+msgid "Connect to MESH failed\n"
 msgstr ""
 
-#: src/sensor/plugin_sensor_model_gaussian.c:229
-msgid "Missing `WEIGHT_INC' value in configuration.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2104
+msgid "Mesh initialized\n"
 msgstr ""
 
-#: src/sensor/sensor_api.c:296
-msgid "Iterate request canceled due to disconnection.\n"
+#: src/scalarproduct/scalarproduct_api.c:246
+msgid "# SUC responder result messages received"
 msgstr ""
 
-#: src/sensor/sensor_api.c:307
-msgid "Force anomaly request canceled due to disconnection.\n"
+#: src/scalarproduct/scalarproduct_api.c:300
+msgid "# bytes sent to scalarproduct"
 msgstr ""
 
-#: src/sensor/sensor_api.c:374
-msgid "Timeout transmitting iteration request to `SENSOR' service."
+#: src/scalarproduct/scalarproduct_api.c:345
+#: src/scalarproduct/scalarproduct_api.c:440
+msgid "Failed to connect to the scalarproduct service\n"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:107
-msgid "Error reading sensor version\n"
+#: src/scalarproduct/scalarproduct_api.c:353
+#: src/scalarproduct/scalarproduct_api.c:448
+msgid "Failed to send a message to the statistics service\n"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:116
-msgid "Invalid sensor version number, format should be major.minor\n"
+#: src/scalarproduct/scalarproduct_api.c:387
+#: src/scalarproduct/scalarproduct_api.c:485
+msgid "Failed to send a message to the scalarproduct service\n"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:131
-msgid "Error reading sensor category\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:538
+msgid "dkg start delay"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:164
-msgid "Error reading sensor run interval\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:541
+msgid "dkg timeout"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:191
-msgid "Error reading sensor source\n"
-msgstr ""
+#: src/secretsharing/gnunet-secretsharing-profiler.c:544
+msgid "threshold"
+msgstr "threshold"
 
-#: src/sensor/sensor_util_lib.c:206
-msgid "Error reading sensor gnunet-statistics source information\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:547
+msgid "also profile decryption"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:218
-msgid "Error reading sensor process name\n"
+#: src/set/gnunet-service-set.c:1431
+msgid "Could not connect to mesh service\n"
 msgstr ""
 
-#: src/sensor/sensor_util_lib.c:233
-msgid "Error reading sensor expected datatype\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:241
-msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:299
-#, c-format
-msgid "Failed to access sensor file: %s\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:308
-#, c-format
-msgid "Failed to load sensor definition: %s\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:370
-#, c-format
-msgid "Sensor `%s' already exists with same or newer version\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:387
-#, c-format
-msgid "Error adding new sensor `%s' to global hashmap.\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:412
-#, c-format
-msgid "Error loading sensor from file: %s\n"
-msgstr ""
-
-#: src/set/gnunet-service-set.c:2015
-msgid "Could not connect to cadet service\n"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:249
+#: src/set/gnunet-set-ibf-profiler.c:221
 msgid "number of element in set A-B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:252
+#: src/set/gnunet-set-ibf-profiler.c:224
 msgid "number of element in set B-A"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:255
+#: src/set/gnunet-set-ibf-profiler.c:227
 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:230
 msgid "hash num"
-msgstr ""
+msgstr "numéro de hash"
 
-#: src/set/gnunet-set-ibf-profiler.c:261
+#: src/set/gnunet-set-ibf-profiler.c:233
 msgid "ibf size"
-msgstr ""
+msgstr "taille ibz"
 
-#: src/set/gnunet-set-profiler.c:365
-msgid "operation to execute"
+#: src/set/gnunet-set-profiler.c:295
+msgid "oeration to execute"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:368
-msgid "dump statistics to stdout after completion"
-msgstr ""
-
-#: src/statistics/gnunet-service-statistics.c:323
+#: src/statistics/gnunet-service-statistics.c:280
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:434
+#: src/statistics/gnunet-service-statistics.c:346
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:145
+#: src/statistics/gnunet-statistics.c:140
 msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:148
+#: src/statistics/gnunet-statistics.c:142
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:198
+#: src/statistics/gnunet-statistics.c:189
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:204
+#: src/statistics/gnunet-statistics.c:195
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:235
+#: src/statistics/gnunet-statistics.c:226
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:243
+#: src/statistics/gnunet-statistics.c:234
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:261
 #, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:282
+#: src/statistics/gnunet-statistics.c:269
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:290
+#: src/statistics/gnunet-statistics.c:276
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:323
+#: src/statistics/gnunet-statistics.c:308
 #, c-format
 msgid "Invalid argument `%s'\n"
-msgstr ""
+msgstr "Argument invalide « %s »\n"
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:334
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:337
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:355
+#: src/statistics/gnunet-statistics.c:340
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:358
+#: src/statistics/gnunet-statistics.c:343
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:346
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:349
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:367
+#: src/statistics/gnunet-statistics.c:352
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:379
+#: src/statistics/gnunet-statistics.c:364
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
@@ -6490,65 +5853,62 @@
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:1088
-msgid ""
-"Failed to receive acknowledgement from statistics service, some statistics "
-"might have been lost!\n"
+#: src/statistics/statistics_api.c:1090
+msgid "Failed to receive acknowledgement from statistics service, some 
statistics might have been lost!\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:225
-msgid "Need at least 2 arguments\n"
+#: src/testbed/generate-underlay-topology.c:223
+msgid "Need atleast 2 arguments\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:230
+#: src/testbed/generate-underlay-topology.c:228
 msgid "Database filename missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:237
+#: src/testbed/generate-underlay-topology.c:235
 msgid "Topology string missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:242
+#: src/testbed/generate-underlay-topology.c:240
 #, c-format
 msgid "Invalid topology: %s\n"
-msgstr ""
+msgstr "Topologie invalide : %s\n"
 
-#: src/testbed/generate-underlay-topology.c:255
+#: src/testbed/generate-underlay-topology.c:252
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:261
+#: src/testbed/generate-underlay-topology.c:258
 #, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:269
+#: src/testbed/generate-underlay-topology.c:266
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:283
+#: src/testbed/generate-underlay-topology.c:280
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:289
+#: src/testbed/generate-underlay-topology.c:286
 #, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:338
+#: src/testbed/generate-underlay-topology.c:335
 #: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:347
+#: src/testbed/generate-underlay-topology.c:344
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
-"The following options are available for TOPO followed by TOPOOPTS if "
-"applicable:\n"
+"The following options are available for TOPO followed by TOPOOPTS if 
applicable:\n"
 "\t LINE\n"
 "\t RING\n"
 "\t RANDOM <num_rnd_links>\n"
@@ -6563,34 +5923,30 @@
 "\t cap: the maximum number of links a node can have\n"
 "\t m: the number of links a node should have while joining the network\n"
 "\t filename: the path of the file which contains topology information\n"
-"NOTE: the format of the above file is descibed here: https://www.gnunet.org/";
-"content/topology-file-format\n"
+"NOTE: the format of the above file is descibed here: 
https://www.gnunet.org/content/topology-file-format\n";
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:323
+#: src/testbed/gnunet-daemon-latency-logger.c:325
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-blacklist.c:264
-msgid ""
-"Daemon to restrict incoming transport layer connections during testbed "
-"deployments"
+msgid "Daemon to restrict incoming transport layer connections during testbed 
deployments"
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:298
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:476
+#: src/testbed/gnunet-daemon-testbed-underlay.c:474
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
 #: src/testbed/gnunet-service-testbed_cpustatus.c:730
 #, c-format
-msgid ""
-"Cannot open %s for writing load statistics.  Not logging load statistics\n"
+msgid "Cannot open %s for writing load statistics.  Not logging load 
statistics\n"
 msgstr ""
 
 #: src/testbed/gnunet-service-testbed_peers.c:1015
@@ -6615,15 +5971,17 @@
 msgid "Spawning process `%s'\n"
 msgstr ""
 
+#: src/testbed/gnunet-testbed-profiler.c:267
+#, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr ""
+
 #: src/testbed/gnunet-testbed-profiler.c:296
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
 #: src/testbed/gnunet-testbed-profiler.c:299
-msgid ""
-"run profiler in non-interactive mode where upon testbed setup the profiler "
-"does not wait for a keystroke but continues to run until a termination "
-"signal is received"
+msgid "run profiler in non-interactive mode where upon testbed setup the 
profiler does not wait for a keystroke but continues to run until a termination 
signal is received"
 msgstr ""
 
 #: src/testbed/testbed_api_hosts.c:415
@@ -6695,16 +6053,12 @@
 
 #: src/testbed/testbed_api_testbed.c:1349
 #, c-format
-msgid ""
-"Maximum number of edges a peer can have in a scale free topology cannot be "
-"more than %u.  Given `%s = %llu'"
+msgid "Maximum number of edges a peer can have in a scale free topology cannot 
be more than %u.  Given `%s = %llu'"
 msgstr ""
 
 #: src/testbed/testbed_api_testbed.c:1365
 #, c-format
-msgid ""
-"The number of edges that can established when adding a new node to scale "
-"free topology cannot be more than %u.  Given `%s = %llu'"
+msgid "The number of edges that can established when adding a new node to 
scale free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
 #: src/testbed/testbed_api_topology.c:960
@@ -6768,9 +6122,7 @@
 msgstr ""
 
 #: src/testing/gnunet-testing.c:359
-msgid ""
-"number of unique configuration files to create, or number of the hostkey to "
-"extract"
+msgid "number of unique configuration files to create, or number of the 
hostkey to extract"
 msgstr ""
 
 #: src/testing/gnunet-testing.c:361
@@ -6805,9 +6157,7 @@
 
 #: src/testing/testing.c:1157
 #, c-format
-msgid ""
-"You attempted to create a testbed with more than %u hosts.  Please "
-"precompute more hostkeys first.\n"
+msgid "You attempted to create a testbed with more than %u hosts.  Please 
precompute more hostkeys first.\n"
 msgstr ""
 
 #: src/testing/testing.c:1166
@@ -6858,482 +6208,458 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:265
+#: src/topology/gnunet-daemon-topology.c:255
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:406
+#: src/topology/gnunet-daemon-topology.c:388
 msgid "# connect requests issued to transport"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:756
-#: src/topology/gnunet-daemon-topology.c:840
+#: src/topology/gnunet-daemon-topology.c:728
+#: src/topology/gnunet-daemon-topology.c:813
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1020
+#: src/topology/gnunet-daemon-topology.c:993
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:1022
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:1029
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1077
+#: src/topology/gnunet-daemon-topology.c:1050
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1079
+#: src/topology/gnunet-daemon-topology.c:1052
 msgid "# friends in configuration"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1084
-msgid ""
-"Fewer friends specified than required by minimum friend count. Will only "
-"connect to friends.\n"
+#: src/topology/gnunet-daemon-topology.c:1057
+msgid "Fewer friends specified than required by minimum friend count. Will 
only connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1090
-msgid ""
-"More friendly connections required than target total number of connections.\n"
+#: src/topology/gnunet-daemon-topology.c:1063
+msgid "More friendly connections required than target total number of 
connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1121
-#: src/transport/plugin_transport_wlan.c:1497
+#: src/topology/gnunet-daemon-topology.c:1094
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1178
+#: src/topology/gnunet-daemon-topology.c:1151
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1323
-msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
+#: src/topology/gnunet-daemon-topology.c:1290
+msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:136
-msgid "# Addresses given to ATS"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_blacklist.c:286
+#: src/transport/gnunet-service-transport_blacklist.c:271
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:279
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:504
-#: src/transport/gnunet-service-transport_blacklist.c:855
+#: src/transport/gnunet-service-transport_blacklist.c:464
+#: src/transport/gnunet-service-transport_blacklist.c:745
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:859
-#, c-format
-msgid "Disallowing connection to peer `%s' on transport %s\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:231
+#: src/transport/gnunet-service-transport.c:220
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:385
+#: src/transport/gnunet-service-transport.c:424
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:480
+#: src/transport/gnunet-service-transport.c:515
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:826
+#: src/transport/gnunet-service-transport.c:686
+#, c-format
+msgid "Could not obtain a valid network for `%s' %s (%s)\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:733
+#, c-format
+msgid "Address or session unknown: failed to update properties for peer `%s' 
plugin `%s' address `%s' session %p\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:1084
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:481
+#: src/transport/gnunet-service-transport_clients.c:432
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:439
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:783
+#: src/transport/gnunet-service-transport_clients.c:596
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:737
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:827
+#: src/transport/gnunet-service-transport_clients.c:770
+#, c-format
+msgid "Blacklist refuses connection attempt to peer `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:776
+#, c-format
+msgid "Blacklist allows connection attempt to peer `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:801
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:864
+#: src/transport/gnunet-service-transport_clients.c:815
+#, c-format
+msgid "Received a request connect message for peer `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:826
 msgid "# REQUEST DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:197
-msgid "# refreshed my HELLO"
+#: src/transport/gnunet-service-transport_clients.c:840
+#, c-format
+msgid "Received a request disconnect message for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:840
-msgid "# session creation failed"
+#: src/transport/gnunet-service-transport_hello.c:181
+msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1095
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1304
-#: src/transport/gnunet-service-transport_neighbours.c:1761
+#: src/transport/gnunet-service-transport_neighbours.c:1220
+#: src/transport/gnunet-service-transport_neighbours.c:1629
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1309
+#: src/transport/gnunet-service-transport_neighbours.c:1225
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1230
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1375
+#: src/transport/gnunet-service-transport_neighbours.c:1287
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1451
-msgid "# KEEPALIVES sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1343
+msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1487
+#: src/transport/gnunet-service-transport_neighbours.c:1376
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1495
+#: src/transport/gnunet-service-transport_neighbours.c:1384
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1505
-msgid "# KEEPALIVES received in good order"
+#: src/transport/gnunet-service-transport_neighbours.c:1431
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1550
-msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1440
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1559
-msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1448
+msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1567
-msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
+#: src/transport/gnunet-service-transport_neighbours.c:1456
+msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1576
-msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:1581
-msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:1587
-msgid "# KEEPALIVE_RESPONSEs received (OK)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:1658
+#: src/transport/gnunet-service-transport_neighbours.c:1534
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1692
+#: src/transport/gnunet-service-transport_neighbours.c:1568
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1707
+#: src/transport/gnunet-service-transport_neighbours.c:1584
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1827
+#: src/transport/gnunet-service-transport_neighbours.c:1678
 #, c-format
-msgid "Failed to send SYN message to peer `%s'\n"
+msgid "Failed to send CONNECT message to peer `%s' using address `%s' session 
%p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1847
-msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
+#: src/transport/gnunet-service-transport_neighbours.c:1705
+msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1886
-msgid "# SYN messages sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1751
+msgid "# SESSION_CONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1903
+#: src/transport/gnunet-service-transport_neighbours.c:1767
 #, c-format
-msgid "Failed to transmit SYN message to %s\n"
+msgid "Failed to transmit CONNECT message via plugin to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1933
-msgid "# Failed attempts to switch addresses (failed to send SYN)"
+#: src/transport/gnunet-service-transport_neighbours.c:1794
+msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1998
+#: src/transport/gnunet-service-transport_neighbours.c:1844
 #, c-format
-msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
+msgid "Failed to send CONNECT_ACK message to peer `%s' using address `%s' 
session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2052
-msgid "# SYN_ACK messages sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1899
+msgid "# CONNECT_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2069
+#: src/transport/gnunet-service-transport_neighbours.c:1914
 #, c-format
-msgid "Failed to transmit SYN_ACK message to %s\n"
+msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2225
+#: src/transport/gnunet-service-transport_neighbours.c:2192
 #, c-format
 msgid "Blacklisting disapproved to connect to peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2352
-msgid "# SYN messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:2312
+msgid "# CONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2357
+#: src/transport/gnunet-service-transport_neighbours.c:2317
 #, c-format
-msgid "SYN request from peer `%s' ignored due impending shutdown\n"
+msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2726
+#: src/transport/gnunet-service-transport_neighbours.c:2590
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3212
-msgid "# SYN_ACK messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:3012
+msgid "# Failed attempts to switch addresses (no response)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3220
-msgid "# unexpected SYN_ACK messages (no peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:3107
+msgid "# CONNECT_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3238
-#: src/transport/gnunet-service-transport_neighbours.c:3262
-msgid "# unexpected SYN_ACK messages (not ready)"
+#: src/transport/gnunet-service-transport_neighbours.c:3115
+msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3274
-msgid "# unexpected SYN_ACK messages (waiting on ATS)"
+#: src/transport/gnunet-service-transport_neighbours.c:3129
+#: src/transport/gnunet-service-transport_neighbours.c:3164
+msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3299
+#: src/transport/gnunet-service-transport_neighbours.c:3176
+msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3200
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3312
-msgid "# unexpected SYN_ACK messages (disconnecting)"
+#: src/transport/gnunet-service-transport_neighbours.c:3208
+msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3506
-msgid "# ACK messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:3396
+msgid "# SESSION_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
-msgid "# unexpected ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:3424
+msgid "# unexpected SESSION_ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3608
+#: src/transport/gnunet-service-transport_neighbours.c:3490
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3637
+#: src/transport/gnunet-service-transport_neighbours.c:3505
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3685
-msgid "# quota messages ignored (malformed)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:3692
-msgid "# QUOTA messages received"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:3733
+#: src/transport/gnunet-service-transport_neighbours.c:3545
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3740
+#: src/transport/gnunet-service-transport_neighbours.c:3551
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3751
+#: src/transport/gnunet-service-transport_neighbours.c:3560
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3885
+#: src/transport/gnunet-service-transport_neighbours.c:3687
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:158
+#: src/transport/gnunet-service-transport_plugins.c:120
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:223
-#: src/transport/gnunet-service-transport_plugins.c:231
-#: src/transport/gnunet-service-transport_plugins.c:239
-#: src/transport/gnunet-service-transport_plugins.c:247
-#: src/transport/gnunet-service-transport_plugins.c:255
-#: src/transport/gnunet-service-transport_plugins.c:263
-#: src/transport/gnunet-service-transport_plugins.c:271
-#: src/transport/gnunet-service-transport_plugins.c:279
-#: src/transport/gnunet-service-transport_plugins.c:287
-#: src/transport/gnunet-service-transport_plugins.c:295
-#: src/transport/gnunet-service-transport_plugins.c:303
+#: src/transport/gnunet-service-transport_plugins.c:178
+#: src/transport/gnunet-service-transport_plugins.c:186
+#: src/transport/gnunet-service-transport_plugins.c:194
+#: src/transport/gnunet-service-transport_plugins.c:202
+#: src/transport/gnunet-service-transport_plugins.c:210
+#: src/transport/gnunet-service-transport_plugins.c:218
+#: src/transport/gnunet-service-transport_plugins.c:226
+#: src/transport/gnunet-service-transport_plugins.c:234
+#: src/transport/gnunet-service-transport_plugins.c:242
+#: src/transport/gnunet-service-transport_plugins.c:250
+#: src/transport/gnunet-service-transport_plugins.c:258
 #, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:310
+#: src/transport/gnunet-service-transport_plugins.c:265
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:343
-msgid "# Addresses in validation map"
+#: src/transport/gnunet-service-transport_validation.c:488
+msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:452
-#: src/transport/gnunet-service-transport_validation.c:640
-#: src/transport/gnunet-service-transport_validation.c:949
-#: src/transport/gnunet-service-transport_validation.c:1540
-msgid "# validations running"
+#: src/transport/gnunet-service-transport_validation.c:558
+#, c-format
+msgid "Not transmitting `%s' with `%s', message too big (%u bytes!). This 
should not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:495
-msgid "# address records discarded (timeout)"
+#: src/transport/gnunet-service-transport_validation.c:616
+msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:543
-msgid "# address records discarded (blacklist)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:631
-msgid "# PINGs for address validation sent"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:713
-msgid "# validations delayed by global throttle"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:750
+#: src/transport/gnunet-service-transport_validation.c:722
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1070
+#: src/transport/gnunet-service-transport_validation.c:1011
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1121
+#: src/transport/gnunet-service-transport_validation.c:1062
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1134
+#: src/transport/gnunet-service-transport_validation.c:1072
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1137
+#: src/transport/gnunet-service-transport_validation.c:1075
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1145
+#: src/transport/gnunet-service-transport_validation.c:1083
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1158
+#: src/transport/gnunet-service-transport_validation.c:1095
 #, c-format
-msgid ""
-"Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
-"having this address.\n"
+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:1213
+#: src/transport/gnunet-service-transport_validation.c:1103
 #, c-format
+msgid "Received a PING message with validation bug from `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1157
+#, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1264
+#: src/transport/gnunet-service-transport_validation.c:1206
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1273
+#: src/transport/gnunet-service-transport_validation.c:1215
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1430
+#: src/transport/gnunet-service-transport_validation.c:1356
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1448
+#: src/transport/gnunet-service-transport_validation.c:1371
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1503
-msgid "# validations succeeded"
+#: src/transport/gnunet-service-transport_validation.c:1493
+#, c-format
+msgid "Validation received new %s message for peer `%s' with size %u\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-service-transport_validation.c:1500
 #, c-format
+msgid "Adding `%s' without addresses for peer `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:367
+#, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:589
-#: src/transport/gnunet-transport-profiler.c:274
+#: src/transport/gnunet-transport.c:375
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:621
+#: src/transport/gnunet-transport.c:415
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:636
+#: src/transport/gnunet-transport.c:428
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:648
+#: src/transport/gnunet-transport.c:438
 msgid "Failed to list connections, timeout occured\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:675 src/transport/gnunet-transport.c:700
+#: src/transport/gnunet-transport.c:559
 #, c-format
-msgid "Configuration for plugin `%s' did not work!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:680
-#, c-format
-msgid "Configuration for plugin `%s' did work!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:685
-#, c-format
-msgid "Internal NAT error while running test for plugin `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:690
-#, c-format
-msgid "Failed to start NAT test for plugin `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:695
-#, c-format
-msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:820
-#, c-format
 msgid ""
 "Peer `%s' %s %s\n"
 "\t%s%s\n"
@@ -7341,420 +6667,329 @@
 "\t%s%s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:855
+#: src/transport/gnunet-transport.c:586
 #, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:949 src/transport/gnunet-transport.c:1744
-msgid "Monitor disconnected from transport service. Reconnecting.\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1006
+#: src/transport/gnunet-transport.c:712
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1020
+#: src/transport/gnunet-transport.c:726
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1045
-msgid "Failed to start resolver!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1091
+#: src/transport/gnunet-transport.c:789
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1114
-#: src/transport/gnunet-transport-profiler.c:406
+#: src/transport/gnunet-transport.c:810
 #, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1138
+#: src/transport/gnunet-transport.c:834
 #, c-format
-msgid ""
-"Successfully connected to `%s', starting to send benchmark data in %u Kb "
-"blocks\n"
+msgid "Successfully connected to `%s', starting to send benchmark data in %u 
Kb blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1171
+#: src/transport/gnunet-transport.c:865
 #, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1194
-#: src/transport/gnunet-transport-profiler.c:434
+#: src/transport/gnunet-transport.c:888
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1219 src/transport/gnunet-transport.c:1245
+#: src/transport/gnunet-transport.c:950
 #, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1221
-msgid "Connected to"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1247
-msgid "Disconnected from"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1271
-#: src/transport/gnunet-transport-profiler.c:458
-#, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1311
+#: src/transport/gnunet-transport.c:975
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1323
+#: src/transport/gnunet-transport.c:986
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1831
-#: src/transport/gnunet-transport-profiler.c:492
+#: src/transport/gnunet-transport.c:1197 src/transport/gnunet-transport.c:1222
 msgid "Failed to send connect request to transport service\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1866
-msgid "Failed to send disconnect request to transport service\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1910
+#: src/transport/gnunet-transport.c:1266
 #, c-format
-msgid ""
-"Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
-"%s, %s %s\n"
+msgid "Multiple operations given. Please choose only one operation: %s, %s, 
%s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1918
+#: src/transport/gnunet-transport.c:1274
 #, c-format
-msgid ""
-"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
+msgid "No operation given. Please choose one operation: %s, %s, %s, %s, %s, 
%s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1937 src/transport/gnunet-transport.c:1967
-#: src/transport/gnunet-transport.c:2000 src/transport/gnunet-transport.c:2026
-#: src/transport/gnunet-transport.c:2085
-#: src/transport/gnunet-transport-profiler.c:578
+#: src/transport/gnunet-transport.c:1293 src/transport/gnunet-transport.c:1323
+#: src/transport/gnunet-transport.c:1353 src/transport/gnunet-transport.c:1376
+#: src/transport/gnunet-transport.c:1419
 msgid "Failed to connect to transport service\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1946 src/transport/gnunet-transport.c:1977
-#: src/transport/gnunet-transport.c:2011
+#: src/transport/gnunet-transport.c:1302 src/transport/gnunet-transport.c:1332
+#: src/transport/gnunet-transport.c:1362
 msgid "Failed to send request to transport service\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2031
+#: src/transport/gnunet-transport.c:1381
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2133
-msgid "print information for all peers (instead of only connected peers)"
+#: src/transport/gnunet-transport.c:1465
+msgid "print information for all peers (instead of only connected peers )"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2136
+#: src/transport/gnunet-transport.c:1468
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2139
+#: src/transport/gnunet-transport.c:1471
 msgid "connect to a peer"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2142
+#: src/transport/gnunet-transport.c:1474
 msgid "disconnect to a peer"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2145
+#: src/transport/gnunet-transport.c:1477
 msgid "print information for all pending validations "
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2148
-msgid "print information for all pending validations continuously"
+#: src/transport/gnunet-transport.c:1480
+msgid "print information for all pending validations continously"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2151
+#: src/transport/gnunet-transport.c:1483
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2157
-msgid ""
-"provide information about all connects and disconnect events (continuously)"
+#: src/transport/gnunet-transport.c:1489
+msgid "provide information about all connects and disconnect events 
(continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2160
+#: src/transport/gnunet-transport.c:1491
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2163
-#: src/transport/gnunet-transport-profiler.c:638
+#: src/transport/gnunet-transport.c:1493
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2166
-msgid "monitor plugin sessions"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:2169
+#: src/transport/gnunet-transport.c:1495
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2172
+#: src/transport/gnunet-transport.c:1498
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2183
-#: src/transport/gnunet-transport-profiler.c:649
+#: src/transport/gnunet-transport.c:1507
 msgid "Direct access to transport service."
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:218
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
+#: src/transport/plugin_transport_bluetooth.c:621
+msgid "# Bluetooth ACKs sent"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:254
-#, c-format
-msgid "%u;%u;%llu;%llu;%.2f;%.2f"
+#: src/transport/plugin_transport_bluetooth.c:640
+msgid "# Bluetooth messages defragmented"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:263
-#, c-format
-msgid ";%llu;%.2f"
+#: src/transport/plugin_transport_bluetooth.c:686
+#: src/transport/plugin_transport_bluetooth.c:737
+#: src/transport/plugin_transport_bluetooth.c:1942
+msgid "# Bluetooth sessions allocated"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:280
-msgid "\n"
+#: src/transport/plugin_transport_bluetooth.c:837
+msgid "# Bluetooth message fragments sent"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:332
-msgid "."
+#: src/transport/plugin_transport_bluetooth.c:861
+msgid "# Bluetooth messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:352
-#, c-format
-msgid ""
-"\n"
-"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
+#: src/transport/plugin_transport_bluetooth.c:969
+#: src/transport/plugin_transport_bluetooth.c:1054
+#: src/transport/plugin_transport_bluetooth.c:1944
+msgid "# Bluetooth MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:400
-#, c-format
-msgid "Connected to different peer `%s'\n"
+#: src/transport/plugin_transport_bluetooth.c:1307
+msgid "# HELLO messages received via Bluetooth"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:483
-#, c-format
-msgid "Retrying to connect to `%s'\n"
+#: src/transport/plugin_transport_bluetooth.c:1331
+msgid "# fragments received via Bluetooth"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:508
-#, c-format
-msgid "Denying connection to `%s'\n"
+#: src/transport/plugin_transport_bluetooth.c:1341
+msgid "# ACKs received via Bluetooth"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:537
-msgid "Message size too big!\n"
+#: src/transport/plugin_transport_bluetooth.c:1401
+msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:543
-msgid "No peer identity given\n"
+#: src/transport/plugin_transport_bluetooth.c:1512
+msgid "# DATA messages received via Bluetooth"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:558
-#, c-format
-msgid "Trying to send %u messages with size %u to peer `%s'\n"
+#: src/transport/plugin_transport_bluetooth.c:1547
+msgid "# Bluetooth DATA messages processed"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:564
-#, c-format
-msgid "Trying to receive messages from peer `%s'\n"
+#: src/transport/plugin_transport_bluetooth.c:1610
+msgid "# HELLO beacons sent via Bluetooth"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:569
-msgid "No operation given\n"
+#: src/transport/plugin_transport_bluetooth.c:1723
+msgid "Bluetooth address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:623
-msgid "send data to peer"
+#: src/transport/plugin_transport_bluetooth.c:1923
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:626
-msgid "receive data from peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:629
-msgid "iterations"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:632
-#, fuzzy
-msgid "number of messages to send"
-msgstr "nombre de valeurs"
-
-#: src/transport/gnunet-transport-profiler.c:635
-msgid "message size to use"
-msgstr ""
-
-#: src/transport/plugin_transport_http_client.c:1485
-#: src/transport/plugin_transport_http_server.c:2249
-#: src/transport/plugin_transport_http_server.c:3435
-#: src/transport/plugin_transport_tcp.c:2991
-#: src/transport/plugin_transport_tcp.c:2998
-msgid "TCP_STEALTH not supported on this platform.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http_client.c:2128
+#: src/transport/plugin_transport_http_client.c:1622
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2177
-#: src/transport/plugin_transport_http_server.c:3150
+#: src/transport/plugin_transport_http_client.c:1697
+#: src/transport/plugin_transport_http_server.c:3007
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2194
-#: src/transport/plugin_transport_http_server.c:3220
+#: src/transport/plugin_transport_http_client.c:1722
+#: src/transport/plugin_transport_http_server.c:3063
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2228
+#: src/transport/plugin_transport_http_client.c:1750
+#: src/transport/plugin_transport_http_server.c:2907
 #, c-format
-msgid "Maximum number of requests is %u\n"
+msgid "Maximum number of connections is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1735
+#: src/transport/plugin_transport_http_server.c:1402
 #, c-format
-msgid ""
-"Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
-"size %u\n"
+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:1967
+#: src/transport/plugin_transport_http_server.c:1663
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1975
+#: src/transport/plugin_transport_http_server.c:1671
 #, c-format
-msgid ""
-"Server reached maximum number connections (%u), rejecting new connection\n"
+msgid "Server reached maximum number connections (%u), rejecting new 
connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2125
-msgid ""
-"Could not create a new TLS certificate, program `gnunet-transport-"
-"certificate-creation' could not be started!\n"
+#: src/transport/plugin_transport_http_server.c:1958
+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:2148
+#: src/transport/plugin_transport_http_server.c:1982
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2275
-msgid "Could not load or create server certificate! Loading plugin failed!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http_server.c:2584
+#: src/transport/plugin_transport_http_server.c:2405
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2618 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2437 src/util/service.c:698
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
-msgstr ""
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2636 src/util/service.c:723
+#: src/transport/plugin_transport_http_server.c:2454 src/util/service.c:715
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2749
+#: src/transport/plugin_transport_http_server.c:2565
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2827
-#: src/transport/plugin_transport_udp.c:3409
+#: src/transport/plugin_transport_http_server.c:2637
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2926
+#: src/transport/plugin_transport_http_server.c:2730
 #, c-format
 msgid "IPv4 support is %s\n"
-msgstr ""
+msgstr "Prise en charge d’IPv4 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2941
+#: src/transport/plugin_transport_http_server.c:2744
 #, c-format
 msgid "IPv6 support is %s\n"
-msgstr ""
+msgstr "Prise en charge d’IPv6 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2947
+#: src/transport/plugin_transport_http_server.c:2751
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2958
+#: src/transport/plugin_transport_http_server.c:2762
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2964
+#: src/transport/plugin_transport_http_server.c:2769
 #, c-format
 msgid "Using port %u\n"
-msgstr ""
+msgstr "Utilisation du port %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2978
+#: src/transport/plugin_transport_http_server.c:2784
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2988
+#: src/transport/plugin_transport_http_server.c:2794
 #, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3010
+#: src/transport/plugin_transport_http_server.c:2815
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3020
+#: src/transport/plugin_transport_http_server.c:2825
 #, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3083
+#: src/transport/plugin_transport_http_server.c:2877
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3104
+#: src/transport/plugin_transport_http_server.c:2893
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3121
-#, c-format
-msgid "Maximum number of connections is %u\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http_server.c:3447
-msgid "Unable to compile URL regex\n"
-msgstr ""
-
 #: src/transport/plugin_transport_smtp.c:223
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -7779,7 +7014,7 @@
 #: src/transport/plugin_transport_smtp.c:511
 #, c-format
 msgid "SMTP: `%s' failed: %s.\n"
-msgstr ""
+msgstr "SNTP : « %s » échouée : %s.\n"
 
 #: src/transport/plugin_transport_smtp.c:652
 msgid "No email-address specified, can not start SMTP transport.\n"
@@ -7797,255 +7032,237 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:672
-#: src/transport/plugin_transport_tcp.c:1989
+#: src/transport/plugin_transport_tcp.c:555
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:855
-#: src/transport/plugin_transport_tcp.c:1081
-#: src/transport/plugin_transport_tcp.c:2259
-#: src/transport/plugin_transport_tcp.c:3112
+#: src/transport/plugin_transport_tcp.c:762
+#: src/transport/plugin_transport_tcp.c:928
+#: src/transport/plugin_transport_tcp.c:2005
+#: src/transport/plugin_transport_tcp.c:2558
 msgid "# TCP sessions active"
-msgstr ""
+msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_tcp.c:897
-#: src/transport/plugin_transport_tcp.c:1063
-#: src/transport/plugin_transport_tcp.c:1187
-#: src/transport/plugin_transport_tcp.c:1260
-#: src/transport/plugin_transport_tcp.c:1360
-#: src/transport/plugin_transport_tcp.c:1385
+#: src/transport/plugin_transport_tcp.c:795
+#: src/transport/plugin_transport_tcp.c:921
+#: src/transport/plugin_transport_tcp.c:1009
+#: src/transport/plugin_transport_tcp.c:1056
+#: src/transport/plugin_transport_tcp.c:1219
+#: src/transport/plugin_transport_tcp.c:1237
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:900
+#: src/transport/plugin_transport_tcp.c:798
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1190
+#: src/transport/plugin_transport_tcp.c:1012
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1264
+#: src/transport/plugin_transport_tcp.c:1059
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1659
+#: src/transport/plugin_transport_tcp.c:1193
+#, c-format
+msgid "Trying to send with invalid session %p\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1462
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1827
+#: src/transport/plugin_transport_tcp.c:1567
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2318
+#: src/transport/plugin_transport_tcp.c:2055
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2509
+#: src/transport/plugin_transport_tcp.c:2215
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2560
-#: src/transport/plugin_transport_tcp.c:2618
-msgid "# TCP server connections active"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2564
-msgid "# TCP server connect events"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2570
-msgid "TCP connection limit reached, suspending server\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2572
-msgid "# TCP service suspended"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2612
-msgid "# TCP service resumed"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2622
+#: src/transport/plugin_transport_tcp.c:2279
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2925 src/util/service.c:584
-#: src/util/service.c:590
+#: src/transport/plugin_transport_tcp.c:2437 src/util/service.c:582
+#: src/util/service.c:588
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2941
+#: src/transport/plugin_transport_tcp.c:2451
 msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3100
+#: src/transport/plugin_transport_tcp.c:2547
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3104
+#: src/transport/plugin_transport_tcp.c:2551
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3108
+#: src/transport/plugin_transport_tcp.c:2554
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:170
-msgid "# Multicast HELLO beacons received via UDP"
+#: src/transport/plugin_transport_udp_broadcasting.c:167
+msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:548
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+#: src/transport/plugin_transport_udp_broadcasting.c:210
+msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:569
+#: src/transport/plugin_transport_udp_broadcasting.c:603
+msgid "Disabling HELLO broadcasting due to friend-to-friend only 
configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:626
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3152
+#: src/transport/plugin_transport_udp.c:1513
 #, c-format
-msgid ""
-"UDP could not transmit message to `%s': Network seems down, please check "
-"your network configuration\n"
+msgid "Trying to create session for address of unexpected length %u (should be 
%u or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3166
-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:3485
-#: src/transport/plugin_transport_udp.c:3584
+#: src/transport/plugin_transport_udp.c:2602
 #, c-format
-msgid "Failed to bind UDP socket to %s: %s\n"
+msgid "UDP could not transmit message to `%s': Network seems down, please 
check your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3503
-msgid "Disabling IPv4 since it is not supported on this system!\n"
+#: src/transport/plugin_transport_udp.c:2616
+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:3594
+#: src/transport/plugin_transport_udp.c:2961
 msgid "Failed to open UDP sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3666
-#: src/transport/plugin_transport_udp.c:3680
-msgid "must be in [0,65535]"
+#: src/transport/plugin_transport_udp.c:3056
+#, c-format
+msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3712
-msgid "must be valid IPv4 address"
+#: src/transport/plugin_transport_udp.c:3097
+#, c-format
+msgid "Invalid IPv6 address: `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3739
-msgid "must be valid IPv6 address"
+#: src/transport/plugin_transport_udp.c:3168
+msgid "Failed to create network sockets, plugin failed\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3805
-msgid "Failed to create UDP network sockets\n"
-msgstr ""
-
-#: src/transport/plugin_transport_unix.c:1409
+#: src/transport/plugin_transport_unix.c:1321
 #, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1422
-#, c-format
-msgid "Cannot bind to `%s'\n"
+#: src/transport/plugin_transport_unix.c:1652
+msgid "No UNIXPATH given in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1824
+#: src/transport/plugin_transport_unix.c:1688
 msgid "Failed to open UNIX listen socket\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:742
-msgid "# ACKs sent"
+#: src/transport/plugin_transport_wlan.c:620
+msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:762
-msgid "# Messages defragmented"
+#: src/transport/plugin_transport_wlan.c:639
+msgid "# WLAN messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:803
-#: src/transport/plugin_transport_wlan.c:890
-msgid "# Sessions allocated"
+#: src/transport/plugin_transport_wlan.c:688
+#: src/transport/plugin_transport_wlan.c:772
+#: src/transport/plugin_transport_wlan.c:1948
+msgid "# WLAN sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1011
-msgid "# message fragments sent"
+#: src/transport/plugin_transport_wlan.c:876
+msgid "# WLAN message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1040
-msgid "# messages pending (with fragmentation)"
+#: src/transport/plugin_transport_wlan.c:900
+msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1171
-#: src/transport/plugin_transport_wlan.c:1264
-#: src/transport/plugin_transport_wlan.c:2287
-msgid "# MAC endpoints allocated"
+#: src/transport/plugin_transport_wlan.c:1008
+#: src/transport/plugin_transport_wlan.c:1098
+#: src/transport/plugin_transport_wlan.c:1950
+msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1547
-msgid "# ACKs received"
+#: src/transport/plugin_transport_wlan.c:1302
+msgid "# HELLO messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1616
-msgid "# DATA messages discarded due to CRC32 error"
+#: src/transport/plugin_transport_wlan.c:1326
+msgid "# fragments received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1722
-msgid "# HELLO beacons sent"
+#: src/transport/plugin_transport_wlan.c:1336
+msgid "# ACKs received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1839
-msgid "# DATA messages received"
+#: src/transport/plugin_transport_wlan.c:1396
+msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1873
-msgid "# DATA messages processed"
+#: src/transport/plugin_transport_wlan.c:1518
+msgid "# DATA messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2262
-#, c-format
-msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
+#: src/transport/plugin_transport_wlan.c:1553
+msgid "# WLAN DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2284
-msgid "# sessions allocated"
+#: src/transport/plugin_transport_wlan.c:1616
+msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
-#: src/transport/transport_api.c:892
+#: src/transport/plugin_transport_wlan.c:1729
+msgid "WLAN address with invalid size encountered\n"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1929
 #, c-format
+msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
+msgstr ""
+
+#: src/transport/transport_api.c:739
+#, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/transport-testing.c:603
+#: src/transport/transport-testing.c:584
 msgid "Failed to initialize testing library!\n"
 msgstr ""
 
-#: src/tun/regex.c:134
+#: src/tun/regex.c:129
 #, c-format
 msgid "Bad mask: %d\n"
-msgstr ""
+msgstr "Masque érroné : %d\n"
 
 #: src/util/bio.c:170 src/util/bio.c:178
 #, c-format
 msgid "Error reading `%s': %s"
-msgstr ""
+msgstr "Erreur de lecture : « %s » : %s"
 
 #: src/util/bio.c:180
 msgid "End of file"
-msgstr ""
+msgstr "Fin de fichier"
 
 #: src/util/bio.c:237
 #, c-format
@@ -8067,74 +7284,81 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:264 src/util/client.c:894 src/util/service.c:621
+#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:619
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:268 src/util/client.c:899 src/util/service.c:625
+#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:623
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
 
-#: src/util/client.c:367
+#: src/util/client.c:360
 #, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
+msgid "Could not determine valid hostname and port for service `%s' from 
configuration.\n"
 msgstr ""
 
-#: src/util/client.c:375
+#: src/util/client.c:368
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1044
+#: src/util/client.c:1008
 #, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr ""
 
-#: src/util/client.c:1056
+#: src/util/client.c:1020
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:255 src/util/common_logging.c:1035
-msgid "DEBUG"
+#: src/util/client.c:1303
+msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1033
+#: src/util/common_logging.c:254 src/util/common_logging.c:1039
+msgid "DEBUG"
+msgstr "DEBUG"
+
+#: src/util/common_logging.c:256 src/util/common_logging.c:1037
 msgid "INFO"
-msgstr ""
+msgstr "INFO"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1031
+#: src/util/common_logging.c:258 src/util/common_logging.c:1035
 msgid "WARNING"
-msgstr ""
+msgstr "AVERTISSEMENT"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1029
+#: src/util/common_logging.c:260 src/util/common_logging.c:1033
 msgid "ERROR"
-msgstr ""
+msgstr "ERREUR"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1037
+#: src/util/common_logging.c:262 src/util/common_logging.c:1041
 msgid "NONE"
+msgstr "AUCUN"
+
+#: src/util/common_logging.c:391
+#, c-format
+msgid "Failed to create or access directory for log file `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:813
+#: src/util/common_logging.c:817
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1038
+#: src/util/common_logging.c:1042
 msgid "INVALID"
-msgstr ""
+msgstr "INVALIDE"
 
-#: src/util/common_logging.c:1154
+#: src/util/common_logging.c:1157
 msgid "unknown address"
-msgstr ""
+msgstr "adresse inconnue"
 
 #: src/util/common_logging.c:1196
 msgid "invalid address"
-msgstr ""
+msgstr "adresse invalide"
 
 #: src/util/common_logging.c:1214
 #, c-format
@@ -8143,120 +7367,122 @@
 
 #: src/util/common_logging.c:1235
 #, c-format
-msgid ""
-"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgid "Configuration specifies invalid value for option `%s' in section `%s': 
%s\n"
 msgstr ""
 
-#: src/util/configuration.c:291
+#: src/util/configuration.c:288
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:1028
+#: src/util/configuration.c:996
 #, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
+msgid "Configuration value '%s' for '%s' in section '%s' is not in set of 
legal choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1147
+#: src/util/configuration.c:1066
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1179
+#: src/util/configuration.c:1098
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1253
+#: src/util/configuration.c:1172
 #, c-format
-msgid ""
-"Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
-"as an environmental variable\n"
+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:429
+#: src/util/connection.c:423
 #, c-format
 msgid "Access denied to `%s'\n"
 msgstr ""
 
-#: src/util/connection.c:446
+#: src/util/connection.c:438
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/connection.c:553
 #, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
+msgid "Failed to establish TCP connection to `%s:%u', no further addresses to 
try.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:756
+#: src/util/connection.c:751 src/util/connection.c:919
 #, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
+msgid "Trying to connect to `%s' (%p)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:806
+#: src/util/connection.c:910
 #, c-format
-msgid "EdDSA signing failed at %s:%d: %s\n"
+msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:880
+#: src/util/container_bloomfilter.c:531
 #, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgid "Size of file on disk is incorrect for this Bloom filter (want %llu, 
have %llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:937
+#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
+#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
 #, 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
-#, 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.c:707 src/util/crypto_ecc.c:863
 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.c:744 src/util/crypto_ecc.c:900
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:194 src/util/crypto_ecc_setup.c:350
+#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
 #, c-format
-msgid ""
-"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
+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.c:778 src/util/crypto_ecc.c:934
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:413
+#: src/util/crypto_ecc.c:1016
 msgid "Could not load peer's private key\n"
 msgstr ""
 
-#: src/util/crypto_random.c:284
+#: src/util/crypto_ecc.c:1120
 #, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:999
+#: src/util/crypto_ecc.c:1170
 #, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
+msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:1226
+#: src/util/crypto_ecc.c:1244
 #, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr ""
+
+#: src/util/crypto_ecc.c:1301
+#, c-format
+msgid "EdDSA signature verification failed at %s:%d: %s\n"
+msgstr ""
+
+#: src/util/crypto_random.c:284
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr ""
+
+#: src/util/disk.c:1184
+#, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/disk.c:1449 src/util/service.c:1328
+#: src/util/disk.c:1546 src/util/service.c:1318
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
@@ -8321,77 +7547,62 @@
 msgid "Use %s to get a list of options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:90
+#: src/util/getopt_helpers.c:84
 #, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
+msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:274 src/util/getopt_helpers.c:332
+#: src/util/getopt_helpers.c:268 src/util/getopt_helpers.c:326
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:304
+#: src/util/getopt_helpers.c:298
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:111
+#: src/util/gnunet-config.c:90
 #, c-format
 msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:113
+#: src/util/gnunet-config.c:133
 #, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:157
-#, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:184
+#: src/util/gnunet-config.c:160
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:187
+#: src/util/gnunet-config.c:163
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:190
+#: src/util/gnunet-config.c:166
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:193
+#: src/util/gnunet-config.c:169
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:196
-msgid "print available configuration sections"
-msgstr ""
-
-#: src/util/gnunet-config.c:205
+#: src/util/gnunet-config.c:178
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:84
+#: src/util/gnunet-ecc.c:75
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:120
+#: src/util/gnunet-ecc.c:81
 #, c-format
-msgid "Generating %u keys like %s, please wait"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:133
-#, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:174
+#: src/util/gnunet-ecc.c:97
 #, c-format
 msgid ""
 "\n"
@@ -8398,14 +7609,16 @@
 "Failed to write to `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:107
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
+"\n"
+"Terminé !\n"
 
-#: src/util/gnunet-ecc.c:187
+#: src/util/gnunet-ecc.c:110
 #, c-format
 msgid ""
 "\n"
@@ -8412,46 +7625,50 @@
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:280
+#: src/util/gnunet-ecc.c:199
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:291
+#: src/util/gnunet-ecc.c:210
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:313
+#: src/util/gnunet-ecc.c:232
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:364
+#: src/util/gnunet-ecc.c:283
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:414
+#: src/util/gnunet-ecc.c:349
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:417
+#: src/util/gnunet-ecc.c:352
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:420
+#: src/util/gnunet-ecc.c:355
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:423
+#: src/util/gnunet-ecc.c:358
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:426
+#: src/util/gnunet-ecc.c:361
+msgid "print the hash of the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:364
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:375
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -8463,38 +7680,33 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:233
-#, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:294
+#: src/util/gnunet-scrypt.c:279
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:297
+#: src/util/gnunet-scrypt.c:282
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:300
+#: src/util/gnunet-scrypt.c:285
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:303
+#: src/util/gnunet-scrypt.c:288
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:315
+#: src/util/gnunet-scrypt.c:299
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:327
+#: src/util/gnunet-service-resolver.c:299
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:401
-#: src/util/gnunet-service-resolver.c:442
+#: src/util/gnunet-service-resolver.c:371
+#: src/util/gnunet-service-resolver.c:412
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
@@ -8523,116 +7735,120 @@
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:342
+#: src/util/helper.c:338
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr ""
 
-#: src/util/helper.c:388
+#: src/util/helper.c:383
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:620
+#: src/util/helper.c:609
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
 
-#: src/util/network.c:137
+#: src/util/network.c:134
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1731 src/util/network.c:1907
+#: src/util/network.c:1355 src/util/network.c:1480
 #, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+msgid "Fatal internal logic error, process hangs in `%s' (abort with 
CTRL-C)!\n"
 msgstr ""
 
 #: src/util/os_installation.c:421
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Could not determine installation path for %s.  Set `%s' environment 
variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:768
+#: src/util/os_installation.c:766
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:828
+#: src/util/os_installation.c:826
 #, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/os_installation.c:838
+#: src/util/os_installation.c:836
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/plugin.c:86
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/plugin.c:151
+#: src/util/plugin.c:148
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:226
+#: src/util/plugin.c:223
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:385
+#: src/util/plugin.c:382
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/program.c:246 src/util/service.c:1462
+#: src/util/program.c:246 src/util/service.c:1452
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/util/program.c:258 src/util/service.c:1477
+#: src/util/program.c:258 src/util/service.c:1467
 #, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr ""
 
-#: src/util/program.c:263 src/util/service.c:1472
+#: src/util/program.c:263 src/util/service.c:1462
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
-#: src/util/resolver_api.c:201
+#: src/util/resolver_api.c:198
 #, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:220
+#: src/util/resolver_api.c:216
 #, c-format
-msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+msgid "Must specify `%s' or numeric IP address for `%s' of `%s' in 
configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:354
+#: src/util/resolver_api.c:348
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:361
+#: src/util/resolver_api.c:352
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1027 src/util/resolver_api.c:1048
-#: src/util/resolver_api.c:1062
+#: src/util/resolver_api.c:908
 #, c-format
-msgid "Could not resolve our FQDN: %s\n"
+msgid "Could not resolve our FQDN : %s\n"
 msgstr ""
 
-#: src/util/server.c:483
+#: src/util/scheduler.c:813
+msgid "Looks like we're busy waiting...\n"
+msgstr ""
+
+#: src/util/scheduler.c:948
 #, c-format
+msgid "Attempt to cancel dead task %llu!\n"
+msgstr ""
+
+#: src/util/server.c:484
+#, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
@@ -8646,11 +7862,9 @@
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/util/server.c:904
+#: src/util/server.c:892
 #, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVER_receive_done' after %s\n"
+msgid "Processing code for message of type %u did not call 
`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
 #: src/util/service.c:347
@@ -8663,80 +7877,77 @@
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:410
+#: src/util/service.c:409
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:448
+#: src/util/service.c:446
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:565
+#: src/util/service.c:563
 #, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgid "Disabling IPv6 support for service `%s', failed to create IPv6 socket: 
%s\n"
 msgstr ""
 
-#: src/util/service.c:656
+#: src/util/service.c:653
 #, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+msgid "Disabling UNIX domain socket support for service `%s', failed to create 
UNIX domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:673
+#: src/util/service.c:669
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:912
+#: src/util/service.c:903
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:961 src/util/service.c:979
+#: src/util/service.c:952 src/util/service.c:970
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1004
+#: src/util/service.c:995
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1175
+#: src/util/service.c:1165
 #, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr ""
 
-#: src/util/service.c:1217
+#: src/util/service.c:1207
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1266
+#: src/util/service.c:1256
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1270
+#: src/util/service.c:1260
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1274
+#: src/util/service.c:1264
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1329
+#: src/util/service.c:1319
 msgid "No such user"
-msgstr ""
+msgstr "Aucun utilisateur trouvé"
 
-#: src/util/service.c:1342
+#: src/util/service.c:1332
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/util/service.c:1412
+#: src/util/service.c:1402
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -8745,240 +7956,226 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/socks.c:592
-#, c-format
-msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
-msgstr ""
-
-#: src/util/socks.c:605
-#, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
-msgstr ""
-
-#: src/util/strings.c:146
+#: src/util/strings.c:145
 msgid "b"
-msgstr ""
+msgstr "o"
 
-#: src/util/strings.c:437
+#: src/util/strings.c:433
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:565
+#: src/util/strings.c:561
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:662
+#: src/util/strings.c:658
 msgid "µs"
-msgstr ""
+msgstr "µs"
 
-#: src/util/strings.c:666
+#: src/util/strings.c:662
 msgid "forever"
-msgstr ""
+msgstr "perpetuel"
 
-#: src/util/strings.c:668
+#: src/util/strings.c:664
 msgid "0 ms"
-msgstr ""
+msgstr "0 ms"
 
-#: src/util/strings.c:674
+#: src/util/strings.c:670
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
-#: src/util/strings.c:680
+#: src/util/strings.c:676
 msgid "s"
-msgstr ""
+msgstr "s"
 
-#: src/util/strings.c:686
+#: src/util/strings.c:682
 msgid "m"
-msgstr ""
+msgstr "m"
 
-#: src/util/strings.c:692
+#: src/util/strings.c:688
 msgid "h"
-msgstr ""
+msgstr "h"
 
-#: src/util/strings.c:699
+#: src/util/strings.c:695
 msgid "day"
-msgstr ""
+msgstr "jour"
 
-#: src/util/strings.c:701
+#: src/util/strings.c:697
 msgid "days"
-msgstr ""
+msgstr "jours"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:726
 msgid "end of time"
-msgstr ""
+msgstr "fin du temps"
 
-#: src/util/strings.c:1229
+#: src/util/strings.c:1159
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1237
+#: src/util/strings.c:1167
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1243
+#: src/util/strings.c:1173
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1250
+#: src/util/strings.c:1180
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1259
+#: src/util/strings.c:1189
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1465 src/util/strings.c:1481
+#: src/util/strings.c:1395 src/util/strings.c:1411
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1490
+#: src/util/strings.c:1420
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1573 src/util/strings.c:1604 src/util/strings.c:1652
-#: src/util/strings.c:1673
+#: src/util/strings.c:1503 src/util/strings.c:1534 src/util/strings.c:1582
+#: src/util/strings.c:1603
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1630
+#: src/util/strings.c:1560
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1682
+#: src/util/strings.c:1612
 #, c-format
 msgid "Invalid format: `%s'\n"
-msgstr ""
+msgstr "fornat invalide : « %s »\n"
 
-#: src/util/strings.c:1734
+#: src/util/strings.c:1664
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1784
+#: src/util/strings.c:1714
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1815
+#: src/util/strings.c:1745
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:556 src/vpn/gnunet-service-vpn.c:1113
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
 msgid "# Active channels"
-msgstr ""
+msgstr "# Canaux actifs"
 
-#: src/vpn/gnunet-service-vpn.c:632
-msgid "# Bytes given to cadet for transmission"
+#: src/vpn/gnunet-service-vpn.c:642
+msgid "# Bytes given to mesh for transmission"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:670
-msgid "# Bytes dropped in cadet queue (overflow)"
+#: src/vpn/gnunet-service-vpn.c:680
+msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:781
-msgid "# Cadet channels created"
+#: src/vpn/gnunet-service-vpn.c:753
+msgid "# Mesh channels created"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:809
-msgid "Failed to setup cadet channel!\n"
+#: src/vpn/gnunet-service-vpn.c:784
+msgid "Failed to setup mesh channel!\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1008
+#: src/vpn/gnunet-service-vpn.c:978
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1133
-msgid "# Packets dropped (channel not yet online)"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:1344
+#: src/vpn/gnunet-service-vpn.c:1305
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1365
+#: src/vpn/gnunet-service-vpn.c:1326
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1571
+#: src/vpn/gnunet-service-vpn.c:1531
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1604 src/vpn/gnunet-service-vpn.c:1640
+#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1650
+#: src/vpn/gnunet-service-vpn.c:1610
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1664
+#: src/vpn/gnunet-service-vpn.c:1624
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1746
-msgid "# ICMP packets received from cadet"
+#: src/vpn/gnunet-service-vpn.c:1706
+msgid "# ICMP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2086
-msgid "# UDP packets received from cadet"
+#: src/vpn/gnunet-service-vpn.c:2045
+msgid "# UDP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2242
-msgid "# TCP packets received from cadet"
+#: src/vpn/gnunet-service-vpn.c:2200
+msgid "# TCP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2394
+#: src/vpn/gnunet-service-vpn.c:2351
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2449
+#: src/vpn/gnunet-service-vpn.c:2406
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2491 src/vpn/gnunet-service-vpn.c:2702
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2753
+#: src/vpn/gnunet-service-vpn.c:2715
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3019
+#: src/vpn/gnunet-service-vpn.c:2982
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3043
+#: src/vpn/gnunet-service-vpn.c:3006
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3051
+#: src/vpn/gnunet-service-vpn.c:3014
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3064
+#: src/vpn/gnunet-service-vpn.c:3027
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3077
+#: src/vpn/gnunet-service-vpn.c:3040
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3087
+#: src/vpn/gnunet-service-vpn.c:3050
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
 #: src/vpn/gnunet-vpn.c:147
 msgid "Error creating tunnel\n"
-msgstr ""
+msgstr "Erreur de création du tunnel\n"
 
 #: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
 #, c-format
@@ -9039,20 +8236,20 @@
 
 #: src/vpn/gnunet-vpn.c:323
 msgid "Setup tunnels via VPN."
-msgstr ""
+msgstr "Configurer des tunnels via VPN."
 
-#: src/include/gnunet_common.h:635 src/include/gnunet_common.h:642
-#: src/include/gnunet_common.h:650
+#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
+#: src/include/gnunet_common.h:581
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:662
+#: src/include/gnunet_common.h:593
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:698
+#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""




reply via email to

[Prev in Thread] Current Thread [Next in Thread]