[gnunet] branch master updated: -.po update

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: -.po update

From:	gnunet
Subject:	[gnunet] branch master updated: -.po update
Date:	Mon, 10 Jan 2022 15:18:31 +0100
This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 703540471 -.po update
703540471 is described below

commit 703540471ff65b37ed1b22c2eb9f70c1e196ce38
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Jan 10 15:18:28 2022 +0100

    -.po update
---
 contrib/gana |    2 +-
 po/de.po     | 1212 ++++-----
 po/es.po     | 1333 +++++-----
 po/fr.po     | 8127 +++++++++++++++++++++++++++++++---------------------------
 po/it.po     | 1090 ++++----
 po/sr.po     | 1290 +++++-----
 po/sv.po     | 1246 +++++----
 po/vi.po     | 1258 +++++----
 po/zh_CN.po  | 1100 ++++----
 9 files changed, 8379 insertions(+), 8279 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index 9b8a78758..278e13cd0 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 9b8a787580307cea5a38359c485d521cd8ece820
+Subproject commit 278e13cd0c4ff95e33b822e48effefa9604eef52
diff --git a/po/de.po b/po/de.po
index dc8abce9b..678ba739f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-10-15 10:46+0200\n"
+"POT-Creation-Date: 2022-01-10 15:13+0100\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -21,129 +21,134 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.7.4\n"
 
-#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1302
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1304
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:901
+#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
 #, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:560 src/abd/gnunet-service-abd.c:1747
-#: src/namestore/gnunet-namestore-fcfsd.c:1067
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
 #: src/namestore/gnunet-namestore.c:1001
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/abd/gnunet-abd.c:840 src/abd/gnunet-abd.c:891
+#: src/abd/gnunet-abd.c:566
+#, fuzzy
+msgid "Ego does not exist!\n"
+msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n"
+
+#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/abd/gnunet-abd.c:849 src/abd/gnunet-abd.c:910
+#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
 #, fuzzy, c-format
 msgid "Failed to connect to ABD\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/abd/gnunet-abd.c:855
+#: src/abd/gnunet-abd.c:865
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:862
+#: src/abd/gnunet-abd.c:872
 #, fuzzy, c-format
 msgid "ego required\n"
 msgstr "Gültiger Typ ist erforderlich\n"
 
-#: src/abd/gnunet-abd.c:872
+#: src/abd/gnunet-abd.c:882
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:881
+#: src/abd/gnunet-abd.c:890
 #, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:916
+#: src/abd/gnunet-abd.c:924
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:975
+#: src/abd/gnunet-abd.c:983
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:996
+#: src/abd/gnunet-abd.c:1004
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1003
+#: src/abd/gnunet-abd.c:1011
 #, fuzzy
 msgid ""
 "The public key of the subject to lookup thecredential for, or for issuer "
 "side storage: subject and its attributes"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/abd/gnunet-abd.c:1010
+#: src/abd/gnunet-abd.c:1018
 msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1017
+#: src/abd/gnunet-abd.c:1025
 msgid "The public key of the authority to verify the credential against"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1022
+#: src/abd/gnunet-abd.c:1030
 msgid "The ego/zone name to use"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1028
+#: src/abd/gnunet-abd.c:1036
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1034
+#: src/abd/gnunet-abd.c:1042
 msgid ""
 "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1039
+#: src/abd/gnunet-abd.c:1047
 msgid "collect credentials"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1044
+#: src/abd/gnunet-abd.c:1052
 msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1049
+#: src/abd/gnunet-abd.c:1057
 msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1054
+#: src/abd/gnunet-abd.c:1062
 msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1061
+#: src/abd/gnunet-abd.c:1069
 msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1065
+#: src/abd/gnunet-abd.c:1073
 msgid "Create private record entry."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1071 src/abd/gnunet-abd.c:1077
+#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
 msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1090
+#: src/abd/gnunet-abd.c:1098
 #, fuzzy
 msgid "GNUnet abd resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/abd/gnunet-service-abd.c:1742 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -383,28 +388,28 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1129
 #: src/transport/plugin_transport_tcp.c:3706
 #: src/transport/tcp_service_legacy.c:594
-#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1090
-#: src/util/service.c:1096
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1094
+#: src/util/service.c:1100
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
 #: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
-#: src/util/service.c:1129
+#: src/util/service.c:1133
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
 #: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
-#: src/util/service.c:1133
+#: src/util/service.c:1137
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
-#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1153
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1157
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -412,7 +417,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
-#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1171
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1175
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -420,7 +425,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:536
 #: src/transport/plugin_transport_http_server.c:2718
 #: src/transport/plugin_transport_tcp.c:1244
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1202
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1206
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
@@ -428,7 +433,7 @@ msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
 #: src/arm/gnunet-service-arm.c:555
 #: src/transport/plugin_transport_http_server.c:2736
 #: src/transport/plugin_transport_tcp.c:1263
-#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1221
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1225
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -1317,34 +1322,34 @@ msgstr ""
 msgid "Print information about connected peers."
 msgstr "Informationen über verbundene Knoten ausgeben."
 
-#: src/core/gnunet-service-core.c:329
+#: src/core/gnunet-service-core.c:328
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core.c:355
+#: src/core/gnunet-service-core.c:354
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
+#: src/core/gnunet-service-core.c:418
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core.c:506
+#: src/core/gnunet-service-core.c:504
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:825
+#: src/core/gnunet-service-core.c:823
 #, fuzzy, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core.c:927
+#: src/core/gnunet-service-core.c:925
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:955
+#: src/core/gnunet-service-core.c:953
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Dienst »%s« wird neu gestartet.\n"
@@ -1502,9 +1507,7 @@ msgstr "# Bytes entschlüsselt"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/dht/gnunet-service-dht_neighbours.c:740
-#: src/dht/gnunet-service-dht_neighbours.c:803
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1522
+#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1520
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1537,49 +1540,44 @@ msgstr "# Bytes empfangen über TCP"
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:299
-#: src/datastore/gnunet-service-datastore.c:742
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:275
+#: src/datastore/gnunet-service-datastore.c:743
 msgid "# bytes stored"
 msgstr "# gespeicherte Bytes"
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:303
+#: src/datacache/datacache.c:121 src/datacache/datacache.c:279
 msgid "# items stored"
 msgstr "# gespeicherte Objekte"
 
-#: src/datacache/datacache.c:190
+#: src/datacache/datacache.c:185
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:208
+#: src/datacache/datacache.c:203
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/datacache/datacache.c:332
+#: src/datacache/datacache.c:297
 msgid "# requests received"
 msgstr "# Anfragen empfangen"
 
-#: src/datacache/datacache.c:343
+#: src/datacache/datacache.c:308
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/datacache.c:370
-#, fuzzy
-msgid "# requests for random value received"
-msgstr "# Anfragen empfangen"
-
-#: src/datacache/datacache.c:400
+#: src/datacache/datacache.c:329
 #, fuzzy
 msgid "# proximity search requests received"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/datacache/plugin_datacache_heap.c:554
+#: src/datacache/plugin_datacache_heap.c:527
 msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:123
-#: src/datacache/plugin_datacache_sqlite.c:144
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:139
 #: src/datastore/plugin_datastore_mysql.c:890
 #: src/datastore/plugin_datastore_sqlite.c:63
 #: src/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:81 src/my/my.c:93
@@ -1596,7 +1594,7 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "»%s« schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:783
+#: src/datacache/plugin_datacache_sqlite.c:693
 #: src/datastore/plugin_datastore_sqlite.c:531
 #: src/namecache/plugin_namecache_sqlite.c:237
 #: src/namestore/plugin_namestore_sqlite.c:273
@@ -1757,135 +1755,135 @@ msgid ""
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:605
+#: src/datastore/gnunet-service-datastore.c:606
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:611
+#: src/datastore/gnunet-service-datastore.c:612
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:618
+#: src/datastore/gnunet-service-datastore.c:619
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:625
-#: src/datastore/gnunet-service-datastore.c:676
-#: src/datastore/gnunet-service-datastore.c:819
-#: src/datastore/gnunet-service-datastore.c:1428
+#: src/datastore/gnunet-service-datastore.c:626
+#: src/datastore/gnunet-service-datastore.c:677
+#: src/datastore/gnunet-service-datastore.c:820
+#: src/datastore/gnunet-service-datastore.c:1429
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:692
+#: src/datastore/gnunet-service-datastore.c:693
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:757
+#: src/datastore/gnunet-service-datastore.c:758
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:857
+#: src/datastore/gnunet-service-datastore.c:858
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:887
+#: src/datastore/gnunet-service-datastore.c:888
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:898
+#: src/datastore/gnunet-service-datastore.c:899
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:939
+#: src/datastore/gnunet-service-datastore.c:940
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:970
+#: src/datastore/gnunet-service-datastore.c:971
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1011
+#: src/datastore/gnunet-service-datastore.c:1012
 msgid "Content not found"
 msgstr "Kein Inhalt gefunden"
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1019
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1058
+#: src/datastore/gnunet-service-datastore.c:1059
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/datastore/gnunet-service-datastore.c:1108
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1282
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/datastore/gnunet-service-datastore.c:1168
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/datastore/gnunet-service-datastore.c:1177
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1236
+#: src/datastore/gnunet-service-datastore.c:1237
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1288
+#: src/datastore/gnunet-service-datastore.c:1289
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1298
+#: src/datastore/gnunet-service-datastore.c:1299
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/datastore/gnunet-service-datastore.c:1464
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/datastore/gnunet-service-datastore.c:1472
+#: src/datastore/gnunet-service-datastore.c:1473
 msgid "# quota"
 msgstr "# Kontingent"
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1476
 msgid "# cache size"
 msgstr "# Zwischenspeichergröße"
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/datastore/gnunet-service-datastore.c:1492
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/datastore/gnunet-service-datastore.c:1513
+#: src/datastore/gnunet-service-datastore.c:1535
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1573
+#: src/datastore/gnunet-service-datastore.c:1574
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Bloomfilter konnte nicht initialisiert werden.\n"
 
@@ -1980,52 +1978,52 @@ msgstr "Sqlite-Datenbank läuft\n"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:158
+#: src/dht/gnunet-dht-get.c:159
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:160
 #, c-format
 msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:197
+#: src/dht/gnunet-dht-get.c:209
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:203 src/dht/gnunet-dht-monitor.c:255
+#: src/dht/gnunet-dht-get.c:217 src/dht/gnunet-dht-monitor.c:255
 msgid "Failed to connect to DHT service!\n"
 msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
 
-#: src/dht/gnunet-dht-get.c:213
+#: src/dht/gnunet-dht-get.c:227
 msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:260 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:251
+#: src/dht/gnunet-dht-get.c:266
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:256 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:272 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:262
+#: src/dht/gnunet-dht-get.c:278
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-get.c:284 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:301
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -2056,256 +2054,30 @@ msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:187
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:193
+#: src/dht/gnunet-dht-put.c:194
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:212
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:212
+#: src/dht/gnunet-dht-put.c:217
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-put.c:223
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:232
+#: src/dht/gnunet-dht-put.c:241
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:367
-#, fuzzy
-msgid "# GET requests from clients injected"
-msgstr "# gap Anfragen mit taktischer Entscheidung: nicht Antworten"
-
-#: src/dht/gnunet-service-dht_clients.c:483
-#, fuzzy
-msgid "# PUT requests received from clients"
-msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:616
-#, fuzzy
-msgid "# GET requests received from clients"
-msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:848
-#, fuzzy
-msgid "# GET STOP requests received from clients"
-msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:1033
-msgid "# Key match, type mismatches in REPLY to CLIENT"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1049
-msgid "# Duplicate REPLIES to CLIENT request dropped"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1102
-#, c-format
-msgid "Unsupported block type (%u) in request!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1110
-msgid "# RESULTS queued for clients"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1191
-msgid "# REPLIES ignored for CLIENTS (no match)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:73
-#, c-format
-msgid "%s request received, but have no datacache!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:83
-msgid "# ITEMS stored in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:206
-msgid "# Good RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:220
-msgid "# Duplicate RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:228
-msgid "# Invalid RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:236
-msgid "# Irrelevant RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:252
-msgid "# Unsupported RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:256
-#, c-format
-msgid "Unsupported block type (%u) in local response!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:291
-msgid "# GET requests given to datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_hello.c:86
-msgid "# HELLOs obtained from peerinfo"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:678
-#, fuzzy
-msgid "# FIND PEER messages initiated"
-msgstr "# PING Nachrichten erstellt"
-
-#: src/dht/gnunet-service-dht_neighbours.c:855
-#, fuzzy
-msgid "# requests TTL-dropped"
-msgstr "# dht Anfragen weitergeleitet"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1042
-#: src/dht/gnunet-service-dht_neighbours.c:1079
-msgid "# Peers excluded from routing due to Bloomfilter"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1095
-#, fuzzy
-msgid "# Peer selection failed"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1253
-#, fuzzy
-msgid "# PUT requests routed"
-msgstr "# dht Anfragen weitergeleitet"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1287
-msgid "# PUT messages queued for transmission"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1299
-#: src/dht/gnunet-service-dht_neighbours.c:1441
-#: src/dht/gnunet-service-dht_neighbours.c:1545
-msgid "# P2P messages dropped due to full queue"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1384
-#, fuzzy
-msgid "# GET requests routed"
-msgstr "# dht Anfragen weitergeleitet"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1428
-msgid "# GET messages queued for transmission"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1560
-msgid "# RESULT messages queued for transmission"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1663
-#, fuzzy
-msgid "# Expired PUTs discarded"
-msgstr "# verworfener Nachrichten"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1671
-#, fuzzy
-msgid "# P2P PUT requests received"
-msgstr "# Client Trace-Anfragen empfangen"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1675
-#, fuzzy
-msgid "# P2P PUT bytes received"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1907
-msgid "# FIND PEER requests ignored due to Bloomfilter"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1916
-msgid "# FIND PEER requests ignored due to lack of HELLO"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2079
-#, fuzzy
-msgid "# P2P GET requests received"
-msgstr "# Client Trace-Anfragen empfangen"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2083
-#, fuzzy
-msgid "# P2P GET bytes received"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2149
-msgid "# P2P FIND PEER requests processed"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2170
-#, fuzzy
-msgid "# P2P GET requests ONLY routed"
-msgstr "# dht Anfragen weitergeleitet"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2348
-#, fuzzy
-msgid "# Expired results discarded"
-msgstr "# verworfener Nachrichten"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2365
-msgid "# P2P RESULTS received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2369
-#, fuzzy
-msgid "# P2P RESULT bytes received"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/dht/gnunet-service-dht_nse.c:59
-#, fuzzy
-msgid "# Network size estimates received"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
-
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Good REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:236
-msgid "# Duplicate REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:244
-msgid "# Invalid REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:252
-msgid "# Irrelevant REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:268
-msgid "# Unsupported REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:347
-msgid "# Entries removed from routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:422
-msgid "# Entries added to routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:444
-#, fuzzy
-msgid "# DHT requests combined"
-msgstr "# dht Anfragen weitergeleitet"
-
 #: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
@@ -2353,17 +2125,17 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:189
+#: src/dht/plugin_block_dht.c:328
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/dht/plugin_block_dht.c:198
+#: src/dht/plugin_block_dht.c:337
 #, c-format
 msgid "Size mismatch for block with type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:209
+#: src/dht/plugin_block_dht.c:348
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -3657,7 +3429,7 @@ msgstr "# verschlüsselter PING Nachrichten empfangen"
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1345
+#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
@@ -3665,64 +3437,47 @@ msgstr ""
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:869
-msgid "# replies dropped due to type mismatch"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:877
-#, fuzzy
-msgid "# replies received for other peers"
-msgstr "# Bytes des Typs %d empfangen"
-
-#: src/fs/gnunet-service-fs_cp.c:892
-msgid "# replies dropped due to insufficient cover traffic"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:940
-msgid "# P2P searches destroyed due to ultimate reply"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1011
+#: src/fs/gnunet-service-fs_cp.c:1009
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1036
+#: src/fs/gnunet-service-fs_cp.c:1034
 #, fuzzy
 msgid "# request dropped, priority insufficient"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1046
+#: src/fs/gnunet-service-fs_cp.c:1044
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1141
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1199
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1225
+#: src/fs/gnunet-service-fs_cp.c:1223
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1239
+#: src/fs/gnunet-service-fs_cp.c:1237
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1296
+#: src/fs/gnunet-service-fs_cp.c:1294
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1341
+#: src/fs/gnunet-service-fs_cp.c:1339
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1711
+#: src/fs/gnunet-service-fs_cp.c:1709
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -3805,108 +3560,94 @@ msgstr ""
 msgid "# Pending requests created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:656
+#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:658
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:832
+#: src/fs/gnunet-service-fs_pr.c:838
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:880
-msgid "# duplicate replies discarded (bloomfilter)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:889
-#, fuzzy
-msgid "# irrelevant replies discarded"
-msgstr "# verworfener Nachrichten"
-
-#: src/fs/gnunet-service-fs_pr.c:908
-#, c-format
-msgid "Unsupported block type %u\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:921
+#: src/fs/gnunet-service-fs_pr.c:916
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1055
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1084
+#: src/fs/gnunet-service-fs_pr.c:1079
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:1123
+#: src/fs/gnunet-service-fs_pr.c:1118
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1259
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1318
+#: src/fs/gnunet-service-fs_pr.c:1313
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1339
+#: src/fs/gnunet-service-fs_pr.c:1334
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1402
+#: src/fs/gnunet-service-fs_pr.c:1401
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1464
+#: src/fs/gnunet-service-fs_pr.c:1463
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1519
+#: src/fs/gnunet-service-fs_pr.c:1518
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1534
+#: src/fs/gnunet-service-fs_pr.c:1533
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1557
+#: src/fs/gnunet-service-fs_pr.c:1556
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1574
+#: src/fs/gnunet-service-fs_pr.c:1573
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1594
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1600
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1642
+#: src/fs/gnunet-service-fs_pr.c:1641
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1655
+#: src/fs/gnunet-service-fs_pr.c:1654
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1706
+#: src/fs/gnunet-service-fs_pr.c:1705
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1756
+#: src/fs/gnunet-service-fs_pr.c:1755
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -3950,31 +3691,26 @@ msgstr ""
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:134
-#, fuzzy, c-format
-msgid "Refusing `%s' request to HTTP server\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/gns/gnunet-bcd.c:347
+#: src/gns/gnunet-bcd.c:571
 #, fuzzy, c-format
-msgid "Invalid port number %u.  Exiting.\n"
+msgid "Invalid port number %u\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/gns/gnunet-bcd.c:352
-#, fuzzy, c-format
-msgid "Businesscard HTTP server starts on %u\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+#: src/gns/gnunet-bcd.c:612 src/namestore/gnunet-namestore-fcfsd.c:1113
+#, fuzzy
+msgid "Unable to set up the daemon\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/gns/gnunet-bcd.c:372
-#, fuzzy, c-format
-msgid "Could not start businesscard HTTP server on port %u\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+#: src/gns/gnunet-bcd.c:635 src/namestore/gnunet-namestore-fcfsd.c:987
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-bcd.c:509
-msgid "Run HTTP serve on port PORT (default is 8888)"
+#: src/gns/gnunet-bcd.c:658
+msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:522
+#: src/gns/gnunet-bcd.c:667
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
@@ -4758,62 +4494,79 @@ msgstr "»%s« ist keine gültige IP-Adresse.\n"
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/identity/gnunet-identity.c:214
+#: src/identity/gnunet-identity.c:231
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/identity/gnunet-identity.c:255
+#: src/identity/gnunet-identity.c:272
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/identity/gnunet-identity.c:461
+#: src/identity/gnunet-identity.c:646
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:466
+#: src/identity/gnunet-identity.c:651
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:472
+#: src/identity/gnunet-identity.c:657
 msgid ""
 "set the private key for the identity to PRIVATE_KEY (use together with -C)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:477
+#: src/identity/gnunet-identity.c:663
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:669
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:674
 msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:481
+#: src/identity/gnunet-identity.c:678
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:485
+#: src/identity/gnunet-identity.c:682
 #, fuzzy
 msgid "reduce output"
 msgstr "Ausführliche Ausgabe"
 
-#: src/identity/gnunet-identity.c:492
+#: src/identity/gnunet-identity.c:689
 msgid ""
 "set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
-"s) or restrict results to NAME (use together with -d)"
+"s), restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:496
+#: src/identity/gnunet-identity.c:695
+msgid "The public key of the recipient (with -W)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:699
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:500
+#: src/identity/gnunet-identity.c:703
 msgid "display private keys as well"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:507
+#: src/identity/gnunet-identity.c:710
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:522
+#: src/identity/gnunet-identity.c:725
 msgid "Maintain egos"
 msgstr ""
 
@@ -4873,6 +4626,12 @@ msgstr ""
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
+#: src/messenger/plugin_gnsrecord_messenger.c:118
+#: src/messenger/plugin_gnsrecord_messenger.c:133
+#, fuzzy, c-format
+msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
 #: src/my/my.c:196 src/my/my.c:215
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
@@ -4913,7 +4672,7 @@ msgstr "Ungültiger Parameter: `%s'\n"
 msgid "You must specify a name\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1639
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1641
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4922,7 +4681,7 @@ msgstr ""
 msgid "specifies the public key of the zone to look in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1700
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1702
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -4972,111 +4731,101 @@ msgstr "Sqlite-Datenbank läuft\n"
 msgid "Failed to setup database at `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:359
+#: src/namestore/gnunet-namestore-fcfsd.c:368
 #, fuzzy
 msgid "can not search the namestore"
 msgstr "GNUnet testbed Controller starten."
 
-#: src/namestore/gnunet-namestore-fcfsd.c:413
-#: src/namestore/gnunet-namestore-fcfsd.c:554
+#: src/namestore/gnunet-namestore-fcfsd.c:422
+#: src/namestore/gnunet-namestore-fcfsd.c:563
 #, fuzzy
 msgid "unable to scan namestore"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:441
+#: src/namestore/gnunet-namestore-fcfsd.c:450
 #, fuzzy, c-format
 msgid "Failed to create record for `%s': %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:453
+#: src/namestore/gnunet-namestore-fcfsd.c:462
 #, fuzzy
 msgid "no errors"
 msgstr "Unbekannter Fehler"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:489
+#: src/namestore/gnunet-namestore-fcfsd.c:498
 #, c-format
 msgid "The requested key `%s' exists as `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/namestore/gnunet-namestore-fcfsd.c:505
 msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:513
+#: src/namestore/gnunet-namestore-fcfsd.c:522
 #, fuzzy
 msgid "Error creating record data\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:517
+#: src/namestore/gnunet-namestore-fcfsd.c:526
 #, fuzzy
 msgid "unable to store record"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:588
+#: src/namestore/gnunet-namestore-fcfsd.c:597
 #, c-format
 msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:594
+#: src/namestore/gnunet-namestore-fcfsd.c:603
 msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:780
+#: src/namestore/gnunet-namestore-fcfsd.c:789
 msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
+#: src/namestore/gnunet-namestore-fcfsd.c:800
 msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:806
+#: src/namestore/gnunet-namestore-fcfsd.c:819
 #, fuzzy
 msgid "invalid parameters"
 msgstr "Ungültiges Argument »%s«\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:823
+#: src/namestore/gnunet-namestore-fcfsd.c:836
 #, fuzzy
 msgid "invalid name"
 msgstr "Ungültiges Argument »%s«\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
+#: src/namestore/gnunet-namestore-fcfsd.c:847
 #, fuzzy, c-format
 msgid "Unable to parse key %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:838
+#: src/namestore/gnunet-namestore-fcfsd.c:851
 #, fuzzy
 msgid "unable to parse key"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:949
+#: src/namestore/gnunet-namestore-fcfsd.c:962
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:974
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1058
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
 msgid "No port specified, using default value\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1076
+#: src/namestore/gnunet-namestore-fcfsd.c:1089
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1100
-#, fuzzy
-msgid "Unable to set up the daemon\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1123
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
 msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1132
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
@@ -5153,7 +4902,7 @@ msgstr ""
 #: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1066
 #: src/namestore/gnunet-namestore.c:1076 src/namestore/gnunet-namestore.c:1105
 #: src/namestore/gnunet-namestore.c:1126 src/namestore/gnunet-namestore.c:1153
-#: src/namestore/gnunet-namestore.c:1228
+#: src/namestore/gnunet-namestore.c:1230
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
@@ -5169,7 +4918,7 @@ msgstr "Ungültiger Parameter: `%s'\n"
 
 #: src/namestore/gnunet-namestore.c:1068 src/namestore/gnunet-namestore.c:1078
 #: src/namestore/gnunet-namestore.c:1107 src/namestore/gnunet-namestore.c:1128
-#: src/namestore/gnunet-namestore.c:1230
+#: src/namestore/gnunet-namestore.c:1232
 msgid "add"
 msgstr ""
 
@@ -5188,7 +4937,7 @@ msgstr ""
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
 
-#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1237
+#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1239
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -5202,18 +4951,18 @@ msgstr ""
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1220
+#: src/namestore/gnunet-namestore.c:1222
 #: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1290
+#: src/namestore/gnunet-namestore.c:1292
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1340
+#: src/namestore/gnunet-namestore.c:1342
 #, c-format
 msgid ""
 "No default identity configured for `namestore' subsystem\n"
@@ -5221,99 +4970,99 @@ msgid ""
 "Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1405
+#: src/namestore/gnunet-namestore.c:1407
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1434
+#: src/namestore/gnunet-namestore.c:1436
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1483
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1493
+#: src/namestore/gnunet-namestore.c:1495
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1505 src/namestore/gnunet-namestore.c:1521
-#: src/namestore/gnunet-namestore.c:1538
+#: src/namestore/gnunet-namestore.c:1507 src/namestore/gnunet-namestore.c:1523
+#: src/namestore/gnunet-namestore.c:1540
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/namestore/gnunet-namestore.c:1513
+#: src/namestore/gnunet-namestore.c:1515
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Unbekannter Befehl »%s«\n"
 
-#: src/namestore/gnunet-namestore.c:1551
+#: src/namestore/gnunet-namestore.c:1553
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Ungültiges Format für IP: »%s«\n"
 
-#: src/namestore/gnunet-namestore.c:1608
+#: src/namestore/gnunet-namestore.c:1610
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1611
+#: src/namestore/gnunet-namestore.c:1613
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1615
+#: src/namestore/gnunet-namestore.c:1617
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1622
+#: src/namestore/gnunet-namestore.c:1624
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1628
+#: src/namestore/gnunet-namestore.c:1630
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1633
+#: src/namestore/gnunet-namestore.c:1635
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1645
+#: src/namestore/gnunet-namestore.c:1647
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1652
+#: src/namestore/gnunet-namestore.c:1654
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1658
+#: src/namestore/gnunet-namestore.c:1660
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1663
+#: src/namestore/gnunet-namestore.c:1665
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1669
+#: src/namestore/gnunet-namestore.c:1671
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1673
+#: src/namestore/gnunet-namestore.c:1675
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1679
+#: src/namestore/gnunet-namestore.c:1681
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1685
+#: src/namestore/gnunet-namestore.c:1687
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5667,8 +5416,8 @@ msgstr ""
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1450
-#: src/revocation/gnunet-service-revocation.c:883 src/util/gnunet-scrypt.c:260
+#: src/nse/gnunet-service-nse.c:1441
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5866,11 +5615,6 @@ msgstr ""
 msgid "Unable to create indices: %s.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/pq/pq_prepare.c:109
-#, fuzzy, c-format
-msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
-msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
-
 #: src/pt/gnunet-daemon-pt.c:418
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
@@ -5934,86 +5678,86 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:801
+#: src/reclaim/gnunet-reclaim.c:802
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/reclaim/gnunet-reclaim.c:808
+#: src/reclaim/gnunet-reclaim.c:809
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:815
+#: src/reclaim/gnunet-reclaim.c:816
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/reclaim/gnunet-reclaim.c:833
-msgid "Add an attribute NAME"
+#: src/reclaim/gnunet-reclaim.c:834
+msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:838
+#: src/reclaim/gnunet-reclaim.c:839
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:843
+#: src/reclaim/gnunet-reclaim.c:844
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:848
+#: src/reclaim/gnunet-reclaim.c:849
 msgid "The EGO to use"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:854
+#: src/reclaim/gnunet-reclaim.c:855
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:858
+#: src/reclaim/gnunet-reclaim.c:859
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:862
+#: src/reclaim/gnunet-reclaim.c:863
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:868
+#: src/reclaim/gnunet-reclaim.c:869
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:873
+#: src/reclaim/gnunet-reclaim.c:874
 msgid "Credential name"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:879
+#: src/reclaim/gnunet-reclaim.c:880
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:884
+#: src/reclaim/gnunet-reclaim.c:885
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:889
+#: src/reclaim/gnunet-reclaim.c:890
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:894
+#: src/reclaim/gnunet-reclaim.c:895
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:899
+#: src/reclaim/gnunet-reclaim.c:900
 msgid "Type of credential"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:903
+#: src/reclaim/gnunet-reclaim.c:904
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:909
+#: src/reclaim/gnunet-reclaim.c:910
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:917
+#: src/reclaim/gnunet-reclaim.c:918
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -6041,56 +5785,56 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1392
+#: src/regex/gnunet-regex-profiler.c:1388
 msgid "No configuration file given. Exiting\n"
 msgstr "Keine Konfigurationsdatei angegeben. Abbruch\n"
 
-#: src/regex/gnunet-regex-profiler.c:1434
+#: src/regex/gnunet-regex-profiler.c:1430
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1440
+#: src/regex/gnunet-regex-profiler.c:1436
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1448
+#: src/regex/gnunet-regex-profiler.c:1444
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "Keine Dateien in »%s« gefunden\n"
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1453
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1477
+#: src/regex/gnunet-regex-profiler.c:1473
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1565
+#: src/regex/gnunet-regex-profiler.c:1562
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1572
+#: src/regex/gnunet-regex-profiler.c:1569
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1578
+#: src/regex/gnunet-regex-profiler.c:1575
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1586
+#: src/regex/gnunet-regex-profiler.c:1582
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1593
+#: src/regex/gnunet-regex-profiler.c:1589
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1606
+#: src/regex/gnunet-regex-profiler.c:1604
 msgid "Profiler for regex"
 msgstr ""
 
@@ -6260,35 +6004,35 @@ msgstr ""
 msgid "number of epochs to calculate for"
 msgstr "Anzahl an Durchläufen"
 
-#: src/revocation/gnunet-service-revocation.c:502
+#: src/revocation/gnunet-service-revocation.c:507
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:512
+#: src/revocation/gnunet-service-revocation.c:517
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/revocation/gnunet-service-revocation.c:517
+#: src/revocation/gnunet-service-revocation.c:522
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:521
+#: src/revocation/gnunet-service-revocation.c:526
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/revocation/gnunet-service-revocation.c:529
+#: src/revocation/gnunet-service-revocation.c:534
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/revocation/gnunet-service-revocation.c:567
+#: src/revocation/gnunet-service-revocation.c:572
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:920
+#: src/revocation/gnunet-service-revocation.c:925
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
@@ -6819,17 +6563,17 @@ msgid ""
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2643
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2651
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2659
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
@@ -7029,9 +6773,9 @@ msgstr "# HELLO-Meldungen empfangen"
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:3329
-#: src/transport/gnunet-communicator-udp.c:3814
-#: src/transport/gnunet-service-tng.c:10388
+#: src/transport/gnunet-communicator-tcp.c:3338
+#: src/transport/gnunet-communicator-udp.c:3856
+#: src/transport/gnunet-service-tng.c:10512
 #: src/transport/gnunet-service-transport.c:2627
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
@@ -7040,7 +6784,7 @@ msgstr ""
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:3889
+#: src/transport/gnunet-communicator-udp.c:3931
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -8031,17 +7775,17 @@ msgstr "Zugriff verweigert auf »%s«\n"
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1396
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1400
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1408
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1412
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1415
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1419
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
@@ -8053,7 +7797,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:833
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -8063,23 +7807,23 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:946
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:950
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:451 src/util/service.c:987
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:991
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:890
-#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1476
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1480
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1500
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1504
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8094,45 +7838,45 @@ msgstr "Es konnte keine Verbindung mit gnunetd 
hergestellt werden.\n"
 msgid "Service `%s' runs at %s\n"
 msgstr "Dienst »%s« läuft auf %s\n"
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1746
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1750
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1751
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1756
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
 msgid "Service process failed to report status\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1220
-#: src/util/service.c:1637
+#: src/util/service.c:1641
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1639
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1643
 msgid "No such user"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1653
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu »%s« geändert werden: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:1996
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2000
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1397
-#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2072
-#: src/util/service.c:2084
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2076
+#: src/util/service.c:2088
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2094
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2098
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "GNUnet Konfiguration"
@@ -8383,7 +8127,7 @@ msgstr ""
 msgid "failed to load configuration defaults"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
 
-#: src/util/container_bloomfilter.c:553
+#: src/util/container_bloomfilter.c:547
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8400,7 +8144,7 @@ msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: 
`%s'.\n"
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/crypto_ecc_setup.c:273
+#: src/util/crypto_ecc_setup.c:280
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
@@ -8411,12 +8155,12 @@ msgid "libgcrypt has not the expected version (version 
%s is required).\n"
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/crypto_rsa.c:862
+#: src/util/crypto_rsa.c:901
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_rsa.c:1162
+#: src/util/crypto_rsa.c:1201
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
@@ -8521,11 +8265,11 @@ msgstr "Die Option »%s« ergibt keinen Sinn ohne die 
Option »%s«.\n"
 msgid "Missing mandatory option `%s'.\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/util/getopt_helpers.c:69
+#: src/util/getopt_helpers.c:63
 msgid "print the version number"
 msgstr ""
 
-#: src/util/getopt_helpers.c:116
+#: src/util/getopt_helpers.c:110
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8533,74 +8277,84 @@ msgstr ""
 "Argumente, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\n"
 
-#: src/util/getopt_helpers.c:208
+#: src/util/getopt_helpers.c:196
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:288
+#: src/util/getopt_helpers.c:261
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:429
+#: src/util/getopt_helpers.c:377
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:510
+#: src/util/getopt_helpers.c:444
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:532
+#: src/util/getopt_helpers.c:461
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:859
-#: src/util/getopt_helpers.c:924
+#: src/util/getopt_helpers.c:497 src/util/getopt_helpers.c:811
+#: src/util/getopt_helpers.c:867
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
 
-#: src/util/getopt_helpers.c:649
+#: src/util/getopt_helpers.c:569
 #, fuzzy, c-format
 msgid ""
 "You must pass a relative time (optionally with sign) to the `%s' option.\n"
 msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
 
-#: src/util/getopt_helpers.c:656
+#: src/util/getopt_helpers.c:576
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:683
+#: src/util/getopt_helpers.c:594
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:685
+#: src/util/getopt_helpers.c:596
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:720
+#: src/util/getopt_helpers.c:630
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
 
-#: src/util/getopt_helpers.c:785
+#: src/util/getopt_helpers.c:684
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
 
-#: src/util/getopt_helpers.c:852
+#: src/util/getopt_helpers.c:741
+#, fuzzy, c-format
+msgid "You must pass a timestamp to the `%s' option.\n"
+msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
+
+#: src/util/getopt_helpers.c:748
+#, c-format
+msgid "The maximum precision allowed for timestamps is seconds.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:804
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:931
+#: src/util/getopt_helpers.c:874
 #, fuzzy, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
 
-#: src/util/getopt_helpers.c:1018
+#: src/util/getopt_helpers.c:952
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
@@ -8728,31 +8482,84 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet-qr.c:145 src/util/gnunet-uri.c:94
-#, c-format
-msgid "Invalid URI: does not start with `%s'\n"
+#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
+#, fuzzy, c-format
+msgid "Failed to add URI %s\n"
+msgstr "Datei `%s' hat URI: %s\n"
+
+#: src/util/gnunet-qr.c:133
+#, fuzzy, c-format
+msgid "Added URI %s\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/util/gnunet-qr.c:160
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr "URL beginnt nicht mit »%s«\n"
 
-#: src/util/gnunet-qr.c:152 src/util/gnunet-uri.c:101
+#: src/util/gnunet-qr.c:170
 #, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
+msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:159 src/util/gnunet-uri.c:108
+#: src/util/gnunet-qr.c:181
 #, c-format
-msgid "No handler known for subsystem `%s'\n"
+msgid "No known handler for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:357
-msgid "use video-device DEVICE (default: /dev/video0"
+#: src/util/gnunet-qr.c:217
+#, fuzzy, c-format
+msgid "Unable to start child process `%s'\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#: src/util/gnunet-qr.c:246
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "»%s« kann nicht geöffnet werden: %s\n"
+
+#: src/util/gnunet-qr.c:260
+#, fuzzy
+msgid "Capturing...\n"
+msgstr "%s wird gestartet …\n"
+
+#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+msgid "No captured images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:362
-msgid "do not show preview windows"
+#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#, c-format
+msgid "Got %d images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:372
-msgid "Scan a QR code using a video device and import the uri read"
+#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#, c-format
+msgid "Found %s: \"%s\"\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:364 src/util/gnunet-qr.c:366
+#, fuzzy, c-format
+msgid "%s is not a PNG file\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/util/gnunet-qr.c:545
+#, fuzzy
+msgid "No data found\n"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/util/gnunet-qr.c:561
+msgid "Dispatching the URI\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:572
+msgid "use the video device DEVICE (defaults to /dev/video0)"
+msgstr ""
+
+#: src/util/gnunet-qr.c:579
+msgid "read from the PNG-encoded file FILE"
+msgstr ""
+
+#: src/util/gnunet-qr.c:590
+msgid "Scan a QR code and import the URI read"
 msgstr ""
 
 #: src/util/gnunet-resolver.c:168
@@ -8763,28 +8570,28 @@ msgstr ""
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:232
+#: src/util/gnunet-scrypt.c:215
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:304
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:310
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:330
+#: src/util/gnunet-scrypt.c:313
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
@@ -8797,6 +8604,21 @@ msgstr ""
 msgid "No URI specified on command line\n"
 msgstr ""
 
+#: src/util/gnunet-uri.c:94
+#, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "URL beginnt nicht mit »%s«\n"
+
+#: src/util/gnunet-uri.c:101
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:108
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
 #: src/util/gnunet-uri.c:178
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
@@ -8816,12 +8638,12 @@ msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei 
%s:%d.\n"
 msgid "Error writing to `%s': %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/util/network.c:178
+#: src/util/network.c:163
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1359
+#: src/util/network.c:1306
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8834,12 +8656,12 @@ msgid ""
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:802
+#: src/util/os_installation.c:786
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/util/os_installation.c:835
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8849,38 +8671,38 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initialisierung des Plugin-Mechanismus fehlgeschlagen: %s!\n"
 
-#: src/util/plugin.c:162
+#: src/util/plugin.c:156
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 "`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/plugin.c:240
+#: src/util/plugin.c:234
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/plugin.c:420
+#: src/util/plugin.c:414
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/program.c:251
+#: src/util/program.c:286
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/program.c:263
+#: src/util/program.c:298
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/program.c:278
+#: src/util/program.c:313
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/program.c:293
+#: src/util/program.c:328
 #, fuzzy
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "GNUnet Konfiguration"
@@ -8933,7 +8755,7 @@ msgid ""
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1568
+#: src/util/service.c:1572
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
@@ -8948,82 +8770,82 @@ msgstr ""
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:409
+#: src/util/strings.c:395
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:501
+#: src/util/strings.c:487
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:1036
+#: src/util/strings.c:1023
 msgid "IPv6 address did not start with `['\n"
 msgstr "IPv6-Adresse beginnt nicht mit »[«\n"
 
-#: src/util/strings.c:1044
+#: src/util/strings.c:1031
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr "IPv6-Adresse enthält kein »:« zur Abtrennung der Portnummer\n"
 
-#: src/util/strings.c:1051
+#: src/util/strings.c:1038
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr "IPv6-Adresse enthält kein »]« vor »:« zur Abtrennung der Portnummer\n"
 
-#: src/util/strings.c:1059
+#: src/util/strings.c:1046
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr "IPv6-Adresse enthält keine gültige Portnummer nach dem letzten »:«\n"
 
-#: src/util/strings.c:1068
+#: src/util/strings.c:1055
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 
-#: src/util/strings.c:1250 src/util/strings.c:1261
+#: src/util/strings.c:1237 src/util/strings.c:1248
 msgid "Port not in range\n"
 msgstr "Port außerhalb des Bereichs\n"
 
-#: src/util/strings.c:1270
+#: src/util/strings.c:1257
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1341 src/util/strings.c:1370 src/util/strings.c:1417
-#: src/util/strings.c:1437
+#: src/util/strings.c:1328 src/util/strings.c:1357 src/util/strings.c:1404
+#: src/util/strings.c:1424
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: »%s«\n"
 
-#: src/util/strings.c:1395
+#: src/util/strings.c:1382
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ungültige Netzwerk-Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/util/strings.c:1446
+#: src/util/strings.c:1433
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/strings.c:1488
+#: src/util/strings.c:1475
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ungültige Netzwerk-Notation (endet nicht mit »;«: »%s«)\n"
 
-#: src/util/strings.c:1538
+#: src/util/strings.c:1525
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/strings.c:1569
+#: src/util/strings.c:1556
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
 
-#: src/util/time.c:699 src/util/time.c:727
+#: src/util/time.c:863 src/util/time.c:891
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:735
+#: src/util/time.c:899
 #, c-format
 msgid ""
 "Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
@@ -9209,6 +9031,110 @@ msgstr "Tunnel über VPN einrichten."
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
+#, fuzzy
+#~ msgid "# requests for random value received"
+#~ msgstr "# Anfragen empfangen"
+
+#, fuzzy
+#~ msgid "# GET requests from clients injected"
+#~ msgstr "# gap Anfragen mit taktischer Entscheidung: nicht Antworten"
+
+#, fuzzy
+#~ msgid "# PUT requests received from clients"
+#~ msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
+
+#, fuzzy
+#~ msgid "# GET requests received from clients"
+#~ msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
+
+#, fuzzy
+#~ msgid "# GET STOP requests received from clients"
+#~ msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
+
+#, fuzzy
+#~ msgid "# FIND PEER messages initiated"
+#~ msgstr "# PING Nachrichten erstellt"
+
+#, fuzzy
+#~ msgid "# requests TTL-dropped"
+#~ msgstr "# dht Anfragen weitergeleitet"
+
+#, fuzzy
+#~ msgid "# Peer selection failed"
+#~ msgstr " Verbindung fehlgeschlagen\n"
+
+#, fuzzy
+#~ msgid "# PUT requests routed"
+#~ msgstr "# dht Anfragen weitergeleitet"
+
+#, fuzzy
+#~ msgid "# GET requests routed"
+#~ msgstr "# dht Anfragen weitergeleitet"
+
+#, fuzzy
+#~ msgid "# Expired PUTs discarded"
+#~ msgstr "# verworfener Nachrichten"
+
+#, fuzzy
+#~ msgid "# P2P PUT requests received"
+#~ msgstr "# Client Trace-Anfragen empfangen"
+
+#, fuzzy
+#~ msgid "# P2P PUT bytes received"
+#~ msgstr "# Bytes empfangen über TCP"
+
+#, fuzzy
+#~ msgid "# P2P GET requests received"
+#~ msgstr "# Client Trace-Anfragen empfangen"
+
+#, fuzzy
+#~ msgid "# P2P GET bytes received"
+#~ msgstr "# Bytes empfangen über TCP"
+
+#, fuzzy
+#~ msgid "# P2P GET requests ONLY routed"
+#~ msgstr "# dht Anfragen weitergeleitet"
+
+#, fuzzy
+#~ msgid "# Expired results discarded"
+#~ msgstr "# verworfener Nachrichten"
+
+#, fuzzy
+#~ msgid "# P2P RESULT bytes received"
+#~ msgstr "# Bytes empfangen über TCP"
+
+#, fuzzy
+#~ msgid "# Network size estimates received"
+#~ msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "# DHT requests combined"
+#~ msgstr "# dht Anfragen weitergeleitet"
+
+#, fuzzy
+#~ msgid "# replies received for other peers"
+#~ msgstr "# Bytes des Typs %d empfangen"
+
+#, fuzzy
+#~ msgid "# irrelevant replies discarded"
+#~ msgstr "# verworfener Nachrichten"
+
+#, fuzzy, c-format
+#~ msgid "Refusing `%s' request to HTTP server\n"
+#~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#, fuzzy, c-format
+#~ msgid "Businesscard HTTP server starts on %u\n"
+#~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#, fuzzy, c-format
+#~ msgid "Could not start businesscard HTTP server on port %u\n"
+#~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#, fuzzy, c-format
+#~ msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
+#~ msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
+
 #, fuzzy
 #~ msgid "Waiting for child to exit.\n"
 #~ msgstr ""
diff --git a/po/es.po b/po/es.po
index 981034502..5f3787759 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-10-15 10:46+0200\n"
+"POT-Creation-Date: 2022-01-10 15:13+0100\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,131 +18,136 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1302
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1304
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:901
+#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
 #, fuzzy, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/abd/gnunet-abd.c:560 src/abd/gnunet-service-abd.c:1747
-#: src/namestore/gnunet-namestore-fcfsd.c:1067
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
 #: src/namestore/gnunet-namestore.c:1001
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
 
-#: src/abd/gnunet-abd.c:840 src/abd/gnunet-abd.c:891
+#: src/abd/gnunet-abd.c:566
+#, fuzzy
+msgid "Ego does not exist!\n"
+msgstr "El número de clave %u no existe\n"
+
+#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/abd/gnunet-abd.c:849 src/abd/gnunet-abd.c:910
+#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
 #, fuzzy, c-format
 msgid "Failed to connect to ABD\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/abd/gnunet-abd.c:855
+#: src/abd/gnunet-abd.c:865
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:862
+#: src/abd/gnunet-abd.c:872
 #, fuzzy, c-format
 msgid "ego required\n"
 msgstr "Tipo requerido\n"
 
-#: src/abd/gnunet-abd.c:872
+#: src/abd/gnunet-abd.c:882
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:881
+#: src/abd/gnunet-abd.c:890
 #, fuzzy, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/abd/gnunet-abd.c:916
+#: src/abd/gnunet-abd.c:924
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:975
+#: src/abd/gnunet-abd.c:983
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:996
+#: src/abd/gnunet-abd.c:1004
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1003
+#: src/abd/gnunet-abd.c:1011
 #, fuzzy
 msgid ""
 "The public key of the subject to lookup thecredential for, or for issuer "
 "side storage: subject and its attributes"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/abd/gnunet-abd.c:1010
+#: src/abd/gnunet-abd.c:1018
 msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1017
+#: src/abd/gnunet-abd.c:1025
 #, fuzzy
 msgid "The public key of the authority to verify the credential against"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/abd/gnunet-abd.c:1022
+#: src/abd/gnunet-abd.c:1030
 #, fuzzy
 msgid "The ego/zone name to use"
 msgstr "tamaño del mensaje"
 
-#: src/abd/gnunet-abd.c:1028
+#: src/abd/gnunet-abd.c:1036
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1034
+#: src/abd/gnunet-abd.c:1042
 msgid ""
 "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1039
+#: src/abd/gnunet-abd.c:1047
 msgid "collect credentials"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1044
+#: src/abd/gnunet-abd.c:1052
 msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1049
+#: src/abd/gnunet-abd.c:1057
 msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1054
+#: src/abd/gnunet-abd.c:1062
 msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1061
+#: src/abd/gnunet-abd.c:1069
 msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1065
+#: src/abd/gnunet-abd.c:1073
 msgid "Create private record entry."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1071 src/abd/gnunet-abd.c:1077
+#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
 msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1090
+#: src/abd/gnunet-abd.c:1098
 #, fuzzy
 msgid "GNUnet abd resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/abd/gnunet-service-abd.c:1742 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
@@ -395,8 +400,8 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1129
 #: src/transport/plugin_transport_tcp.c:3706
 #: src/transport/tcp_service_legacy.c:594
-#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1090
-#: src/util/service.c:1096
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1094
+#: src/util/service.c:1100
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -405,7 +410,7 @@ msgstr ""
 
 #: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
 #: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
-#: src/util/service.c:1129
+#: src/util/service.c:1133
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
@@ -413,13 +418,13 @@ msgstr ""
 
 #: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
 #: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
-#: src/util/service.c:1133
+#: src/util/service.c:1137
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
 
 #: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
-#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1153
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1157
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -429,7 +434,7 @@ msgstr ""
 "«%s», no se pudo crear un «socket» UNIX: %s\n"
 
 #: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
-#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1171
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1175
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -439,7 +444,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:536
 #: src/transport/plugin_transport_http_server.c:2718
 #: src/transport/plugin_transport_tcp.c:1244
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1202
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1206
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
@@ -447,7 +452,7 @@ msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 #: src/arm/gnunet-service-arm.c:555
 #: src/transport/plugin_transport_http_server.c:2736
 #: src/transport/plugin_transport_tcp.c:1263
-#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1221
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1225
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "No se encontró la dirección %s para «%s».\n"
@@ -1393,35 +1398,35 @@ msgstr ""
 msgid "Print information about connected peers."
 msgstr "Imprime información sobre los pares conectados."
 
-#: src/core/gnunet-service-core.c:329
+#: src/core/gnunet-service-core.c:328
 msgid "# send requests dropped (disconnected)"
 msgstr "# peticiones de envío descartadas (desconectado)"
 
-#: src/core/gnunet-service-core.c:355
+#: src/core/gnunet-service-core.c:354
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
+#: src/core/gnunet-service-core.c:418
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de mensajes del tipo %u recibidos"
 
-#: src/core/gnunet-service-core.c:506
+#: src/core/gnunet-service-core.c:504
 msgid "# messages discarded (session disconnected)"
 msgstr "# mensajes descartados (sesión desconectada)"
 
-#: src/core/gnunet-service-core.c:825
+#: src/core/gnunet-service-core.c:823
 #, fuzzy, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# bytes de mensajes del tipo %u recibidos"
 
-#: src/core/gnunet-service-core.c:927
+#: src/core/gnunet-service-core.c:925
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
 
-#: src/core/gnunet-service-core.c:955
+#: src/core/gnunet-service-core.c:953
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "El servicio principal de «%4s» está listo.\n"
@@ -1572,9 +1577,7 @@ msgstr "# bytes de «payload» descifrados"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/dht/gnunet-service-dht_neighbours.c:740
-#: src/dht/gnunet-service-dht_neighbours.c:803
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1522
+#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1520
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1605,50 +1608,45 @@ msgstr "# mapas de tipos recibidos"
 msgid "# updates to my type map"
 msgstr "# actualizaciones de mi mapa de tipos"
 
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:299
-#: src/datastore/gnunet-service-datastore.c:742
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:275
+#: src/datastore/gnunet-service-datastore.c:743
 msgid "# bytes stored"
 msgstr "# bytes almacenados"
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:303
+#: src/datacache/datacache.c:121 src/datacache/datacache.c:279
 msgid "# items stored"
 msgstr "# elementos almacenados"
 
-#: src/datacache/datacache.c:190
+#: src/datacache/datacache.c:185
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr "Cargando el módulo de la cache de datos «%s»\n"
 
-#: src/datacache/datacache.c:208
+#: src/datacache/datacache.c:203
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 "Se produjo un fallo al cargar el módulo de la cache de datos para «%s»\n"
 
-#: src/datacache/datacache.c:332
+#: src/datacache/datacache.c:297
 msgid "# requests received"
 msgstr "# peticiones recibidas"
 
-#: src/datacache/datacache.c:343
+#: src/datacache/datacache.c:308
 msgid "# requests filtered by bloom filter"
 msgstr "# peticiones filtradas por el «bloomfilter»"
 
-#: src/datacache/datacache.c:370
-#, fuzzy
-msgid "# requests for random value received"
-msgstr "# peticiones recibidas"
-
-#: src/datacache/datacache.c:400
+#: src/datacache/datacache.c:329
 #, fuzzy
 msgid "# proximity search requests received"
 msgstr "# búsquedas de clientes recibidas"
 
-#: src/datacache/plugin_datacache_heap.c:554
+#: src/datacache/plugin_datacache_heap.c:527
 msgid "Heap datacache running\n"
 msgstr "Caché de datos de montículo (heap) ejecutándose\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:123
-#: src/datacache/plugin_datacache_sqlite.c:144
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:139
 #: src/datastore/plugin_datastore_mysql.c:890
 #: src/datastore/plugin_datastore_sqlite.c:63
 #: src/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:81 src/my/my.c:93
@@ -1665,7 +1663,7 @@ msgstr "Caché de datos de montículo (heap) ejecutándose\n"
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:783
+#: src/datacache/plugin_datacache_sqlite.c:693
 #: src/datastore/plugin_datastore_sqlite.c:531
 #: src/namecache/plugin_namecache_sqlite.c:237
 #: src/namestore/plugin_namestore_sqlite.c:273
@@ -1826,7 +1824,7 @@ msgstr ""
 "Espacio insuficiente (%llu bytes están disponibles) para satisfacer la "
 "petición «%s» de %llu bytes\n"
 
-#: src/datastore/gnunet-service-datastore.c:605
+#: src/datastore/gnunet-service-datastore.c:606
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1835,7 +1833,7 @@ msgstr ""
 "La cantidad solicitada (%llu bytes) es mayor que el tamaño de la caché (%llu "
 "bytes)\n"
 
-#: src/datastore/gnunet-service-datastore.c:611
+#: src/datastore/gnunet-service-datastore.c:612
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
@@ -1843,62 +1841,62 @@ msgstr ""
 "Espacio insuficiente para satisfacer la petición y la cantidad pedida es "
 "mayor que el tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:618
+#: src/datastore/gnunet-service-datastore.c:619
 msgid "Insufficient space to satisfy request"
 msgstr "Espacio insuficiente para satisfacer la petición"
 
-#: src/datastore/gnunet-service-datastore.c:625
-#: src/datastore/gnunet-service-datastore.c:676
-#: src/datastore/gnunet-service-datastore.c:819
-#: src/datastore/gnunet-service-datastore.c:1428
+#: src/datastore/gnunet-service-datastore.c:626
+#: src/datastore/gnunet-service-datastore.c:677
+#: src/datastore/gnunet-service-datastore.c:820
+#: src/datastore/gnunet-service-datastore.c:1429
 msgid "# reserved"
 msgstr "# reservado"
 
-#: src/datastore/gnunet-service-datastore.c:692
+#: src/datastore/gnunet-service-datastore.c:693
 msgid "Could not find matching reservation"
 msgstr "No se pudo encontrar una reserva coincidente"
 
-#: src/datastore/gnunet-service-datastore.c:757
+#: src/datastore/gnunet-service-datastore.c:758
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 "Se necesitan %llu bytes más de espacio (%llu permitidos, usando %llu)\n"
 
-#: src/datastore/gnunet-service-datastore.c:857
+#: src/datastore/gnunet-service-datastore.c:858
 msgid "# GET requests received"
 msgstr "# peticiones «GET» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:887
+#: src/datastore/gnunet-service-datastore.c:888
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# peticiones «GET» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:898
+#: src/datastore/gnunet-service-datastore.c:899
 msgid "# requests filtered by bloomfilter"
 msgstr "# peticiones filtradas por el «bloomfilter»"
 
-#: src/datastore/gnunet-service-datastore.c:939
+#: src/datastore/gnunet-service-datastore.c:940
 msgid "# GET REPLICATION requests received"
 msgstr "# peticiones «GET REPLICATION» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:970
+#: src/datastore/gnunet-service-datastore.c:971
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# peticiones «GET ZERO ANONYMITY» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1011
+#: src/datastore/gnunet-service-datastore.c:1012
 msgid "Content not found"
 msgstr "Contenido no encontrado"
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1019
 msgid "# bytes removed (explicit request)"
 msgstr "# bytes eliminados (petición explícita)"
 
-#: src/datastore/gnunet-service-datastore.c:1058
+#: src/datastore/gnunet-service-datastore.c:1059
 msgid "# REMOVE requests received"
 msgstr "# peticiones «REMOVE» recibidas"
 
 # Miguel: ¿Cómo traducir «payload»? ¿Código cargado?
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/datastore/gnunet-service-datastore.c:1108
 #, fuzzy, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
@@ -1906,63 +1904,63 @@ msgstr ""
 "El «payload» del almacén de datos es impreciso (%lld < %lld).  Intentando "
 "repararlo.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1282
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/datastore/gnunet-service-datastore.c:1168
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr "Cargando el módulo del almacén de datos «%s»\n"
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/datastore/gnunet-service-datastore.c:1177
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 "Se produjo un fallo al inicializar el módulo del almacén de datos para «%s»\n"
 
-#: src/datastore/gnunet-service-datastore.c:1236
+#: src/datastore/gnunet-service-datastore.c:1237
 msgid "Bloomfilter construction complete.\n"
 msgstr "Construcción de «bloomfilter» completa.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1288
+#: src/datastore/gnunet-service-datastore.c:1289
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr "Reconstruyendo «bloomfilter».  Por favor, tenga paciencia.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1298
+#: src/datastore/gnunet-service-datastore.c:1299
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr "El módulo no soporta la función «get_keys». Por favor, corríjalo.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/datastore/gnunet-service-datastore.c:1464
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes usados en el almacén de ficheros compartidos «%s»"
 
-#: src/datastore/gnunet-service-datastore.c:1472
+#: src/datastore/gnunet-service-datastore.c:1473
 msgid "# quota"
 msgstr "# cuota"
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1476
 msgid "# cache size"
 msgstr "# tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/datastore/gnunet-service-datastore.c:1492
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 "No se pudo usar el nombre de fichero especificado «%s» para «bloomfilter».\n"
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/datastore/gnunet-service-datastore.c:1513
+#: src/datastore/gnunet-service-datastore.c:1535
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 "Se produjo un fallo al borrar el fichero de configuración defectuoso de "
 "«bloomfilter» «%s»:\n"
 
-#: src/datastore/gnunet-service-datastore.c:1573
+#: src/datastore/gnunet-service-datastore.c:1574
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Se produjo un fallo al inicializar «bloomfilter».\n"
 
@@ -2061,7 +2059,7 @@ msgstr "Base de datos sqlite ejecutándose\n"
 msgid "Template database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
 
-#: src/dht/gnunet-dht-get.c:158
+#: src/dht/gnunet-dht-get.c:159
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -2070,48 +2068,48 @@ msgstr ""
 "Resultado %d, tipo %d:\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:160
 #, fuzzy, c-format
 msgid "Result %d, type %d:\n"
 msgstr ""
 "Resultado %d, tipo %d:\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:197
+#: src/dht/gnunet-dht-get.c:209
 msgid "Must provide key for DHT GET!\n"
 msgstr "¡Se debe proveer una clave para el «GET» DHT!\n"
 
-#: src/dht/gnunet-dht-get.c:203 src/dht/gnunet-dht-monitor.c:255
+#: src/dht/gnunet-dht-get.c:217 src/dht/gnunet-dht-monitor.c:255
 msgid "Failed to connect to DHT service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
-#: src/dht/gnunet-dht-get.c:213
+#: src/dht/gnunet-dht-get.c:227
 #, fuzzy
 msgid "Issuing DHT GET with key"
 msgstr "Enviando un «GET» DHT con clave"
 
-#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:260 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr "la clave de búsqueda"
 
-#: src/dht/gnunet-dht-get.c:251
+#: src/dht/gnunet-dht-get.c:266
 msgid "how many parallel requests (replicas) to create"
 msgstr "cuantas peticiones paralelas (réplicas) crear"
 
-#: src/dht/gnunet-dht-get.c:256 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:272 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr "el tipo de datos a buscar"
 
-#: src/dht/gnunet-dht-get.c:262
+#: src/dht/gnunet-dht-get.c:278
 msgid "how long to execute this query before giving up?"
 msgstr "¿cuánto tiempo se debe ejecutar esta consulta antes de abandonar?"
 
-#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-get.c:284 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr "opción para usar el demultiplexado de la DHT siempre"
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:301
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 "Iniciando una peticion «GET» a la DHT de GNUnet, imprimiendo resultados."
@@ -2143,256 +2141,33 @@ msgstr "¡No se pudo conectar al servicio %s!\n"
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr "¡Iniciando petición de subida para «%s» con datos «%s»!\n"
 
-#: src/dht/gnunet-dht-put.c:187
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr "los datos a insertar bajo la clave"
 
-#: src/dht/gnunet-dht-put.c:193
+#: src/dht/gnunet-dht-put.c:194
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr "cuanto tiempo almacenar esta entrada en la DHT (en segundos)"
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:212
 msgid "how many replicas to create"
 msgstr "cuantas réplicas crear"
 
-#: src/dht/gnunet-dht-put.c:212
+#: src/dht/gnunet-dht-put.c:217
 #, fuzzy
 msgid "use DHT's record route option"
 msgstr "opción para usar el demultiplexado de la DHT siempre"
 
-#: src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-put.c:223
 msgid "the type to insert data as"
 msgstr "el tipo de datos a insertar"
 
-#: src/dht/gnunet-dht-put.c:232
+#: src/dht/gnunet-dht-put.c:241
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 "Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo "
 "«KEY»."
 
-#: src/dht/gnunet-service-dht_clients.c:367
-msgid "# GET requests from clients injected"
-msgstr "# peticiones «GET» inyectadas de clientes"
-
-#: src/dht/gnunet-service-dht_clients.c:483
-msgid "# PUT requests received from clients"
-msgstr "# peticiones «PUT» recibidas de clientes"
-
-#: src/dht/gnunet-service-dht_clients.c:616
-msgid "# GET requests received from clients"
-msgstr "# peticiones «GET» recibidas de clientes"
-
-#: src/dht/gnunet-service-dht_clients.c:848
-msgid "# GET STOP requests received from clients"
-msgstr "# peticiones «GET STOP» recibidas de clientes"
-
-#: src/dht/gnunet-service-dht_clients.c:1033
-msgid "# Key match, type mismatches in REPLY to CLIENT"
-msgstr ""
-"# Coincidencias de clave, diferencias de tipo en la respuesta (REPLY) del "
-"cliente (CLIENT)"
-
-#: src/dht/gnunet-service-dht_clients.c:1049
-msgid "# Duplicate REPLIES to CLIENT request dropped"
-msgstr ""
-"# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas"
-
-#: src/dht/gnunet-service-dht_clients.c:1102
-#, c-format
-msgid "Unsupported block type (%u) in request!\n"
-msgstr "¡Tipo de bloque no soportado (%u) en la petición!\n"
-
-#: src/dht/gnunet-service-dht_clients.c:1110
-msgid "# RESULTS queued for clients"
-msgstr "# Resultados (RESULTS) encolados para clientes"
-
-#: src/dht/gnunet-service-dht_clients.c:1191
-msgid "# REPLIES ignored for CLIENTS (no match)"
-msgstr ""
-"# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)"
-
-#: src/dht/gnunet-service-dht_datacache.c:73
-#, c-format
-msgid "%s request received, but have no datacache!\n"
-msgstr "¡Petición %s recibida, pero no tiene caché de datos!\n"
-
-#: src/dht/gnunet-service-dht_datacache.c:83
-msgid "# ITEMS stored in datacache"
-msgstr "# Elementos (ITEMS) almacenados en la caché de datos"
-
-#: src/dht/gnunet-service-dht_datacache.c:206
-msgid "# Good RESULTS found in datacache"
-msgstr "# Buenos resultados (RESULTS) encontrados en la caché de datos"
-
-#: src/dht/gnunet-service-dht_datacache.c:220
-msgid "# Duplicate RESULTS found in datacache"
-msgstr "# Resultados (RESULTS) duplicados encontrados en la caché de datos"
-
-#: src/dht/gnunet-service-dht_datacache.c:228
-msgid "# Invalid RESULTS found in datacache"
-msgstr "# Resultados (RESULTS) no válidos encontrados en la caché de datos"
-
-#: src/dht/gnunet-service-dht_datacache.c:236
-msgid "# Irrelevant RESULTS found in datacache"
-msgstr "# Resultados (RESULTS) irrelevantes encontrados en la caché de datos"
-
-#: src/dht/gnunet-service-dht_datacache.c:252
-msgid "# Unsupported RESULTS found in datacache"
-msgstr "# Resultados (RESULTS) no soportados encontrados en la caché de datos"
-
-#: src/dht/gnunet-service-dht_datacache.c:256
-#, c-format
-msgid "Unsupported block type (%u) in local response!\n"
-msgstr "¡Tipo de bloque no soportado (%u) en respuesta local!\n"
-
-#: src/dht/gnunet-service-dht_datacache.c:291
-msgid "# GET requests given to datacache"
-msgstr "# Peticiones «GET» realizadas a la caché de datos"
-
-#: src/dht/gnunet-service-dht_hello.c:86
-msgid "# HELLOs obtained from peerinfo"
-msgstr "# «HELLO» obtenidos de «peerinfo»"
-
-#: src/dht/gnunet-service-dht_neighbours.c:678
-msgid "# FIND PEER messages initiated"
-msgstr "# mensajes «FIND PEER» iniciados"
-
-#: src/dht/gnunet-service-dht_neighbours.c:855
-#, fuzzy
-msgid "# requests TTL-dropped"
-msgstr "# peticiones unidas"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1042
-#: src/dht/gnunet-service-dht_neighbours.c:1079
-msgid "# Peers excluded from routing due to Bloomfilter"
-msgstr "# Pares excluidos del encaminado debido a «Bloomfilter»"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1095
-msgid "# Peer selection failed"
-msgstr "# Selecciones de pares fallidas"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1253
-msgid "# PUT requests routed"
-msgstr "# Peticiones «PUT» encaminadas"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1287
-msgid "# PUT messages queued for transmission"
-msgstr "# mensajes «PUT» encolados para transmisión"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1299
-#: src/dht/gnunet-service-dht_neighbours.c:1441
-#: src/dht/gnunet-service-dht_neighbours.c:1545
-msgid "# P2P messages dropped due to full queue"
-msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1384
-msgid "# GET requests routed"
-msgstr "# Peticiones «GET» encaminadas"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1428
-msgid "# GET messages queued for transmission"
-msgstr "# Mensajes «GET» encolados para transmisión"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1560
-msgid "# RESULT messages queued for transmission"
-msgstr "# Mensajes «RESULT» encolados para transmisión"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1663
-#, fuzzy
-msgid "# Expired PUTs discarded"
-msgstr "# respuestas irrelevantes descartadas"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1671
-msgid "# P2P PUT requests received"
-msgstr "# Peticiones «PUT» P2P recibidas"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1675
-#, fuzzy
-msgid "# P2P PUT bytes received"
-msgstr "# Peticiones «PUT» P2P recibidas"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1907
-msgid "# FIND PEER requests ignored due to Bloomfilter"
-msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1916
-msgid "# FIND PEER requests ignored due to lack of HELLO"
-msgstr "# Peticiones «FIND PEER» ignoradas debido a falta de «HELLO»"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2079
-msgid "# P2P GET requests received"
-msgstr "# Peticiones «GET» P2P recibidas"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2083
-#, fuzzy
-msgid "# P2P GET bytes received"
-msgstr "# Peticiones «GET» P2P recibidas"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2149
-msgid "# P2P FIND PEER requests processed"
-msgstr "# Peticiones «FIND PEER» P2P procesadas"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2170
-msgid "# P2P GET requests ONLY routed"
-msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2348
-#, fuzzy
-msgid "# Expired results discarded"
-msgstr "# respuestas irrelevantes descartadas"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2365
-msgid "# P2P RESULTS received"
-msgstr "# Resultados (RESULTS) P2P recibidos"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2369
-#, fuzzy
-msgid "# P2P RESULT bytes received"
-msgstr "# Resultados (RESULTS) P2P recibidos"
-
-#: src/dht/gnunet-service-dht_nse.c:59
-msgid "# Network size estimates received"
-msgstr "# Estimaciones del tamaño de red recibidas"
-
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Good REPLIES matched against routing table"
-msgstr ""
-"# Buenas respuestas (REPLIES) encontradas en la tabla de encaminamiento"
-
-#: src/dht/gnunet-service-dht_routing.c:236
-msgid "# Duplicate REPLIES matched against routing table"
-msgstr ""
-"# Respuestas (REPLIES) duplicadas encontradas en la tabla de encaminamiento"
-
-#: src/dht/gnunet-service-dht_routing.c:244
-msgid "# Invalid REPLIES matched against routing table"
-msgstr ""
-"# Respuestas (REPLIES) no válidas encontradas en la tabla de encaminamiento"
-
-#: src/dht/gnunet-service-dht_routing.c:252
-msgid "# Irrelevant REPLIES matched against routing table"
-msgstr ""
-"# Respuestas (REPLIES) irrelevantes encontradas en la tabla de encaminamiento"
-
-#: src/dht/gnunet-service-dht_routing.c:268
-msgid "# Unsupported REPLIES matched against routing table"
-msgstr ""
-"# Respuestas (REPLIES) no soportadas encontradas en la tabla de "
-"encaminamiento"
-
-#: src/dht/gnunet-service-dht_routing.c:347
-msgid "# Entries removed from routing table"
-msgstr "# Entradas eliminadas de la tabla de encaminamiento"
-
-#: src/dht/gnunet-service-dht_routing.c:422
-msgid "# Entries added to routing table"
-msgstr "# Entradas añadidas a la tabla de encaminamiento"
-
-#: src/dht/gnunet-service-dht_routing.c:444
-msgid "# DHT requests combined"
-msgstr "# Peticiones a la DHT combinadas"
-
 #: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
@@ -2442,17 +2217,17 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/dht/plugin_block_dht.c:189
+#: src/dht/plugin_block_dht.c:328
 #, c-format
 msgid "Block not of type %u\n"
 msgstr "El bloque no es del tipo %u\n"
 
-#: src/dht/plugin_block_dht.c:198
+#: src/dht/plugin_block_dht.c:337
 #, fuzzy, c-format
 msgid "Size mismatch for block with type %u\n"
 msgstr "Discrepancias de tamaños para el bloque\n"
 
-#: src/dht/plugin_block_dht.c:209
+#: src/dht/plugin_block_dht.c:348
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
@@ -3789,7 +3564,7 @@ msgstr "# mensajes de detención de migración recibidos"
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr "Migración de contenido al par «%s» bloqueada durante %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1345
+#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr "# busquedas P2P activas"
 
@@ -3797,60 +3572,44 @@ msgstr "# busquedas P2P activas"
 msgid "# artificial delays introduced (ms)"
 msgstr "# retardos artificiales introducidos (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:869
-msgid "# replies dropped due to type mismatch"
-msgstr "# respuestas omitidas debido a incompatibilidad de tipos"
-
-#: src/fs/gnunet-service-fs_cp.c:877
-msgid "# replies received for other peers"
-msgstr "# respuestas recibidas de otros pares"
-
-#: src/fs/gnunet-service-fs_cp.c:892
-msgid "# replies dropped due to insufficient cover traffic"
-msgstr "# respuestas omitidas debido a insuficiente tráfico de cobertura"
-
-#: src/fs/gnunet-service-fs_cp.c:940
-msgid "# P2P searches destroyed due to ultimate reply"
-msgstr "# búsquedas P2P destruidas debido a respuesta definitiva"
-
-#: src/fs/gnunet-service-fs_cp.c:1011
+#: src/fs/gnunet-service-fs_cp.c:1009
 msgid "# requests done for free (low load)"
 msgstr "# peticiones realizadas gratuitamente (baja carga)"
 
-#: src/fs/gnunet-service-fs_cp.c:1036
+#: src/fs/gnunet-service-fs_cp.c:1034
 msgid "# request dropped, priority insufficient"
 msgstr "# peticiones omitidas, prioridad insuficiente"
 
-#: src/fs/gnunet-service-fs_cp.c:1046
+#: src/fs/gnunet-service-fs_cp.c:1044
 msgid "# requests done for a price (normal load)"
 msgstr "# peticiones realizadas por un precio (carga normal)"
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1141
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# peticiones omitidas debido a una petición de mayor TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1199
 msgid "# GET requests received (from other peers)"
 msgstr "# peticiones «GET» recibidas (de otros pares)"
 
-#: src/fs/gnunet-service-fs_cp.c:1225
+#: src/fs/gnunet-service-fs_cp.c:1223
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
-#: src/fs/gnunet-service-fs_cp.c:1239
+#: src/fs/gnunet-service-fs_cp.c:1237
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/fs/gnunet-service-fs_cp.c:1296
+#: src/fs/gnunet-service-fs_cp.c:1294
 msgid "# requests dropped due TTL underflow"
 msgstr "# peticiones omitidas debido a expiración del TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1341
+#: src/fs/gnunet-service-fs_cp.c:1339
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1711
+#: src/fs/gnunet-service-fs_cp.c:1709
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
@@ -3934,104 +3693,91 @@ msgstr "# entradas de planes de búsqueda"
 msgid "# Pending requests created"
 msgstr "# Peticiones pendientes creadas"
 
-#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:656
+#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:658
 msgid "# Pending requests active"
 msgstr "# Peticiones pendientes activas"
 
-#: src/fs/gnunet-service-fs_pr.c:832
+#: src/fs/gnunet-service-fs_pr.c:838
 msgid "# replies received and matched"
 msgstr "# respuestas recibidas y asociadas"
 
-#: src/fs/gnunet-service-fs_pr.c:880
-msgid "# duplicate replies discarded (bloomfilter)"
-msgstr "# respuestas duplicadas descartadas (bloomfilter)"
-
-#: src/fs/gnunet-service-fs_pr.c:889
-msgid "# irrelevant replies discarded"
-msgstr "# respuestas irrelevantes descartadas"
-
-#: src/fs/gnunet-service-fs_pr.c:908
-#, c-format
-msgid "Unsupported block type %u\n"
-msgstr "Tipo de bloque %u no soportado\n"
-
-#: src/fs/gnunet-service-fs_pr.c:921
+#: src/fs/gnunet-service-fs_pr.c:916
 msgid "# results found locally"
 msgstr "# resultados hallados localmente"
 
-#: src/fs/gnunet-service-fs_pr.c:1055
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1084
+#: src/fs/gnunet-service-fs_pr.c:1079
 msgid "# storage requests dropped due to high load"
 msgstr "# peticiones de almacenamiento omitidas debido a alta carga"
 
-#: src/fs/gnunet-service-fs_pr.c:1123
+#: src/fs/gnunet-service-fs_pr.c:1118
 msgid "# Replies received from DHT"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1259
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1318
+#: src/fs/gnunet-service-fs_pr.c:1313
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr "¡La búsqueda en el almacén de datos toma %s!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1339
+#: src/fs/gnunet-service-fs_pr.c:1334
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr "¡La búsqueda en bajo demanda toma %s!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1402
+#: src/fs/gnunet-service-fs_pr.c:1401
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr "# «DBLOCK» o «IBLOCK» pedido no encontrado"
 
-#: src/fs/gnunet-service-fs_pr.c:1464
+#: src/fs/gnunet-service-fs_pr.c:1463
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (error encolando)"
 
-#: src/fs/gnunet-service-fs_pr.c:1519
+#: src/fs/gnunet-service-fs_pr.c:1518
 msgid "# Datastore lookups concluded (no results)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (sin resultados)"
 
-#: src/fs/gnunet-service-fs_pr.c:1534
+#: src/fs/gnunet-service-fs_pr.c:1533
 msgid "# Datastore lookups concluded (seen all)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (vistos todos)"
 
-#: src/fs/gnunet-service-fs_pr.c:1557
+#: src/fs/gnunet-service-fs_pr.c:1556
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (más de «MAX_RESULTS»)"
 
-#: src/fs/gnunet-service-fs_pr.c:1574
+#: src/fs/gnunet-service-fs_pr.c:1573
 msgid "# on-demand blocks matched requests"
 msgstr "# peticiones asociadas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1594
 msgid "# on-demand lookups performed successfully"
 msgstr "# búsquedas satisfactorias de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1600
 msgid "# on-demand lookups failed"
 msgstr "# búsquedas fallidas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1642
+#: src/fs/gnunet-service-fs_pr.c:1641
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 "# Búsquedas en el almacén de datos finalizadas (encontrado último resultado)"
 
-#: src/fs/gnunet-service-fs_pr.c:1655
+#: src/fs/gnunet-service-fs_pr.c:1654
 msgid "# Datastore lookups concluded (load too high)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (carga demasiado alta)"
 
-#: src/fs/gnunet-service-fs_pr.c:1706
+#: src/fs/gnunet-service-fs_pr.c:1705
 msgid "# Datastore lookups initiated"
 msgstr "# Búsquedas en el almacén de datos iniciadas"
 
-#: src/fs/gnunet-service-fs_pr.c:1756
+#: src/fs/gnunet-service-fs_pr.c:1755
 msgid "# GAP PUT messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
@@ -4070,32 +3816,25 @@ msgstr "Desindexa un fichero previamente indexado con 
«gnunet-publish»."
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:134
-#, fuzzy, c-format
-msgid "Refusing `%s' request to HTTP server\n"
-msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
-
-#: src/gns/gnunet-bcd.c:347
+#: src/gns/gnunet-bcd.c:571
 #, fuzzy, c-format
-msgid "Invalid port number %u.  Exiting.\n"
+msgid "Invalid port number %u\n"
 msgstr "Número de puerto %llu no válido.  Saliendo.\n"
 
-#: src/gns/gnunet-bcd.c:352
-#, fuzzy, c-format
-msgid "Businesscard HTTP server starts on %u\n"
-msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
+#: src/gns/gnunet-bcd.c:612 src/namestore/gnunet-namestore-fcfsd.c:1113
+#, fuzzy
+msgid "Unable to set up the daemon\n"
+msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/gns/gnunet-bcd.c:372
-#, fuzzy, c-format
-msgid "Could not start businesscard HTTP server on port %u\n"
-msgstr ""
-"No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
+#: src/gns/gnunet-bcd.c:635 src/namestore/gnunet-namestore-fcfsd.c:987
+msgid "Failed to start HTTP server\n"
+msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/gns/gnunet-bcd.c:509
-msgid "Run HTTP serve on port PORT (default is 8888)"
+#: src/gns/gnunet-bcd.c:658
+msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:522
+#: src/gns/gnunet-bcd.c:667
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
@@ -4917,67 +4656,84 @@ msgid "Could not start hostlist HTTP server on port 
%u\n"
 msgstr ""
 "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
 
-#: src/identity/gnunet-identity.c:214
+#: src/identity/gnunet-identity.c:231
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/identity/gnunet-identity.c:255
+#: src/identity/gnunet-identity.c:272
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/identity/gnunet-identity.c:461
+#: src/identity/gnunet-identity.c:646
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:466
+#: src/identity/gnunet-identity.c:651
 #, fuzzy
 msgid "delete ego NAME "
 msgstr "borrar un nombre de espacio de nombres (NAME)"
 
-#: src/identity/gnunet-identity.c:472
+#: src/identity/gnunet-identity.c:657
 msgid ""
 "set the private key for the identity to PRIVATE_KEY (use together with -C)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:477
+#: src/identity/gnunet-identity.c:663
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:669
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:674
 msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:481
+#: src/identity/gnunet-identity.c:678
 #, fuzzy
 msgid "display all egos"
 msgstr "mostrar registros"
 
-#: src/identity/gnunet-identity.c:485
+#: src/identity/gnunet-identity.c:682
 #, fuzzy
 msgid "reduce output"
 msgstr "Sin salida innecesaria"
 
-#: src/identity/gnunet-identity.c:492
+#: src/identity/gnunet-identity.c:689
 msgid ""
 "set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
-"s) or restrict results to NAME (use together with -d)"
+"s), restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:695
+msgid "The public key of the recipient (with -W)"
 msgstr ""
 
 # Miguel: Aquí he dejado monitorización porque esto es
 # del servicio de traducción de direcciones.
-#: src/identity/gnunet-identity.c:496
+#: src/identity/gnunet-identity.c:699
 #, fuzzy
 msgid "run in monitor mode egos"
 msgstr "modo de monitorización"
 
-#: src/identity/gnunet-identity.c:500
+#: src/identity/gnunet-identity.c:703
 msgid "display private keys as well"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:507
+#: src/identity/gnunet-identity.c:710
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:522
+#: src/identity/gnunet-identity.c:725
 msgid "Maintain egos"
 msgstr ""
 
@@ -5040,6 +4796,12 @@ msgstr "Conexión fallida\n"
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
+#: src/messenger/plugin_gnsrecord_messenger.c:118
+#: src/messenger/plugin_gnsrecord_messenger.c:133
+#, fuzzy, c-format
+msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
+msgstr "No se pudo procesar el registro SOA «%s»\n"
+
 #: src/my/my.c:196 src/my/my.c:215
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
@@ -5080,7 +4842,7 @@ msgstr "Parámetro no válido «%s»\n"
 msgid "You must specify a name\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1639
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1641
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
@@ -5089,7 +4851,7 @@ msgstr "nombre del registro a añadir/borrar/mostrar"
 msgid "specifies the public key of the zone to look in"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1700
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1702
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
@@ -5140,112 +4902,103 @@ msgstr "Base de datos sqlite ejecutándose\n"
 msgid "Failed to setup database at `%s'\n"
 msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:359
+#: src/namestore/gnunet-namestore-fcfsd.c:368
 #, fuzzy
 msgid "can not search the namestore"
 msgstr "No se puede iniciar el controlador maestro"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:413
-#: src/namestore/gnunet-namestore-fcfsd.c:554
+#: src/namestore/gnunet-namestore-fcfsd.c:422
+#: src/namestore/gnunet-namestore-fcfsd.c:563
 #, fuzzy
 msgid "unable to scan namestore"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:441
+#: src/namestore/gnunet-namestore-fcfsd.c:450
 #, fuzzy, c-format
 msgid "Failed to create record for `%s': %s\n"
 msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:453
+#: src/namestore/gnunet-namestore-fcfsd.c:462
 #, fuzzy
 msgid "no errors"
 msgstr "error desconocido"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:489
+#: src/namestore/gnunet-namestore-fcfsd.c:498
 #, fuzzy, c-format
 msgid "The requested key `%s' exists as `%s'\n"
 msgstr "Creada la entrada '%s' en el espacio '%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/namestore/gnunet-namestore-fcfsd.c:505
 msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:513
+#: src/namestore/gnunet-namestore-fcfsd.c:522
 #, fuzzy
 msgid "Error creating record data\n"
 msgstr "Error interno escaneando directorio.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:517
+#: src/namestore/gnunet-namestore-fcfsd.c:526
 #, fuzzy
 msgid "unable to store record"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:588
+#: src/namestore/gnunet-namestore-fcfsd.c:597
 #, c-format
 msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:594
+#: src/namestore/gnunet-namestore-fcfsd.c:603
 msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:780
+#: src/namestore/gnunet-namestore-fcfsd.c:789
 msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
+#: src/namestore/gnunet-namestore-fcfsd.c:800
 msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:806
+#: src/namestore/gnunet-namestore-fcfsd.c:819
 #, fuzzy
 msgid "invalid parameters"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:823
+#: src/namestore/gnunet-namestore-fcfsd.c:836
 #, fuzzy
 msgid "invalid name"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
+#: src/namestore/gnunet-namestore-fcfsd.c:847
 #, fuzzy, c-format
 msgid "Unable to parse key %s\n"
 msgstr "No se pudo procesar el registro MX «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:838
+#: src/namestore/gnunet-namestore-fcfsd.c:851
 #, fuzzy
 msgid "unable to parse key"
 msgstr "No se pudo procesar el registro MX «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:949
+#: src/namestore/gnunet-namestore-fcfsd.c:962
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:974
-msgid "Failed to start HTTP server\n"
-msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1058
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
 #, fuzzy
 msgid "No port specified, using default value\n"
 msgstr ""
 "La configuración no especifica «%s», asumiendo el valor predeterminado."
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1076
+#: src/namestore/gnunet-namestore-fcfsd.c:1089
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1100
-#, fuzzy
-msgid "Unable to set up the daemon\n"
-msgstr "Imposible crear la cuenta de usuario:"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1123
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
 msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1132
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 #, fuzzy
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
@@ -5323,7 +5076,7 @@ msgstr "No se han proporcionado opciones\n"
 #: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1066
 #: src/namestore/gnunet-namestore.c:1076 src/namestore/gnunet-namestore.c:1105
 #: src/namestore/gnunet-namestore.c:1126 src/namestore/gnunet-namestore.c:1153
-#: src/namestore/gnunet-namestore.c:1228
+#: src/namestore/gnunet-namestore.c:1230
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
@@ -5339,7 +5092,7 @@ msgstr "URI no válida: «%s»\n"
 
 #: src/namestore/gnunet-namestore.c:1068 src/namestore/gnunet-namestore.c:1078
 #: src/namestore/gnunet-namestore.c:1107 src/namestore/gnunet-namestore.c:1128
-#: src/namestore/gnunet-namestore.c:1230
+#: src/namestore/gnunet-namestore.c:1232
 msgid "add"
 msgstr "añadir"
 
@@ -5358,7 +5111,7 @@ msgstr ""
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "Valor «%s» no válido para el tipo de registro «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1237
+#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1239
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
@@ -5372,18 +5125,18 @@ msgstr "borrar"
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1220
+#: src/namestore/gnunet-namestore.c:1222
 #: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1290
+#: src/namestore/gnunet-namestore.c:1292
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1340
+#: src/namestore/gnunet-namestore.c:1342
 #, c-format
 msgid ""
 "No default identity configured for `namestore' subsystem\n"
@@ -5391,104 +5144,104 @@ msgid ""
 "Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1405
+#: src/namestore/gnunet-namestore.c:1407
 #, fuzzy, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr "Argumentos superfluos (ignorados).\n"
 
-#: src/namestore/gnunet-namestore.c:1434
+#: src/namestore/gnunet-namestore.c:1436
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1483
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1493
+#: src/namestore/gnunet-namestore.c:1495
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1505 src/namestore/gnunet-namestore.c:1521
-#: src/namestore/gnunet-namestore.c:1538
+#: src/namestore/gnunet-namestore.c:1507 src/namestore/gnunet-namestore.c:1523
+#: src/namestore/gnunet-namestore.c:1540
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1513
+#: src/namestore/gnunet-namestore.c:1515
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Comando desconocido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1551
+#: src/namestore/gnunet-namestore.c:1553
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Formato no válido para la IP: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1608
+#: src/namestore/gnunet-namestore.c:1610
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:1611
+#: src/namestore/gnunet-namestore.c:1613
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:1615
+#: src/namestore/gnunet-namestore.c:1617
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:1622
+#: src/namestore/gnunet-namestore.c:1624
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 "tiempo de expiración del registro a usar (únicamente para añadir), nunca "
 "(\"never\") es posible"
 
-#: src/namestore/gnunet-namestore.c:1628
+#: src/namestore/gnunet-namestore.c:1630
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/namestore/gnunet-namestore.c:1633
+#: src/namestore/gnunet-namestore.c:1635
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/namestore/gnunet-namestore.c:1645
+#: src/namestore/gnunet-namestore.c:1647
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:1652
+#: src/namestore/gnunet-namestore.c:1654
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1658
+#: src/namestore/gnunet-namestore.c:1660
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:1663
+#: src/namestore/gnunet-namestore.c:1665
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:1669
+#: src/namestore/gnunet-namestore.c:1671
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:1673
+#: src/namestore/gnunet-namestore.c:1675
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:1679
+#: src/namestore/gnunet-namestore.c:1681
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1685
+#: src/namestore/gnunet-namestore.c:1687
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
@@ -5856,8 +5609,8 @@ msgstr "Medir la calidad y rendimiento del servicio NSE."
 msgid "Show network size estimates from NSE service."
 msgstr "# Estimaciones del tamaño de red recibidas"
 
-#: src/nse/gnunet-service-nse.c:1450
-#: src/revocation/gnunet-service-revocation.c:883 src/util/gnunet-scrypt.c:260
+#: src/nse/gnunet-service-nse.c:1441
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -6057,11 +5810,6 @@ msgstr "Error leyendo de «%s»: %s\n"
 msgid "Unable to create indices: %s.\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/pq/pq_prepare.c:109
-#, fuzzy, c-format
-msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
-msgstr "«%s» para «%s» falló en %s: %d con error: %s\n"
-
 #: src/pt/gnunet-daemon-pt.c:418
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Se produjo un fallo al empaquetar la petición DNS.  Omitiendo.\n"
@@ -6119,87 +5867,87 @@ msgid "Daemon to run to perform IP protocol translation 
to GNUnet"
 msgstr ""
 "Demonio a ejecutar para realizar la traducción de protocolo IP a GNUnet"
 
-#: src/reclaim/gnunet-reclaim.c:801
+#: src/reclaim/gnunet-reclaim.c:802
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "Las opción «%s» o «%s» es necesaria.\n"
 
-#: src/reclaim/gnunet-reclaim.c:808
+#: src/reclaim/gnunet-reclaim.c:809
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:815
+#: src/reclaim/gnunet-reclaim.c:816
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "el parámetro --section es necesario\n"
 
-#: src/reclaim/gnunet-reclaim.c:833
-msgid "Add an attribute NAME"
+#: src/reclaim/gnunet-reclaim.c:834
+msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:838
+#: src/reclaim/gnunet-reclaim.c:839
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:843
+#: src/reclaim/gnunet-reclaim.c:844
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:848
+#: src/reclaim/gnunet-reclaim.c:849
 #, fuzzy
 msgid "The EGO to use"
 msgstr "tamaño del mensaje"
 
-#: src/reclaim/gnunet-reclaim.c:854
+#: src/reclaim/gnunet-reclaim.c:855
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:858
+#: src/reclaim/gnunet-reclaim.c:859
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:862
+#: src/reclaim/gnunet-reclaim.c:863
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:868
+#: src/reclaim/gnunet-reclaim.c:869
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:873
+#: src/reclaim/gnunet-reclaim.c:874
 msgid "Credential name"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:879
+#: src/reclaim/gnunet-reclaim.c:880
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:884
+#: src/reclaim/gnunet-reclaim.c:885
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:889
+#: src/reclaim/gnunet-reclaim.c:890
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:894
+#: src/reclaim/gnunet-reclaim.c:895
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:899
+#: src/reclaim/gnunet-reclaim.c:900
 msgid "Type of credential"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:903
+#: src/reclaim/gnunet-reclaim.c:904
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:909
+#: src/reclaim/gnunet-reclaim.c:910
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:917
+#: src/reclaim/gnunet-reclaim.c:918
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -6230,11 +5978,11 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr "Demonio para anunciar expresiones regulares para el par usando mesh."
 
-#: src/regex/gnunet-regex-profiler.c:1392
+#: src/regex/gnunet-regex-profiler.c:1388
 msgid "No configuration file given. Exiting\n"
 msgstr "No se ha introducido ningún fichero de configuración. Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1434
+#: src/regex/gnunet-regex-profiler.c:1430
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
@@ -6242,51 +5990,51 @@ msgstr ""
 "No se ha especificado una política de directorios en la línea de comandos. "
 "Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1440
+#: src/regex/gnunet-regex-profiler.c:1436
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Las políticas de directorio especificadas no existen. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1448
+#: src/regex/gnunet-regex-profiler.c:1444
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1453
 msgid "No search strings file given. Exiting.\n"
 msgstr "No se ha proporcionado un fichero de cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1477
+#: src/regex/gnunet-regex-profiler.c:1473
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Error cargando cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1565
+#: src/regex/gnunet-regex-profiler.c:1562
 msgid "name of the file for writing statistics"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1572
+#: src/regex/gnunet-regex-profiler.c:1569
 #, fuzzy
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 "esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas como "
 "fallida"
 
-#: src/regex/gnunet-regex-profiler.c:1578
+#: src/regex/gnunet-regex-profiler.c:1575
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1586
+#: src/regex/gnunet-regex-profiler.c:1582
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1593
+#: src/regex/gnunet-regex-profiler.c:1589
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1606
+#: src/regex/gnunet-regex-profiler.c:1604
 msgid "Profiler for regex"
 msgstr "Perfilador para expresiones regulares."
 
@@ -6462,36 +6210,36 @@ msgstr ""
 msgid "number of epochs to calculate for"
 msgstr "número de pares para empezar"
 
-#: src/revocation/gnunet-service-revocation.c:502
+#: src/revocation/gnunet-service-revocation.c:507
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
 
-#: src/revocation/gnunet-service-revocation.c:512
+#: src/revocation/gnunet-service-revocation.c:517
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# mensajes «DATA» recibidos vía WLAN"
 
-#: src/revocation/gnunet-service-revocation.c:517
+#: src/revocation/gnunet-service-revocation.c:522
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:521
+#: src/revocation/gnunet-service-revocation.c:526
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# sesiones wlan creadas"
 
-#: src/revocation/gnunet-service-revocation.c:529
+#: src/revocation/gnunet-service-revocation.c:534
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# transmisiones de fragmentos completadas"
 
-#: src/revocation/gnunet-service-revocation.c:567
+#: src/revocation/gnunet-service-revocation.c:572
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:920
+#: src/revocation/gnunet-service-revocation.c:925
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "No se pudo conectar con el almacén de datos."
@@ -7032,17 +6780,17 @@ msgid ""
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2643
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr "El fichero de topología %s no fue encontrado\n"
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2651
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr "El fichero de topología %s no tiene datos\n"
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2659
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "El fichero de topología %s no puede ser leido\n"
@@ -7269,9 +7017,9 @@ msgstr "# mensajes «HELLO» recibidos"
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:3329
-#: src/transport/gnunet-communicator-udp.c:3814
-#: src/transport/gnunet-service-tng.c:10388
+#: src/transport/gnunet-communicator-tcp.c:3338
+#: src/transport/gnunet-communicator-udp.c:3856
+#: src/transport/gnunet-service-tng.c:10512
 #: src/transport/gnunet-service-transport.c:2627
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
@@ -7284,7 +7032,7 @@ msgstr ""
 msgid "GNUnet TCP communicator"
 msgstr "Configurador Gtk de GNUnet"
 
-#: src/transport/gnunet-communicator-udp.c:3889
+#: src/transport/gnunet-communicator-udp.c:3931
 #, fuzzy
 msgid "GNUnet UDP communicator"
 msgstr "Configurador Gtk de GNUnet"
@@ -8334,17 +8082,17 @@ msgstr "Acceso denegado a «%s»\n"
 msgid "Accepting connection from `%s': %p\n"
 msgstr "Aceptando conexión desde «%s»: %p\n"
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1396
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1400
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "«%s» falló para el puerto %d (%s).\n"
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1408
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1412
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "«%s» falló para el puerto %d (%s): dirección en uso actualmente\n"
 
-#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1415
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1419
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
@@ -8358,7 +8106,7 @@ msgstr ""
 "El código de procesado para el mensaje del tipo %u no llamó a "
 "«GNUNET_SERVER_receive_done» después de %s\n"
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:833
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr "Familia de direcciones %d desconocida\n"
@@ -8368,23 +8116,23 @@ msgstr "Familia de direcciones %d desconocida\n"
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr "Acceso denegado desde «%s» al servicio «%s»\n"
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:946
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:950
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr "No se pudo procesar la especificación de red IPv4 «%s» para «%s:%s»\n"
 
-#: src/transport/tcp_service_legacy.c:451 src/util/service.c:987
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:991
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr "No se pudo procesar la especificación de red IPv6 «%s» para «%s:%s»\n"
 
 #: src/transport/tcp_service_legacy.c:890
-#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1476
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1480
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr "El valor especificado «%s» para el servicio «%s» no es válido\n"
 
-#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1500
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1504
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8401,46 +8149,46 @@ msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 msgid "Service `%s' runs at %s\n"
 msgstr "El servicio «%s» se ejecuta en %s\n"
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1746
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1750
 msgid "Service process failed to initialize\n"
 msgstr "No se pudo inicializar el proceso del servicio\n"
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1751
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
 msgid "Service process could not initialize server function\n"
 msgstr ""
 "No se pudo inicializar la función del servidor en el proceso del servicio\n"
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1756
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
 msgid "Service process failed to report status\n"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
 #: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1220
-#: src/util/service.c:1637
+#: src/util/service.c:1641
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1639
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1643
 msgid "No such user"
 msgstr "No existe tal usuario"
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1653
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:1996
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2000
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
 #: src/transport/tcp_service_legacy.c:1397
-#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2072
-#: src/util/service.c:2084
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2076
+#: src/util/service.c:2088
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2094
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2098
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
@@ -8692,7 +8440,7 @@ msgstr "el parámetro --option es necesario para 
establecer un valor\n"
 msgid "failed to load configuration defaults"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
 
-#: src/util/container_bloomfilter.c:553
+#: src/util/container_bloomfilter.c:547
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8711,7 +8459,7 @@ msgstr "El firmado ECC falló en %s:%d: %s\n"
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
 
-#: src/util/crypto_ecc_setup.c:273
+#: src/util/crypto_ecc_setup.c:280
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "No se pudo acceder a la clave de máquina.\n"
@@ -8721,12 +8469,12 @@ msgstr "No se pudo acceder a la clave de máquina.\n"
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/crypto_rsa.c:862
+#: src/util/crypto_rsa.c:901
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_rsa.c:1162
+#: src/util/crypto_rsa.c:1201
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
@@ -8833,11 +8581,11 @@ msgstr "La opción «%s» no tiene sentido sin la opción 
«%s».\n"
 msgid "Missing mandatory option `%s'.\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/util/getopt_helpers.c:69
+#: src/util/getopt_helpers.c:63
 msgid "print the version number"
 msgstr "imprime el número de versión"
 
-#: src/util/getopt_helpers.c:116
+#: src/util/getopt_helpers.c:110
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8845,73 +8593,83 @@ msgstr ""
 "Los parámetros obligatorios para las opciones largas también lo son para sus "
 "versiones cortas.\n"
 
-#: src/util/getopt_helpers.c:208
+#: src/util/getopt_helpers.c:196
 msgid "print this help"
 msgstr "imprime esta ayuda"
 
-#: src/util/getopt_helpers.c:288
+#: src/util/getopt_helpers.c:261
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:429
+#: src/util/getopt_helpers.c:377
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:510
+#: src/util/getopt_helpers.c:444
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:532
+#: src/util/getopt_helpers.c:461
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "crear ficheros de configuración únicos"
 
-#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:859
-#: src/util/getopt_helpers.c:924
+#: src/util/getopt_helpers.c:497 src/util/getopt_helpers.c:811
+#: src/util/getopt_helpers.c:867
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:649
+#: src/util/getopt_helpers.c:569
 #, fuzzy, c-format
 msgid ""
 "You must pass a relative time (optionally with sign) to the `%s' option.\n"
 msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:656
+#: src/util/getopt_helpers.c:576
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:683
+#: src/util/getopt_helpers.c:594
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:685
+#: src/util/getopt_helpers.c:596
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:720
+#: src/util/getopt_helpers.c:630
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:785
+#: src/util/getopt_helpers.c:684
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:852
+#: src/util/getopt_helpers.c:741
+#, fuzzy, c-format
+msgid "You must pass a timestamp to the `%s' option.\n"
+msgstr "Tienes que introducir un número en la opción «%s».\n"
+
+#: src/util/getopt_helpers.c:748
+#, c-format
+msgid "The maximum precision allowed for timestamps is seconds.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:804
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:931
+#: src/util/getopt_helpers.c:874
 #, fuzzy, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:1018
+#: src/util/getopt_helpers.c:952
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
@@ -9039,31 +8797,84 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
-#: src/util/gnunet-qr.c:145 src/util/gnunet-uri.c:94
-#, c-format
-msgid "Invalid URI: does not start with `%s'\n"
+#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
+#, fuzzy, c-format
+msgid "Failed to add URI %s\n"
+msgstr "Se produjo un fallo al procesar la URI: %s\n"
+
+#: src/util/gnunet-qr.c:133
+#, fuzzy, c-format
+msgid "Added URI %s\n"
+msgstr "URI no válida: «%s»\n"
+
+#: src/util/gnunet-qr.c:160
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr "URI no válida: no comienza con «%s»\n"
 
-#: src/util/gnunet-qr.c:152 src/util/gnunet-uri.c:101
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
+#: src/util/gnunet-qr.c:170
+#, fuzzy, c-format
+msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr "URI no válida: falla al especificar el subsistema\n"
 
-#: src/util/gnunet-qr.c:159 src/util/gnunet-uri.c:108
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
+#: src/util/gnunet-qr.c:181
+#, fuzzy, c-format
+msgid "No known handler for subsystem `%s'\n"
 msgstr "No hay un manejador conocido para el subsistema «%s»\n"
 
-#: src/util/gnunet-qr.c:357
-msgid "use video-device DEVICE (default: /dev/video0"
+#: src/util/gnunet-qr.c:217
+#, fuzzy, c-format
+msgid "Unable to start child process `%s'\n"
+msgstr "Se produjo un fallo al iniciar el proceso «ssh».\n"
+
+#: src/util/gnunet-qr.c:246
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "Se produjo un fallo al abrir «%s»: %s\n"
+
+#: src/util/gnunet-qr.c:260
+#, fuzzy
+msgid "Capturing...\n"
+msgstr "Iniciando descarga «%s».\n"
+
+#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+msgid "No captured images\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#, c-format
+msgid "Got %d images\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#, fuzzy, c-format
+msgid "Found %s: \"%s\"\n"
+msgstr "Yo soy el par '%s'.\n"
+
+#: src/util/gnunet-qr.c:364 src/util/gnunet-qr.c:366
+#, fuzzy, c-format
+msgid "%s is not a PNG file\n"
+msgstr "«%s» no es un directorio GNUnet\n"
+
+#: src/util/gnunet-qr.c:545
+#, fuzzy
+msgid "No data found\n"
+msgstr "«upnpc» no encontrado\n"
+
+#: src/util/gnunet-qr.c:561
+msgid "Dispatching the URI\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:572
+msgid "use the video device DEVICE (defaults to /dev/video0)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:362
-msgid "do not show preview windows"
+#: src/util/gnunet-qr.c:579
+msgid "read from the PNG-encoded file FILE"
 msgstr ""
 
-#: src/util/gnunet-qr.c:372
-msgid "Scan a QR code using a video device and import the uri read"
+#: src/util/gnunet-qr.c:590
+msgid "Scan a QR code and import the URI read"
 msgstr ""
 
 #: src/util/gnunet-resolver.c:168
@@ -9075,28 +8886,28 @@ msgstr "realizar una búsqueda inversa"
 msgid "Use built-in GNUnet stub resolver"
 msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
 
-#: src/util/gnunet-scrypt.c:232
+#: src/util/gnunet-scrypt.c:215
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "La carga de la clave de la máquina desde «%s» ha fallado.\n"
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:304
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:310
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:330
+#: src/util/gnunet-scrypt.c:313
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
@@ -9110,6 +8921,21 @@ msgstr ""
 msgid "No URI specified on command line\n"
 msgstr "No se ha especificado una URI en la línea de comandos. Saliendo.\n"
 
+#: src/util/gnunet-uri.c:94
+#, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "URI no válida: no comienza con «%s»\n"
+
+#: src/util/gnunet-uri.c:101
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr "URI no válida: falla al especificar el subsistema\n"
+
+#: src/util/gnunet-uri.c:108
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr "No hay un manejador conocido para el subsistema «%s»\n"
+
 #: src/util/gnunet-uri.c:178
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
@@ -9131,12 +8957,12 @@ msgstr ""
 msgid "Error writing to `%s': %s\n"
 msgstr "Error escribiendo a «%s»: %s\n"
 
-#: src/util/network.c:178
+#: src/util/network.c:163
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
 
-#: src/util/network.c:1359
+#: src/util/network.c:1306
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9153,12 +8979,12 @@ msgstr ""
 "No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
 "de entorno «%s».\n"
 
-#: src/util/os_installation.c:802
+#: src/util/os_installation.c:786
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "¡No se pudo encontrar el programa llamado «%s» en PATH!\n"
 
-#: src/util/os_installation.c:835
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -9168,36 +8994,36 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
 
-#: src/util/plugin.c:162
+#: src/util/plugin.c:156
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "«%s» falló al resolver el método «%s» con error: %s\n"
 
-#: src/util/plugin.c:240
+#: src/util/plugin.c:234
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "Falló «%s» para la biblioteca «%s» con error: %s\n"
 
-#: src/util/plugin.c:420
+#: src/util/plugin.c:414
 msgid "Could not determine plugin installation path.\n"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/util/program.c:251
+#: src/util/program.c:286
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/util/program.c:263
+#: src/util/program.c:298
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/util/program.c:278
+#: src/util/program.c:313
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/util/program.c:293
+#: src/util/program.c:328
 #, fuzzy
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
@@ -9256,7 +9082,7 @@ msgstr ""
 "El código de procesado para el mensaje del tipo %u no llamó a "
 "«GNUNET_SERVER_receive_done» después de %s\n"
 
-#: src/util/service.c:1568
+#: src/util/service.c:1572
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
@@ -9271,90 +9097,90 @@ msgstr ""
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:409
+#: src/util/strings.c:395
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n"
 
-#: src/util/strings.c:501
+#: src/util/strings.c:487
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Se produjo un fallo al expandir «$HOME»: variable de entorno «HOME» no "
 "establecida"
 
-#: src/util/strings.c:1036
+#: src/util/strings.c:1023
 msgid "IPv6 address did not start with `['\n"
 msgstr "La dirección IPv6 no empezaba con «[»\n"
 
-#: src/util/strings.c:1044
+#: src/util/strings.c:1031
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr "La dirección IPv6 contenía «:» para separar el número de puerto\n"
 
-#: src/util/strings.c:1051
+#: src/util/strings.c:1038
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 "La dirección IPv6 contenía «]» antes de «:» para separar el número de "
 "puerto\n"
 
-#: src/util/strings.c:1059
+#: src/util/strings.c:1046
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 "La dirección IPv6 contenía un número de puerto válido después del último "
 "«:»\n"
 
-#: src/util/strings.c:1068
+#: src/util/strings.c:1055
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
 
-#: src/util/strings.c:1250 src/util/strings.c:1261
+#: src/util/strings.c:1237 src/util/strings.c:1248
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1270
+#: src/util/strings.c:1257
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/util/strings.c:1341 src/util/strings.c:1370 src/util/strings.c:1417
-#: src/util/strings.c:1437
+#: src/util/strings.c:1328 src/util/strings.c:1357 src/util/strings.c:1404
+#: src/util/strings.c:1424
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: «%s»\n"
 
-#: src/util/strings.c:1395
+#: src/util/strings.c:1382
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Notación de red no válida («/%d» no es válido en IPv4 CIDR)."
 
-#: src/util/strings.c:1446
+#: src/util/strings.c:1433
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/util/strings.c:1488
+#: src/util/strings.c:1475
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Notación de red no válida (no termina con «;»: «%s»)\n"
 
-#: src/util/strings.c:1538
+#: src/util/strings.c:1525
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato «%s» erroneo para máscara de red\n"
 
-#: src/util/strings.c:1569
+#: src/util/strings.c:1556
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato «%s» erroneo para red\n"
 
-#: src/util/time.c:699 src/util/time.c:727
+#: src/util/time.c:863 src/util/time.c:891
 #, fuzzy, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 "Se produjo un fallo al recuperar el espacio de nombres «%s», no se pudo "
 "retomar la operación de publicación.\n"
 
-#: src/util/time.c:735
+#: src/util/time.c:899
 #, c-format
 msgid ""
 "Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
@@ -9541,6 +9367,226 @@ msgstr "Configurar túneles vía VPN."
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
+#, fuzzy
+#~ msgid "# requests for random value received"
+#~ msgstr "# peticiones recibidas"
+
+#~ msgid "# GET requests from clients injected"
+#~ msgstr "# peticiones «GET» inyectadas de clientes"
+
+#~ msgid "# PUT requests received from clients"
+#~ msgstr "# peticiones «PUT» recibidas de clientes"
+
+#~ msgid "# GET requests received from clients"
+#~ msgstr "# peticiones «GET» recibidas de clientes"
+
+#~ msgid "# GET STOP requests received from clients"
+#~ msgstr "# peticiones «GET STOP» recibidas de clientes"
+
+#~ msgid "# Key match, type mismatches in REPLY to CLIENT"
+#~ msgstr ""
+#~ "# Coincidencias de clave, diferencias de tipo en la respuesta (REPLY) del "
+#~ "cliente (CLIENT)"
+
+#~ msgid "# Duplicate REPLIES to CLIENT request dropped"
+#~ msgstr ""
+#~ "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) "
+#~ "omitidas"
+
+#, c-format
+#~ msgid "Unsupported block type (%u) in request!\n"
+#~ msgstr "¡Tipo de bloque no soportado (%u) en la petición!\n"
+
+#~ msgid "# RESULTS queued for clients"
+#~ msgstr "# Resultados (RESULTS) encolados para clientes"
+
+#~ msgid "# REPLIES ignored for CLIENTS (no match)"
+#~ msgstr ""
+#~ "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin "
+#~ "coincidencia)"
+
+#, c-format
+#~ msgid "%s request received, but have no datacache!\n"
+#~ msgstr "¡Petición %s recibida, pero no tiene caché de datos!\n"
+
+#~ msgid "# ITEMS stored in datacache"
+#~ msgstr "# Elementos (ITEMS) almacenados en la caché de datos"
+
+#~ msgid "# Good RESULTS found in datacache"
+#~ msgstr "# Buenos resultados (RESULTS) encontrados en la caché de datos"
+
+#~ msgid "# Duplicate RESULTS found in datacache"
+#~ msgstr "# Resultados (RESULTS) duplicados encontrados en la caché de datos"
+
+#~ msgid "# Invalid RESULTS found in datacache"
+#~ msgstr "# Resultados (RESULTS) no válidos encontrados en la caché de datos"
+
+#~ msgid "# Irrelevant RESULTS found in datacache"
+#~ msgstr ""
+#~ "# Resultados (RESULTS) irrelevantes encontrados en la caché de datos"
+
+#~ msgid "# Unsupported RESULTS found in datacache"
+#~ msgstr ""
+#~ "# Resultados (RESULTS) no soportados encontrados en la caché de datos"
+
+#, c-format
+#~ msgid "Unsupported block type (%u) in local response!\n"
+#~ msgstr "¡Tipo de bloque no soportado (%u) en respuesta local!\n"
+
+#~ msgid "# GET requests given to datacache"
+#~ msgstr "# Peticiones «GET» realizadas a la caché de datos"
+
+#~ msgid "# HELLOs obtained from peerinfo"
+#~ msgstr "# «HELLO» obtenidos de «peerinfo»"
+
+#~ msgid "# FIND PEER messages initiated"
+#~ msgstr "# mensajes «FIND PEER» iniciados"
+
+#, fuzzy
+#~ msgid "# requests TTL-dropped"
+#~ msgstr "# peticiones unidas"
+
+#~ msgid "# Peers excluded from routing due to Bloomfilter"
+#~ msgstr "# Pares excluidos del encaminado debido a «Bloomfilter»"
+
+#~ msgid "# Peer selection failed"
+#~ msgstr "# Selecciones de pares fallidas"
+
+#~ msgid "# PUT requests routed"
+#~ msgstr "# Peticiones «PUT» encaminadas"
+
+#~ msgid "# PUT messages queued for transmission"
+#~ msgstr "# mensajes «PUT» encolados para transmisión"
+
+#~ msgid "# P2P messages dropped due to full queue"
+#~ msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
+
+#~ msgid "# GET requests routed"
+#~ msgstr "# Peticiones «GET» encaminadas"
+
+#~ msgid "# GET messages queued for transmission"
+#~ msgstr "# Mensajes «GET» encolados para transmisión"
+
+#~ msgid "# RESULT messages queued for transmission"
+#~ msgstr "# Mensajes «RESULT» encolados para transmisión"
+
+#, fuzzy
+#~ msgid "# Expired PUTs discarded"
+#~ msgstr "# respuestas irrelevantes descartadas"
+
+#~ msgid "# P2P PUT requests received"
+#~ msgstr "# Peticiones «PUT» P2P recibidas"
+
+#, fuzzy
+#~ msgid "# P2P PUT bytes received"
+#~ msgstr "# Peticiones «PUT» P2P recibidas"
+
+#~ msgid "# FIND PEER requests ignored due to Bloomfilter"
+#~ msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
+
+#~ msgid "# FIND PEER requests ignored due to lack of HELLO"
+#~ msgstr "# Peticiones «FIND PEER» ignoradas debido a falta de «HELLO»"
+
+#~ msgid "# P2P GET requests received"
+#~ msgstr "# Peticiones «GET» P2P recibidas"
+
+#, fuzzy
+#~ msgid "# P2P GET bytes received"
+#~ msgstr "# Peticiones «GET» P2P recibidas"
+
+#~ msgid "# P2P FIND PEER requests processed"
+#~ msgstr "# Peticiones «FIND PEER» P2P procesadas"
+
+#~ msgid "# P2P GET requests ONLY routed"
+#~ msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
+
+#, fuzzy
+#~ msgid "# Expired results discarded"
+#~ msgstr "# respuestas irrelevantes descartadas"
+
+#~ msgid "# P2P RESULTS received"
+#~ msgstr "# Resultados (RESULTS) P2P recibidos"
+
+#, fuzzy
+#~ msgid "# P2P RESULT bytes received"
+#~ msgstr "# Resultados (RESULTS) P2P recibidos"
+
+#~ msgid "# Network size estimates received"
+#~ msgstr "# Estimaciones del tamaño de red recibidas"
+
+#~ msgid "# Good REPLIES matched against routing table"
+#~ msgstr ""
+#~ "# Buenas respuestas (REPLIES) encontradas en la tabla de encaminamiento"
+
+#~ msgid "# Duplicate REPLIES matched against routing table"
+#~ msgstr ""
+#~ "# Respuestas (REPLIES) duplicadas encontradas en la tabla de "
+#~ "encaminamiento"
+
+#~ msgid "# Invalid REPLIES matched against routing table"
+#~ msgstr ""
+#~ "# Respuestas (REPLIES) no válidas encontradas en la tabla de "
+#~ "encaminamiento"
+
+#~ msgid "# Irrelevant REPLIES matched against routing table"
+#~ msgstr ""
+#~ "# Respuestas (REPLIES) irrelevantes encontradas en la tabla de "
+#~ "encaminamiento"
+
+#~ msgid "# Unsupported REPLIES matched against routing table"
+#~ msgstr ""
+#~ "# Respuestas (REPLIES) no soportadas encontradas en la tabla de "
+#~ "encaminamiento"
+
+#~ msgid "# Entries removed from routing table"
+#~ msgstr "# Entradas eliminadas de la tabla de encaminamiento"
+
+#~ msgid "# Entries added to routing table"
+#~ msgstr "# Entradas añadidas a la tabla de encaminamiento"
+
+#~ msgid "# DHT requests combined"
+#~ msgstr "# Peticiones a la DHT combinadas"
+
+#~ msgid "# replies dropped due to type mismatch"
+#~ msgstr "# respuestas omitidas debido a incompatibilidad de tipos"
+
+#~ msgid "# replies received for other peers"
+#~ msgstr "# respuestas recibidas de otros pares"
+
+#~ msgid "# replies dropped due to insufficient cover traffic"
+#~ msgstr "# respuestas omitidas debido a insuficiente tráfico de cobertura"
+
+#~ msgid "# P2P searches destroyed due to ultimate reply"
+#~ msgstr "# búsquedas P2P destruidas debido a respuesta definitiva"
+
+#~ msgid "# duplicate replies discarded (bloomfilter)"
+#~ msgstr "# respuestas duplicadas descartadas (bloomfilter)"
+
+#~ msgid "# irrelevant replies discarded"
+#~ msgstr "# respuestas irrelevantes descartadas"
+
+#, c-format
+#~ msgid "Unsupported block type %u\n"
+#~ msgstr "Tipo de bloque %u no soportado\n"
+
+#, fuzzy, c-format
+#~ msgid "Refusing `%s' request to HTTP server\n"
+#~ msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
+
+#, fuzzy, c-format
+#~ msgid "Businesscard HTTP server starts on %u\n"
+#~ msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
+
+#, fuzzy, c-format
+#~ msgid "Could not start businesscard HTTP server on port %u\n"
+#~ msgstr ""
+#~ "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto "
+#~ "%u\n"
+
+#, fuzzy, c-format
+#~ msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
+#~ msgstr "«%s» para «%s» falló en %s: %d con error: %s\n"
+
 #, fuzzy
 #~ msgid "Waiting for child to exit.\n"
 #~ msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
@@ -12062,9 +12108,6 @@ msgstr "¡Se produjo un fallo al conectar con el almacén 
de nombres!\n"
 #~ msgstr ""
 #~ "No se pudo iniciar el proceso «%s» para crear la clave de máquina.\n"
 
-#~ msgid "Failed to start `ssh' process.\n"
-#~ msgstr "Se produjo un fallo al iniciar el proceso «ssh».\n"
-
 #~ msgid "Error reading from gnunet-peerinfo: %s\n"
 #~ msgstr "Error leyendo de «gnunet-peerinfo»: %s\n"
 
@@ -12614,10 +12657,6 @@ msgstr "¡Se produjo un fallo al conectar con el 
almacén de nombres!\n"
 #~ msgid "Failed to load dhtlog plugin for `%s'\n"
 #~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#, fuzzy
-#~ msgid "Found peer `%s'\n"
-#~ msgstr "Yo soy el par '%s'.\n"
-
 #, fuzzy
 #~ msgid "Failed to initialize MySQL database connection for dhtlog.\n"
 #~ msgstr "Imposible inicializar SQLite.\n"
diff --git a/po/fr.po b/po/fr.po
index 96840c4a2..3692461e5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2014-04-08 11:11+0200\n"
+"POT-Creation-Date: 2022-01-10 15:13+0100\n"
 "PO-Revision-Date: 2021-11-21 00:53+0100\n"
 "Last-Translator: Stéphane  Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -17,635 +17,834 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: src/arm/arm_api.c:337
-msgid "Client was disconnected from arm service, trying to reconnect.\n"
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1304
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/arm/arm_monitor_api.c:321
-msgid "Monitoring client was disconnected from arm service, trying to 
reconnect.\n"
+#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
+#, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:164
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
+#: src/namestore/gnunet-namestore.c:1001
 #, c-format
-msgid "Failed to remove configuration file %s\n"
+msgid "Failed to connect to namestore\n"
+msgstr ""
+
+#: src/abd/gnunet-abd.c:566
+msgid "Ego does not exist!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:170
+#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
 #, c-format
-msgid "Failed to remove servicehome directory %s\n"
+msgid "Issuer public key not well-formed\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
-msgid "Message was sent successfully"
+#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
+#, fuzzy, c-format
+msgid "Failed to connect to ABD\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/abd/gnunet-abd.c:865
+#, c-format
+msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:218
-msgid "Misconfiguration (can not connect to the ARM service)"
+#: src/abd/gnunet-abd.c:872
+#, c-format
+msgid "ego required\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
-msgid "We disconnected from ARM before we could send a request"
+#: src/abd/gnunet-abd.c:882
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/abd/gnunet-abd.c:890
+#, c-format
+msgid "Subject public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
-msgid "ARM API is busy"
-msgstr "API ARM occupé"
+#: src/abd/gnunet-abd.c:924
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:224
-msgid "Request does not fit into a message"
+#: src/abd/gnunet-abd.c:983
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
-msgid "Request timed out"
+#: src/abd/gnunet-abd.c:1004
+msgid "verify credential against attribute"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
-msgid "Unknown request status"
+#: src/abd/gnunet-abd.c:1011
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
+msgstr ""
+
+#: src/abd/gnunet-abd.c:1018
+msgid "The private, signed delegate presented by the subject"
+msgstr ""
+
+#: src/abd/gnunet-abd.c:1025
+msgid "The public key of the authority to verify the credential against"
+msgstr ""
+
+#: src/abd/gnunet-abd.c:1030
+msgid "The ego/zone name to use"
+msgstr ""
+
+#: src/abd/gnunet-abd.c:1036
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
+
+#: src/abd/gnunet-abd.c:1042
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
+msgstr ""
+
+#: src/abd/gnunet-abd.c:1047
+msgid "collect credentials"
+msgstr ""
+
+#: src/abd/gnunet-abd.c:1052
+msgid "Create and issue a credential issuer side."
+msgstr ""
+
+#: src/abd/gnunet-abd.c:1057
+msgid "Issue a credential subject side."
+msgstr ""
+
+#: src/abd/gnunet-abd.c:1062
+msgid "Create, sign and return a credential subject side."
+msgstr ""
+
+#: src/abd/gnunet-abd.c:1069
+msgid "Import signed credentials that should be issued to a zone/ego"
+msgstr ""
+
+#: src/abd/gnunet-abd.c:1073
+msgid "Create private record entry."
+msgstr ""
+
+#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
+msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/abd/gnunet-abd.c:1098
+msgid "GNUnet abd resolver tool"
+msgstr ""
+
+#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
 #, c-format
-msgid "%s is stopped"
-msgstr "%s est arrêté"
+msgid "Failed to connect to GNS\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/abd/plugin_gnsrecord_abd.c:182
 #, c-format
-msgid "%s is starting"
-msgstr "%s est en cours de démarrage"
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:162
 #, c-format
-msgid "%s is stopping"
-msgstr "%s est en cours d'arrêt"
+msgid "Failed to remove configuration file %s\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:168
 #, c-format
-msgid "%s is starting already"
+msgid "Failed to remove servicehome directory %s\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1144
+msgid "Message was sent successfully"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1147
+msgid "We disconnected from ARM before we could send a request"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1149
+msgid "Unknown request status"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:250
+#, fuzzy
+msgid "is stopped"
+msgstr "%s est arrêté"
+
+#: src/arm/gnunet-arm.c:253
+#, fuzzy
+msgid "is starting"
+msgstr "%s est en cours de démarrage"
+
+#: src/arm/gnunet-arm.c:256
+#, fuzzy
+msgid "is stopping"
+msgstr "%s est en cours d'arrêt"
+
+#: src/arm/gnunet-arm.c:259
+#, fuzzy
+msgid "is starting already"
 msgstr "%s est déjà en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
-#, c-format
-msgid "%s is stopping already"
+#: src/arm/gnunet-arm.c:262
+#, fuzzy
+msgid "is stopping already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
-#, c-format
-msgid "%s is started already"
+#: src/arm/gnunet-arm.c:265
+#, fuzzy
+msgid "is started already"
 msgstr "%s est déjà démarré"
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
-#, c-format
-msgid "%s is stopped already"
+#: src/arm/gnunet-arm.c:268
+#, fuzzy
+msgid "is stopped already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
-#, c-format
-msgid "%s service is not known to ARM"
+#: src/arm/gnunet-arm.c:271
+msgid "service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
-#, c-format
-msgid "%s service failed to start"
-msgstr ""
+#: src/arm/gnunet-arm.c:274
+#, fuzzy
+msgid "service failed to start"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/arm/gnunet-arm.c:262
-#, c-format
-msgid "%s service cannot be started because ARM is shutting down"
+#: src/arm/gnunet-arm.c:277
+msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1061
-#, c-format
-msgid "%.s Unknown result code."
+#: src/arm/gnunet-arm.c:279
+#, fuzzy
+msgid "Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
 
-#: src/arm/gnunet-arm.c:297
+#: src/arm/gnunet-arm.c:312
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
+#: src/arm/gnunet-arm.c:341 src/arm/gnunet-arm.c:350
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:388
 #, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:379
+#: src/arm/gnunet-arm.c:399
 #, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:421
-#, c-format
-msgid "Failed to send a request to start the `%s' service: %%s\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:440
+#, fuzzy, c-format
+msgid "Failed to send a request to start the `%s' service: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/arm/gnunet-arm.c:431
+#: src/arm/gnunet-arm.c:450
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:468
+#: src/arm/gnunet-arm.c:490
 #, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:479
+#: src/arm/gnunet-arm.c:503
 #, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:517
+#: src/arm/gnunet-arm.c:549
 #, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:525
+#: src/arm/gnunet-arm.c:561
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:530
-msgid "Running services:\n"
+#: src/arm/gnunet-arm.c:603
+#, fuzzy
+msgid "All services:\n"
 msgstr "Services en exécution :\n"
 
-#: src/arm/gnunet-arm.c:612
+#: src/arm/gnunet-arm.c:607
+msgid "Services (excluding stopped services):\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:664
+msgid "(No services configured.)\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:825
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:861
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "Arrêté %s.\n"
 
-#: src/arm/gnunet-arm.c:646
+#: src/arm/gnunet-arm.c:865
 #, c-format
 msgid "Starting %s...\n"
 msgstr "En cous de démarrage %s…\n"
 
-#: src/arm/gnunet-arm.c:649
+#: src/arm/gnunet-arm.c:869
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "En cour d'arrêt %s…\n"
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:884
 #, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:974
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:979
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:728
+#: src/arm/gnunet-arm.c:984
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:989
+msgid "also show stopped services (used with -I)"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:994
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:733
+#: src/arm/gnunet-arm.c:999
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:736
+#: src/arm/gnunet-arm.c:1004
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:1008
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:1012
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:744
-msgid "timeout in MSECS milliseconds for completing current operation"
+#: src/arm/gnunet-arm.c:1019
+msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:746
+#: src/arm/gnunet-arm.c:1024
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:748
+#: src/arm/gnunet-arm.c:1029
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:750
+#: src/arm/gnunet-arm.c:1034
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:761
+#: src/arm/gnunet-arm.c:1052
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:266
-msgid "Could not send status result to client\n"
+#: src/arm/gnunet-service-arm.c:391 src/transport/plugin_transport_tcp.c:1102
+#: src/transport/tcp_service_legacy.c:573
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
+#: src/transport/plugin_transport_tcp.c:1123
+#: src/transport/plugin_transport_tcp.c:1129
+#: src/transport/plugin_transport_tcp.c:3706
+#: src/transport/tcp_service_legacy.c:594
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1094
+#: src/util/service.c:1100
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
+#: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
+#: src/util/service.c:1133
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
+#: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
+#: src/util/service.c:1137
+#, c-format
+msgid "Using `%s' instead\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1157
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1175
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:302
-msgid "Could not send list result to client\n"
+#: src/arm/gnunet-service-arm.c:536
+#: src/transport/plugin_transport_http_server.c:2718
+#: src/transport/plugin_transport_tcp.c:1244
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1206
+#, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/arm/gnunet-service-arm.c:555
+#: src/transport/plugin_transport_http_server.c:2736
+#: src/transport/plugin_transport_tcp.c:1263
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1225
+#, c-format
+msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:529
+#: src/arm/gnunet-service-arm.c:951
 #, c-format
 msgid "Failed to start service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:540
+#: src/arm/gnunet-service-arm.c:962
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:639
+#: src/arm/gnunet-service-arm.c:1062
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:661
+#: src/arm/gnunet-service-arm.c:1093
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:695
+#: src/arm/gnunet-service-arm.c:1124
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:831
+#: src/arm/gnunet-service-arm.c:1272
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1100
+#: src/arm/gnunet-service-arm.c:1604
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1193
+#: src/arm/gnunet-service-arm.c:1755
 msgid "exit"
 msgstr "exit"
 
-#: src/arm/gnunet-service-arm.c:1198
+#: src/arm/gnunet-service-arm.c:1760
 msgid "signal"
 msgstr "signal"
 
-#: src/arm/gnunet-service-arm.c:1203
+#: src/arm/gnunet-service-arm.c:1765
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/arm/gnunet-service-arm.c:1209
+#: src/arm/gnunet-service-arm.c:1771
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1231
+#: src/arm/gnunet-service-arm.c:1798
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1246
+#: src/arm/gnunet-service-arm.c:1815
 #, 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"
+#: src/arm/mockup-service.c:42
+msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1511
+#: src/ats-tool/gnunet-ats.c:299
 #, 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"
+msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:41
-msgid "Initiating shutdown as requested by client.\n"
+#: src/ats-tool/gnunet-ats.c:302
+#, c-format
+msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:468
+#: src/ats-tool/gnunet-ats.c:389
 #, c-format
-msgid "Received %s message\n"
-msgstr "%s message(s) reçu(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/ats_api_performance.c:511
-#, c-format
-msgid "Received last message for %s \n"
-msgstr "Dernier message reçu de %s\n"
+#: src/ats-tool/gnunet-ats.c:396
+msgid "active "
+msgstr ""
 
-#: 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"
+#: src/ats-tool/gnunet-ats.c:396
+msgid "inactive "
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2205
-#: src/ats/gnunet-service-ats_addresses.c:1987
+#: src/ats-tool/gnunet-ats.c:501
 #, c-format
-msgid "Outbound quota configure for network `%s' is %llu\n"
+msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2212
-#: src/ats/gnunet-service-ats_addresses.c:1995
+#: src/ats-tool/gnunet-ats.c:692
 #, c-format
-msgid "No outbound quota configured for network `%s', assigning default 
bandwidth %llu\n"
+msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2239
-#: src/ats/gnunet-service-ats_addresses.c:2031
+#: src/ats-tool/gnunet-ats.c:734 src/ats-tool/gnunet-ats.c:745
 #, c-format
-msgid "Inbound quota configured for network `%s' is %llu\n"
+msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2246
-#: src/ats/gnunet-service-ats_addresses.c:2039
+#: src/ats-tool/gnunet-ats.c:756
 #, c-format
-msgid "No outbound quota configure for network `%s', assigning default 
bandwidth %llu\n"
+msgid "Please select one operation: %s or %s or %s or %s or %s\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: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"
+#: src/ats-tool/gnunet-ats.c:776 src/ats-tool/gnunet-ats.c:800
+#: src/ats-tool/gnunet-ats.c:825 src/ats-tool/gnunet-ats.c:862
+msgid "Cannot connect to ATS service, exiting...\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2680
-msgid "print logging"
-msgstr "afficher le journal"
-
-#: src/ats/gnunet-service-ats_addresses.c:2217
-#, c-format
-msgid "Initializing solver `%s '`%s'\n"
+#: src/ats-tool/gnunet-ats.c:789 src/ats-tool/gnunet-ats.c:812
+msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2220
-#, c-format
-msgid "Failed to initialize solver `%s'!\n"
+#: src/ats-tool/gnunet-ats.c:834
+msgid "No preference type given!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2243
-msgid "Failed to initialize solver!\n"
+#: src/ats-tool/gnunet-ats.c:839
+msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:892
-msgid "Problem size too large, cannot allocate memory!\n"
+#: src/ats-tool/gnunet-ats.c:855
+msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1329
-#, c-format
-msgid "Adding address for peer `%s' multiple times\n"
+#: src/ats-tool/gnunet-ats.c:911
+msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1376
-#, c-format
-msgid "Updating address property `%s' for peer `%s' %p not added before\n"
+#: src/ats-tool/gnunet-ats.c:916
+msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2122
-#, c-format
-msgid "Adjusting inconsistent outbound quota configuration for network `%s', 
is %llu must be at least %llu\n"
-msgstr ""
+#: src/ats-tool/gnunet-ats.c:922
+#, fuzzy
+msgid "connect to PEER"
+msgstr "Connecté à"
 
-#: src/ats/plugin_ats_mlp.c:2131
-#, c-format
-msgid "Adjusting inconsistent inbound quota configuration for network `%s', is 
%llu must be at least %llu\n"
+#: src/ats-tool/gnunet-ats.c:927
+msgid "do not resolve IP addresses to hostnames"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2142
-#, c-format
-msgid "Adjusting outbound quota configuration for network `%s'from %llu to 
%.0f\n"
-msgstr ""
+#: src/ats-tool/gnunet-ats.c:932
+msgid "monitor mode"
+msgstr "mode moniteur"
 
-#: src/ats/plugin_ats_mlp.c:2150
-#, c-format
-msgid "Adjusting inbound quota configuration for network `%s' from %llu to 
%.0f\n"
+#: src/ats-tool/gnunet-ats.c:938
+msgid "set preference for the given peer"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2161
-#, c-format
-msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
+#: src/ats-tool/gnunet-ats.c:943
+msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1511
-#, c-format
-msgid "Invalid network type `%u' `%s': Disconnect!\n"
+#: src/ats-tool/gnunet-ats.c:948
+msgid "peer id"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:72
-msgid "Benchmarking done\n"
-msgstr "Benchmark terminé\n"
+#: src/ats-tool/gnunet-ats.c:955
+msgid "preference type to set: latency | bandwidth"
+msgstr ""
 
-#: src/ats-tests/ats-testing.c:105
-#, c-format
-msgid "Failed to connect peer 0 and %u\n"
+#: src/ats-tool/gnunet-ats.c:961
+msgid "preference value"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:413
-#, c-format
-msgid "Connected master [%u] with slave [%u]\n"
+#: src/ats-tool/gnunet-ats.c:967
+msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:419
-#, c-format
-msgid "Failed to connect master peer [%u] with slave [%u]\n"
+#: src/ats-tool/gnunet-ats.c:977
+msgid "Print information about ATS state"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:450
-msgid "Connecting peers on CORE level\n"
+#: src/ats/gnunet-ats-solver-eval.c:2992 src/ats/gnunet-ats-solver-eval.c:3044
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:461
+#: src/ats/gnunet-ats-solver-eval.c:3011
 #, c-format
-msgid "Connecting master [%u] with slave [%u]\n"
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:470
+#: src/ats/gnunet-ats-solver-eval.c:3063
 #, c-format
-msgid "Could not connect master [%u] and slave [%u]\n"
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:671
-msgid "Initialization failed, shutdown\n"
+#: src/ats/gnunet-ats-solver-eval.c:3552
+msgid "solver to use"
+msgstr "solveur utilisé"
+
+#: src/ats/gnunet-ats-solver-eval.c:3557
+msgid "experiment to use"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:842
-msgid "Stop logging\n"
-msgstr "Arrêter la journalisation\n"
+#: src/ats/gnunet-ats-solver-eval.c:3564
+msgid "print logging"
+msgstr "afficher le journal"
 
-#: src/ats-tests/ats-testing-log.c:893
-#, c-format
-msgid "Start logging `%s'\n"
-msgstr "Démarrer la journalisation « %s »\n"
+#: src/ats/gnunet-ats-solver-eval.c:3569
+msgid "save logging to disk"
+msgstr ""
 
-#: 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"
+#: src/ats/gnunet-ats-solver-eval.c:3574
+msgid "disable normalization"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:169
+#: src/ats/gnunet-service-ats_plugins.c:326
 #, c-format
-msgid "%u address resolutions had a timeout\n"
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:171
+#: src/ats/gnunet-service-ats_plugins.c:336
 #, c-format
-msgid "ATS returned results for %u addresses\n"
+msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:232
+#: src/ats/gnunet-service-ats_plugins.c:382
 #, c-format
-msgid "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u 
Bytes/s, %s\n"
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:413
+#: src/ats/gnunet-service-ats_plugins.c:474
 #, c-format
-msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
+msgid "Failed to initialize solver `%s'!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:433 src/core/gnunet-core.c:163
-#: src/namestore/gnunet-namestore.c:550 src/transport/gnunet-transport.c:1246
-#, c-format
-msgid "Service `%s' is not running\n"
+#: src/ats/plugin_ats_proportional.c:1142
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/ats/plugin_ats_proportional.c:1165
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f\n"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/auction/gnunet-auction-create.c:163
+msgid "description of the item to be sold"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:445 src/transport/gnunet-transport.c:1255
-#, c-format
-msgid "Failed to parse peer identity `%s'\n"
+#: src/auction/gnunet-auction-create.c:169
+msgid "mapping of possible prices"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:454
-#, c-format
-msgid "Please select one operation : %s or %s or %s or %s or %s\n"
+#: src/auction/gnunet-auction-create.c:175
+msgid "max duration per round"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:470 src/ats-tool/gnunet-ats.c:489
-#: src/ats-tool/gnunet-ats.c:506 src/ats-tool/gnunet-ats.c:543
-#, c-format
-msgid "Cannot connect to ATS service, exiting...\n"
+#: src/auction/gnunet-auction-create.c:182
+msgid "duration until auction starts"
 msgstr ""
 
-#: 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"
+#: src/auction/gnunet-auction-create.c:187
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:515
-#, c-format
-msgid "No preference type given!\n"
+#: src/auction/gnunet-auction-create.c:194
+msgid "public auction outcome"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:520
-#, c-format
-msgid "No peer given!\n"
+#: src/auction/gnunet-auction-create.c:200
+msgid "keep running in foreground until auction completes"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:536
-msgid "Valid type required\n"
+#: src/auction/gnunet-auction-create.c:212
+msgid "create a new auction and start listening for bidders"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:594
-msgid "get list of active addresses currently used"
+#: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
+#: src/conversation/gnunet-conversation-test.c:256
+#: src/revocation/gnunet-revocation.c:570 src/template/gnunet-template.c:75
+msgid "help text"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:596
-msgid "get list of all active addresses"
+#: src/cadet/gnunet-cadet.c:606
+#, c-format
+msgid "Invalid peer ID `%s'\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:599
-msgid "do not resolve IP addresses to hostnames"
+#: src/cadet/gnunet-cadet.c:685
+#, c-format
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:601
-msgid "monitor mode"
-msgstr "mode moniteur"
+#: src/cadet/gnunet-cadet.c:746
+#, c-format
+msgid "Invalid target `%s'\n"
+msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:603
-msgid "set preference for the given peer"
+#: src/cadet/gnunet-cadet.c:775
+msgid "No action requested\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:605
-msgid "print all configured quotas"
+#: src/cadet/gnunet-cadet.c:800
+msgid "Provide information about a particular connection"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:607
-msgid "peer id"
+#: src/cadet/gnunet-cadet.c:804
+msgid "Activate echo mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:610
-msgid "preference type to set: latency | bandwidth"
+#: src/cadet/gnunet-cadet.c:811
+msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:612
-msgid "preference value"
+#: src/cadet/gnunet-cadet.c:817
+msgid "Provide information about a patricular peer"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:615
-msgid "verbose output (include ATS address properties)"
+#: src/cadet/gnunet-cadet.c:822
+msgid "Provide information about all peers"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:622
-msgid "Print information about ATS state"
+#: src/cadet/gnunet-cadet.c:827
+msgid "Provide information about all tunnels"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:437
-#: src/secretsharing/gnunet-secretsharing-profiler.c:535
+#: src/consensus/gnunet-consensus-profiler.c:530
+#: src/secretsharing/gnunet-secretsharing-profiler.c:624
 msgid "number of peers in consensus"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:440
-msgid "how many peers receive one value?"
+#: src/consensus/gnunet-consensus-profiler.c:537
+msgid ""
+"how many peers (random selection without replacement) receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:443
-#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
-#: src/set/gnunet-set-profiler.c:292
+#: src/consensus/gnunet-consensus-profiler.c:543
+#: src/set/gnunet-set-profiler.c:451 src/set/gnunet-set-profiler.c:457
+#: src/set/gnunet-set-profiler.c:480 src/seti/gnunet-seti-profiler.c:441
+#: src/seti/gnunet-seti-profiler.c:446 src/seti/gnunet-seti-profiler.c:451
+#: src/setu/gnunet-setu-profiler.c:442 src/setu/gnunet-setu-profiler.c:448
+#: src/setu/gnunet-setu-profiler.c:471
 msgid "number of values"
 msgstr "nombre de valeurs"
 
-#: src/consensus/gnunet-consensus-profiler.c:446
+#: src/consensus/gnunet-consensus-profiler.c:549
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:449
+#: src/consensus/gnunet-consensus-profiler.c:557
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:452
-#: src/secretsharing/gnunet-secretsharing-profiler.c:550
+#: src/consensus/gnunet-consensus-profiler.c:563
+#: src/set/gnunet-set-profiler.c:498 src/seti/gnunet-seti-profiler.c:467
+#: src/setu/gnunet-setu-profiler.c:489
+msgid "write statistics to file"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:569
+msgid "distribute elements to a static subset of good peers"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:575
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:470
+#: src/conversation/conversation_api.c:523
+#: src/conversation/conversation_api_call.c:515
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/conversation/gnunet-conversation-test.c:120
 #, c-format
-msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:286
+#: src/conversation/gnunet-conversation-test.c:146
 #, c-format
-msgid "Call from `%s' terminated\n"
+msgid ""
+"\n"
+"ew are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:218
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:264
+#, c-format
+msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:287
+#, c-format
+msgid "Call from `%s' terminated\n"
 msgstr ""
 
 #: src/conversation/gnunet-conversation.c:319
@@ -653,12 +852,12 @@ msgstr ""
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:324
+#: src/conversation/gnunet-conversation.c:325
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:342
+#: src/conversation/gnunet-conversation.c:343
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
@@ -669,15 +868,15 @@ msgstr ""
 
 #: 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 at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:390
+#: src/conversation/gnunet-conversation.c:391
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:397
+#: src/conversation/gnunet-conversation.c:398
 #, c-format
 msgid "Connection established to `%s'\n"
 msgstr ""
@@ -688,1014 +887,1035 @@ msgid "Failed to resolve `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
 
 #: src/conversation/gnunet-conversation.c:411
-msgid "Call terminated\n"
+#, fuzzy, c-format
+msgid "Call to `%s' terminated\n"
 msgstr "Appel terminé\n"
 
-#: src/conversation/gnunet-conversation.c:417
+#: src/conversation/gnunet-conversation.c:420
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:427
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:428
+#: src/conversation/gnunet-conversation.c:432
+#, c-format
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:501
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Commande « %s » inconnue\n"
 
-#: src/conversation/gnunet-conversation.c:511
-#: src/conversation/gnunet-conversation.c:525
+#: src/conversation/gnunet-conversation.c:515
+#: src/conversation/gnunet-conversation.c:527
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:518
-#: src/conversation/gnunet-conversation.c:575
+#: src/conversation/gnunet-conversation.c:521
+#: src/conversation/gnunet-conversation.c:579
+#, c-format
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:533
-#: src/conversation/gnunet-conversation.c:588
+#: src/conversation/gnunet-conversation.c:538
+#: src/conversation/gnunet-conversation.c:596
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:544
+#: src/conversation/gnunet-conversation.c:548
+#, c-format
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:599
+#: src/conversation/gnunet-conversation.c:607
+#, c-format
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:622
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:647
+#: src/conversation/gnunet-conversation.c:649
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:670
+#: src/conversation/gnunet-conversation.c:673
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:675
+#: src/conversation/gnunet-conversation.c:680
 #, c-format
-msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:681
-#: src/conversation/gnunet-conversation.c:705
+#: src/conversation/gnunet-conversation.c:687
+#: src/conversation/gnunet-conversation.c:717
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
-msgid "We had an internal error setting up our phone line. You can still make 
calls.\n"
+#: src/conversation/gnunet-conversation.c:696
+#, c-format
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:705
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:700
+#: src/conversation/gnunet-conversation.c:711
 #, c-format
-msgid "We are calling `%s', his phone should be ringing.\n"
+msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:719
+#: src/conversation/gnunet-conversation.c:728
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:734
 #, 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:761
+#: src/conversation/gnunet-conversation.c:777
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:801
-#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:811
+#: src/conversation/gnunet-conversation.c:826
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:835
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:843
+#, c-format
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:850
+#: src/conversation/gnunet-conversation.c:858
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:891
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:893
+#: src/conversation/gnunet-conversation.c:899
+#, c-format
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:910
+#: src/conversation/gnunet-conversation.c:914
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:937
+#: src/conversation/gnunet-conversation.c:941
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:939
+#: src/conversation/gnunet-conversation.c:942
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/conversation/gnunet-conversation.c:945
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:943
+#: src/conversation/gnunet-conversation.c:948
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: 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."
+#: src/conversation/gnunet-conversation.c:952
+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:947
+#: src/conversation/gnunet-conversation.c:955
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:949
+#: src/conversation/gnunet-conversation.c:958
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:961
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1151
+#: src/conversation/gnunet-conversation.c:1124
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1164
+#: src/conversation/gnunet-conversation.c:1134
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/conversation/gnunet-conversation.c:1166
 msgid "You must specify the NAME of an ego to use\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1223
-msgid "Failed to start gnunet-helper-w32-console\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation.c:1249
-msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+#: src/conversation/gnunet-conversation.c:1193
+msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1252
+#: src/conversation/gnunet-conversation.c:1199
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1276
+#: src/conversation/gnunet-conversation.c:1218
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:121
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:149
-#, c-format
-msgid ""
-"\n"
-"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
+#: src/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/conversation/gnunet_gst.c:664
 #, c-format
-msgid "We will now be recording you for %s. After that time, the recording 
will be played back to you..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:248
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
-#: src/template/gnunet-template.c:70
-msgid "help text"
+msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:305
+#: src/conversation/gnunet-helper-audio-playback.c:330
 #, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "pa_stream_write() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:587
+#: src/conversation/gnunet-helper-audio-playback.c:649
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:612
-#: src/conversation/gnunet-helper-audio-record.c:545
+#: src/conversation/gnunet-helper-audio-playback.c:676
+#: src/conversation/gnunet-helper-audio-record.c:568
 msgid "Connection established.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:617
-#: src/conversation/gnunet-helper-audio-record.c:550
+#: src/conversation/gnunet-helper-audio-playback.c:681
+#: src/conversation/gnunet-helper-audio-record.c:573
 #, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "pa_stream_new() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:631
+#: src/conversation/gnunet-helper-audio-playback.c:697
 #, 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:644
-#: src/conversation/gnunet-helper-audio-record.c:576
+#: src/conversation/gnunet-helper-audio-playback.c:711
+#: src/conversation/gnunet-helper-audio-record.c:601
 #, c-format
 msgid "Connection failure: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:665
-#: src/conversation/gnunet-helper-audio-record.c:599
+#: src/conversation/gnunet-helper-audio-playback.c:732
+#: src/conversation/gnunet-helper-audio-record.c:624
 msgid "Wrong Spec\n"
 msgstr "Spécification incorrecte\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:671
-#: src/conversation/gnunet-helper-audio-record.c:605
+#: src/conversation/gnunet-helper-audio-playback.c:738
+#: src/conversation/gnunet-helper-audio-record.c:630
 msgid "pa_mainloop_new() failed.\n"
 msgstr "pa_mainloop_new() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:685
-#: src/conversation/gnunet-helper-audio-record.c:620
+#: src/conversation/gnunet-helper-audio-playback.c:752
+#: src/conversation/gnunet-helper-audio-record.c:645
 msgid "pa_context_new() failed.\n"
 msgstr "pa_context_new() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:692
-#: src/conversation/gnunet-helper-audio-record.c:626
+#: src/conversation/gnunet-helper-audio-playback.c:759
+#: src/conversation/gnunet-helper-audio-record.c:651
 #, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "pa_context_connect() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:698
-#: src/conversation/gnunet-helper-audio-record.c:632
+#: src/conversation/gnunet-helper-audio-playback.c:765
+#: src/conversation/gnunet-helper-audio-record.c:657
 msgid "pa_mainloop_run() failed.\n"
 msgstr "pa_mainloop_run() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:768
+#: src/conversation/gnunet-helper-audio-playback.c:845
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:325
-#, c-format
-msgid "Read error from STDIN: %d %s\n"
-msgstr ""
-
-#: src/conversation/gnunet-helper-audio-record.c:344
+#: src/conversation/gnunet-helper-audio-record.c:356
 #, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
 msgstr "opus_encode_float() échoué : %s. Annulation\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:420
+#: src/conversation/gnunet-helper-audio-record.c:435
 #, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr "pa_stream_peek() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:458
+#: src/conversation/gnunet-helper-audio-record.c:477
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:483
+#: src/conversation/gnunet-helper-audio-record.c:504
 msgid "Stream successfully created.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:488
+#: src/conversation/gnunet-helper-audio-record.c:509
 #, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "pa_stream_get_buffer_attr() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:496
+#: src/conversation/gnunet-helper-audio-record.c:516
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:500
+#: src/conversation/gnunet-helper-audio-record.c:520
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:507
+#: src/conversation/gnunet-helper-audio-record.c:527
 #, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:516
+#: src/conversation/gnunet-helper-audio-record.c:537
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:563
+#: src/conversation/gnunet-helper-audio-record.c:586
 #, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr "pa_stream_connect_record() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:676
+#: src/conversation/gnunet-helper-audio-record.c:703
 msgid "ogg_stream_init() failed.\n"
 msgstr "ogg_stream_init() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:721
+#: src/conversation/gnunet-helper-audio-record.c:748
 #, c-format
-msgid "Failed to allocate %d bytes for second packet\n"
-msgstr ""
-
-#: src/conversation/gnunet-service-conversation.c:841
-msgid "Mesh audio channel not ready; audio data dropped\n"
+msgid "Failed to allocate %u bytes for second packet\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:932
+#: src/conversation/gnunet-service-conversation.c:1286
 #, c-format
-msgid "No available phone for incoming call on line %u, sending HANG_UP 
signal\n"
+msgid "Could not open line, port %s already in use!\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1338
-#, c-format
-msgid "Received incoming channel on port %u\n"
+#: src/conversation/microphone.c:118
+msgid "Could not start record audio helper\n"
 msgstr ""
 
-#: src/conversation/microphone.c:121
-msgid "Could not start record audio helper\n"
+#: src/conversation/plugin_gnsrecord_conversation.c:72
+#, c-format
+msgid "PHONE version %u not supported\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:116
+#: src/conversation/plugin_gnsrecord_conversation.c:136
+#: src/conversation/plugin_gnsrecord_conversation.c:150
 #, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr ""
 
-#: src/conversation/speaker.c:75
+#: src/conversation/speaker.c:73
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/core_api.c:767
-msgid "Client was disconnected from core service, trying to reconnect.\n"
+#: src/core/gnunet-core.c:91
+msgid "fresh connection"
 msgstr ""
 
-#: src/core/gnunet-core.c:80
-#, c-format
-msgid "Peer `%s'\n"
+#: src/core/gnunet-core.c:95
+msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:910 src/transport/gnunet-transport.c:930
-#, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
+#: src/core/gnunet-core.c:99
+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:103
+msgid "connection established"
+msgstr ""
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:931
-msgid "Disconnected from"
+#: src/core/gnunet-core.c:107
+msgid "rekeying"
+msgstr ""
+
+#: src/core/gnunet-core.c:111
+#, fuzzy
+msgid "disconnected"
 msgstr "Déconnecté de"
 
-#: src/core/gnunet-core.c:211 src/peerinfo-tool/gnunet-peerinfo.c:694
+#: src/core/gnunet-core.c:120
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+
+#: src/core/gnunet-core.c:124
+#, fuzzy
+msgid "unknown state"
+msgstr "adresse inconnue"
+
+#: src/core/gnunet-core.c:129
+#, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgstr ""
+
+#: src/core/gnunet-core.c:157 src/peerinfo-tool/gnunet-peerinfo.c:697
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:233 src/transport/gnunet-transport.c:1486
+#: src/core/gnunet-core.c:163
+msgid "Failed to connect to CORE service!\n"
+msgstr ""
+
+#: src/core/gnunet-core.c:186 src/transport/gnunet-transport.c:1389
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:244
+#: src/core/gnunet-core.c:196
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:105
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+#: src/core/gnunet-service-core.c:328
+msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:126
-#, c-format
-msgid "Core service of `%4s' ready.\n"
+#: src/core/gnunet-service-core.c:354
+msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:370
-msgid "# send requests dropped (disconnected)"
+#: src/core/gnunet-service-core.c:418
+#, c-format
+msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:480
+#: src/core/gnunet-service-core.c:504
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:526
+#: src/core/gnunet-service-core.c:823
 #, c-format
-msgid "# bytes of messages of type %u received"
+msgid "# messages of type %u discarded (client busy)"
+msgstr ""
+
+#: src/core/gnunet-service-core.c:925
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr ""
+
+#: src/core/gnunet-service-core.c:953
+#, c-format
+msgid "Core service of `%s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:535
+#: src/core/gnunet-service-core_kx.c:512
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:586
+#: src/core/gnunet-service-core_kx.c:570
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:667
+msgid "# PAYLOAD dropped (out of order)"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:719
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:713
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:810
+#: src/core/gnunet-service-core_kx.c:807
+msgid "# PING messages transmitted"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:866
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:816
-msgid "# ephemeral keys received"
+#: src/core/gnunet-service-core_kx.c:880
+msgid "# duplicate ephemeral keys ignored"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:915
+msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:850
+#: src/core/gnunet-service-core_kx.c:933
 #, 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 from peer `%s' rejected as its validity range does not match "
+"our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:861
-msgid "# EPHEMERAL_KEY messages received"
+#: src/core/gnunet-service-core_kx.c:940
+msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:951
-#: src/transport/gnunet-service-transport_validation.c:1016
-msgid "# PING messages received"
+#: src/core/gnunet-service-core_kx.c:958
+msgid "# valid ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:959
-msgid "# PING messages dropped (out of order)"
+#: src/core/gnunet-service-core_kx.c:1067
+#: src/transport/gnunet-service-transport_validation.c:1133
+msgid "# PING messages received"
 msgstr ""
 
-#: 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"
+#: src/core/gnunet-service-core_kx.c:1077
+msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1003
+#: src/core/gnunet-service-core_kx.c:1126
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1151
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1164
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1096
-#: src/transport/gnunet-service-transport_validation.c:1328
+#: src/core/gnunet-service-core_kx.c:1221
+#: src/transport/gnunet-service-transport_validation.c:1476
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1102
+#: src/core/gnunet-service-core_kx.c:1229
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1107
+#: src/core/gnunet-service-core_kx.c:1237
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1137
+#: src/core/gnunet-service-core_kx.c:1276
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1171
+#: src/core/gnunet-service-core_kx.c:1316
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1181
+#: src/core/gnunet-service-core_kx.c:1328
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1188
+#: src/core/gnunet-service-core_kx.c:1337
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1513
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1335
+#: src/core/gnunet-service-core_kx.c:1524
 #, 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:1338
+#: src/core/gnunet-service-core_kx.c:1528
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1383
-#: src/core/gnunet-service-core_kx.c:1408
+#: src/core/gnunet-service-core_kx.c:1606
+#: src/core/gnunet-service-core_kx.c:1633
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1395
+#: src/core/gnunet-service-core_kx.c:1619
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1437
+#: src/core/gnunet-service-core_kx.c:1664
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1445
+#: src/core/gnunet-service-core_kx.c:1673
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1480
-msgid "# PAYLOAD dropped (out of order)"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:168
-msgid "# sessions terminated by transport disconnect"
-msgstr ""
-
-#: 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:252
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: 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: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
+#: src/core/gnunet-service-core_sessions.c:252
+#: src/core/gnunet-service-core_sessions.c:337
+#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1520
+#: src/topology/gnunet-daemon-topology.c:579
+#: src/topology/gnunet-daemon-topology.c:671
+#: src/transport/gnunet-service-transport_neighbours.c:723
+#: src/transport/gnunet-service-transport_neighbours.c:731
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:255
+#: src/core/gnunet-service-core_sessions.c:285
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:426
-msgid "# messages discarded (expired prior to transmission)"
+#: src/core/gnunet-service-core_sessions.c:400
+msgid "# outdated typemap confirmations received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
+#: src/core/gnunet-service-core_sessions.c:418
+msgid "# valid typemap confirmations received"
+msgstr ""
+
+#: src/core/gnunet-service-core_typemap.c:170
+#: src/core/gnunet-service-core_typemap.c:184
 msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:151
+#: src/core/gnunet-service-core_typemap.c:218
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:275
+#: src/datastore/gnunet-service-datastore.c:743
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:117 src/datacache/datacache.c:268
+#: src/datacache/datacache.c:121 src/datacache/datacache.c:279
 msgid "# items stored"
 msgstr ""
 
-#: 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
+#: src/datacache/datacache.c:185
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:192
+#: src/datacache/datacache.c:203
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:295
+#: src/datacache/datacache.c:297
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:304
+#: src/datacache/datacache.c:308
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:406
+#: src/datacache/datacache.c:329
+msgid "# proximity search requests received"
+msgstr ""
+
+#: src/datacache/plugin_datacache_heap.c:527
 msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:392
-msgid "Postgres datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:72
-#: src/datastore/plugin_datastore_mysql.c:806
-#: src/datastore/plugin_datastore_mysql.c:820
-#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
-#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
-#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
-#: src/namecache/plugin_namecache_postgres.c:52
-#: src/namecache/plugin_namecache_sqlite.c:52
-#: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:52
-#: src/testbed/generate-underlay-topology.c:47
-#: src/testbed/gnunet-daemon-latency-logger.c:52
-#: src/testbed/gnunet-daemon-testbed-underlay.c:55
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
-#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:50
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:139
+#: src/datastore/plugin_datastore_mysql.c:890
+#: src/datastore/plugin_datastore_sqlite.c:63
+#: src/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:81 src/my/my.c:93
+#: src/mysql/mysql.c:46 src/mysql/mysql.c:64
+#: src/namecache/plugin_namecache_sqlite.c:54
+#: src/namestore/plugin_namestore_sqlite.c:55
+#: src/peerstore/plugin_peerstore_sqlite.c:54
+#: src/testbed/generate-underlay-topology.c:48
+#: src/testbed/gnunet-daemon-latency-logger.c:53
+#: src/testbed/gnunet-daemon-testbed-underlay.c:57
+#: src/testbed/testbed_api_hosts.c:72 src/util/crypto_ecc.c:78
+#: src/util/crypto_ecc_setup.c:47 src/util/crypto_mpi.c:40
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: 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
+#: src/datacache/plugin_datacache_sqlite.c:693
+#: src/datastore/plugin_datastore_sqlite.c:531
+#: src/namecache/plugin_namecache_sqlite.c:237
+#: src/namestore/plugin_namestore_sqlite.c:273
 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:340
+#, fuzzy
+msgid "DATASTORE disconnected"
+msgstr "Déconnecté de"
 
-#: src/datastore/datastore_api.c:394
-msgid "# queue entry timeouts"
-msgstr ""
+#: src/datastore/datastore_api.c:462
+#, fuzzy
+msgid "Disconnected from DATASTORE"
+msgstr "Déconnecté de"
 
-#: src/datastore/datastore_api.c:443
+#: src/datastore/datastore_api.c:565
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:471
+#: src/datastore/datastore_api.c:595
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:491
-msgid "# Requests dropped from datastore queue"
+#: src/datastore/datastore_api.c:756
+msgid "# status messages received"
+msgstr ""
+
+#: src/datastore/datastore_api.c:810
+msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:533
+#: src/datastore/datastore_api.c:917
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
-msgid "# transmission request failures"
+#: src/datastore/datastore_api.c:1032
+msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:638
-msgid "# bytes sent to datastore"
+#: src/datastore/datastore_api.c:1093
+msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:770
-msgid "Failed to receive status response from database."
+#: src/datastore/datastore_api.c:1158
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:784
-msgid "Error reading response from datastore service"
+#: src/datastore/datastore_api.c:1236
+msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
-msgid "Invalid error message received from datastore service"
+#: src/datastore/datastore_api.c:1295
+msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:806
-msgid "# status messages received"
+#: src/datastore/datastore_api.c:1357
+msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:876
-msgid "# PUT requests executed"
+#: src/datastore/datastore_api.c:1438
+msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:944
-msgid "# RESERVE requests executed"
+#: src/datastore/gnunet-datastore.c:187
+#, c-format
+msgid "Dumped %<PRIu64> records\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1005
-msgid "# RELEASE RESERVE requests executed"
+#: src/datastore/gnunet-datastore.c:214 src/datastore/gnunet-datastore.c:226
+#, c-format
+msgid "Short write to file: %zd bytes expecting %zd\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1065
-msgid "# UPDATE requests executed"
+#: src/datastore/gnunet-datastore.c:257
+#, c-format
+msgid "Error queueing datastore GET operation\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1129
-msgid "# REMOVE requests executed"
+#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:400
+#, c-format
+msgid "Unable to open dump file: %s\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1174
-msgid "Failed to receive response from database.\n"
+#: src/datastore/gnunet-datastore.c:319
+#, c-format
+msgid "Failed to store item: %s, aborting\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1233
-msgid "# Results received"
+#: src/datastore/gnunet-datastore.c:331
+#, c-format
+msgid "Inserted %<PRIu64> records\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1300
-msgid "# GET REPLICATION requests executed"
+#: src/datastore/gnunet-datastore.c:339 src/datastore/gnunet-datastore.c:353
+#, c-format
+msgid "Short read from file: %zd bytes expecting %zd\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1363
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/datastore/gnunet-datastore.c:378
+#, c-format
+msgid "Error queueing datastore PUT operation\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1424
-msgid "# GET requests executed"
+#: src/datastore/gnunet-datastore.c:417
+#, c-format
+msgid "Input file is not of a supported format\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:114
+#: src/datastore/gnunet-datastore.c:442
 #, c-format
-msgid "Failed to store item: %s, aborting\n"
+msgid "Failed connecting to the datastore.\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:200
+#: src/datastore/gnunet-datastore.c:454
 #, c-format
-msgid "Cannot use the same configuration for source and destination\n"
+msgid "Please choose at least one operation: %s, %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:246
-msgid "specifies the configuration to use to access an alternative datastore; 
will merge that datastore into our current datastore"
+#: src/datastore/gnunet-datastore.c:477
+msgid "Dump all records from the datastore"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:255
-msgid "Manipulate GNUnet datastore"
+#: src/datastore/gnunet-datastore.c:482
+msgid "Insert records into the datastore"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:351
-msgid "# bytes expired"
+#: src/datastore/gnunet-datastore.c:487
+msgid "File to dump or insert"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:425
-msgid "# bytes purged (low-priority)"
+#: src/datastore/gnunet-datastore.c:498
+msgid "Manipulate GNUnet datastore"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:223
-msgid "Transmission to client failed!\n"
+#: src/datastore/gnunet-service-datastore.c:335
+msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:262
-msgid "Shutdown in progress, aborting transmission.\n"
+#: src/datastore/gnunet-service-datastore.c:419
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:630
+#: src/datastore/gnunet-service-datastore.c:551
 msgid "# results found"
 msgstr "# résultats introuvables"
 
-#: src/datastore/gnunet-service-datastore.c:673
+#: src/datastore/gnunet-service-datastore.c:593
 #, 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 RESERVE request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:606
 #, 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:688
-msgid "Insufficient space to satisfy request and requested amount is larger 
than cache size"
+#: src/datastore/gnunet-service-datastore.c:612
+msgid ""
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:694
+#: src/datastore/gnunet-service-datastore.c:619
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: 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
+#: src/datastore/gnunet-service-datastore.c:626
+#: src/datastore/gnunet-service-datastore.c:677
+#: src/datastore/gnunet-service-datastore.c:820
+#: src/datastore/gnunet-service-datastore.c:1429
 msgid "# reserved"
 msgstr "# réservé"
 
-#: src/datastore/gnunet-service-datastore.c:764
+#: src/datastore/gnunet-service-datastore.c:693
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:850
+#: src/datastore/gnunet-service-datastore.c:758
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1010
+#: src/datastore/gnunet-service-datastore.c:858
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1022
-msgid "# requests filtered by bloomfilter"
+#: src/datastore/gnunet-service-datastore.c:888
+msgid "# GET KEY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1050
-msgid "# UPDATE requests received"
+#: src/datastore/gnunet-service-datastore.c:899
+msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:940
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:971
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1138
+#: src/datastore/gnunet-service-datastore.c:1012
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1019
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1178
+#: src/datastore/gnunet-service-datastore.c:1059
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1220
+#: src/datastore/gnunet-service-datastore.c:1108
+#, c-format
+msgid ""
+"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1282
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1168
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1290
+#: src/datastore/gnunet-service-datastore.c:1177
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1237
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1289
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1299
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1464
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1473
 msgid "# quota"
 msgstr "# quota"
 
-#: src/datastore/gnunet-service-datastore.c:1505
+#: src/datastore/gnunet-service-datastore.c:1476
 msgid "# cache size"
 msgstr "# taille du cache"
 
-#: src/datastore/gnunet-service-datastore.c:1518
+#: src/datastore/gnunet-service-datastore.c:1492
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1536
-#: src/datastore/gnunet-service-datastore.c:1552
+#: src/datastore/gnunet-service-datastore.c:1513
+#: src/datastore/gnunet-service-datastore.c:1535
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1582
+#: src/datastore/gnunet-service-datastore.c:1574
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1611
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1616
-msgid "Plugin does not support get_keys function. Please fix!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1619
-msgid "Bloomfilter construction complete.\n"
+#: src/datastore/plugin_datastore_heap.c:895
+msgid "Heap database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_heap.c:820
-msgid "Heap database running\n"
+#: src/datastore/plugin_datastore_mysql.c:371
+#: src/datastore/plugin_datastore_mysql.c:423
+#: src/datastore/plugin_datastore_mysql.c:1071
+msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:783
-#, c-format
-msgid "Failed to prepare statement `%s'\n"
+#: src/datastore/plugin_datastore_mysql.c:410
+#: src/datastore/plugin_datastore_sqlite.c:674
+msgid "Data too large"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:791
+#: src/datastore/plugin_datastore_mysql.c:847
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1022
+#: src/datastore/plugin_datastore_mysql.c:1179
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:824
+#: src/datastore/plugin_datastore_postgres.c:284
+#: src/datastore/plugin_datastore_postgres.c:897
+msgid "Postgresql exec failure"
+msgstr ""
+
+#: src/datastore/plugin_datastore_postgres.c:858
 msgid "Failed to drop table from database.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:860
-#: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:569
+#: src/datastore/plugin_datastore_postgres.c:956
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:57
-#: src/testbed/generate-underlay-topology.c:50
-#: src/testbed/gnunet-daemon-latency-logger.c:55
-#: src/testbed/gnunet-daemon-testbed-underlay.c:58
+#: src/datastore/plugin_datastore_sqlite.c:87
+#: src/testbed/generate-underlay-topology.c:55
+#: src/testbed/gnunet-daemon-latency-logger.c:56
+#: src/testbed/gnunet-daemon-testbed-underlay.c:60
 #, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:255
-#: src/namecache/plugin_namecache_sqlite.c:193
-#: src/namestore/plugin_namestore_sqlite.c:204
-#: src/psycstore/plugin_psycstore_sqlite.c:319
+#: src/datastore/plugin_datastore_sqlite.c:310
+#: src/namecache/plugin_namecache_sqlite.c:180
+#: src/namestore/plugin_namestore_sqlite.c:213
+#: src/peerstore/plugin_peerstore_sqlite.c:540
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:663
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+#: src/datastore/plugin_datastore_sqlite.c:633
+msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1156
+#: src/datastore/plugin_datastore_sqlite.c:1251
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1175
+#: src/datastore/plugin_datastore_sqlite.c:1266
+#: src/datastore/plugin_datastore_sqlite.c:1279
+#, fuzzy
+msgid "error preparing statement\n"
+msgstr "Erreur de création du tunnel\n"
+
+#: src/datastore/plugin_datastore_sqlite.c:1287
+msgid "error stepping\n"
+msgstr ""
+
+#: src/datastore/plugin_datastore_sqlite.c:1295
 #, 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:1215
-#: src/namecache/plugin_namecache_sqlite.c:583
-#: src/namestore/plugin_namestore_sqlite.c:719
+#: src/datastore/plugin_datastore_sqlite.c:1337
+#: src/namecache/plugin_namecache_sqlite.c:564
+#: src/namestore/plugin_namestore_sqlite.c:765
 msgid "Sqlite database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:257
+#: src/datastore/plugin_datastore_template.c:252
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:376
-msgid "Failed to connect to the DHT service!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:133
+#: src/dht/gnunet-dht-get.c:159
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1704,1250 +1924,873 @@ msgstr ""
 "Resultat %d, type %d :\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:160
+#, fuzzy, c-format
+msgid "Result %d, type %d:\n"
+msgstr ""
+"Resultat %d, type %d :\n"
+"%.*s\n"
+
+#: src/dht/gnunet-dht-get.c:209
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
+#: src/dht/gnunet-dht-get.c:217 src/dht/gnunet-dht-monitor.c:255
 msgid "Failed to connect to DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:173
-msgid "Issueing DHT GET with key"
+#: src/dht/gnunet-dht-get.c:227
+msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:260 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:192
+#: src/dht/gnunet-dht-get.c:266
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
+#: src/dht/gnunet-dht-get.c:272 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:278
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:284 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c: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 ""
-
-#: src/dht/gnunet-dht-get.c:225
+#: src/dht/gnunet-dht-get.c:301
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:268
+#: src/dht/gnunet-dht-monitor.c:315
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:293
-msgid "Prints all packets that go through the DHT."
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:118
-msgid "PUT request sent with key"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:121
-msgid "Timeout sending PUT request!\n"
+#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:359
+#: src/nse/gnunet-nse-profiler.c:894
+msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
-msgid "PUT request not confirmed!\n"
+#: src/dht/gnunet-dht-monitor.c:336
+msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:133
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:160
+#: src/dht/gnunet-dht-put.c:140
 #, c-format
-msgid "Could not connect to %s service!\n"
+msgid "Could not connect to DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:176
+#: src/dht/gnunet-dht-put.c:151
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:194
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:212
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:217
+msgid "use DHT's record route option"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:223
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:236
+#: src/dht/gnunet-dht-put.c:241
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
-msgid "Failed to connect to transport service!\n"
+#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
+#, c-format
+msgid "Exiting as the number of peers is %u\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:838
-msgid "# GET requests from clients injected"
-msgstr ""
+#: src/dht/gnunet_dht_profiler.c:955 src/rps/gnunet-rps-profiler.c:3136
+#, fuzzy
+msgid "number of peers to start"
+msgstr "nombre de valeurs"
 
-#: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:927
-msgid "# PUT requests received from clients"
+#: src/dht/gnunet_dht_profiler.c:961
+msgid "number of PUTs to perform per peer"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:1013
-msgid "# GET requests received from clients"
+#: src/dht/gnunet_dht_profiler.c:967 src/nse/gnunet-nse-profiler.c:872
+#: src/testbed/gnunet-testbed-profiler.c:302
+msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1214
-msgid "# GET STOP requests received from clients"
+#: src/dht/gnunet_dht_profiler.c:973
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: 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"
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1052
-#: src/dht/gnunet-service-xdht_clients.c:511
-msgid "# Duplicate REPLIES to CLIENT request dropped"
+#: src/dht/gnunet_dht_profiler.c:985
+msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: 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"
+#: src/dht/gnunet_dht_profiler.c:990
+msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1112
-#: src/dht/gnunet-service-xdht_clients.c:571
-msgid "# RESULTS queued for clients"
+#: src/dht/gnunet_dht_profiler.c:996
+msgid "chance that a peer is selected at random for PUTs"
 msgstr ""
 
-#: 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)"
+#: src/dht/gnunet_dht_profiler.c:1002
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: 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"
+#: src/dht/gnunet_dht_profiler.c:1023
+msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:68
+#: src/dht/plugin_block_dht.c:328
 #, c-format
-msgid "%s request received, but have no datacache!\n"
+msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:78
-msgid "# ITEMS stored in datacache"
+#: src/dht/plugin_block_dht.c:337
+#, c-format
+msgid "Size mismatch for block with type %u\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:165
-msgid "# Good RESULTS found in datacache"
+#: src/dht/plugin_block_dht.c:348
+#, c-format
+msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:176
-msgid "# Duplicate RESULTS found in datacache"
+#: src/dns/gnunet-dns-monitor.c:371 src/dns/gnunet-dns-monitor.c:376
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:182
-msgid "# Invalid RESULTS found in datacache"
+#: src/dns/gnunet-dns-monitor.c:388
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:188
-msgid "# Irrelevant RESULTS found in datacache"
+#: src/dns/gnunet-dns-redirector.c:241
+msgid "set A records"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:200
-msgid "# Unsupported RESULTS found in datacache"
+#: src/dns/gnunet-dns-redirector.c:247
+msgid "set AAAA records"
 msgstr ""
 
-#: 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"
+#: src/dns/gnunet-dns-redirector.c:260
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:234
-msgid "# GET requests given to datacache"
+#: src/dns/gnunet-service-dns.c:466
+msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
-msgid "# HELLOs obtained from peerinfo"
+#: src/dns/gnunet-service-dns.c:620
+msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:516
-msgid "# Preference updates given to core"
+#: src/dns/gnunet-service-dns.c:756
+msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:610
-msgid "# FIND PEER messages initiated"
+#: src/dns/gnunet-service-dns.c:832
+msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:764
-msgid "# Queued messages discarded (peer disconnected)"
+#: src/dns/gnunet-service-dns.c:954
+msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:703
-msgid "# Bytes transmitted to other peers"
+#: src/dns/gnunet-service-dns.c:973
+msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: 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:889
-msgid "# requests TTL-dropped"
+#: src/dns/gnunet-service-dns.c:984
+#, c-format
+msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1093
-#: src/dht/gnunet-service-dht_neighbours.c:1130
-msgid "# Peers excluded from routing due to Bloomfilter"
+#: src/dns/gnunet-service-dns.c:996
+msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1108
-#: src/dht/gnunet-service-dht_neighbours.c:1145
-msgid "# Peer selection failed"
+#: src/dns/gnunet-service-dns.c:999
+msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1287
-msgid "# PUT requests routed"
+#: src/dns/gnunet-service-dns.c:1069
+msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1316
-msgid "# PUT messages queued for transmission"
+#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3708
+msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: 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"
+#: src/dns/gnunet-service-dns.c:1128
+#, c-format
+msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1405
-msgid "# GET requests routed"
+#: src/exit/gnunet-daemon-exit.c:971
+msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1432
-msgid "# GET messages queued for transmission"
+#: src/exit/gnunet-daemon-exit.c:1077
+msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1550
-msgid "# RESULT messages queued for transmission"
+#: src/exit/gnunet-daemon-exit.c:1371
+msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1636
-msgid "# P2P PUT requests received"
+#: src/exit/gnunet-daemon-exit.c:1503 src/exit/gnunet-daemon-exit.c:1615
+#: src/exit/gnunet-daemon-exit.c:1665 src/exit/gnunet-daemon-exit.c:1748
+#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:2016
+#: src/exit/gnunet-daemon-exit.c:2286
+msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1639
-msgid "# P2P PUT bytes received"
+#: src/exit/gnunet-daemon-exit.c:1507
+msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
-msgid "# FIND PEER requests ignored due to Bloomfilter"
+#: src/exit/gnunet-daemon-exit.c:1619
+msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
-msgid "# FIND PEER requests ignored due to lack of HELLO"
+#: src/exit/gnunet-daemon-exit.c:1661
+msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1904
-msgid "# P2P GET requests received"
+#: src/exit/gnunet-daemon-exit.c:1752
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1907
-msgid "# P2P GET bytes received"
+#: src/exit/gnunet-daemon-exit.c:1840
+msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1961
-msgid "# P2P FIND PEER requests processed"
+#: src/exit/gnunet-daemon-exit.c:1879
+msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1975
-msgid "# P2P GET requests ONLY routed"
+#: src/exit/gnunet-daemon-exit.c:2020
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2052
-msgid "# P2P RESULTS received"
+#: src/exit/gnunet-daemon-exit.c:2091 src/exit/gnunet-daemon-exit.c:2366
+#: src/exit/gnunet-daemon-exit.c:2736 src/vpn/gnunet-service-vpn.c:817
+#: src/vpn/gnunet-service-vpn.c:1004 src/vpn/gnunet-service-vpn.c:2134
+msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2055
-msgid "# P2P RESULT bytes received"
+#: src/exit/gnunet-daemon-exit.c:2156 src/exit/gnunet-daemon-exit.c:2433
+#: src/exit/gnunet-daemon-exit.c:2777 src/vpn/gnunet-service-vpn.c:890
+#: src/vpn/gnunet-service-vpn.c:1043 src/vpn/gnunet-service-vpn.c:2200
+msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59
-msgid "# Network size estimates received"
+#: src/exit/gnunet-daemon-exit.c:2290
+msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:211
-msgid "# Good REPLIES matched against routing table"
+#: src/exit/gnunet-daemon-exit.c:2349 src/vpn/gnunet-service-vpn.c:995
+#: src/vpn/gnunet-service-vpn.c:2122
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Duplicate REPLIES matched against routing table"
+#: src/exit/gnunet-daemon-exit.c:2416 src/vpn/gnunet-service-vpn.c:873
+#: src/vpn/gnunet-service-vpn.c:2164 src/vpn/gnunet-service-vpn.c:2178
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
-msgid "# Invalid REPLIES matched against routing table"
+#: src/exit/gnunet-daemon-exit.c:2498 src/exit/gnunet-daemon-exit.c:3199
+msgid "# Inbound CADET channels created"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:232
-msgid "# Irrelevant REPLIES matched against routing table"
+#: src/exit/gnunet-daemon-exit.c:2619
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:244
-msgid "# Unsupported REPLIES matched against routing table"
+#: src/exit/gnunet-daemon-exit.c:2639
+msgid "# Messages transmitted via cadet channels"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:317
-msgid "# Entries removed from routing table"
+#: src/exit/gnunet-daemon-exit.c:2831
+msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:399
-msgid "# Entries added to routing table"
+#: src/exit/gnunet-daemon-exit.c:2840
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:417
-msgid "# DHT requests combined"
+#: src/exit/gnunet-daemon-exit.c:2916
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1398
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
+#: src/exit/gnunet-daemon-exit.c:2990
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1514
-#: src/dht/gnunet-service-xdht_neighbours.c:1524
-#: src/dht/gnunet-service-xdht_neighbours.c:1530
-#: src/dht/gnunet-service-xdht_neighbours.c:1536
-#: src/dht/gnunet-service-xdht_neighbours.c:1545
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d"
+#: src/exit/gnunet-daemon-exit.c:3039
+msgid "# Packets received from TUN"
 msgstr ""
-"\n"
-"SUPU %s, %s, %d"
 
-#: src/dht/plugin_block_dht.c:138
-#, c-format
-msgid "Block not of type %u\n"
+#: src/exit/gnunet-daemon-exit.c:3054
+msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:145
-msgid "Size mismatch for block\n"
+#: src/exit/gnunet-daemon-exit.c:3081
+msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:155
+#: src/exit/gnunet-daemon-exit.c:3112
 #, c-format
-msgid "Block of type %u is malformed\n"
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:257
+#: src/exit/gnunet-daemon-exit.c:3164
 #, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:856
+#: src/exit/gnunet-daemon-exit.c:3173
 #, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:175
+#: src/exit/gnunet-daemon-exit.c:3377 src/exit/gnunet-daemon-exit.c:3388
 #, c-format
-msgid "Could not bind to any port: %s\n"
+msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#: src/exit/gnunet-daemon-exit.c:3402 src/exit/gnunet-daemon-exit.c:3410
 #, c-format
-msgid "Failed to send DNS request to %s\n"
+msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/dns/dnsstub.c:299
+#: src/exit/gnunet-daemon-exit.c:3452
 #, c-format
-msgid "Sent DNS request to %s\n"
+msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:368
+#: src/exit/gnunet-daemon-exit.c:3467 src/exit/gnunet-daemon-exit.c:3482
 #, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
+msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:440
+#: src/exit/gnunet-daemon-exit.c:3496
 #, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:355
-msgid "only monitor DNS queries"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:358
-msgid "only monitor DNS replies"
+msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:369
-msgid "Monitor DNS queries."
+#: src/exit/gnunet-daemon-exit.c:3641
+msgid ""
+"This system does not support IPv4, will disable IPv4 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:236
-msgid "set A records"
+#: src/exit/gnunet-daemon-exit.c:3650
+msgid ""
+"This system does not support IPv6, will disable IPv6 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:239
-msgid "set AAAA records"
+#: src/exit/gnunet-daemon-exit.c:3658
+msgid ""
+"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
+"ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:251
-msgid "Change DNS replies to point elsewhere."
+#: src/exit/gnunet-daemon-exit.c:3665
+msgid ""
+"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
+"ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:456
-msgid "# DNS requests answered via TUN interface"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:3836
+msgid "Must be a number"
+msgstr "Doit être un nombre"
 
-#: src/dns/gnunet-service-dns.c:603
-msgid "# DNS exit failed (failed to open socket)"
+#: src/exit/gnunet-daemon-exit.c:3952
+#, c-format
+msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:714
-msgid "# External DNS response discarded (no matching request)"
+#: src/exit/gnunet-daemon-exit.c:3964 src/pt/gnunet-daemon-pt.c:1210
+msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:792
-msgid "# Client response discarded (no matching request)"
+#: src/exit/gnunet-daemon-exit.c:4118
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:907
-msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
+#: src/fragmentation/defragmentation.c:272
+msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:923
-msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
+#: src/fragmentation/defragmentation.c:465
+#: src/transport/plugin_transport_wlan.c:1559
+msgid "# fragments received"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:932
-#, c-format
-msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
+#: src/fragmentation/defragmentation.c:537
+msgid "# duplicate fragments received"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:942
-msgid "# Non-DNS UDP packet received via TUN interface"
+#: src/fragmentation/defragmentation.c:555
+msgid "# messages defragmented"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1009
-msgid "# DNS requests received via TUN interface"
+#: src/fragmentation/fragmentation.c:240
+msgid "# fragments transmitted"
 msgstr ""
 
-#: 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"
+#: src/fragmentation/fragmentation.c:245
+msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3571
-msgid "need a valid IPv4 or IPv6 address\n"
+#: src/fragmentation/fragmentation.c:278
+msgid "# fragments wrap arounds"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:169
-msgid "verbose output"
-msgstr "sortie verbeuse"
-
-#: src/dv/gnunet-dv.c:178
-msgid "Print information about DV state"
+#: src/fragmentation/fragmentation.c:325
+msgid "# messages fragmented"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:802
-#, c-format
-msgid "Got duplicate service records for `%s:%u'\n"
+#: src/fragmentation/fragmentation.c:331
+msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:853
-msgid "# Bytes transmitted via mesh channels"
+#: src/fragmentation/fragmentation.c:459
+msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: 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)"
+#: src/fragmentation/fragmentation.c:466
+msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2456
-#: src/exit/gnunet-daemon-exit.c:2713 src/vpn/gnunet-service-vpn.c:1463
-#: src/vpn/gnunet-service-vpn.c:1856 src/vpn/gnunet-service-vpn.c:1993
-msgid "# ICMPv6 packets dropped (type not allowed)"
+#: src/fragmentation/fragmentation.c:490
+msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1047
-msgid "# ICMP packets dropped (not allowed)"
+#: src/fs/fs_api.c:491
+#, c-format
+msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1054
-msgid "ICMP Packet dropped, have no matching connection information\n"
+#: src/fs/fs_api.c:502
+#, c-format
+msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1130
-msgid "UDP Packet dropped, have no matching connection information\n"
+#: src/fs/fs_api.c:510
+#, c-format
+msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1204
-msgid "TCP Packet dropped, have no matching connection information\n"
+#: src/fs/fs_api.c:1173
+#, c-format
+msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1256
-msgid "# Packets received from TUN"
+#: src/fs/fs_api.c:1724
+#, c-format
+msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1270
-msgid "# Bytes received from TUN"
+#: src/fs/fs_api.c:1739
+#, c-format
+msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1296
-msgid "IPv4 packet options received.  Ignored.\n"
+#: src/fs/fs_api.c:2468
+#, c-format
+msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1323
+#: src/fs/fs_api.c:2479
 #, c-format
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1369
+#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
 #, c-format
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
+msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1377
+#: src/fs/fs_api.c:2645
 #, c-format
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
+msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1759
-msgid "# TCP packets sent via TUN"
+#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
+#, c-format
+msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1872
-msgid "# TCP service creation requests received via mesh"
+#: src/fs/fs_api.c:2863
+#, c-format
+msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: 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"
+#: src/fs/fs_api.c:3124
+msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
+#: src/fs/fs_api.c:3219
 #, c-format
-msgid "No service %s found for %s on port %d!\n"
+msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1914
-msgid "# TCP requests dropped (no such service)"
+#: src/fs/fs_directory.c:215
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1971
-msgid "# TCP IP-exit creation requests received via mesh"
+#: src/fs/fs_download.c:310
+msgid ""
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2076
-msgid "# TCP data requests received via mesh"
+#: src/fs/fs_download.c:332
+msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2090
-msgid "# TCP DATA requests dropped (no session)"
+#: src/fs/fs_download.c:346
+#, c-format
+msgid ""
+"Failed to access full directory contents of `%s' for recursive download\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2150
-msgid "# ICMP packets sent via TUN"
+#: src/fs/fs_download.c:528 src/fs/fs_download.c:541
+#, c-format
+msgid "Failed to open file `%s' for writing"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2324
-msgid "# ICMP IP-exit requests received via mesh"
+#: src/fs/fs_download.c:960
+#, c-format
+msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2573
-msgid "# ICMP service requests received via mesh"
+#: src/fs/fs_download.c:1053
+#, c-format
+msgid ""
+"Internal error or bogus download URI (expected %lu bytes at depth %u and "
+"offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: 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)"
+#: src/fs/fs_download.c:1075
+msgid "internal error decrypting content"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2698 src/vpn/gnunet-service-vpn.c:1433
-#: src/vpn/gnunet-service-vpn.c:1445 src/vpn/gnunet-service-vpn.c:1844
-msgid "# ICMPv6 packets dropped (impossible PT to v4)"
+#: src/fs/fs_download.c:1098
+#, c-format
+msgid "Download failed: could not open file `%s': %s"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2748
-msgid "# UDP packets sent via TUN"
+#: src/fs/fs_download.c:1109
+#, c-format
+msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2862
-msgid "# UDP IP-exit requests received via mesh"
+#: src/fs/fs_download.c:1119
+#, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2969
-msgid "# UDP service requests received via mesh"
+#: src/fs/fs_download.c:1227
+msgid "internal error decoding tree"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2995
-msgid "# UDP requests dropped (no such service)"
-msgstr ""
+#: src/fs/fs_download.c:1899
+msgid "Invalid URI"
+msgstr "URI invalide"
 
-#: src/exit/gnunet-daemon-exit.c:3031
-msgid "# Inbound MESH channels created"
+#: src/fs/fs_getopt.c:237
+#, c-format
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#: src/fs/fs_list_indexed.c:151
+#, fuzzy, c-format
+msgid "Failed to receive response from `%s' service.\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/fs/fs_list_indexed.c:195
 #, c-format
-msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
+msgid "Failed to not connect to `%s' service.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3259 src/exit/gnunet-daemon-exit.c:3267
+#: src/fs/fs_misc.c:128
 #, c-format
-msgid "`%s' is not a valid port number (for domain `%s')!"
+msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3300
+#: src/fs/fs_namespace.c:202
 #, c-format
-msgid "No addresses found for hostname `%s' of service `%s'!\n"
+msgid "Failed to open `%s' for writing: %s\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
+#: src/fs/fs_namespace.c:233
 #, c-format
-msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
+msgid "Failed to write `%s': %s\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3337
+#: src/fs/fs_namespace.c:330
 #, c-format
-msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
+msgid "Failed to read `%s': %s\n"
 msgstr ""
 
-#: 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"
+#: src/fs/fs_namespace.c:472
+msgid "Failed to connect to datastore."
 msgstr ""
 
-#: 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"
+#: src/fs/fs_publish.c:128 src/fs/fs_publish.c:438
+#, c-format
+msgid "Publishing failed: %s"
 msgstr ""
 
-#: 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/fs/fs_publish.c:731
+#, fuzzy, c-format
+msgid "Can not index file `%s': %s.\n"
+msgstr "Résolution de « %s » échouée : %s\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"
+#: src/fs/fs_publish.c:788 src/fs/fs_publish.c:834 src/fs/fs_publish.c:855
+#: src/fs/fs_publish.c:886 src/fs/fs_publish.c:1154
+#, c-format
+msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: 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"
+#: src/fs/fs_publish.c:790
+msgid "error on index-start request to `fs' service"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3664
-msgid "Must be a number"
-msgstr "Doit être un nombre"
-
-#: src/exit/gnunet-daemon-exit.c:3813
-msgid "Daemon to run to provide an IP exit node for the VPN"
+#: src/fs/fs_publish.c:836
+msgid "failed to compute hash"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:55
-msgid "Experimentation daemon shutting down ...\n"
+#: src/fs/fs_publish.c:856
+msgid "filename too long"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:77
-msgid "Experimentation daemon starting ...\n"
+#: src/fs/fs_publish.c:888
+msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:83
-msgid "Failed to create statistics!\n"
+#: src/fs/fs_publish.c:914
+#, c-format
+msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation.c:120
-msgid "GNUnet experimentation daemon"
+#: src/fs/fs_publish.c:1003 src/fs/fs_publish.c:1040
+msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
+#: src/fs/fs_publish.c:1107
 #, c-format
-msgid "Experiment `%s': Experiment signature is invalid\n"
+msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
+#: src/fs/fs_publish.c:1115
 #, c-format
-msgid "Adding experiment `%s' running from `%s' to `%s' every %llu sec. for 
%llu sec. \n"
+msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
-#, c-format
-msgid "Experiment `%s': Issuer missing\n"
+#: src/fs/fs_publish.c:1156
+msgid "needs to be an actual file"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
+#: src/fs/fs_publish.c:1396
+#, fuzzy, c-format
+msgid "Datastore failure: %s"
+msgstr "pa_stream_new() échoué : %s\n"
+
+#: src/fs/fs_publish.c:1488
 #, c-format
-msgid "Experiment `%s': Issuer invalid\n"
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
-#, c-format
-msgid "Experiment `%s': Issuer not accepted!\n"
+#: src/fs/fs_publish_ksk.c:218
+msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
+#: src/fs/fs_publish_ublock.c:240
+msgid "Internal error."
+msgstr "Erreur interne."
+
+#: src/fs/fs_search.c:829 src/fs/fs_search.c:900
 #, c-format
-msgid "Experiment `%s': Version missing or invalid \n"
+msgid "Failed to parse URI `%s': %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
+#: src/fs/fs_search.c:993
 #, c-format
-msgid "Experiment `%s': Required capabilities missing \n"
+msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
-#, c-format
-msgid "Experiment `%s': Required capabilities invalid \n"
+#: src/fs/fs_unindex.c:63
+msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
-#, c-format
-msgid "Failed to parse file `%s'\n"
+#: src/fs/fs_unindex.c:68
+msgid "Failed to read file"
 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"
+#: src/fs/fs_unindex.c:275
+msgid "Error communicating with `fs' service."
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
-msgid "Invalid value for public key\n"
+#: src/fs/fs_unindex.c:326
+msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
-#, c-format
-msgid "Cannot read experiments file `%s'\n"
+#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:389
+msgid "Failed to get KSKs from directory scan."
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
+#: src/fs/fs_unindex.c:385
 #, c-format
-msgid "Cannot send message to peer `%s' for experiment `%s'\n"
+msgid "Internal error scanning `%s'.\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
+#: src/fs/fs_unindex.c:446
 #, c-format
-msgid "Sending experimentation request to peer %s\n"
+msgid "Failed to remove UBlock: %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
-#, c-format
-msgid "Added peer `%s' as active node\n"
+#: src/fs/fs_unindex.c:592 src/fs/fs_unindex.c:656
+msgid "Failed to connect to `datastore' service."
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
-#, c-format
-msgid "Connected to peer %s\n"
+#: src/fs/fs_unindex.c:669
+msgid "Failed to open file for unindexing."
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
-#, c-format
-msgid "Disconnected from peer %s\n"
+#: src/fs/fs_unindex.c:708
+msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
-msgid "Failed to connect to CORE service!\n"
+#: src/fs/fs_uri.c:239
+#, no-c-format
+msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
-#, c-format
-msgid "Peer `%s' did not respond to request for experiment `%s'\n"
+#: src/fs/fs_uri.c:298
+msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
-#, c-format
-msgid "Starting inbound experiment `%s' with peer `%s'\n"
+#: src/fs/fs_uri.c:316
+msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
-#, c-format
-msgid "Starting outbound experiment `%s' with peer `%s'\n"
+#: src/fs/fs_uri.c:323
+msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
-#, c-format
-msgid "Received %s message from peer %s for experiment `%s'\n"
+#: src/fs/fs_uri.c:390
+msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:270
-msgid "# acknowledgements sent for fragment"
+#: src/fs/fs_uri.c:431
+msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:456
-msgid "# fragments received"
+#: src/fs/fs_uri.c:448
+msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:521
-msgid "# duplicate fragments received"
+#: src/fs/fs_uri.c:525
+msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:534
-msgid "# messages defragmented"
+#: src/fs/fs_uri.c:542
+msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:208
-msgid "# fragments transmitted"
+#: src/fs/fs_uri.c:552
+msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:211
-msgid "# fragments retransmitted"
+#: src/fs/fs_uri.c:560
+msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:237
-msgid "# fragments wrap arounds"
+#: src/fs/fs_uri.c:569
+msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:281
-msgid "# messages fragmented"
+#: src/fs/fs_uri.c:575
+msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:284
-msgid "# total size of fragmented messages"
+#: src/fs/fs_uri.c:582
+msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:405
-msgid "# fragment acknowledgements received"
+#: src/fs/fs_uri.c:593
+msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:411
-msgid "# bits removed from fragmentation ACKs"
+#: src/fs/fs_uri.c:600
+msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:435
-msgid "# fragmentation transmissions completed"
+#: src/fs/fs_uri.c:606
+msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_api.c:465
-#, c-format
-msgid "Could not open file `%s': %s"
+#: src/fs/fs_uri.c:620
+msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_api.c:474
-#, c-format
-msgid "Could not read file `%s': %s"
+#: src/fs/fs_uri.c:653
+#, fuzzy
+msgid "invalid argument"
+msgstr "Argument invalide « %s »\n"
+
+#: src/fs/fs_uri.c:665
+msgid "Unrecognized URI type"
+msgstr "Type d’URI non reconnu"
+
+#: src/fs/fs_uri.c:1071 src/fs/fs_uri.c:1098
+msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_api.c:480
-#, c-format
-msgid "Short read reading from file `%s'!"
+#: src/fs/fs_uri.c:1104
+msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1066
+#: src/fs/gnunet-auto-share.c:234
 #, c-format
-msgid "Failed to resume publishing information `%s': %s\n"
+msgid "Failed to load state: %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1571
-#, c-format
-msgid "Failure while resuming publishing operation `%s': %s\n"
-msgstr ""
-
-#: src/fs/fs_api.c:1585
-#, c-format
-msgid "Failed to resume publishing operation `%s': %s\n"
-msgstr ""
-
-#: src/fs/fs_api.c:2242
-#, c-format
-msgid "Failure while resuming unindexing operation `%s': %s\n"
-msgstr ""
-
-#: src/fs/fs_api.c:2252
-#, c-format
-msgid "Failed to resume unindexing operation `%s': %s\n"
-msgstr ""
-
-#: 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:2395
-#, c-format
-msgid "Failed to resume sub-search `%s': %s\n"
-msgstr ""
-
-#: 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:2610
-#, c-format
-msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
-msgstr ""
-
-#: src/fs/fs_api.c:2855
-msgid "Could not resume running search, will resume as paused search\n"
-msgstr ""
-
-#: src/fs/fs_api.c:2949
-#, c-format
-msgid "Failure while resuming download operation `%s': %s\n"
-msgstr ""
-
-#: src/fs/fs_directory.c:208
-msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
-msgstr ""
-
-#: src/fs/fs_download.c:322
-msgid "Recursive downloads of directories larger than 4 GB are not supported 
on 32-bit systems\n"
-msgstr ""
-
-#: src/fs/fs_download.c:342
-msgid "Directory too large for system address space\n"
-msgstr ""
-
-#: src/fs/fs_download.c:523 src/fs/fs_download.c:535
-#, c-format
-msgid "Failed to open file `%s' for writing"
-msgstr ""
-
-#: src/fs/fs_download.c:905
-#, c-format
-msgid "Failed to create directory for recursive download of `%s'\n"
-msgstr ""
-
-#: 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)"
-msgstr ""
-
-#: src/fs/fs_download.c:1013
-msgid "internal error decrypting content"
-msgstr ""
-
-#: src/fs/fs_download.c:1036
-#, c-format
-msgid "Download failed: could not open file `%s': %s"
-msgstr ""
-
-#: src/fs/fs_download.c:1046
-#, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s"
-msgstr ""
-
-#: src/fs/fs_download.c:1055
-#, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
-msgstr ""
-
-#: src/fs/fs_download.c:1153
-msgid "internal error decoding tree"
-msgstr ""
-
-#: src/fs/fs_download.c:1944
-msgid "Invalid URI"
-msgstr "URI invalide"
-
-#: src/fs/fs_getopt.c:192
-#, c-format
-msgid "Unknown metadata type in metadata option `%s'.  Using metadata type 
`unknown' instead.\n"
-msgstr ""
-
-#: src/fs/fs_list_indexed.c:90
-#, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
-msgstr ""
-
-#: src/fs/fs_list_indexed.c:113
-#, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
-msgstr ""
-
-#: src/fs/fs_list_indexed.c:151
-#, c-format
-msgid "Failed to not connect to `%s' service.\n"
-msgstr ""
-
-#: src/fs/fs_misc.c:126
-#, c-format
-msgid "Did not find mime type `%s' in extension list.\n"
-msgstr ""
-
-#: src/fs/fs_namespace.c:207
-#, c-format
-msgid "Failed to open `%s' for writing: %s\n"
-msgstr ""
-
-#: src/fs/fs_namespace.c:229
-#, c-format
-msgid "Failed to write `%s': %s\n"
-msgstr ""
-
-#: src/fs/fs_namespace.c:320
-#, c-format
-msgid "Failed to read `%s': %s\n"
-msgstr ""
-
-#: src/fs/fs_namespace.c:466
-msgid "Failed to connect to datastore."
-msgstr ""
-
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
-#, c-format
-msgid "Publishing failed: %s"
-msgstr ""
-
-#: 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:669
-msgid "timeout on index-start request to `fs' service"
-msgstr ""
-
-#: src/fs/fs_publish.c:681
-msgid "unknown error"
-msgstr "erreur unconnue."
-
-#: src/fs/fs_publish.c:725
-msgid "failed to compute hash"
-msgstr ""
-
-#: src/fs/fs_publish.c:745
-msgid "filename too long"
-msgstr ""
-
-#: src/fs/fs_publish.c:770
-msgid "could not connect to `fs' service"
-msgstr ""
-
-#: src/fs/fs_publish.c:793
-#, c-format
-msgid "Failed to get file identifiers for `%s'\n"
-msgstr ""
-
-#: src/fs/fs_publish.c:862
-#, c-format
-msgid "Recursive upload failed at `%s': %s"
-msgstr ""
-
-#: src/fs/fs_publish.c:868
-#, c-format
-msgid "Recursive upload failed: %s"
-msgstr ""
-
-#: src/fs/fs_publish.c:915
-msgid "needs to be an actual file"
-msgstr ""
-
-#: src/fs/fs_publish.c:1151
-#, c-format
-msgid "Insufficient space for publishing: %s"
-msgstr ""
-
-#: 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:219
-msgid "Could not connect to datastore."
-msgstr ""
-
-#: src/fs/fs_publish_ublock.c:219
-msgid "Internal error."
-msgstr "Erreur interne."
-
-#: src/fs/fs_search.c:813
-#, c-format
-msgid "Failed to parse URI `%s': %s\n"
-msgstr ""
-
-#: src/fs/fs_search.c:872
-#, c-format
-msgid "Got result with unknown block type `%d', ignoring"
-msgstr ""
-
-#: src/fs/fs_unindex.c:59
-msgid "Failed to find given position in file"
-msgstr ""
-
-#: src/fs/fs_unindex.c:64
-msgid "Failed to read file"
-msgstr ""
-
-#: src/fs/fs_unindex.c:234
-msgid "Unexpected time for a response from `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:242
-msgid "Timeout waiting for `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:250
-msgid "Invalid response from `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:291
-msgid "Failed to connect to FS service for unindexing."
-msgstr ""
-
-#: 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:355
-#, c-format
-msgid "Internal error scanning `%s'.\n"
-msgstr ""
-
-#: src/fs/fs_unindex.c:414
-#, c-format
-msgid "Failed to remove UBlock: %s\n"
-msgstr ""
-
-#: 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:639
-msgid "Failed to open file for unindexing."
-msgstr ""
-
-#: src/fs/fs_unindex.c:673
-msgid "Failed to compute hash of file."
-msgstr ""
-
-#: src/fs/fs_uri.c:222
-#, no-c-format
-msgid "`%' must be followed by HEX number"
-msgstr ""
-
-#: src/fs/fs_uri.c:281
-msgid "Malformed KSK URI (must not begin or end with `+')"
-msgstr ""
-
-#: src/fs/fs_uri.c:299
-msgid "`++' not allowed in KSK URI"
-msgstr ""
-
-#: src/fs/fs_uri.c:306
-msgid "Quotes not balanced in KSK URI"
-msgstr ""
-
-#: src/fs/fs_uri.c:376
-msgid "Malformed SKS URI"
-msgstr ""
-
-#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
-msgid "Malformed CHK URI"
-msgstr ""
-
-#: src/fs/fs_uri.c:512 src/fs/fs_uri.c:580
-msgid "SKS URI malformed"
-msgstr ""
-
-#: src/fs/fs_uri.c:527 src/fs/fs_uri.c:537
-msgid "LOC URI malformed"
-msgstr ""
-
-#: 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:559
-msgid "SKS URI malformed (could not find signature)"
-msgstr ""
-
-#: 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:586
-msgid "SKS URI malformed (could not parse expiration time)"
-msgstr ""
-
-#: src/fs/fs_uri.c:598
-msgid "SKS URI malformed (signature failed validation)"
-msgstr ""
-
-#: src/fs/fs_uri.c:636
-msgid "Unrecognized URI type"
-msgstr "Type d’URI non reconnu"
-
-#: src/fs/fs_uri.c:860
-msgid "Lacking key configuration settings.\n"
-msgstr ""
-
-#: src/fs/fs_uri.c:866
-#, c-format
-msgid "Could not access hostkey file `%s'.\n"
-msgstr ""
-
-#: src/fs/fs_uri.c:1050 src/fs/fs_uri.c:1077
-msgid "No keywords specified!\n"
-msgstr ""
-
-#: src/fs/fs_uri.c:1083
-msgid "Number of double-quotes not balanced!\n"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:236
-#, c-format
-msgid "Failed to load state: %s\n"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
-#: src/fs/gnunet-auto-share.c:309
+#: src/fs/gnunet-auto-share.c:287 src/fs/gnunet-auto-share.c:296
+#: src/fs/gnunet-auto-share.c:304
 #, c-format
 msgid "Failed to save state to file %s\n"
 msgstr ""
@@ -2957,1140 +2800,1162 @@ msgstr ""
 msgid "Publication of `%s' done\n"
 msgstr "Publication de « %s » terminée\n"
 
-#: src/fs/gnunet-auto-share.c:488
+#: src/fs/gnunet-auto-share.c:480
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr "Publication de « %s »\n"
 
-#: src/fs/gnunet-auto-share.c:497
+#: src/fs/gnunet-auto-share.c:491
 #, c-format
 msgid "Failed to run `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:686
+#: src/fs/gnunet-auto-share.c:661
 #, 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:737 src/fs/gnunet-publish.c:824
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:896
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
+#: src/fs/gnunet-auto-share.c:718
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:901
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:946
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:959
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:770
+#: src/fs/gnunet-auto-share.c:761
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:660
+#: src/fs/gnunet-daemon-fsprofiler.c:667
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:49
+#: src/fs/gnunet-directory.c:53
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
+#: src/fs/gnunet-directory.c:105
 #, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:97
+#: src/fs/gnunet-directory.c:108
 #, c-format
 msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:132
+#: src/fs/gnunet-directory.c:145
 msgid "You must specify a filename to inspect.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-directory.c:159
 #, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:154
+#: src/fs/gnunet-directory.c:169
 #, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:183
+#: src/fs/gnunet-directory.c:200
 msgid "Display contents of a GNUnet directory"
 msgstr ""
 
-#: src/fs/gnunet-download.c:137
+#: src/fs/gnunet-download.c:130
 #, c-format
 msgid "Starting download `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:147
+#: src/fs/gnunet-download.c:142
 msgid "<unknown time>"
 msgstr ""
 
-#: src/fs/gnunet-download.c:157
+#: src/fs/gnunet-download.c:154
 #, 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
+#: src/fs/gnunet-download.c:176
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:194
+#: src/fs/gnunet-download.c:188
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
-#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-download.c:206 src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-search.c:229 src/fs/gnunet-unindex.c:117
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:234
+#: src/fs/gnunet-download.c:233
 msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
+#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:715
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:247
+#: src/fs/gnunet-download.c:246
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:254
+#: src/fs/gnunet-download.c:253
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
-#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
+#: src/fs/gnunet-download.c:271 src/fs/gnunet-publish.c:869
+#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:154
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289
+#: src/fs/gnunet-download.c:318 src/fs/gnunet-search.c:334
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:308
+#: src/fs/gnunet-download.c:324
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
+#: src/fs/gnunet-download.c:330 src/fs/gnunet-search.c:339
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:314
+#: src/fs/gnunet-download.c:335
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:318
+#: src/fs/gnunet-download.c:342
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:322
+#: src/fs/gnunet-download.c:349
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:325
+#: src/fs/gnunet-download.c:354
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: 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
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:127
-msgid "Special file-sharing operations"
+#: src/fs/gnunet-download.c:373
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:193
+#: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:196
+#: src/fs/gnunet-fs-profiler.c:218
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:199
+#: src/fs/gnunet-fs-profiler.c:225
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:237
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
+#: src/fs/gnunet-fs.c:128
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:141
+msgid "Special file-sharing operations"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:234
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:250
+#: src/fs/gnunet-publish.c:246
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:260
+#: src/fs/gnunet-publish.c:254
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr "Publication de « %s » terminée.\n"
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:258
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr "L’URI est « %s ».\n"
 
-#: src/fs/gnunet-publish.c:283
-msgid "Cleanup after abort complete.\n"
+#: src/fs/gnunet-publish.c:264
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr "L’URI est « %s ».\n"
+
+#: src/fs/gnunet-publish.c:279
+msgid "Starting cleanup after abort\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:401
+#: src/fs/gnunet-publish.c:286
+msgid "Cleanup after abort completed.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:291
+msgid "Cleanup after abort failed.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:425
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:403
+#: src/fs/gnunet-publish.c:427
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:542
+#: src/fs/gnunet-publish.c:582
 msgid "Could not publish\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:611
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:598
+#: src/fs/gnunet-publish.c:644
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:600
+#: src/fs/gnunet-publish.c:646
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:652
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:610
+#: src/fs/gnunet-publish.c:658
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:614
+#: src/fs/gnunet-publish.c:664
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-publish.c:670
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:625
-msgid "Internal error scanning directory.\n"
+#: src/fs/gnunet-publish.c:678
+msgid "Error scanning directory.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:656
+#: src/fs/gnunet-publish.c:705
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:737
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:695
-msgid "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs 
installed?\n"
+#: src/fs/gnunet-publish.c:754
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:810
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:817
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:760
+#: src/fs/gnunet-publish.c:823
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:832 src/vpn/gnunet-vpn.c:209
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1284 src/transport/gnunet-transport.c:1314
-#: src/transport/gnunet-transport.c:1344
+#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:853
+#: src/transport/gnunet-transport.c:1230 src/transport/gnunet-transport.c:1255
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:835
-msgid "print list of extracted keywords that would be used, but do not perform 
upload"
+#: src/fs/gnunet-publish.c:906
+msgid "enable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: 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)"
+#: src/fs/gnunet-publish.c:912
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:920
+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:843
+#: src/fs/gnunet-publish.c:927
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:846
-msgid "do not index, perform full insertion (stores entire file in encrypted 
form in GNUnet database)"
+#: src/fs/gnunet-publish.c:932
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:851
-msgid "specify ID of an updated version to be published in the future (for 
namespace insertions only)"
+#: src/fs/gnunet-publish.c:939
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:859
+#: src/fs/gnunet-publish.c:952
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:865
-msgid "only simulate the process but do not do any actual publishing (useful 
to compute URIs)"
+#: src/fs/gnunet-publish.c:964
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:869
-msgid "set the ID of this version of the publication (for namespace insertions 
only)"
+#: src/fs/gnunet-publish.c:971
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: 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)"
+#: src/fs/gnunet-publish.c:979
+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:889
+#: src/fs/gnunet-publish.c:997
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:114
+#: src/fs/gnunet-search.c:130
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:191
+#: src/fs/gnunet-search.c:219
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:240
+#: src/fs/gnunet-search.c:281
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:264
+#: src/fs/gnunet-search.c:308
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:295
+#: src/fs/gnunet-search.c:345
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:298
+#: src/fs/gnunet-search.c:351
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:305
+#: src/fs/gnunet-search.c:357
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:316
+#: src/fs/gnunet-search.c:371
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:271
+#: src/fs/gnunet-service-fs.c:371 src/fs/gnunet-service-fs.c:878
+msgid "# client searches active"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:430
+msgid "# replies received for local clients"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:596
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
+#: src/fs/gnunet-service-fs.c:648 src/fs/gnunet-service-fs_cp.c:558
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1254
-#: src/topology/gnunet-daemon-topology.c:1261
+#: src/fs/gnunet-service-fs.c:831
+msgid "# client searches received"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:871
+msgid "# client searches updated (merged content seen list)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1041
 #, c-format
-msgid "Failed to connect to `%s' service.\n"
+msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:682
-msgid "# migration stop messages received"
+#: src/fs/gnunet-service-fs.c:1282
+msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:686
+#: src/fs/gnunet-service-fs.c:1316 src/hostlist/gnunet-daemon-hostlist.c:343
+#: src/topology/gnunet-daemon-topology.c:1098
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %s\n"
+msgid "Failed to connect to `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:721
-msgid "# replies transmitted to other peers"
+#: src/fs/gnunet-service-fs_cadet_client.c:353
+msgid "# replies received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:727
-msgid "# replies dropped"
+#: src/fs/gnunet-service-fs_cadet_client.c:369
+msgid "# replies received via cadet dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
-msgid "# P2P searches active"
+#: src/fs/gnunet-service-fs_cadet_server.c:263
+msgid "# queries received via CADET not answered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:845
-msgid "# artificial delays introduced (ms)"
+#: src/fs/gnunet-service-fs_cadet_server.c:318
+msgid "# Blocks transferred via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:344
+msgid "# queries received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:898
-msgid "# replies dropped due to type mismatch"
+#: src/fs/gnunet-service-fs_cadet_server.c:387
+msgid "# cadet client connections rejected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:906
-msgid "# replies received for other peers"
+#: src/fs/gnunet-service-fs_cadet_server.c:394
+#: src/fs/gnunet-service-fs_cadet_server.c:434
+#, fuzzy
+msgid "# cadet connections active"
+msgstr "# Session TCP active"
+
+#: src/fs/gnunet-service-fs_cp.c:680
+msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:920
-msgid "# replies dropped due to insufficient cover traffic"
+#: src/fs/gnunet-service-fs_cp.c:684
+#, c-format
+msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:958
-msgid "# P2P searches destroyed due to ultimate reply"
+#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1343
+msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1026
+#: src/fs/gnunet-service-fs_cp.c:812
+msgid "# artificial delays introduced (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1009
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1051
+#: src/fs/gnunet-service-fs_cp.c:1034
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1061
+#: src/fs/gnunet-service-fs_cp.c:1044
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1139
-msgid "# GET requests received (from other peers)"
+#: src/fs/gnunet-service-fs_cp.c:1141
+msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1173
-msgid "# requests dropped due to initiator not being connected"
+#: src/fs/gnunet-service-fs_cp.c:1199
+msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1195
+#: src/fs/gnunet-service-fs_cp.c:1223
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1246
-msgid "# requests dropped due TTL underflow"
+#: src/fs/gnunet-service-fs_cp.c:1237
+msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1270
-msgid "# requests dropped due to higher-TTL request"
+#: src/fs/gnunet-service-fs_cp.c:1294
+msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:1339
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1670
+#: src/fs/gnunet-service-fs_cp.c:1709
 msgid "# migration stop messages sent"
 msgstr ""
 
 #: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:181
+#: src/fs/gnunet-service-fs_indexing.c:188
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:142
+#: src/fs/gnunet-service-fs_indexing.c:147
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:237
-#, c-format
-msgid "Index request received for file `%s' is already indexed as `%s'.  
Permitting anyway.\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:275
-#, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:477
+#: src/fs/gnunet-service-fs_indexing.c:244
 #, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:542
+#: src/fs/gnunet-service-fs_indexing.c:317
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:557
+#: src/fs/gnunet-service-fs_indexing.c:331
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:559
+#: src/fs/gnunet-service-fs_indexing.c:335
 msgid "not indexed"
 msgstr "non indexé"
 
-#: src/fs/gnunet-service-fs_indexing.c:574
+#: src/fs/gnunet-service-fs_indexing.c:349
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: 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:256
-msgid "# replies received for local clients"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_lc.c:327
-msgid "# client searches received"
-msgstr ""
-
-#: 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"
+#: src/fs/gnunet-service-fs_indexing.c:455
+#, c-format
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:269
+#: src/fs/gnunet-service-fs_pe.c:260
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:400
-msgid "# transmission failed (core has no bandwidth)"
+#: src/fs/gnunet-service-fs_pe.c:422
+msgid "# delay heap timeout (ms)"
 msgstr ""
 
 #: src/fs/gnunet-service-fs_pe.c:433
-msgid "# query messages sent to other peers"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:484
-msgid "# delay heap timeout (ms)"
+msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:492
-msgid "# query plans executed"
+#: src/fs/gnunet-service-fs_pe.c:462
+msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:552
+#: src/fs/gnunet-service-fs_pe.c:530
 msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:560
+#: src/fs/gnunet-service-fs_pe.c:540
 msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700
-#: src/fs/gnunet-service-fs_pe.c:771
+#: src/fs/gnunet-service-fs_pe.c:600 src/fs/gnunet-service-fs_pe.c:703
+#: src/fs/gnunet-service-fs_pe.c:786
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:311
+#: src/fs/gnunet-service-fs_pr.c:329
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645
+#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:658
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:838
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:844
-msgid "# duplicate replies discarded (bloomfilter)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:853
-msgid "# irrelevant replies discarded"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:867
-#, c-format
-msgid "Unsupported block type %u\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:880
+#: src/fs/gnunet-service-fs_pr.c:916
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1001
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1029
+#: src/fs/gnunet-service-fs_pr.c:1079
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1064
+#: src/fs/gnunet-service-fs_pr.c:1118
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1192
-msgid "# Replies received from MESH"
+#: src/fs/gnunet-service-fs_pr.c:1259
+msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1313
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1334
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1401
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1463
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1518
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1326
+#: src/fs/gnunet-service-fs_pr.c:1533
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1335
+#: src/fs/gnunet-service-fs_pr.c:1556
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1350
-msgid "# requested DBLOCK or IBLOCK not found"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1573
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1377
+#: src/fs/gnunet-service-fs_pr.c:1594
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1382
+#: src/fs/gnunet-service-fs_pr.c:1600
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: 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:1467
+#: src/fs/gnunet-service-fs_pr.c:1641
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1654
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1566
+#: src/fs/gnunet-service-fs_pr.c:1705
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1651
+#: src/fs/gnunet-service-fs_pr.c:1755
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:631
+#: src/fs/gnunet-service-fs_push.c:648
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:89
+#: src/fs/gnunet-unindex.c:93
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:95
+#: src/fs/gnunet-unindex.c:102
 #, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:100
+#: src/fs/gnunet-unindex.c:108
 msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:130
+#: src/fs/gnunet-unindex.c:141
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:147
+#: src/fs/gnunet-unindex.c:161
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:179
+#: src/fs/gnunet-unindex.c:194
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:393
-msgid "Failed to deserialize lookup reply from GNS service!\n"
+#: src/gns/gns_tld_api.c:293
+msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:123
-#, c-format
-msgid "Refusing `%s' request to HTTP server\n"
-msgstr ""
-
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
-#, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
-msgstr ""
+#: src/gns/gnunet-bcd.c:571
+#, fuzzy, c-format
+msgid "Invalid port number %u\n"
+msgstr "Argument invalide « %s »\n"
 
-#: src/gns/gnunet-bcd.c:360
-#, c-format
-msgid "Businesscard HTTP server starts on %llu\n"
+#: src/gns/gnunet-bcd.c:612 src/namestore/gnunet-namestore-fcfsd.c:1113
+msgid "Unable to set up the daemon\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:374
-#, c-format
-msgid "Could not start businesscard HTTP server on port %u\n"
+#: src/gns/gnunet-bcd.c:635 src/namestore/gnunet-namestore-fcfsd.c:987
+msgid "Failed to start HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:519
-msgid "Run HTTP serve on port PORT (default is 8888)"
+#: src/gns/gnunet-bcd.c:658
+msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:667
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:228
+#: src/gns/gnunet-dns2gns.c:241
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:400
+#: src/gns/gnunet-dns2gns.c:315
+#, fuzzy
+msgid "Failed to parse DNS response!\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/gns/gnunet-dns2gns.c:452
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:416
+#: src/gns/gnunet-dns2gns.c:468
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:476
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:701
-msgid "No ego configured for `dns2gns` subsystem\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:727
+#: src/gns/gnunet-dns2gns.c:637
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:749
-msgid "No valid GNS zone specified!\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:770
+#: src/gns/gnunet-dns2gns.c:786
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:773
-msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
+#: src/gns/gnunet-dns2gns.c:792
+msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:776
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+#: src/gns/gnunet-dns2gns.c:809
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:779
-msgid "UDP port to listen on for inbound DNS requests; default: 53"
+#: src/gns/gnunet-gns-benchmark.c:582
+msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
-msgid "Public key of the GNS zone to use (overrides default)"
+#: src/gns/gnunet-gns-benchmark.c:588
+msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:795
-msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+#: src/gns/gnunet-gns-benchmark.c:593
+msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:227
-#, c-format
-msgid "Please specify name to lookup!\n"
+#: src/gns/gnunet-gns-import.c:490
+msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns.c:308
+#: src/gns/gnunet-gns-proxy.c:116
+#: src/hostlist/gnunet-daemon-hostlist_client.c:544
+#: src/hostlist/gnunet-daemon-hostlist_client.c:772
+#: src/hostlist/gnunet-daemon-hostlist_client.c:781
+#: src/hostlist/gnunet-daemon-hostlist_client.c:836
+#: src/hostlist/gnunet-daemon-hostlist_client.c:848
+#: src/hostlist/gnunet-daemon-hostlist_client.c:964
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1066
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1074
+#: src/transport/plugin_transport_http_client.c:600
+#: src/transport/plugin_transport_http_client.c:618
 #, c-format
-msgid "Ego for `%s' not found, cannot perform lookup.\n"
+msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:347 src/gns/gnunet-gns-helper-service-w32.c:798
+#: src/gns/gnunet-gns-proxy.c:979
 #, c-format
-msgid "Ego for `gns-master' not found, cannot perform lookup.  Did you run 
gnunet-gns-import.sh?\n"
+msgid "Unsupported CURL TLS backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:386 src/gns/gnunet-gns-helper-service-w32.c:828
+#: src/gns/gnunet-gns-proxy.c:1004
 #, c-format
-msgid "Failed to connect to GNS\n"
+msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:399
+#: src/gns/gnunet-gns-proxy.c:1025
 #, c-format
-msgid "Public key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:449
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:452
-msgid "Specify the type of the record to lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:455
-msgid "Specify timeout for the lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:458
-msgid "No unneeded output"
-msgstr ""
-
-#: 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:464
-msgid "Specify the name of the ego of the zone to lookup the record in"
+msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:478
-msgid "GNUnet GNS resolver tool"
+#: src/gns/gnunet-gns-proxy.c:1040
+#, c-format
+msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:768
+#: src/gns/gnunet-gns-proxy.c:1056
 #, 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 "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:838
+#: src/gns/gnunet-gns-proxy.c:1067
 #, c-format
-msgid "Failed to connect to identity service\n"
+msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:479
-msgid "This program will import some GNS authorities into your GNS namestore."
+#: src/gns/gnunet-gns-proxy.c:1092
+#, c-format
+msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
-#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
-#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
-#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
-#: src/hostlist/hostlist-client.c:968
-#: src/transport/plugin_transport_http_client.c:1062
-#: src/transport/plugin_transport_http_client.c:1077
+#: src/gns/gnunet-gns-proxy.c:1223
 #, c-format
-msgid "%s failed at %s:%d: `%s'\n"
+msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:833
+#: src/gns/gnunet-gns-proxy.c:2134
 #, c-format
-msgid "Unsupported CURL SSL backend %d\n"
+msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:856
+#: src/gns/gnunet-gns-proxy.c:2658
 #, c-format
-msgid "Failed to fetch CN from cert: %s\n"
+msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:879
+#: src/gns/gnunet-gns-proxy.c:2690
 #, c-format
-msgid "Failed to initialize DANE: %s\n"
+msgid "Unable to import certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:892
+#: src/gns/gnunet-gns-proxy.c:2899
 #, c-format
-msgid "Failed to parse DANE record: %s\n"
+msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:907
-#, c-format
-msgid "Failed to verify TLS connection using DANE: %s\n"
+#: src/gns/gnunet-gns-proxy.c:2923 src/rest/gnunet-rest-server.c:917
+msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:917
+#: src/gns/gnunet-gns-proxy.c:3272
 #, c-format
-msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
+msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:941
+#: src/gns/gnunet-gns-proxy.c:3304
 #, c-format
-msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1086
+#: src/gns/gnunet-gns-proxy.c:3390
 #, c-format
-msgid "Cookie domain `%s' supplied by server is invalid\n"
+msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1602
+#: src/gns/gnunet-gns-proxy.c:3731
 #, c-format
-msgid "Unsupported HTTP method `%s'\n"
+msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1973
-#, c-format
-msgid "Unable to import private key from file `%s'\n"
+#: src/gns/gnunet-gns-proxy.c:3865
+msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2003
-#, c-format
-msgid "Unable to import certificate %s\n"
+#: src/gns/gnunet-gns-proxy.c:3870
+msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2177
-#, c-format
-msgid "Failed to start HTTPS server for `%s'\n"
+#: src/gns/gnunet-gns-proxy.c:3874
+msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2196
-msgid "Failed to pass client to MHD\n"
+#: src/gns/gnunet-gns-proxy.c:3900
+msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2504
+#: src/gns/gnunet-gns.c:257
 #, c-format
-msgid "Unsupported socks version %d\n"
+msgid "`%s' is not a valid DNS domain name\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2533
+#: src/gns/gnunet-gns.c:267 src/util/dnsparser.c:254
 #, c-format
-msgid "Unsupported socks command %d\n"
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
-msgid "SSL connection to plain IPv4 address requested\n"
+#: src/gns/gnunet-gns.c:281
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2631
+#: src/gns/gnunet-gns.c:305
 #, c-format
-msgid "Unsupported socks address type %d\n"
+msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2970
-msgid "No ego configured for `shorten-zone`\n"
+#: src/gns/gnunet-gns.c:340
+msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3010
-#, c-format
-msgid "No ego configured for `%s`\n"
+#: src/gns/gnunet-gns.c:346
+msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3072
-#, c-format
-msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+#: src/gns/gnunet-gns.c:352
+msgid "Specify a timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3113
-msgid "listen on specified port (default: 7777)"
+#: src/gns/gnunet-gns.c:356
+msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3116
-msgid "pem file to use as CA"
+#: src/gns/gnunet-gns.c:361
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3135
-msgid "GNUnet GNS proxy"
+#: src/gns/gnunet-gns.c:375
+msgid "GNUnet GNS resolver tool"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:862
-msgid "Failed to connect to the namestore!\n"
+#: src/gns/gnunet-service-gns.c:505
+msgid "Properly base32-encoded public key required"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:870
+#: src/gns/gnunet-service-gns.c:541
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:903
+#: src/gns/gnunet-service-gns.c:560
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:442
+#: src/zonemaster/gnunet-service-zonemaster.c:885
 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
+#: src/gns/gnunet-service-gns_interceptor.c:279
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:369
+#: src/gns/gnunet-service-gns_interceptor.c:386
 msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:816
+#: src/gns/gnunet-service-gns_resolver.c:706
+#, c-format
+msgid "Protocol `%s' unknown, skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:718
+#, c-format
+msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:724
+#, c-format
+msgid "Service `%s' not a port, skipping service labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:938
 msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:958
+#: src/gns/gnunet-service-gns_resolver.c:1129
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1317
+#: src/gns/gnunet-service-gns_resolver.c:1447
+#, c-format
+msgid "VPN returned empty result for `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1919
+#, c-format
+msgid "Name `%s' cannot be converted to IDNA."
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1934
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1817
+#: src/gns/gnunet-service-gns_resolver.c:1979
+#, c-format
+msgid "GNS lookup failed (zero records found for `%s')\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2406
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1841
+#: src/gns/gnunet-service-gns_resolver.c:2429
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2123
+#: src/gns/gnunet-service-gns_resolver.c:2594
 #, c-format
-msgid "Zone %s was revoked, resolution fails\n"
+msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2272
+#: src/gns/gnunet-service-gns_resolver.c:2734
 #, c-format
-msgid "Hostname `%s' is not well-formed, resolution fails\n"
+msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:151
+#: src/gns/plugin_gnsrecord_gns.c:174
 #, c-format
-msgid "Unable to parse PKEY record `%s'\n"
+msgid "Unable to parse zone key record `%s'\n"
+msgstr ""
+
+#: src/gns/plugin_gnsrecord_gns.c:187
+msgid "Record type does not match parsed record type\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:180
+#: src/gns/plugin_gnsrecord_gns.c:213
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:229
 #, c-format
-msgid "Failed to serialize GNS2DNS record with value `%s'\n"
+msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:217
+#: src/gns/plugin_gnsrecord_gns.c:253
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:293
+#: src/gns/plugin_gnsrecord_gns.c:285
+#, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr ""
+
+#: src/gns/plugin_rest_gns.c:450
+msgid "Gns REST API initialized\n"
+msgstr ""
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:367
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:314
+#: src/gnsrecord/plugin_gnsrecord_dns.c:385
 #, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:336
+#: src/gnsrecord/plugin_gnsrecord_dns.c:406
 #, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:420
+#: src/gnsrecord/plugin_gnsrecord_dns.c:480
 #, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#: src/gnsrecord/plugin_gnsrecord_dns.c:516
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:471
+#: src/gnsrecord/plugin_gnsrecord_dns.c:533
 #, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:494
+#: src/gnsrecord/plugin_gnsrecord_dns.c:553
 #, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:514
+#: src/gnsrecord/plugin_gnsrecord_dns.c:573
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:529
+#: src/gnsrecord/plugin_gnsrecord_dns.c:585
 #, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:549
+#: src/gnsrecord/plugin_gnsrecord_dns.c:608
+#, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr ""
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:621
+#, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr ""
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:640
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:567
+#: src/gnsrecord/plugin_gnsrecord_dns.c:660
+#: src/gnsrecord/plugin_gnsrecord_dns.c:674
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:123
+#: src/gnsrecord/plugin_gnsrecord_dns.c:693
+#, c-format
+msgid "Unable to parse CAA record string `%s'\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:122
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
@@ -4099,1817 +3964,2177 @@ msgstr ""
 msgid "Error accessing file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:137
+#: src/hello/gnunet-hello.c:136
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:144
+#: src/hello/gnunet-hello.c:141
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
+#: src/hello/gnunet-hello.c:150 src/hello/gnunet-hello.c:189
 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:170
+#: src/hello/gnunet-hello.c:165
 #, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:195
+#: src/hello/gnunet-hello.c:199
 #, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:203
+#: src/hello/gnunet-hello.c:208
 #, c-format
-msgid "Modified %u addresses \n"
+msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:944
+#: src/hello/hello.c:1111
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:953
+#: src/hello/hello.c:1121
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:963
+#: src/hello/hello.c:1131
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr ""
 
-#: src/hello/hello.c:973
+#: src/hello/hello.c:1143
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:990
-#, c-format
-msgid "Plugin `%s' not found\n"
+#: src/hello/hello.c:1161
+#, fuzzy, c-format
+msgid "Plugin `%s' not found, skipping address\n"
 msgstr "Extension « %s » introuvable\n"
 
-#: src/hello/hello.c:999
+#: src/hello/hello.c:1169
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1018
+#: src/hello/hello.c:1184
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 
-#: 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"
+#: src/hostlist/gnunet-daemon-hostlist.c:306
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/hostlist/gnunet-daemon-hostlist.c:364
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
-msgid "bootstrap using hostlists (it is highly recommended that you always use 
this option)"
+#: src/hostlist/gnunet-daemon-hostlist.c:369
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:374
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:378
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:393
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:288
+#: src/hostlist/gnunet-daemon-hostlist_client.c:343
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
+#: src/hostlist/gnunet-daemon-hostlist_client.c:365
+#: src/hostlist/gnunet-daemon-hostlist_client.c:402
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
+#: src/hostlist/gnunet-daemon-hostlist_client.c:369
+#: src/hostlist/gnunet-daemon-hostlist_client.c:406
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/gnunet-daemon-hostlist_client.c:388
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
+#: src/hostlist/gnunet-daemon-hostlist_client.c:677
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/gnunet-daemon-hostlist_client.c:709
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/gnunet-daemon-hostlist_client.c:752
 #, 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/hostlist-client.c:802
+#: src/hostlist/gnunet-daemon-hostlist_client.c:893
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/gnunet-daemon-hostlist_client.c:908
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/gnunet-daemon-hostlist_client.c:928
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/gnunet-daemon-hostlist_client.c:934
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/gnunet-daemon-hostlist_client.c:942
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/gnunet-daemon-hostlist_client.c:998
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1007
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1144
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1728
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1049
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1154
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1212
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1233
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1285
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1296
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1412
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1514
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1566
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1560
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1471
-msgid "Learning is enabled on this peer\n"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
+#: src/transport/plugin_transport_http_client.c:2300
+#, c-format
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
-msgid "Learning is not enabled on this peer\n"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1686
+msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1495
-#, c-format
-msgid "Since learning is not enabled on this peer, hostlist file `%s' was 
removed\n"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1699
+msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1499
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1713
 #, c-format
-msgid "Hostlist file `%s' could not be removed\n"
+msgid ""
+"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:137
+#: src/hostlist/gnunet-daemon-hostlist_server.c:173
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:161
+#: src/hostlist/gnunet-daemon-hostlist_server.c:199
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:350
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
-#: src/peerinfo-tool/gnunet-peerinfo.c:490
-#: src/topology/gnunet-daemon-topology.c:925
+#: src/hostlist/gnunet-daemon-hostlist_server.c:236
+#: src/hostlist/gnunet-daemon-hostlist_server.c:527
+#: src/peerinfo-tool/gnunet-peerinfo.c:379
+#: src/peerinfo-tool/gnunet-peerinfo.c:516
+#: src/topology/gnunet-daemon-topology.c:799
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:210
+#: src/hostlist/gnunet-daemon-hostlist_server.c:257
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/gnunet-daemon-hostlist_server.c:275
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:268
+#: src/hostlist/gnunet-daemon-hostlist_server.c:377
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:271
+#: src/hostlist/gnunet-daemon-hostlist_server.c:381
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:394
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:288
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:296
+#: src/hostlist/gnunet-daemon-hostlist_server.c:409
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/gnunet-daemon-hostlist_server.c:412
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:303
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:304
+#: src/hostlist/gnunet-daemon-hostlist_server.c:420
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:346
+#: src/hostlist/gnunet-daemon-hostlist_server.c:461
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:390
-msgid "Advertisement message could not be queued by core\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:674
+#: src/transport/gnunet-service-transport.c:2662
+msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: 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"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:685
+#, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:576
+#: src/hostlist/gnunet-daemon-hostlist_server.c:697
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:590
+#: src/hostlist/gnunet-daemon-hostlist_server.c:714
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:630
+#: src/hostlist/gnunet-daemon-hostlist_server.c:729
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:743
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:765
 #, c-format
-msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:673
+#: src/hostlist/gnunet-daemon-hostlist_server.c:786
+#, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:165
+#: src/identity/gnunet-identity.c:231
 #, c-format
 msgid "Failed to create ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:184
+#: src/identity/gnunet-identity.c:272
 #, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:646
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:651
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:657
+msgid ""
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:663
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:669
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:674
+msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:678
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:336
-msgid "set default identity to EGO for a subsystem SUBSYSTEM (use together 
with -s)"
+#: src/identity/gnunet-identity.c:682
+#, fuzzy
+msgid "reduce output"
+msgstr "sortie verbeuse"
+
+#: src/identity/gnunet-identity.c:689
+msgid ""
+"set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
+"s), restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:695
+msgid "The public key of the recipient (with -W)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:699
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:342
-msgid "set default identity to EGO for a subsystem SUBSYSTEM (use together 
with -e)"
+#: src/identity/gnunet-identity.c:703
+msgid "display private keys as well"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:710
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:351
+#: src/identity/gnunet-identity.c:725
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:338
+#: src/identity/gnunet-service-identity.c:503
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:362
+#: src/identity/gnunet-service-identity.c:528
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:439
-#: src/identity/gnunet-service-identity.c:670
-#: src/identity/gnunet-service-identity.c:778
+#: src/identity/gnunet-service-identity.c:621
+#: src/identity/gnunet-service-identity.c:896
+#: src/identity/gnunet-service-identity.c:1016
 #, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:446
+#: src/identity/gnunet-service-identity.c:631
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:516
+#: src/identity/gnunet-service-identity.c:725
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:647
+#: src/identity/gnunet-service-identity.c:872
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:686
-#: src/identity/gnunet-service-identity.c:795
+#: src/identity/gnunet-service-identity.c:914
+#: src/identity/gnunet-service-identity.c:1033
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:829
+#: src/identity/gnunet-service-identity.c:1131
 #, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:902
+#: src/identity/gnunet-service-identity.c:1189
 #, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:914
+#: src/identity/gnunet-service-identity.c:1198
 #, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:357
+#: src/identity/plugin_rest_identity.c:1401
+msgid "Identity REST API initialized\n"
+msgstr ""
+
+#: src/json/json.c:120
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/messenger/plugin_gnsrecord_messenger.c:118
+#: src/messenger/plugin_gnsrecord_messenger.c:133
+#, c-format
+msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
+msgstr ""
+
+#: src/my/my.c:196 src/my/my.c:215
 #, c-format
-msgid "Invalid target `%s'\n"
+msgid "%s failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:607
+#: src/mysql/mysql.c:190
 #, c-format
-msgid "Invalid peer ID `%s'\n"
+msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:650
+#: src/mysql/mysql.c:198
 #, c-format
-msgid "Invalid tunnel owner `%s'\n"
+msgid "Could not access file `%s': %s\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:716
-msgid "You must NOT give a TARGETwhen using 'request all' options\n"
+#: src/namecache/gnunet-namecache.c:106
+#, c-format
+msgid "No records found for `%s'"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:807
-msgid "provide information about a particular connection"
+#: src/namecache/gnunet-namecache.c:119 src/namestore/gnunet-namestore.c:459
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:810
-msgid "activate echo mode"
+#: src/namecache/gnunet-namecache.c:175
+#, c-format
+msgid "You must specify which zone should be accessed\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:816
-msgid "port to listen to (default; 0)"
+#: src/namecache/gnunet-namecache.c:182
+#, fuzzy, c-format
+msgid "Invalid public key for zone `%s'\n"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/namecache/gnunet-namecache.c:188
+#, c-format
+msgid "You must specify a name\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:819 src/mesh/gnunet-mesh.c:822
-msgid "provide information about all peers"
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1641
+msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:825
-msgid "provide information about a particular tunnel"
+#: src/namecache/gnunet-namecache.c:221
+msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:828
-msgid "provide information about all tunnels"
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1702
+msgid "GNUnet zone manipulation tool"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh_peer.c:390
-msgid "Wrong CORE service\n"
+#: src/namecache/namecache_api.c:286
+msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/mysql/mysql.c:174
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
+#: src/namecache/namecache_api.c:374
+msgid "Error communicating with namecache service"
 msgstr ""
 
-#: src/mysql/mysql.c:181
+#: src/namecache/plugin_namecache_flat.c:118
+#: src/namecache/plugin_namecache_flat.c:253
+#: src/namestore/plugin_namestore_flat.c:176
+#: src/namestore/plugin_namestore_flat.c:424
+#: src/peerstore/plugin_peerstore_flat.c:380
+#: src/peerstore/plugin_peerstore_flat.c:542
 #, c-format
-msgid "Could not access file `%s': %s\n"
+msgid "Unable to initialize file: %s.\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:109
+#: src/namecache/plugin_namecache_flat.c:129
+#: src/namestore/plugin_namestore_flat.c:187
+#: src/peerstore/plugin_peerstore_flat.c:395
 #, c-format
-msgid "No records found for `%s'"
+msgid "Unable to get filesize: %s.\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
-#, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
+#: src/namecache/plugin_namecache_flat.c:148
+#: src/peerstore/plugin_peerstore_flat.c:407
+#, fuzzy, c-format
+msgid "Unable to read file: %s.\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/namecache/plugin_namecache_flat.c:404
+msgid "flat plugin running\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:185
-#, c-format
-msgid "You must specify which zone should be accessed\n"
+#: src/namecache/plugin_namecache_sqlite.c:190
+#: src/namecache/plugin_namecache_sqlite.c:204
+#: src/namestore/plugin_namestore_sqlite.c:226
+#: src/namestore/plugin_namestore_sqlite.c:237
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:368
+msgid "can not search the namestore"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695
+#: src/namestore/gnunet-namestore-fcfsd.c:422
+#: src/namestore/gnunet-namestore-fcfsd.c:563
+msgid "unable to scan namestore"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:450
+#, fuzzy, c-format
+msgid "Failed to create record for `%s': %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:462
+#, fuzzy
+msgid "no errors"
+msgstr "erreur unconnue."
+
+#: src/namestore/gnunet-namestore-fcfsd.c:498
 #, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
+msgid "The requested key `%s' exists as `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:505
+msgid "key exists"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:203
+#: src/namestore/gnunet-namestore-fcfsd.c:522
+#, fuzzy
+msgid "Error creating record data\n"
+msgstr "Erreur de création du tunnel\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:526
+#, fuzzy
+msgid "unable to store record"
+msgstr "suprimer un enregistrement"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:597
 #, c-format
-msgid "You must specify a name\n"
+msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
-msgid "name of the record to add/delete/display"
+#: src/namestore/gnunet-namestore-fcfsd.c:603
+msgid "name exists\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:237
-msgid "spezifies the public key of the zone to look in"
+#: src/namestore/gnunet-namestore-fcfsd.c:789
+msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
-msgid "GNUnet zone manipulation tool"
+#: src/namestore/gnunet-namestore-fcfsd.c:800
+msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namecache/namecache_api.c:276
-msgid "Namecache failed to cache block"
+#: src/namestore/gnunet-namestore-fcfsd.c:819
+#, fuzzy
+msgid "invalid parameters"
+msgstr "adresse invalide"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:836
+#, fuzzy
+msgid "invalid name"
+msgstr "adresse invalide"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:847
+#, fuzzy, c-format
+msgid "Unable to parse key %s\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:851
+msgid "unable to parse key"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:962
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
+msgid "No port specified, using default value\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1089
+msgid "Failed to connect to identity\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
+msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namecache/plugin_namecache_postgres.c:89
-#: src/namestore/plugin_namestore_postgres.c:96
-msgid "Failed to create indices\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
+msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:303
+#: src/namestore/gnunet-namestore.c:334
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:332
+#: src/namestore/gnunet-namestore.c:362
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:339
+#: src/namestore/gnunet-namestore.c:369
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:558
+#: src/namestore/gnunet-namestore.c:656
 #, c-format
-msgid "No options given\n"
+msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:569
-#: src/namestore/gnunet-namestore-fcfsd.c:970
-msgid "Failed to connect to namestore\n"
+#: src/namestore/gnunet-namestore.c:668
+#, c-format
+msgid ""
+"A zone key record exists already under `%s', no other records can be added.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:680
+#, c-format
+msgid ""
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:696
+#, c-format
+msgid "Records already exist under `%s', cannot add `%s' record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:711
+#, c-format
+msgid "Records already exist under `%s', cannot add record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:726
+#, c-format
+msgid ""
+"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:846
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:889
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:970
+#, fuzzy, c-format
+msgid "Failed to replace records: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/namestore/gnunet-namestore.c:993
+#, c-format
+msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:577 src/namestore/gnunet-namestore.c:586
-#: src/namestore/gnunet-namestore.c:603 src/namestore/gnunet-namestore.c:625
-#: src/namestore/gnunet-namestore.c:665
+#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1076 src/namestore/gnunet-namestore.c:1105
+#: src/namestore/gnunet-namestore.c:1126 src/namestore/gnunet-namestore.c:1153
+#: src/namestore/gnunet-namestore.c:1230
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
-#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
+#: src/namestore/gnunet-namestore.c:1016
+msgid "replace"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1045
+#, c-format
+msgid "Invalid nick `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1068 src/namestore/gnunet-namestore.c:1078
+#: src/namestore/gnunet-namestore.c:1107 src/namestore/gnunet-namestore.c:1128
+#: src/namestore/gnunet-namestore.c:1232
 msgid "add"
 msgstr "ajouter"
 
-#: src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:1086
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:615
+#: src/namestore/gnunet-namestore.c:1096
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1116
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:651
+#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1239
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:666
+#: src/namestore/gnunet-namestore.c:1155
 msgid "del"
 msgstr "supprimer"
 
-#: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:723
+#: src/namestore/gnunet-namestore.c:1197
+#, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1222
+#: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI invalide « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:750
+#: src/namestore/gnunet-namestore.c:1292
 #, c-format
-msgid "Invalid nick `%s'\n"
+msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:790
+#: src/namestore/gnunet-namestore.c:1342
 #, c-format
-msgid "Ego `%s' not known to identity service\n"
+msgid ""
+"No default identity configured for `namestore' subsystem\n"
+"Run gnunet-identity -s namestore -e $NAME to set the default to $NAME\n"
+"Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:817
+#: src/namestore/gnunet-namestore.c:1407
 #, c-format
-msgid "No default ego configured in identity service\n"
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:853
+#: src/namestore/gnunet-namestore.c:1436
 #, c-format
-msgid "Identity service is not running\n"
+msgid "Cannot connect to identity service\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1483
+msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:865
+#: src/namestore/gnunet-namestore.c:1495
 #, c-format
-msgid "Cannot connect to identity service\n"
+msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:1507 src/namestore/gnunet-namestore.c:1523
+#: src/namestore/gnunet-namestore.c:1540
+#, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1515
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Commande « %s » inconnue\n"
+
+#: src/namestore/gnunet-namestore.c:1553
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/namestore/gnunet-namestore.c:1610
 msgid "add record"
 msgstr "ajouter un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1613
 msgid "delete record"
 msgstr "suprimer un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:1617
 msgid "display records"
 msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore.c:922
-msgid "expiration time for record to use (for adding only), \"never\" is 
possible"
+#: src/namestore/gnunet-namestore.c:1624
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:925
+#: src/namestore/gnunet-namestore.c:1630
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:928
+#: src/namestore/gnunet-namestore.c:1635
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:1647
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:1654
+msgid ""
+"set record set to values given by (possibly multiple) RECORDLINES; can be "
+"specified multiple times"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1660
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:1665
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:1671
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:1675
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:949
-msgid "create shadow record (only valid if all other records of the same type 
have expired"
+#: src/namestore/gnunet-namestore.c:1681
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:952
+#: src/namestore/gnunet-namestore.c:1687
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:464
+#: src/namestore/gnunet-service-namestore.c:871
 #, c-format
-msgid "Unsupported form value `%s'\n"
+msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:491
-#, c-format
-msgid "Failed to create record for domain `%s': %s\n"
+#: src/namestore/gnunet-zoneimport.c:1847
+msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:525
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
+#: src/namestore/gnunet-zoneimport.c:1853
+msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:534
-msgid "Error when mapping zone to name\n"
+#: src/namestore/namestore_api.c:373
+msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:596
+#: src/namestore/plugin_namestore_flat.c:195
 #, c-format
-msgid "Found %u existing records for domain `%s'\n"
+msgid "File too big to map: %llu bytes.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:652
+#: src/namestore/plugin_namestore_flat.c:219
 #, c-format
-msgid "Failed to create page for `%s'\n"
+msgid "Namestore database file `%s' malformed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:668
-#, c-format
-msgid "Failed to setup post processor for `%s'\n"
+#: src/namestore/plugin_namestore_flat.c:792
+msgid "Flat file database running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:704
-msgid "Domain name must not contain `.'\n"
+#: src/namestore/plugin_rest_namestore.c:1111
+msgid "Namestore REST API initialized\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:712
-msgid "Domain name must not contain `+'\n"
+#: src/nat-auto/gnunet-nat-auto.c:189
+msgid "Suggested configuration changes:\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:910
-msgid "No ego configured for `fcfsd` subsystem\n"
+#: src/nat-auto/gnunet-nat-auto.c:208
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:215
+#, c-format
+msgid "Wrote updated configuration to `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:936
-msgid "Failed to start HTTP server\n"
+#: src/nat-auto/gnunet-nat-auto.c:327
+msgid "run autoconfiguration"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:978
-msgid "Failed to connect to identity\n"
+#: src/nat-auto/gnunet-nat-auto.c:335
+msgid "section name providing the configuration for the adapter"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1011
-msgid "GNU Name System First Come First Serve name registration service"
+#: src/nat-auto/gnunet-nat-auto.c:338 src/nat/gnunet-nat.c:446
+msgid "use TCP"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:655
-#, c-format
-msgid "Failed to replicate block in namecache: %s\n"
+#: src/nat-auto/gnunet-nat-auto.c:340 src/nat/gnunet-nat.c:448
+msgid "use UDP"
 msgstr ""
 
-#: src/namestore/namestore_api.c:275
-msgid "Namestore failed to store record\n"
+#: src/nat-auto/gnunet-nat-auto.c:345
+msgid "write configuration file (for autoconfiguration)"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:355
+msgid "GNUnet NAT traversal autoconfiguration"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:279
+#: src/nat-auto/gnunet-nat-auto_legacy.c:377
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:685
+#: src/nat-auto/nat_auto_api_test.c:383
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:483
 #, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
-msgid "GNUnet NAT traversal test helper daemon"
+#: src/nat-auto/gnunet-nat-auto_legacy.c:527
+#: src/nat-auto/nat_auto_api_test.c:532
+msgid "NAT test failed to start NAT library\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:170
-msgid "NAT traversal with ICMP Server timed out.\n"
+#: src/nat-auto/gnunet-service-nat-auto.c:346
+msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:203
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:384
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:204
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:225
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:274
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:344
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:574
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:360
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:592
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:413
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:727
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:414
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:728
 msgid "upnpc not found\n"
 msgstr "upnpc introuvable\n"
 
-#: src/nat/nat_auto.c:447
-msgid "gnunet-helper-nat-server found, testing it\n"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:766
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:448
-msgid "No working gnunet-helper-nat-server found\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:482
-msgid "gnunet-helper-nat-client found, enabling it\n"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:779
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:483
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:791
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:853
+msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat.c:867
-#, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:917
-#, c-format
-msgid "Failed to start %s\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/nat/nat.c:1205
-msgid "malformed"
-msgstr "malformé"
-
-#: 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"
+#: src/nat-auto/nat_auto_api.c:73
+msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:1426
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+#: src/nat-auto/nat_auto_api.c:76
+msgid "IPC failure"
 msgstr ""
 
-#: src/nat/nat.c:1442
-#, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
+#: src/nat-auto/nat_auto_api.c:79
+msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat_mini.c:155
-msgid "no valid address was returned by `external-ip'"
+#: src/nat-auto/nat_auto_api.c:82
+msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat_mini.c:175
-msgid "`external-ip' command not found"
+#: src/nat-auto/nat_auto_api.c:85
+msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat_mini.c:201
-msgid "`external-ip' command not found\n"
+#: src/nat-auto/nat_auto_api.c:88
+msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat_mini.c:366
+#: src/nat-auto/nat_auto_api.c:91
 msgid "Failed to run `upnpc` command"
 msgstr ""
 
-#: src/nat/nat_mini.c:512
+#: src/nat-auto/nat_auto_api.c:94
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat_mini.c:540
+#: src/nat-auto/nat_auto_api.c:97
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat_mini.c:604
-msgid "`upnpc' command not found\n"
+#: src/nat-auto/nat_auto_api.c:100
+msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat_mini.c:608
-msgid "`upnpc` command not found"
+#: src/nat-auto/nat_auto_api.c:103
+msgid "Failed to run `external-ip` command"
 msgstr ""
 
-#: src/nat/nat_test.c:351
-msgid "Failed to connect to `gnunet-nat-server'\n"
+#: src/nat-auto/nat_auto_api.c:106
+msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat_test.c:423
-#, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+#: src/nat-auto/nat_auto_api.c:109
+msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:117
-msgid "NSE service is not running\n"
+#: src/nat-auto/nat_auto_api.c:113
+msgid "Could not determine interface with internal/local network address"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:122
-msgid "Error while checking if NSE service is running or not\n"
+#: src/nat-auto/nat_auto_api.c:116
+msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:168
-msgid "Show network size estimates from NSE service."
+#: src/nat-auto/nat_auto_api.c:119
+msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:858
-msgid "limit to the number of connections to NSE services, 0 for none"
+#: src/nat-auto/nat_auto_api.c:122
+msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:861
-msgid "name of the file for writing connection information and statistics"
+#: src/nat-auto/nat_auto_api.c:125
+msgid "could not register NAT"
 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"
+#: src/nat-auto/nat_auto_api.c:128
+msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:867
-msgid "name of the file for writing the main results"
+#: src/nat-auto/nat_auto_api_test.c:445
+#, c-format
+msgid "Failed to find valid PORT in section `%s'\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:870
-msgid "Number of peers to run in each round, separated by commas"
+#: src/nat-auto/nat_auto_api_test.c:489
+#, fuzzy, c-format
+msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/nat/gnunet-nat.c:422
+msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:876
-msgid "delay between rounds"
+#: src/nat/gnunet-nat.c:430
+msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:885
-msgid "Measure quality and performance of the NSE service."
+#: src/nat/gnunet-nat.c:438
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
 msgstr ""
 
-#: 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"
+#: src/nat/gnunet-nat.c:443
+msgid "enable STUN processing"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:215
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
+#: src/nat/gnunet-nat.c:453
+msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:352
-#, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
+#: src/nat/gnunet-nat.c:464
+msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:371
-#: src/peerinfo/gnunet-service-peerinfo.c:388
+#: src/nat/gnunet-service-nat.c:1351
 #, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
+msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:466
-msgid "# peers known"
+#: src/nat/gnunet-service-nat.c:1362
+#, c-format
+msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:503
+#: src/nat/gnunet-service-nat.c:1378
 #, c-format
-msgid "File `%s' in directory `%s' does not match naming convention. 
Removed.\n"
+msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:653
+#: src/nat/gnunet-service-nat.c:1390
 #, c-format
-msgid "Scanning directory `%s'\n"
+msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:658
-#, c-format
-msgid "Still no peers found in `%s'!\n"
+#: src/nat/gnunet-service-nat.c:1861
+msgid "Connection reversal request failed\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:994
-#, c-format
-msgid "Cleaning up directory `%s'\n"
+#: src/nat/gnunet-service-nat.c:1935
+msgid ""
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1287
+#: src/nat/gnunet-service-nat_helper.c:175
 #, c-format
-msgid "Importing HELLOs from `%s'\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1298
-msgid "Skipping import of included HELLOs\n"
+#: src/nat/gnunet-service-nat_helper.c:249
+#, c-format
+msgid "Failed to start %s\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/nat/gnunet-service-nat_mini.c:188
+msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:236
-msgid "aborted due to explicit disconnect request"
+#: src/nat/gnunet-service-nat_mini.c:607
+msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:356
-msgid "failed to transmit request (service down?)"
+#: src/nse/gnunet-nse-profiler.c:857
+msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:506
-msgid "Failed to receive response from `PEERINFO' service."
+#: src/nse/gnunet-nse-profiler.c:864
+msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: 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."
+#: src/nse/gnunet-nse-profiler.c:879
+msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:678
-msgid "Timeout transmitting iteration request to `PEERINFO' service."
+#: src/nse/gnunet-nse-profiler.c:888
+msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:268
-#, c-format
-msgid "Could not connect to `%s' service.\n"
+#: src/nse/gnunet-nse-profiler.c:900
+msgid "delay between rounds"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:232
-#, c-format
-msgid "%sPeer `%s'\n"
+#: src/nse/gnunet-nse-profiler.c:912
+msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
-#, c-format
-msgid "\tExpires: %s \t %s\n"
+#: src/nse/gnunet-nse.c:124
+msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
-#, c-format
-msgid "Failure: Did not receive %s\n"
+#: src/nse/gnunet-service-nse.c:1441
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
+msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:436
+#: src/peerinfo-tool/gnunet-peerinfo.c:237
 #, c-format
-msgid "Failure: Received invalid %s\n"
+msgid "%sPeer `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:244
 #, c-format
-msgid "Failed to write HELLO with %u bytes to file `%s'\n"
+msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:292
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:525
 #, c-format
-msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
+msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:522
+#: src/peerinfo-tool/gnunet-peerinfo.c:451
 #, c-format
-msgid "Failure adding HELLO: %s\n"
+msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:633
+#: src/peerinfo-tool/gnunet-peerinfo.c:464
 #, c-format
-msgid "Service `%s' is not running, please start GNUnet\n"
+msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:480
 #, c-format
-msgid "Loading hostkey from `%s' failed.\n"
+msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:745
+#: src/peerinfo-tool/gnunet-peerinfo.c:759
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:800
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:806
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:811
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:816
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:801
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:804
+#: src/peerinfo-tool/gnunet-peerinfo.c:827
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:807
+#: src/peerinfo-tool/gnunet-peerinfo.c:832
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:810
+#: src/peerinfo-tool/gnunet-peerinfo.c:839
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:853
 msgid "Print information about peers."
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:128
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:103
+#: src/transport/gnunet-service-transport_plugins.c:167
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:133
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:107
+#: src/transport/gnunet-service-transport_plugins.c:172
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:165
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:207
 #, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
 
-#: src/postgres/postgres.c:59
-#, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:811
+msgid "Peerinfo REST API initialized\n"
 msgstr ""
 
-#: src/postgres/postgres.c:148
+#: src/peerinfo/gnunet-service-peerinfo.c:175
 #, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr ""
-
-#: src/psycstore/gnunet-service-psycstore.c:200
-msgid "Failed to store membership information!\n"
-msgstr ""
-
-#: src/psycstore/gnunet-service-psycstore.c:224
-msgid "Failed to test membership!\n"
+msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:246
-msgid "Failed to store fragment!\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:306
+#, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:272
-msgid "Failed to get fragment!\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:323
+#: src/peerinfo/gnunet-service-peerinfo.c:348
+#, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:299
-msgid "Failed to get message!\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:426
+msgid "# peers known"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:328
-msgid "Failed to get message fragment!\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:468
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:356
-msgid "Failed to get master counters!\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:624
+#, c-format
+msgid "Scanning directory `%s'\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:392
-#: src/psycstore/gnunet-service-psycstore.c:465
-msgid "Tried to set invalid state variable name!\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:631
+#, c-format
+msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:408
-msgid "Failed to begin modifying state!\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:1027
+#, c-format
+msgid "Cleaning up directory `%s'\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:431
+#: src/peerinfo/gnunet-service-peerinfo.c:1322
 #, c-format
-msgid "Unknown operator: %c\n"
+msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:441
-msgid "Failed to end modifying state!\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:1335
+msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:479
-msgid "Failed to begin synchronizing state!\n"
+#: src/peerinfo/peerinfo_api.c:217
+msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:495
-msgid "Failed to end synchronizing state!\n"
+#: src/peerstore/gnunet-peerstore.c:92
+msgid "peerstore"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:515
-#: src/psycstore/gnunet-service-psycstore.c:534
-msgid "Failed to reset state!\n"
-msgstr ""
+#: src/peerstore/gnunet-service-peerstore.c:570
+#, fuzzy, c-format
+msgid "Could not load database backend `%s'\n"
+msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:557
-#: src/psycstore/gnunet-service-psycstore.c:608
-msgid "Tried to get invalid state variable name!\n"
+#: src/peerstore/peerstore_api.c:594 src/peerstore/peerstore_api.c:642
+msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:584
-#: src/psycstore/gnunet-service-psycstore.c:623
-msgid "Failed to get state variable!\n"
+#: src/peerstore/peerstore_api.c:656
+msgid "Received a malformed response from service."
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:60
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+#: src/peerstore/peerstore_api.c:781
+msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:253
+#: src/peerstore/plugin_peerstore_sqlite.c:458
 #, c-format
 msgid ""
-"Error preparing SQL query: %s\n"
+"Error executing SQL query: %s\n"
 "  %s\n"
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:276
+#: src/peerstore/plugin_peerstore_sqlite.c:493
 #, c-format
 msgid ""
-"Error executing SQL query: %s\n"
+"Error preparing SQL query: %s\n"
 "  %s\n"
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1796
-msgid "SQLite database running\n"
+#: src/peerstore/plugin_peerstore_sqlite.c:575
+#, c-format
+msgid "Unable to create indices: %s.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:482
+#: src/pt/gnunet-daemon-pt.c:418
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:488
+#: src/pt/gnunet-daemon-pt.c:424
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:541
+#: src/pt/gnunet-daemon-pt.c:478
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:717
+#: src/pt/gnunet-daemon-pt.c:673
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:723
+#: src/pt/gnunet-daemon-pt.c:680
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:826
+#: src/pt/gnunet-daemon-pt.c:718
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:773
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:888
-msgid "# DNS requests dropped (DNS mesh channel down)"
+#: src/pt/gnunet-daemon-pt.c:779
+msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:896
+#: src/pt/gnunet-daemon-pt.c:788
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:969
+#: src/pt/gnunet-daemon-pt.c:883
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:985
+#: src/pt/gnunet-daemon-pt.c:900
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1261 src/pt/gnunet-daemon-pt.c:1270
-#: src/pt/gnunet-daemon-pt.c:1290 src/pt/gnunet-daemon-pt.c:1301
-#: src/pt/gnunet-daemon-pt.c:1310
+#: src/pt/gnunet-daemon-pt.c:1225 src/pt/gnunet-daemon-pt.c:1234
+#: src/pt/gnunet-daemon-pt.c:1250 src/pt/gnunet-daemon-pt.c:1259
+#: src/pt/gnunet-daemon-pt.c:1268
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1347
+#: src/pt/gnunet-daemon-pt.c:1314
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:270
-#: src/regex/gnunet-regex-simulation-profiler.c:659
+#: src/reclaim/gnunet-reclaim.c:802
 #, c-format
-msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
+msgid "Ego is required\n"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:380
-msgid "Daemon to announce regular expressions for the peer using mesh."
+#: src/reclaim/gnunet-reclaim.c:809
+#, c-format
+msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1288
-msgid "No configuration file given. Exiting\n"
+#: src/reclaim/gnunet-reclaim.c:816
+#, c-format
+msgid "Requesting party key is required!\n"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:834
+msgid "Add or update an attribute NAME"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:839
+msgid "Delete the attribute with ID"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:844
+msgid "The attribute VALUE"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:849
+msgid "The EGO to use"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:855
+msgid "Specify the relying party for issue"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:859
+msgid "List attributes for EGO"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:863
+msgid "List credentials for EGO"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:869
+msgid "Credential to use for attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:874
+msgid "Credential name"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:880
+msgid "Issue a ticket for a set of attributes separated by comma"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:885
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:890
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:895
+msgid "Type of attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:900
+msgid "Type of credential"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:904
+msgid "List tickets of ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:910
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:918
+msgid "re:claimID command line tool"
+msgstr ""
+
+#: src/reclaim/plugin_rest_openid_connect.c:2793
+msgid "OpenID Connect REST API initialized\n"
+msgstr ""
+
+#: src/reclaim/plugin_rest_pabc.c:637 src/reclaim/plugin_rest_reclaim.c:1520
+msgid "Identity Provider REST API initialized\n"
+msgstr ""
+
+#: src/reclaim/reclaim_api.c:545
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/regex/gnunet-daemon-regexprofiler.c:268
+#, c-format
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
+msgstr ""
+
+#: src/regex/gnunet-daemon-regexprofiler.c:384
+msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1299
-msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
+#: src/regex/gnunet-regex-profiler.c:1388
+msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1328
-#: src/regex/gnunet-regex-simulation-profiler.c:622
+#: src/regex/gnunet-regex-profiler.c:1430
+#: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1334
-#: src/regex/gnunet-regex-simulation-profiler.c:629
+#: src/regex/gnunet-regex-profiler.c:1436
+#: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1341
+#: src/regex/gnunet-regex-profiler.c:1444
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1350
+#: src/regex/gnunet-regex-profiler.c:1453
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1370
+#: src/regex/gnunet-regex-profiler.c:1473
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1455
+#: src/regex/gnunet-regex-profiler.c:1562
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1458
+#: src/regex/gnunet-regex-profiler.c:1569
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1461
+#: src/regex/gnunet-regex-profiler.c:1575
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1464
+#: src/regex/gnunet-regex-profiler.c:1582
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1467
+#: src/regex/gnunet-regex-profiler.c:1589
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1479
+#: src/regex/gnunet-regex-profiler.c:1604
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:689
+#: src/regex/gnunet-regex-simulation-profiler.c:700
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:692
+#: src/regex/gnunet-regex-simulation-profiler.c:706
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:705
+#: src/regex/gnunet-regex-simulation-profiler.c:720
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api.c:131
+#: src/regex/regex_api_announce.c:151
 #, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:126
+#: src/regex/regex_api_search.c:212
+#, c-format
+msgid "Search string `%s' is too long!\n"
+msgstr ""
+
+#: src/rest/gnunet-rest-server.c:1267
+msgid "GNUnet REST server"
+msgstr ""
+
+#: src/rest/plugin_rest_config.c:429
+msgid "CONFIG REST API initialized\n"
+msgstr ""
+
+#: src/rest/plugin_rest_copying.c:211
+msgid "COPYING REST API initialized\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "En cous de démarrage %s…\n"
+
+#: src/revocation/gnunet-revocation.c:146
 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:131
+#: src/revocation/gnunet-revocation.c:150
 #, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:137
+#: src/revocation/gnunet-revocation.c:154
 msgid "Internal error\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:163
+#: src/revocation/gnunet-revocation.c:180
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:168
+#: src/revocation/gnunet-revocation.c:183
 msgid "Revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:189
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:178
+#: src/revocation/gnunet-revocation.c:192
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:183
+#: src/revocation/gnunet-revocation.c:198
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:294
+#: src/revocation/gnunet-revocation.c:252
+msgid "Cancelling calculation.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:302
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:324
+#: src/revocation/gnunet-revocation.c:334
 #, c-format
 msgid "Ego `%s' not found.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:345
+#: src/revocation/gnunet-revocation.c:350
+#, c-format
+msgid "Error: Key is invalid\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:357
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:365
+#: src/revocation/gnunet-revocation.c:367
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:375
+#: src/revocation/gnunet-revocation.c:379
+msgid "Continuing calculation where left off...\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:386
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:407
+#: src/revocation/gnunet-revocation.c:424
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:421
-msgid "Testing and revoking at the same time is not allowed, only executing 
test.\n"
+#: src/revocation/gnunet-revocation.c:434
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:441
+#: src/revocation/gnunet-revocation.c:464
 msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:463
+#: src/revocation/gnunet-revocation.c:481
 #, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:488
+#: src/revocation/gnunet-revocation.c:489
+#, c-format
+msgid "Revocation certificate corrupted in `%s'\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:511
 msgid "No action specified. Nothing to do.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:504
+#: src/revocation/gnunet-revocation.c:530
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:507
-msgid "revoke the private key associated for the the private key associated 
with the ego NAME "
+#: src/revocation/gnunet-revocation.c:538
+msgid ""
+"revoke the private key associated for the the private key associated with "
+"the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:510
+#: src/revocation/gnunet-revocation.c:545
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:513
+#: src/revocation/gnunet-revocation.c:552
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:272
-msgid "Duplicate revocation received from peer. Ignored.\n"
-msgstr ""
-
-#: 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:486
-msgid "SET service crashed, terminating revocation service\n"
-msgstr ""
-
-#: src/revocation/gnunet-service-revocation.c:812
-msgid "Could not open revocation database file!"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:225
-msgid "You must specify at least one message ID to check!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:232
-msgid "This program needs a session identifier for comparing vectors.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:239
-msgid "Please give a session key for --input_key!\n"
-msgstr ""
-
-#: 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"
+#: src/revocation/gnunet-revocation.c:558
+msgid "number of epochs to calculate for"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:278
-#: src/scalarproduct/gnunet-scalarproduct.c:314
-#, c-format
-msgid "Could not convert `%s' to int32_t.\n"
+#: src/revocation/gnunet-service-revocation.c:507
+msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:286
-msgid "Need elements to compute the vectorproduct, got none.\n"
+#: src/revocation/gnunet-service-revocation.c:517
+msgid "# revocation messages received via set union"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:346
+#: src/revocation/gnunet-service-revocation.c:522
 #, c-format
-msgid "Could not convert `%s' to integer.\n"
-msgstr ""
-
-#: 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:410
-msgid "A comma separated mask to select which elements should actually be 
compared."
-msgstr ""
-
-#: 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."
+msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:425
-msgid "Calculate the Vectorproduct with a GNUnet peer."
+#: src/revocation/gnunet-service-revocation.c:526
+msgid "# revocation set unions failed"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:541
-#, c-format
-msgid "Client (%p) disconnected from us.\n"
+#: src/revocation/gnunet-service-revocation.c:534
+msgid "# revocation set unions completed"
 msgstr ""
 
-#: 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"
+#: src/revocation/gnunet-service-revocation.c:572
+msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:619
-#, c-format
-msgid "Sending session-end notification to client (%p) for session %s\n"
+#: src/revocation/gnunet-service-revocation.c:925
+msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:712
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+#: src/rps/gnunet-rps-profiler.c:3142
+msgid "duration of the profiling"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:766
-#: src/scalarproduct/gnunet-service-scalarproduct.c:855
-msgid "Could not send service-response message via mesh!)\n"
+#: src/rps/gnunet-rps-profiler.c:3148
+msgid "timeout for the profiling"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1028
-#, c-format
-msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
+#: src/rps/gnunet-rps-profiler.c:3153
+msgid "number of PeerIDs to request"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1099
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1208
-msgid "Transmitting service request.\n"
+#: src/rps/gnunet-rps-profiler.c:3170
+msgid "Measure quality and performance of the RPS service."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1108
-msgid "Could not send service-request multipart message to channel!\n"
+#: src/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1147
-#, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
+#: src/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1217
-msgid "Could not send message to channel!\n"
+#: src/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1274
-msgid "Too short message received from client!\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:229
+msgid "You must specify at least one message ID to check!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1287
-msgid "Invalid message received from client, session information incorrect!\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:237
+msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1298
+#: src/scalarproduct/gnunet-scalarproduct.c:250
 #, c-format
-msgid "Duplicate session information received, cannot create new session with 
key `%s'\n"
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1318
-#, c-format
-msgid "Got client-request-session with key %s, preparing channel to remote 
service.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:268
+msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1354
+#: src/scalarproduct/gnunet-scalarproduct.c:291
 #, c-format
-msgid "Creating new channel for session with key %s.\n"
+msgid "Malformed input, could not parse `%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1399
-#, c-format
-msgid "Got client-responder-session with key %s and a matching 
service-request-session set, processing.\n"
-msgstr ""
+#: src/scalarproduct/gnunet-scalarproduct.c:309
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
+msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1409
+#: src/scalarproduct/gnunet-scalarproduct.c:339
 #, c-format
-msgid "Got client-responder-session with key %s but NO matching 
service-request-session set, queuing element for later use.\n"
+msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1439
-#, c-format
-msgid "New incoming channel from peer %s.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:365
+#: src/scalarproduct/gnunet-scalarproduct.c:372
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1471
-#, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:379
+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-service-scalarproduct.c:1672
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1814
-#, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:386
+msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1681
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1821
-#, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:397
+msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1771
-#, c-format
-msgid "Got message with duplicate session key (`%s'), ignoring service 
request.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1118
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1034
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1358
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1355
+msgid "Connect to CADET failed\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2014
-msgid "Shutting down, initiating cleanup.\n"
+#: src/scalarproduct/scalarproduct_api.c:184
+msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
-msgid "Connect to MESH failed\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:630
+msgid "dkg start delay"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2104
-msgid "Mesh initialized\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:636
+msgid "dkg timeout"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:246
-msgid "# SUC responder result messages received"
-msgstr ""
+#: src/secretsharing/gnunet-secretsharing-profiler.c:642
+msgid "threshold"
+msgstr "threshold"
 
-#: src/scalarproduct/scalarproduct_api.c:300
-msgid "# bytes sent to scalarproduct"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:647
+msgid "also profile decryption"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:345
-#: src/scalarproduct/scalarproduct_api.c:440
-msgid "Failed to connect to the scalarproduct service\n"
+#: src/set/gnunet-service-set.c:1916 src/seti/gnunet-service-seti.c:2467
+#: src/setu/gnunet-service-setu.c:5389
+msgid "Could not connect to CADET service\n"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:353
-#: src/scalarproduct/scalarproduct_api.c:448
-msgid "Failed to send a message to the statistics service\n"
+#: src/set/gnunet-set-ibf-profiler.c:268
+#: src/setu/gnunet-setu-ibf-profiler.c:268
+msgid "number of element in set A-B"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:387
-#: src/scalarproduct/scalarproduct_api.c:485
-msgid "Failed to send a message to the scalarproduct service\n"
+#: src/set/gnunet-set-ibf-profiler.c:274
+#: src/setu/gnunet-setu-ibf-profiler.c:274
+msgid "number of element in set B-A"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:538
-msgid "dkg start delay"
+#: src/set/gnunet-set-ibf-profiler.c:281
+#: src/setu/gnunet-setu-ibf-profiler.c:281
+msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:541
-msgid "dkg timeout"
-msgstr ""
+#: src/set/gnunet-set-ibf-profiler.c:287
+#: src/setu/gnunet-setu-ibf-profiler.c:287
+msgid "hash num"
+msgstr "numéro de hash"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:544
-msgid "threshold"
-msgstr "threshold"
+#: src/set/gnunet-set-ibf-profiler.c:293
+#: src/setu/gnunet-setu-ibf-profiler.c:293
+msgid "ibf size"
+msgstr "taille ibz"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:547
-msgid "also profile decryption"
+#: src/set/gnunet-set-profiler.c:462 src/setu/gnunet-setu-profiler.c:453
+msgid "use byzantine mode"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1431
-msgid "Could not connect to mesh service\n"
+#: src/set/gnunet-set-profiler.c:468 src/setu/gnunet-setu-profiler.c:459
+msgid "force sending full set"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:221
-msgid "number of element in set A-B"
+#: src/set/gnunet-set-profiler.c:474 src/setu/gnunet-setu-profiler.c:465
+msgid "number delta operation"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:224
-msgid "number of element in set B-A"
+#: src/set/gnunet-set-profiler.c:486 src/setu/gnunet-setu-profiler.c:477
+msgid "operation to execute"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:227
-msgid "number of common elements in A and B"
+#: src/set/gnunet-set-profiler.c:492 src/seti/gnunet-seti-profiler.c:462
+#: src/setu/gnunet-setu-profiler.c:483
+msgid "element size"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:230
-msgid "hash num"
-msgstr "numéro de hash"
+#: src/seti/gnunet-seti-profiler.c:457
+msgid "return intersection instead of delta"
+msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:233
-msgid "ibf size"
-msgstr "taille ibz"
+#: src/sq/sq.c:54
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
 
-#: src/set/gnunet-set-profiler.c:295
-msgid "oeration to execute"
+#: src/sq/sq.c:61
+msgid "Failure in sqlite3_reset (!)\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:280
+#: src/sq/sq.c:139
 #, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
+msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:346
+#: src/statistics/gnunet-service-statistics.c:319
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:140
+#: src/statistics/gnunet-service-statistics.c:984
+#, c-format
+msgid "Loading %llu bytes of statistics from `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:413
+#: src/statistics/gnunet-statistics.c:455
 msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:416
+#: src/statistics/gnunet-statistics.c:458
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:189
+#: src/statistics/gnunet-statistics.c:532
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:195
+#: src/statistics/gnunet-statistics.c:538
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:226
+#: src/statistics/gnunet-statistics.c:577
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:234
+#: src/statistics/gnunet-statistics.c:589
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:261
+#: src/statistics/gnunet-statistics.c:725
 #, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr ""
+msgid "Invalid argument `%s'\n"
+msgstr "Argument invalide « %s »\n"
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:742
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:276
+#: src/statistics/gnunet-statistics.c:751
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:308
+#: src/statistics/gnunet-statistics.c:783
 #, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Argument invalide « %s »\n"
+msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
+msgstr ""
 
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:816
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:821
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:827
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:832
+msgid "use as csv separator"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:838
+msgid "path to the folder containing the testbed data"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:843
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:847
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:852
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:857
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:874
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:519
+#: src/statistics/statistics_api.c:749
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:1090
-msgid "Failed to receive acknowledgement from statistics service, some 
statistics might have been lost!\n"
-msgstr ""
-
-#: src/testbed/generate-underlay-topology.c:223
-msgid "Need atleast 2 arguments\n"
+#: src/testbed/generate-underlay-topology.c:235
+msgid "Need at least 2 arguments\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:228
+#: src/testbed/generate-underlay-topology.c:240
 msgid "Database filename missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:235
+#: src/testbed/generate-underlay-topology.c:247
 msgid "Topology string missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:240
+#: src/testbed/generate-underlay-topology.c:252
 #, c-format
 msgid "Invalid topology: %s\n"
 msgstr "Topologie invalide : %s\n"
 
-#: src/testbed/generate-underlay-topology.c:252
+#: src/testbed/generate-underlay-topology.c:265
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:258
+#: src/testbed/generate-underlay-topology.c:271
 #, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:266
+#: src/testbed/generate-underlay-topology.c:280
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:280
+#: src/testbed/generate-underlay-topology.c:295
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:286
+#: src/testbed/generate-underlay-topology.c:301
 #, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:335
-#: src/testbed/gnunet-testbed-profiler.c:293
+#: src/testbed/generate-underlay-topology.c:366
+#: src/testbed/gnunet-testbed-profiler.c:282
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:344
+#: src/testbed/generate-underlay-topology.c:379
 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"
@@ -5924,1071 +6149,1063 @@ msgid ""
 "\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 described here: https://www.gnunet.org/";
+"content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:325
+#: src/testbed/gnunet-daemon-latency-logger.c:318
 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"
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:250
+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:217
+#: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:318
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:474
+#: src/testbed/gnunet-daemon-testbed-underlay.c:477
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:730
+#: src/testbed/gnunet-service-testbed_cpustatus.c:618
 #, 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
-msgid "Misconfiguration (can't connect to the ARM service)"
-msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1165
+#, c-format
+msgid "%s is stopped"
+msgstr "%s est arrêté"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1021
-msgid "Request doesn't fit into a message"
-msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1168
+#, c-format
+msgid "%s is starting"
+msgstr "%s est en cours de démarrage"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/testbed/gnunet-service-testbed_peers.c:1171
 #, c-format
-msgid "%s service can't be started because ARM is shutting down"
-msgstr ""
+msgid "%s is stopping"
+msgstr "%s est en cours d'arrêt"
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:125
-msgid "Waiting for child to exit.\n"
-msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1174
+#, c-format
+msgid "%s is starting already"
+msgstr "%s est déjà en cours de démarrage"
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:247
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
-msgid "Spawning process `%s'\n"
-msgstr ""
+msgid "%s is stopping already"
+msgstr "%s est déjà arrêté"
 
-#: src/testbed/gnunet-testbed-profiler.c:267
+#: src/testbed/gnunet-service-testbed_peers.c:1180
 #, c-format
-msgid "Exiting as the number of peers is %u\n"
+msgid "%s is started already"
+msgstr "%s est déjà démarré"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1183
+#, c-format
+msgid "%s is stopped already"
+msgstr "%s est déjà arrêté"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1186
+#, c-format
+msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:296
-msgid "tolerate COUNT number of continious timeout failures"
+#: src/testbed/gnunet-service-testbed_peers.c:1189
+#, c-format
+msgid "%s service failed to start"
 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"
+#: src/testbed/gnunet-service-testbed_peers.c:1192
+#, c-format
+msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:415
+#: src/testbed/gnunet-service-testbed_peers.c:1194
 #, c-format
-msgid "Hosts file %s not found\n"
+msgid "%.s Unknown result code."
+msgstr "%.s Code d'erreur inconnu"
+
+#: src/testbed/gnunet-testbed-profiler.c:288
+msgid "tolerate COUNT number of continuous timeout failures"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:293
+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:423
+#: src/testbed/testbed_api.c:399
 #, c-format
-msgid "Hosts file %s has no data\n"
+msgid "Adding host %u failed with error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:430
+#: src/testbed/testbed_api_hosts.c:429
 #, c-format
-msgid "Hosts file %s cannot be read\n"
+msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:570
+#: src/testbed/testbed_api_hosts.c:438
 #, c-format
-msgid "The function %s is only available when compiled with (--with-ll)\n"
+msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1586
+#: src/testbed/testbed_api_hosts.c:447
 #, c-format
-msgid "Adding host %u failed with error: %s\n"
+msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:819
+#: src/testbed/testbed_api_testbed.c:822
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:988
+#: src/testbed/testbed_api_testbed.c:999
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1054
+#: src/testbed/testbed_api_testbed.c:1065
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1143
+#: src/testbed/testbed_api_testbed.c:1154
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1147
+#: src/testbed/testbed_api_testbed.c:1158
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1185
+#: src/testbed/testbed_api_testbed.c:1196
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1203
+#: src/testbed/testbed_api_testbed.c:1214
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1263
-msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
-msgstr ""
-
-#: src/testbed/testbed_api_testbed.c:1275
+#: src/testbed/testbed_api_testbed.c:1276
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1299
+#: src/testbed/testbed_api_testbed.c:1301
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1349
+#: src/testbed/testbed_api_testbed.c:1357
 #, 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
+#: src/testbed/testbed_api_testbed.c:1374
 #, 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
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2643
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:966
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2651
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:973
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2659
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:995
+#: src/testbed/testbed_api_topology.c:1071
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1004
-#: src/testbed/testbed_api_topology.c:1028
+#: src/testbed/testbed_api_topology.c:1080
+#: src/testbed/testbed_api_topology.c:1105
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1010
-#: src/testbed/testbed_api_topology.c:1034
+#: src/testbed/testbed_api_topology.c:1086
+#: src/testbed/testbed_api_topology.c:1111
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1016
-#: src/testbed/testbed_api_topology.c:1040
+#: src/testbed/testbed_api_topology.c:1092
+#: src/testbed/testbed_api_topology.c:1117
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1153
 #, c-format
-msgid "Ignoring to connect peer %u to peer %u\n"
+msgid "Ignoring to connect peer %lu to peer %lu\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:173
+#: src/testing/gnunet-testing.c:185
 #, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:258
+#: src/testing/gnunet-testing.c:275
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:355
+#: src/testing/gnunet-testing.c:386
 msgid "create unique configuration files"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:357
+#: src/testing/gnunet-testing.c:392
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:359
-msgid "number of unique configuration files to create, or number of the 
hostkey to extract"
+#: src/testing/gnunet-testing.c:400
+msgid ""
+"number of unique configuration files to create, or number of the hostkey to "
+"extract"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:361
+#: src/testing/gnunet-testing.c:407
 msgid "configuration template"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:363
+#: src/testing/gnunet-testing.c:415
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:376
+#: src/testing/gnunet-testing.c:432
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:90
+#: src/testing/list-keys.c:92
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/list-keys.c:93
-msgid "skip COUNT number of keys in the beginning"
-msgstr ""
-
-#: src/testing/testing.c:277
+#: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:718
+#: src/testing/testing.c:725
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1157
+#: src/testing/testing.c:1199
 #, 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
+#: src/testing/testing.c:1208
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 
-#: src/testing/testing.c:1176
+#: src/testing/testing.c:1218
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1189
+#: src/testing/testing.c:1231
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/testing/testing.c:1203
+#: src/testing/testing.c:1247
 #, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1215
+#: src/testing/testing.c:1261
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1240
+#: src/testing/testing.c:1289
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1342
+#: src/testing/testing.c:1395
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1706
+#: src/testing/testing.c:1694
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr ""
 
-#: src/topology/friends.c:100
+#: src/topology/friends.c:118
 #, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr ""
 
-#: src/topology/friends.c:154
+#: src/topology/friends.c:172
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:255
+#: src/topology/gnunet-daemon-topology.c:228
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:388
-msgid "# connect requests issued to transport"
+#: src/topology/gnunet-daemon-topology.c:334
+msgid "# connect requests issued to ATS"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:511
+msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:728
-#: src/topology/gnunet-daemon-topology.c:813
+#: src/topology/gnunet-daemon-topology.c:598
+#: src/topology/gnunet-daemon-topology.c:678
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:993
+#: src/topology/gnunet-daemon-topology.c:849
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1022
+#: src/topology/gnunet-daemon-topology.c:875
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1029
+#: src/topology/gnunet-daemon-topology.c:882
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/topology/gnunet-daemon-topology.c:900
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1052
+#: src/topology/gnunet-daemon-topology.c:903
 msgid "# friends in configuration"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1057
-msgid "Fewer friends specified than required by minimum friend count. Will 
only connect to friends.\n"
+#: src/topology/gnunet-daemon-topology.c:911
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1063
-msgid "More friendly connections required than target total number of 
connections.\n"
+#: src/topology/gnunet-daemon-topology.c:919
+msgid ""
+"More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1094
+#: src/topology/gnunet-daemon-topology.c:966
+#: src/transport/plugin_transport_wlan.c:1521
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1151
-msgid "# HELLO messages gossipped"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1290
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_blacklist.c:271
-#, c-format
-msgid "Adding blacklisting entry for peer `%s'\n"
+#: src/topology/gnunet-daemon-topology.c:1127
+msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:279
-#, c-format
-msgid "Adding blacklisting entry for peer `%s':`%s'\n"
+#: src/transport/gnunet-communicator-tcp.c:3338
+#: src/transport/gnunet-communicator-udp.c:3856
+#: src/transport/gnunet-service-tng.c:10512
+#: src/transport/gnunet-service-transport.c:2627
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:464
-#: src/transport/gnunet-service-transport_blacklist.c:745
-msgid "# disconnects due to blacklist"
+#: src/transport/gnunet-communicator-tcp.c:3671
+msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:220
-msgid "# bytes payload discarded due to not connected peer"
+#: src/transport/gnunet-communicator-udp.c:3931
+msgid "GNUnet UDP communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:424
-msgid "# bytes total received"
+#: src/transport/gnunet-communicator-unix.c:789
+msgid ""
+"Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:515
-msgid "# bytes payload received"
+#: src/transport/gnunet-communicator-unix.c:1016
+msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:686
+#: src/transport/gnunet-communicator-unix.c:1061
+#: src/transport/plugin_transport_unix.c:1383
 #, c-format
-msgid "Could not obtain a valid network for `%s' %s (%s)\n"
+msgid "Cannot create path to `%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"
+#: src/transport/gnunet-communicator-unix.c:1139
+msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1084
-msgid "Transport service is lacking key configuration settings. Exiting.\n"
+#: src/transport/gnunet-service-transport.c:445
+msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: 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"
+#: src/transport/gnunet-service-transport.c:797
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:439
-msgid "# messages dropped due to slow client"
+#: src/transport/gnunet-service-transport.c:1480
+msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:596
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
+#: src/transport/gnunet-service-transport.c:1625
+msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:737
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/transport/gnunet-service-transport.c:1715
+msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:770
-#, c-format
-msgid "Blacklist refuses connection attempt to peer `%s'\n"
+#: src/transport/gnunet-service-transport.c:2019
+#: src/transport/gnunet-service-transport.c:2453
+msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:776
+#: src/transport/gnunet-service-transport.c:2457
 #, 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"
+msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:815
+#: src/transport/gnunet-service-transport.c:2552
 #, c-format
-msgid "Received a request connect message for peer `%s'\n"
+msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:826
-msgid "# REQUEST DISCONNECT messages received"
+#: src/transport/gnunet-service-transport.c:2561
+#, c-format
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:840
-#, c-format
-msgid "Received a request disconnect message for peer `%s'\n"
+#: src/transport/gnunet-service-transport_ats.c:137
+msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:181
+#: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1095
+#: src/transport/gnunet-service-transport_neighbours.c:808
+#, fuzzy
+msgid "# session creation failed"
+msgstr "# Session TCP active"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1061
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1220
-#: src/transport/gnunet-service-transport_neighbours.c:1629
+#: src/transport/gnunet-service-transport_neighbours.c:1192
+msgid "# disconnects due to quota of 0"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1341
+#: src/transport/gnunet-service-transport_neighbours.c:1817
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1225
+#: src/transport/gnunet-service-transport_neighbours.c:1347
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1230
+#: src/transport/gnunet-service-transport_neighbours.c:1354
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1287
+#: src/transport/gnunet-service-transport_neighbours.c:1415
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1343
-msgid "# keepalives sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1499
+msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1376
+#: src/transport/gnunet-service-transport_neighbours.c:1535
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1384
+#: src/transport/gnunet-service-transport_neighbours.c:1543
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1431
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1554
+msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1440
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1601
+msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1448
-msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+#: src/transport/gnunet-service-transport_neighbours.c:1611
+msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1456
-msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+#: src/transport/gnunet-service-transport_neighbours.c:1620
+msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1534
-msgid "# messages discarded due to lack of neighbour record"
+#: src/transport/gnunet-service-transport_neighbours.c:1630
+msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1568
-msgid "# bandwidth quota violations by other peers"
+#: src/transport/gnunet-service-transport_neighbours.c:1636
+msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1584
-msgid "# ms throttling suggested"
+#: src/transport/gnunet-service-transport_neighbours.c:1643
+msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1678
-#, c-format
-msgid "Failed to send CONNECT message to peer `%s' using address `%s' session 
%p\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1714
+msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1705
-msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
+#: src/transport/gnunet-service-transport_neighbours.c:1748
+msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1751
-msgid "# SESSION_CONNECT messages sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1763
+msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1767
-#, c-format
-msgid "Failed to transmit CONNECT message via plugin to %s\n"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:1886
+#, fuzzy, c-format
+msgid "Failed to send SYN message to peer `%s'\n"
+msgstr "Résolution de « %s » échouée\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1794
-msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
+#: src/transport/gnunet-service-transport_neighbours.c:1912
+msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1844
-#, c-format
-msgid "Failed to send CONNECT_ACK message to peer `%s' using address `%s' 
session %p\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1953
+msgid "# SYN messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1899
-msgid "# CONNECT_ACK messages sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1970
+#, fuzzy, c-format
+msgid "Failed to transmit SYN message to %s\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2006
+msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1914
+#: src/transport/gnunet-service-transport_neighbours.c:2077
 #, c-format
-msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
+msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2192
-#, c-format
-msgid "Blacklisting disapproved to connect to peer `%s'\n"
+#: src/transport/gnunet-service-transport_neighbours.c:2132
+msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2312
-msgid "# CONNECT messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:2150
+#, fuzzy, c-format
+msgid "Failed to transmit SYN_ACK message to %s\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2314
+msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2317
+#: src/transport/gnunet-service-transport_neighbours.c:2320
 #, c-format
-msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2590
+#: src/transport/gnunet-service-transport_neighbours.c:2731
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3012
-msgid "# Failed attempts to switch addresses (no response)"
+#: src/transport/gnunet-service-transport_neighbours.c:3244
+msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
-msgid "# CONNECT_ACK messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:3252
+msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3115
-msgid "# unexpected CONNECT_ACK messages (no peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:3272
+#: src/transport/gnunet-service-transport_neighbours.c:3300
+msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3129
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-msgid "# unexpected CONNECT_ACK messages (not ready)"
+#: src/transport/gnunet-service-transport_neighbours.c:3315
+msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: 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
+#: src/transport/gnunet-service-transport_neighbours.c:3345
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3208
-msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+#: src/transport/gnunet-service-transport_neighbours.c:3359
+msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3396
-msgid "# SESSION_ACK messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:3548
+msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3424
-msgid "# unexpected SESSION_ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:3582
+msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3490
-msgid "# SET QUOTA messages ignored (no such peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:3672
+msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3505
-msgid "# disconnects due to quota of 0"
+#: src/transport/gnunet-service-transport_neighbours.c:3679
+msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3545
+#: src/transport/gnunet-service-transport_neighbours.c:3722
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3729
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3560
+#: src/transport/gnunet-service-transport_neighbours.c:3742
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3687
+#: src/transport/gnunet-service-transport_neighbours.c:3879
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:120
+#: src/transport/gnunet-service-transport_plugins.c:157
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: 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
+#: src/transport/gnunet-service-transport_plugins.c:222
+#: src/transport/gnunet-service-transport_plugins.c:230
+#: src/transport/gnunet-service-transport_plugins.c:238
+#: src/transport/gnunet-service-transport_plugins.c:246
+#: src/transport/gnunet-service-transport_plugins.c:254
+#: src/transport/gnunet-service-transport_plugins.c:262
+#: src/transport/gnunet-service-transport_plugins.c:270
+#: src/transport/gnunet-service-transport_plugins.c:278
+#: src/transport/gnunet-service-transport_plugins.c:286
+#: src/transport/gnunet-service-transport_plugins.c:294
+#: src/transport/gnunet-service-transport_plugins.c:302
 #, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:309
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:488
-msgid "# address records discarded"
+#: src/transport/gnunet-service-transport_validation.c:386
+msgid "# Addresses in validation map"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:558
-#, c-format
-msgid "Not transmitting `%s' with `%s', message too big (%u bytes!). This 
should not happen.\n"
+#: src/transport/gnunet-service-transport_validation.c:489
+#: src/transport/gnunet-service-transport_validation.c:679
+#: src/transport/gnunet-service-transport_validation.c:1000
+#: src/transport/gnunet-service-transport_validation.c:1627
+msgid "# validations running"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:616
-msgid "# PING without HELLO messages sent"
+#: src/transport/gnunet-service-transport_validation.c:531
+msgid "# address records discarded (timeout)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:722
+#: src/transport/gnunet-service-transport_validation.c:580
+msgid "# address records discarded (blacklist)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:670
+msgid "# PINGs for address validation sent"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:752
+msgid "# validations delayed by global throttle"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:789
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1011
+#: src/transport/gnunet-service-transport_validation.c:1127
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1062
+#: src/transport/gnunet-service-transport_validation.c:1180
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1072
+#: src/transport/gnunet-service-transport_validation.c:1193
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1198
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1083
+#: src/transport/gnunet-service-transport_validation.c:1207
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: 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"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1103
+#: src/transport/gnunet-service-transport_validation.c:1222
 #, c-format
-msgid "Received a PING message with validation bug from `%s'\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:1157
+#: src/transport/gnunet-service-transport_validation.c:1279
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1206
+#: src/transport/gnunet-service-transport_validation.c:1331
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1215
+#: src/transport/gnunet-service-transport_validation.c:1340
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1356
+#: src/transport/gnunet-service-transport_validation.c:1515
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1371
+#: src/transport/gnunet-service-transport_validation.c:1533
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1493
-#, c-format
-msgid "Validation received new %s message for peer `%s' with size %u\n"
+#: src/transport/gnunet-service-transport_validation.c:1590
+msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1500
-#, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
+#: src/transport/gnunet-service-transport_validation.c:1645
+msgid "# HELLOs given to peerinfo"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:367
+#: src/transport/gnunet-transport-profiler.c:220
 #, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:375
-#, c-format
-msgid "Received %llu bytes/s (%llu bytes in %s)\n"
+#: src/transport/gnunet-transport-profiler.c:577
+msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:415
-#, c-format
-msgid "Failed to connect to `%s'\n"
+#: src/transport/gnunet-transport-profiler.c:581
+msgid "receive data from peer"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:428
-#, c-format
-msgid "Failed to resolve address for peer `%s'\n"
+#: src/transport/gnunet-transport-profiler.c:586
+msgid "iterations"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:438
-msgid "Failed to list connections, timeout occured\n"
+#: src/transport/gnunet-transport-profiler.c:591
+#, fuzzy
+msgid "number of messages to send"
+msgstr "nombre de valeurs"
+
+#: src/transport/gnunet-transport-profiler.c:596
+msgid "message size to use"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:559
-#, c-format
-msgid ""
-"Peer `%s' %s %s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-"\t%s%s\n"
+#: src/transport/gnunet-transport-profiler.c:601
+#: src/transport/gnunet-transport.c:1404
+msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:586
-#, c-format
-msgid "Peer `%s' %s `%s' \n"
+#: src/transport/gnunet-transport-profiler.c:614
+#: src/transport/gnunet-transport.c:1426
+msgid "Direct access to transport service."
 msgstr ""
 
-#: src/transport/gnunet-transport.c:712
-msgid "No transport plugins configured, peer will never communicate\n"
+#: src/transport/gnunet-transport.c:406
+#, c-format
+msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:726
+#: src/transport/gnunet-transport.c:415
 #, c-format
-msgid "No port configured for plugin `%s', cannot test it\n"
+msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:789
+#: src/transport/gnunet-transport.c:454
 #, c-format
-msgid "Transmitting %u bytes to %s\n"
+msgid "Failed to connect to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:466
 #, c-format
-msgid "Successfully connected to `%s'\n"
+msgid "Failed to resolve address for peer `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:477
+msgid "Failed to list connections, timeout occurred\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:504
 #, c-format
-msgid "Successfully connected to `%s', starting to send benchmark data in %u 
Kb blocks\n"
+msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:865
+#: src/transport/gnunet-transport.c:537
 #, c-format
-msgid "Successfully disconnected from `%s'\n"
+msgid ""
+"Successfully connected to `%s', starting to send benchmark data in %u Kb "
+"blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:566
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:950
+#: src/transport/gnunet-transport.c:590 src/transport/gnunet-transport.c:619
 #, c-format
-msgid "Received %u bytes from %s\n"
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:975
+#: src/transport/gnunet-transport.c:592
+msgid "Connected to"
+msgstr "Connecté à"
+
+#: src/transport/gnunet-transport.c:621
+msgid "Disconnected from"
+msgstr "Déconnecté de"
+
+#: src/transport/gnunet-transport.c:654
+#, fuzzy, c-format
+msgid "Received %u bytes\n"
+msgstr "%s message(s) reçu(s)\n"
+
+#: src/transport/gnunet-transport.c:689
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:986
+#: src/transport/gnunet-transport.c:701
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1197 src/transport/gnunet-transport.c:1222
-msgid "Failed to send connect request to transport service\n"
+#: src/transport/gnunet-transport.c:1103
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1266
+#: src/transport/gnunet-transport.c:1199
 #, c-format
-msgid "Multiple operations given. Please choose only one operation: %s, %s, 
%s, %s, %s, %s\n"
+msgid ""
+"Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
+"%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1274
+#: src/transport/gnunet-transport.c:1214
 #, c-format
-msgid "No operation given. Please choose one operation: %s, %s, %s, %s, %s, 
%s\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1293 src/transport/gnunet-transport.c:1323
-#: src/transport/gnunet-transport.c:1353 src/transport/gnunet-transport.c:1376
-#: src/transport/gnunet-transport.c:1419
-msgid "Failed to connect to transport service\n"
-msgstr ""
-
-#: 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"
+msgid ""
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1381
-msgid "Starting to receive benchmark data\n"
+#: src/transport/gnunet-transport.c:1242
+msgid "Failed to connect to transport service for disconnection\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1465
-msgid "print information for all peers (instead of only connected peers )"
+#: src/transport/gnunet-transport.c:1248
+msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1468
-msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
+#: src/transport/gnunet-transport.c:1270 src/transport/gnunet-transport.c:1296
+#: src/transport/gnunet-transport.c:1342
+msgid "Failed to connect to transport service\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1471
-msgid "connect to a peer"
+#: src/transport/gnunet-transport.c:1301
+msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1474
-msgid "disconnect to a peer"
+#: src/transport/gnunet-transport.c:1367
+msgid "print information for all peers (instead of only connected peers)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1477
-msgid "print information for all pending validations "
+#: src/transport/gnunet-transport.c:1373
+msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1480
-msgid "print information for all pending validations continously"
-msgstr ""
+#: src/transport/gnunet-transport.c:1377
+#, fuzzy
+msgid "disconnect from a peer"
+msgstr "Déconnecté de"
 
-#: src/transport/gnunet-transport.c:1483
+#: src/transport/gnunet-transport.c:1383
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1489
-msgid "provide information about all connects and disconnect events 
(continuously)"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1491
-msgid "do not resolve hostnames"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1493
-msgid "peer identity"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1495
-msgid "send data for benchmarking to the other peer (until CTRL-C)"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1498
-msgid "test transport configuration (involves external server)"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1507
-msgid "Direct access to transport service."
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:621
-msgid "# Bluetooth ACKs sent"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:640
-msgid "# Bluetooth messages defragmented"
-msgstr ""
-
-#: 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/plugin_transport_bluetooth.c:837
-msgid "# Bluetooth message fragments sent"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:861
-msgid "# Bluetooth messages pending (with fragmentation)"
-msgstr ""
-
-#: 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/plugin_transport_bluetooth.c:1307
-msgid "# HELLO messages received via Bluetooth"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:1331
-msgid "# fragments received via Bluetooth"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:1341
-msgid "# ACKs received via Bluetooth"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:1401
-msgid "# Bluetooth DATA messages discarded due to CRC32 error"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:1512
-msgid "# DATA messages received via Bluetooth"
+#: src/transport/gnunet-transport.c:1395
+msgid ""
+"provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1547
-msgid "# Bluetooth DATA messages processed"
+#: src/transport/gnunet-transport.c:1399
+msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1610
-msgid "# HELLO beacons sent via Bluetooth"
+#: src/transport/gnunet-transport.c:1408
+msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1723
-msgid "Bluetooth address with invalid size encountered\n"
+#: src/transport/gnunet-transport.c:1414
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1923
-#, c-format
-msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+#: src/transport/plugin_transport_http_client.c:1488
+#: src/transport/plugin_transport_http_server.c:2331
+#: src/transport/plugin_transport_http_server.c:3562
+#: src/transport/plugin_transport_tcp.c:3773
+#: src/transport/plugin_transport_tcp.c:3780
+msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1622
+#: src/transport/plugin_transport_http_client.c:2140
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1697
-#: src/transport/plugin_transport_http_server.c:3007
+#: src/transport/plugin_transport_http_client.c:2189
+#: src/transport/plugin_transport_http_server.c:3276
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1722
-#: src/transport/plugin_transport_http_server.c:3063
+#: src/transport/plugin_transport_http_client.c:2206
+#: src/transport/plugin_transport_http_server.c:3346
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1750
-#: src/transport/plugin_transport_http_server.c:2907
+#: src/transport/plugin_transport_http_client.c:2240
 #, c-format
-msgid "Maximum number of connections is %u\n"
+msgid "Maximum number of requests is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1402
+#: src/transport/plugin_transport_http_server.c:1764
 #, 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 %lu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1663
+#: src/transport/plugin_transport_http_server.c:2040
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1671
+#: src/transport/plugin_transport_http_server.c:2049
 #, 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:1958
-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:2202
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1982
+#: src/transport/plugin_transport_http_server.c:2226
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2405
-msgid "Require valid port number for service in configuration!\n"
+#: src/transport/plugin_transport_http_server.c:2358
+msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2437 src/util/service.c:698
-#, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Résolution de « %s » échouée : %s\n"
-
-#: src/transport/plugin_transport_http_server.c:2454 src/util/service.c:715
-#, c-format
-msgid "Failed to find %saddress for `%s'.\n"
+#: src/transport/plugin_transport_http_server.c:2684
+msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2565
+#: src/transport/plugin_transport_http_server.c:2849
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2637
+#: src/transport/plugin_transport_http_server.c:2935
+#: src/transport/plugin_transport_udp.c:3398
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2730
+#: src/transport/plugin_transport_http_server.c:3041
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "Prise en charge d’IPv4 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2744
+#: src/transport/plugin_transport_http_server.c:3056
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "Prise en charge d’IPv6 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:3062
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2762
+#: src/transport/plugin_transport_http_server.c:3073
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2769
+#: src/transport/plugin_transport_http_server.c:3079
 #, c-format
 msgid "Using port %u\n"
 msgstr "Utilisation du port %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2784
+#: src/transport/plugin_transport_http_server.c:3098
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2794
+#: src/transport/plugin_transport_http_server.c:3133
 #, c-format
-msgid "Binding to IPv4 address %s\n"
+msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_http_server.c:3208
 #, c-format
-msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
+msgid "Using external hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2825
+#: src/transport/plugin_transport_http_server.c:3230
 #, c-format
-msgid "Binding to IPv6 address %s\n"
+msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2877
+#: src/transport/plugin_transport_http_server.c:3247
 #, c-format
-msgid "Using external hostname `%s'\n"
+msgid "Maximum number of connections is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2893
-#, c-format
-msgid "Notifying transport only about hostname `%s'\n"
+#: src/transport/plugin_transport_http_server.c:3574
+msgid "Unable to compile URL regex\n"
 msgstr ""
 
 #: src/transport/plugin_transport_smtp.c:223
@@ -6996,621 +7213,902 @@ msgstr ""
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:310
+#: src/transport/plugin_transport_smtp.c:312
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:319
+#: src/transport/plugin_transport_smtp.c:321
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:414
-#: src/transport/plugin_transport_smtp.c:424
-#: src/transport/plugin_transport_smtp.c:437
-#: src/transport/plugin_transport_smtp.c:456
-#: src/transport/plugin_transport_smtp.c:479
-#: src/transport/plugin_transport_smtp.c:487
-#: src/transport/plugin_transport_smtp.c:500
-#: src/transport/plugin_transport_smtp.c:511
+#: src/transport/plugin_transport_smtp.c:418
+#: src/transport/plugin_transport_smtp.c:428
+#: src/transport/plugin_transport_smtp.c:441
+#: src/transport/plugin_transport_smtp.c:460
+#: src/transport/plugin_transport_smtp.c:484
+#: src/transport/plugin_transport_smtp.c:492
+#: src/transport/plugin_transport_smtp.c:505
+#: src/transport/plugin_transport_smtp.c:516
 #, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "SNTP : « %s » échouée : %s.\n"
 
-#: src/transport/plugin_transport_smtp.c:652
+#: src/transport/plugin_transport_smtp.c:666
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:664
+#: src/transport/plugin_transport_smtp.c:678
 msgid "# bytes received via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:665
+#: src/transport/plugin_transport_smtp.c:679
 msgid "# bytes sent via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:667
+#: src/transport/plugin_transport_smtp.c:681
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:555
+#: src/transport/plugin_transport_tcp.c:1545
+#: src/transport/plugin_transport_tcp.c:2815
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:762
-#: src/transport/plugin_transport_tcp.c:928
-#: src/transport/plugin_transport_tcp.c:2005
-#: src/transport/plugin_transport_tcp.c:2558
+#: src/transport/plugin_transport_tcp.c:1724
+#: src/transport/plugin_transport_tcp.c:1941
+#: src/transport/plugin_transport_tcp.c:3058
+#: src/transport/plugin_transport_tcp.c:3884
 msgid "# TCP sessions active"
 msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_tcp.c:795
-#: src/transport/plugin_transport_tcp.c:921
-#: src/transport/plugin_transport_tcp.c:1009
-#: src/transport/plugin_transport_tcp.c:1056
-#: src/transport/plugin_transport_tcp.c:1219
-#: src/transport/plugin_transport_tcp.c:1237
+#: src/transport/plugin_transport_tcp.c:1765
+#: src/transport/plugin_transport_tcp.c:1923
+#: src/transport/plugin_transport_tcp.c:2038
+#: src/transport/plugin_transport_tcp.c:2107
+#: src/transport/plugin_transport_tcp.c:2208
+#: src/transport/plugin_transport_tcp.c:2233
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:798
+#: src/transport/plugin_transport_tcp.c:1770
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1012
+#: src/transport/plugin_transport_tcp.c:2043
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:2111
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: 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
+#: src/transport/plugin_transport_tcp.c:2497
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:2660
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2055
+#: src/transport/plugin_transport_tcp.c:3116
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2215
+#: src/transport/plugin_transport_tcp.c:3307
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2279
-msgid "# network-level TCP disconnect events"
+#: src/transport/plugin_transport_tcp.c:3353
+#: src/transport/plugin_transport_tcp.c:3410
+#, fuzzy
+msgid "# TCP server connections active"
+msgstr "# Session TCP active"
+
+#: src/transport/plugin_transport_tcp.c:3357
+msgid "# TCP server connect events"
 msgstr ""
 
-#: 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"
+#: src/transport/plugin_transport_tcp.c:3363
+msgid "TCP connection limit reached, suspending server\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:3365
+msgid "# TCP service suspended"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:3404
+msgid "# TCP service resumed"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:3415
+msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2451
+#: src/transport/plugin_transport_tcp.c:3721
 msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2547
+#: src/transport/plugin_transport_tcp.c:3873
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2551
+#: src/transport/plugin_transport_tcp.c:3877
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2554
+#: src/transport/plugin_transport_tcp.c:3880
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:167
-msgid "# IPv6 multicast HELLO beacons received via udp"
+#: src/transport/plugin_transport_udp.c:3170
+#, c-format
+msgid ""
+"UDP could not transmit message to `%s': Network seems down, please check "
+"your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:210
-msgid "# IPv4 broadcast HELLO beacons received via udp"
+#: src/transport/plugin_transport_udp.c:3183
+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_broadcasting.c:603
-msgid "Disabling HELLO broadcasting due to friend-to-friend only 
configuration!\n"
+#: src/transport/plugin_transport_udp.c:3466
+#: src/transport/plugin_transport_udp.c:3551
+#, fuzzy, c-format
+msgid "Failed to bind UDP socket to %s: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/transport/plugin_transport_udp.c:3480
+msgid "Disabling IPv4 since it is not supported on this system!\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"
+#: src/transport/plugin_transport_udp.c:3559
+msgid "Failed to open UDP sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1513
-#, c-format
-msgid "Trying to create session for address of unexpected length %u (should be 
%u or %u)\n"
+#: src/transport/plugin_transport_udp.c:3629
+#: src/transport/plugin_transport_udp.c:3642
+msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2602
-#, c-format
-msgid "UDP could not transmit message to `%s': Network seems down, please 
check your network configuration\n"
+#: src/transport/plugin_transport_udp.c:3667
+#, fuzzy
+msgid "must be valid IPv4 address"
+msgstr "adresse invalide"
+
+#: src/transport/plugin_transport_udp.c:3689
+#, fuzzy
+msgid "must be valid IPv6 address"
+msgstr "adresse invalide"
+
+#: src/transport/plugin_transport_udp.c:3750
+msgid "Failed to create UDP network sockets\n"
 msgstr ""
 
-#: 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"
+#: src/transport/plugin_transport_udp_broadcasting.c:169
+msgid "# Multicast HELLO beacons received via UDP"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2961
-msgid "Failed to open UDP sockets\n"
+#: src/transport/plugin_transport_udp_broadcasting.c:553
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3056
+#: src/transport/plugin_transport_udp_broadcasting.c:571
 #, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3097
+#: src/transport/plugin_transport_unix.c:1396
 #, c-format
-msgid "Invalid IPv6 address: `%s'\n"
+msgid "Cannot bind to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3168
-msgid "Failed to create network sockets, plugin failed\n"
+#: src/transport/plugin_transport_unix.c:1786
+msgid "Failed to open UNIX listen socket\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1321
-#, c-format
-msgid "Cannot create path to `%s'\n"
+#: src/transport/plugin_transport_wlan.c:767
+msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1652
-msgid "No UNIXPATH given in configuration!\n"
+#: src/transport/plugin_transport_wlan.c:787
+msgid "# Messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1688
-msgid "Failed to open UNIX listen socket\n"
+#: src/transport/plugin_transport_wlan.c:828
+#: src/transport/plugin_transport_wlan.c:914
+#, fuzzy
+msgid "# Sessions allocated"
+msgstr "# Session TCP active"
+
+#: src/transport/plugin_transport_wlan.c:1037
+msgid "# message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:620
-msgid "# WLAN ACKs sent"
+#: src/transport/plugin_transport_wlan.c:1066
+msgid "# messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:639
-msgid "# WLAN messages defragmented"
+#: src/transport/plugin_transport_wlan.c:1195
+#: src/transport/plugin_transport_wlan.c:1287
+#: src/transport/plugin_transport_wlan.c:2325
+msgid "# MAC endpoints allocated"
 msgstr ""
 
-#: 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"
+#: src/transport/plugin_transport_wlan.c:1573
+msgid "# ACKs received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:876
-msgid "# WLAN message fragments sent"
+#: src/transport/plugin_transport_wlan.c:1645
+msgid "# DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:900
-msgid "# WLAN messages pending (with fragmentation)"
+#: src/transport/plugin_transport_wlan.c:1752
+msgid "# HELLO beacons sent"
 msgstr ""
 
-#: 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"
+#: src/transport/plugin_transport_wlan.c:1869
+msgid "# DATA messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1302
-msgid "# HELLO messages received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1904
+msgid "# DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1326
-msgid "# fragments received via WLAN"
+#: src/transport/plugin_transport_wlan.c:2300
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1336
-msgid "# ACKs received via WLAN"
+#: src/transport/plugin_transport_wlan.c:2322
+#, fuzzy
+msgid "# sessions allocated"
+msgstr "# Session TCP active"
+
+#: src/transport/tcp_connection_legacy.c:440
+#, c-format
+msgid "Access denied to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1396
-msgid "# WLAN DATA messages discarded due to CRC32 error"
+#: src/transport/tcp_connection_legacy.c:455
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1518
-msgid "# DATA messages received via WLAN"
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1400
+#, c-format
+msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1553
-msgid "# WLAN DATA messages processed"
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1412
+#, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1616
-msgid "# HELLO beacons sent via WLAN"
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1419
+#, c-format
+msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1729
-msgid "WLAN address with invalid size encountered\n"
+#: src/transport/tcp_server_legacy.c:897
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1929
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
 #, c-format
-msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
+msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/transport/transport_api.c:739
+#: src/transport/tcp_service_legacy.c:352
 #, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/transport-testing.c:584
-msgid "Failed to initialize testing library!\n"
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:950
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/tun/regex.c:129
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:991
 #, c-format
-msgid "Bad mask: %d\n"
-msgstr "Masque érroné : %d\n"
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
 
-#: src/util/bio.c:170 src/util/bio.c:178
+#: src/transport/tcp_service_legacy.c:890
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1480
 #, c-format
-msgid "Error reading `%s': %s"
-msgstr "Erreur de lecture : « %s » : %s"
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
 
-#: src/util/bio.c:180
-msgid "End of file"
-msgstr "Fin de fichier"
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1504
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
 
-#: src/util/bio.c:237
+#: src/transport/tcp_service_legacy.c:1100
 #, c-format
-msgid "Error reading length of string `%s'"
+msgid "Failed to start `%s' at `%s'\n"
 msgstr ""
 
-#: src/util/bio.c:247
+#: src/transport/tcp_service_legacy.c:1142
 #, c-format
-msgid "String `%s' longer than allowed (%u > %u)"
+msgid "Service `%s' runs at %s\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1750
+msgid "Service process failed to initialize\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
+msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/bio.c:293
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
+msgid "Service process failed to report status\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1220
+#: src/util/service.c:1641
 #, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/util/bio.c:307
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1643
+msgid "No such user"
+msgstr "Aucun utilisateur trouvé"
+
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
 #, c-format
-msgid "Metadata `%s' failed to deserialize"
+msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:619
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2000
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1397
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2076
+#: src/util/service.c:2088
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2098
+msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:623
+#: src/transport/tcp_service_legacy.c:1412
 #, c-format
-msgid "Using `%s' instead\n"
+msgid "Could not access configuration file `%s'\n"
+msgstr ""
+
+#: src/transport/transport_api2_communication.c:743
+msgid "Dropped backchanel message: handler not provided by communicator\n"
+msgstr ""
+
+#: src/util/bio.c:227 src/util/bio.c:235
+#, fuzzy, c-format
+msgid "Error reading `%s' from file: %s"
+msgstr "Erreur de lecture : « %s » : %s"
+
+#: src/util/bio.c:237
+msgid "End of file"
+msgstr "Fin de fichier"
+
+#: src/util/bio.c:266
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "Erreur de lecture : « %s » : %s"
+
+#: src/util/bio.c:268
+msgid "Not enough data left"
 msgstr ""
 
-#: src/util/client.c:360
+#: src/util/bio.c:308
 #, c-format
-msgid "Could not determine valid hostname and port for service `%s' from 
configuration.\n"
+msgid "Invalid handle type while reading `%s'"
+msgstr ""
+
+#: src/util/bio.c:335 src/util/bio.c:839
+msgid "string length"
 msgstr ""
 
-#: src/util/client.c:368
+#: src/util/bio.c:341
 #, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+msgid "%s (while reading `%s')"
 msgstr ""
 
-#: src/util/client.c:1008
+#: src/util/bio.c:346
 #, c-format
-msgid "Could not connect to service `%s', configuration broken.\n"
+msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/client.c:1020
+#: src/util/bio.c:359
 #, c-format
-msgid "Failure to transmit request to service `%s'\n"
+msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/util/client.c:1303
-msgid "Could not submit request, not expecting to receive a response.\n"
+#: src/util/bio.c:398 src/util/bio.c:864 src/util/bio.c:881
+msgid "metadata length"
 msgstr ""
 
-#: src/util/common_logging.c:254 src/util/common_logging.c:1039
-msgid "DEBUG"
-msgstr "DEBUG"
+#: src/util/bio.c:410
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
+msgstr ""
 
-#: src/util/common_logging.c:256 src/util/common_logging.c:1037
-msgid "INFO"
-msgstr "INFO"
+#: src/util/bio.c:426
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Résolution de « %s » échouée\n"
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1035
-msgid "WARNING"
-msgstr "AVERTISSEMENT"
+#: src/util/bio.c:668
+msgid "Unable to flush buffer to file"
+msgstr ""
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1033
-msgid "ERROR"
-msgstr "ERREUR"
+#: src/util/bio.c:730 src/util/bio.c:751
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1041
-msgid "NONE"
-msgstr "AUCUN"
+#: src/util/bio.c:732
+msgid "No associated file"
+msgstr ""
+
+#: src/util/bio.c:816
+#, c-format
+msgid "Invalid handle type while writing `%s'"
+msgstr ""
+
+#: src/util/bio.c:876
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/util/client.c:747 src/util/client.c:938
+msgid "not a valid filename"
+msgstr ""
+
+#: src/util/client.c:1104
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
+msgstr ""
 
-#: src/util/common_logging.c:391
+#: src/util/common_logging.c:626 src/util/common_logging.c:665
 #, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:817
+#: src/util/common_logging.c:904
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1042
+#: src/util/common_logging.c:1108
+msgid "ERROR"
+msgstr "ERREUR"
+
+#: src/util/common_logging.c:1110
+msgid "WARNING"
+msgstr "AVERTISSEMENT"
+
+#: src/util/common_logging.c:1112
+msgid "MESSAGE"
+msgstr ""
+
+#: src/util/common_logging.c:1114
+msgid "INFO"
+msgstr "INFO"
+
+#: src/util/common_logging.c:1116
+msgid "DEBUG"
+msgstr "DEBUG"
+
+#: src/util/common_logging.c:1118
+msgid "NONE"
+msgstr "AUCUN"
+
+#: src/util/common_logging.c:1119
 msgid "INVALID"
 msgstr "INVALIDE"
 
-#: src/util/common_logging.c:1157
+#: src/util/common_logging.c:1400
 msgid "unknown address"
 msgstr "adresse inconnue"
 
-#: src/util/common_logging.c:1196
+#: src/util/common_logging.c:1445
 msgid "invalid address"
 msgstr "adresse invalide"
 
-#: src/util/common_logging.c:1214
-#, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+#: src/util/common_logging.c:1464
+#, c-format
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr ""
+
+#: src/util/common_logging.c:1487
+#, c-format
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgstr ""
+
+#: src/util/configuration.c:790
+#, c-format
+msgid "Illegal directive in line %u (parsing restricted section %s)\n"
+msgstr ""
+
+#: src/util/configuration.c:800
+#, c-format
+msgid "Bad directive in line %u\n"
+msgstr ""
+
+#: src/util/configuration.c:853
+#, c-format
+msgid "Bad inline-secret directive in line %u\n"
+msgstr ""
+
+#: src/util/configuration.c:875
+#, c-format
+msgid "Unknown or malformed directive '%s' in line %u\n"
+msgstr ""
+
+#: src/util/configuration.c:905
+#, c-format
+msgid "Syntax error while deserializing in line %u (option without section)\n"
+msgstr ""
+
+#: src/util/configuration.c:949
+#, c-format
+msgid "Syntax error while deserializing in line %u\n"
+msgstr ""
+
+#: src/util/configuration.c:1049
+#, fuzzy, c-format
+msgid "Error while reading file `%s'\n"
+msgstr "Erreur de lecture : « %s » : %s"
+
+#: src/util/configuration.c:1062
+#, fuzzy, c-format
+msgid "Failed to parse configuration file `%s'\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/util/configuration.c:1695
+msgid "Not a valid relative time specification"
+msgstr ""
+
+#: src/util/configuration.c:1765
+#, c-format
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
+msgstr ""
+
+#: src/util/configuration.c:1860
+#, c-format
+msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
+msgstr ""
+
+#: src/util/configuration.c:1892
+#, c-format
+msgid "Missing closing `%s' in option `%s'\n"
+msgstr ""
+
+#: src/util/configuration.c:1958
+#, c-format
+msgid ""
+"Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
+"as an environmental variable\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:133
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:147
+#, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:218
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:262
+#, c-format
+msgid "failed to load configuration defaults"
+msgstr ""
+
+#: src/util/container_bloomfilter.c:547
+#, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
+msgstr ""
+
+#: src/util/crypto_ecc.c:567
+#, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr ""
+
+#: src/util/crypto_ecc.c:669
+#, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr ""
+
+#: src/util/crypto_ecc_setup.c:280
+msgid "Could not load peer's private key\n"
 msgstr ""
 
-#: src/util/common_logging.c:1235
+#: src/util/crypto_random.c:381
 #, c-format
-msgid "Configuration specifies invalid value for option `%s' in section `%s': 
%s\n"
+msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/configuration.c:288
+#: src/util/crypto_rsa.c:901
 #, c-format
-msgid "Syntax error while deserializing in line %u\n"
+msgid "RSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/configuration.c:996
+#: src/util/crypto_rsa.c:1201
 #, c-format
-msgid "Configuration value '%s' for '%s' in section '%s' is not in set of 
legal choices\n"
+msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/configuration.c:1066
+#: src/util/disk.c:843
 #, c-format
-msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
+msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/configuration.c:1098
+#: src/util/dnsparser.c:910
 #, c-format
-msgid "Missing closing `%s' in option `%s'\n"
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 
-#: src/util/configuration.c:1172
+#: src/util/dnsstub.c:227
 #, c-format
-msgid "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor 
defined as an environmental variable\n"
+msgid "Could not bind to any port: %s\n"
 msgstr ""
 
-#: src/util/connection.c:423
+#: src/util/dnsstub.c:344
 #, c-format
-msgid "Access denied to `%s'\n"
+msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/util/connection.c:438
+#: src/util/dnsstub.c:482
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/util/dnsstub.c:487
 #, c-format
-msgid "Accepting connection from `%s': %p\n"
+msgid "Sent DNS request to %s\n"
 msgstr ""
 
-#: src/util/connection.c:553
+#: src/util/getopt.c:565
 #, c-format
-msgid "Failed to establish TCP connection to `%s:%u', no further addresses to 
try.\n"
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: src/util/connection.c:751 src/util/connection.c:919
+#: src/util/getopt.c:590
 #, c-format
-msgid "Trying to connect to `%s' (%p)\n"
+msgid "%s: option `--%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/connection.c:910
+#: src/util/getopt.c:596
 #, c-format
-msgid "Attempt to connect to `%s' failed\n"
+msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/getopt.c:616 src/util/getopt.c:797
 #, c-format
-msgid "Size of file on disk is incorrect for this Bloom filter (want %llu, 
have %llu)\n"
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
-#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
+#: src/util/getopt.c:647
 #, c-format
-msgid "Could not acquire lock on file `%s': %s...\n"
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863
-msgid "Creating a new private key.  This may take a while.\n"
+#: src/util/getopt.c:653
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: 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"
+#: src/util/getopt.c:680
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
+#: src/util/getopt.c:682
 #, c-format
-msgid "When trying to read key file `%s' I found %u bytes but I need at least 
%u.\n"
+msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: 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"
+#: src/util/getopt.c:711 src/util/getopt.c:847
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1016
-msgid "Could not load peer's private key\n"
+#: src/util/getopt.c:761
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1120
+#: src/util/getopt.c:781
 #, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
+msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1170
+#: src/util/getopt.c:970
 #, c-format
-msgid "EdDSA signing failed at %s:%d: %s\n"
+msgid "Use %s to get a list of options.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1244
+#: src/util/getopt.c:983
 #, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgid "Option `%s' can't be used with other options.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1301
+#: src/util/getopt.c:995
 #, c-format
-msgid "EdDSA signature verification failed at %s:%d: %s\n"
+msgid "Missing mandatory option `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_random.c:284
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
+#: src/util/getopt_helpers.c:63
+msgid "print the version number"
 msgstr ""
 
-#: src/util/disk.c:1184
+#: src/util/getopt_helpers.c:110
 #, c-format
-msgid "Expected `%s' to be a directory!\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/disk.c:1546 src/util/service.c:1318
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
+#: src/util/getopt_helpers.c:196
+msgid "print this help"
 msgstr ""
 
-#: src/util/getopt.c:568
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: src/util/getopt_helpers.c:261
+msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt.c:592
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
+#: src/util/getopt_helpers.c:377
+msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
+#: src/util/getopt_helpers.c:444
+msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt.c:614 src/util/getopt.c:781
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: src/util/getopt_helpers.c:461
+msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/util/getopt.c:643
+#: src/util/getopt_helpers.c:497 src/util/getopt_helpers.c:811
+#: src/util/getopt_helpers.c:867
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt.c:647
+#: src/util/getopt_helpers.c:569
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt.c:672
+#: src/util/getopt_helpers.c:576
 #, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt.c:674
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: src/util/getopt_helpers.c:594
+msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt.c:702 src/util/getopt.c:829
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: src/util/getopt_helpers.c:596
+msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt.c:750
+#: src/util/getopt_helpers.c:630
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt.c:768
+#: src/util/getopt_helpers.c:684
 #, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
+msgid "You must pass absolute time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt.c:933
+#: src/util/getopt_helpers.c:741
 #, c-format
-msgid "Use %s to get a list of options.\n"
+msgid "You must pass a timestamp to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:84
+#: src/util/getopt_helpers.c:748
 #, c-format
-msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
+msgid "The maximum precision allowed for timestamps is seconds.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:268 src/util/getopt_helpers.c:326
+#: src/util/getopt_helpers.c:804
 #, c-format
-msgid "You must pass a number to the `%s' option.\n"
+msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:298
+#: src/util/getopt_helpers.c:874
 #, c-format
-msgid "You must pass relative time to the `%s' option.\n"
+msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:90
+#: src/util/getopt_helpers.c:952
 #, c-format
-msgid "--section argument is required\n"
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:133
-#, c-format
-msgid "--option argument required to set value\n"
+#: src/util/gnunet-base32.c:46
+msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/util/gnunet-config.c:160
-msgid "obtain option of value as a filename (with $-expansion)"
+#: src/util/gnunet-config.c:139
+msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/util/gnunet-config.c:163
-msgid "name of the section to access"
+#: src/util/gnunet-config.c:145
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:166
-msgid "name of the option to access"
+#: src/util/gnunet-config.c:151
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:169
-msgid "value to set"
+#: src/util/gnunet-config.c:157
+msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/util/gnunet-config.c:178
+#: src/util/gnunet-config.c:172
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:75
+#: src/util/gnunet-crypto-tvg.c:1072
+msgid "verify a test vector from stdin"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:94
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:81
+#: src/util/gnunet-ecc.c:128
+#, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:136
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:97
+#: src/util/gnunet-ecc.c:177
 #, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:107
+#: src/util/gnunet-ecc.c:184
 #, c-format
 msgid ""
 "\n"
@@ -7619,566 +8117,531 @@ msgstr ""
 "\n"
 "Terminé !\n"
 
-#: src/util/gnunet-ecc.c:110
+#: src/util/gnunet-ecc.c:186
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199
+#: src/util/gnunet-ecc.c:303
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:210
+#: src/util/gnunet-ecc.c:313
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:232
+#: src/util/gnunet-ecc.c:333
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:283
+#: src/util/gnunet-ecc.c:387
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:349
+#: src/util/gnunet-ecc.c:451
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:352
+#: src/util/gnunet-ecc.c:457
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:355
+#: src/util/gnunet-ecc.c:463
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:358
+#: src/util/gnunet-ecc.c:468
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: 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:375
-msgid "Manipulate GNUnet private ECC key files"
+#: src/util/gnunet-ecc.c:473
+msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:149
-msgid "perform a reverse lookup"
+#: src/util/gnunet-ecc.c:478
+msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:160
-msgid "Use build-in GNUnet stub resolver"
+#: src/util/gnunet-ecc.c:484
+msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:279
-msgid "number of bits to require for the proof of work"
+#: src/util/gnunet-ecc.c:498
+msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:282
-msgid "file with private key, otherwise default is used"
-msgstr ""
+#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
+#, fuzzy, c-format
+msgid "Failed to add URI %s\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/util/gnunet-scrypt.c:285
-msgid "file with proof of work, otherwise default is used"
-msgstr ""
+#: src/util/gnunet-qr.c:133
+#, fuzzy, c-format
+msgid "Added URI %s\n"
+msgstr "URI invalide « %s »\n"
 
-#: src/util/gnunet-scrypt.c:288
-msgid "time to wait between calculations"
+#: src/util/gnunet-qr.c:160
+#, c-format
+msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
-msgid "Manipulate GNUnet proof of work files"
+#: src/util/gnunet-qr.c:170
+#, c-format
+msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:299
+#: src/util/gnunet-qr.c:181
 #, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
+msgid "No known handler for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:371
-#: src/util/gnunet-service-resolver.c:412
+#: src/util/gnunet-qr.c:217
 #, c-format
-msgid "Could not find IP of host `%s': %s\n"
+msgid "Unable to start child process `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:84
-#, c-format
-msgid "No URI specified on command line\n"
+#: src/util/gnunet-qr.c:246
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/util/gnunet-qr.c:260
+#, fuzzy
+msgid "Capturing...\n"
+msgstr "En cous de démarrage %s…\n"
+
+#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+msgid "No captured images\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:89
+#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
 #, c-format
-msgid "Invalid URI: does not start with `%s'\n"
+msgid "Got %d images\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:96
+#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
 #, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
+msgid "Found %s: \"%s\"\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:106
+#: src/util/gnunet-qr.c:364 src/util/gnunet-qr.c:366
 #, c-format
-msgid "No handler known for subsystem `%s'\n"
+msgid "%s is not a PNG file\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:168
-msgid "Perform default-actions for GNUnet URIs"
-msgstr ""
+#: src/util/gnunet-qr.c:545
+#, fuzzy
+msgid "No data found\n"
+msgstr "upnpc introuvable\n"
 
-#: src/util/helper.c:338
-#, c-format
-msgid "Error reading from `%s': %s\n"
+#: src/util/gnunet-qr.c:561
+msgid "Dispatching the URI\n"
 msgstr ""
 
-#: src/util/helper.c:383
-#, c-format
-msgid "Failed to parse inbound message from helper `%s'\n"
+#: src/util/gnunet-qr.c:572
+msgid "use the video device DEVICE (defaults to /dev/video0)"
 msgstr ""
 
-#: src/util/helper.c:609
-#, c-format
-msgid "Error writing to `%s': %s\n"
+#: src/util/gnunet-qr.c:579
+msgid "read from the PNG-encoded file FILE"
 msgstr ""
 
-#: src/util/network.c:134
-#, c-format
-msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+#: src/util/gnunet-qr.c:590
+msgid "Scan a QR code and import the URI read"
 msgstr ""
 
-#: 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"
+#: src/util/gnunet-resolver.c:168
+msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/os_installation.c:421
-#, c-format
-msgid "Could not determine installation path for %s.  Set `%s' environment 
variable.\n"
+#: src/util/gnunet-resolver.c:182
+msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/os_installation.c:766
+#: src/util/gnunet-scrypt.c:215
 #, c-format
-msgid "Could not find binary `%s' in PATH!\n"
+msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/os_installation.c:826
-#, c-format
-msgid "CreateProcess failed for binary %s (%d).\n"
+#: src/util/gnunet-scrypt.c:281
+msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/os_installation.c:836
-#, c-format
-msgid "GetExitCodeProcess failed for binary %s (%d).\n"
+#: src/util/gnunet-scrypt.c:287
+msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/plugin.c:87
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
+#: src/util/gnunet-scrypt.c:293
+msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/plugin.c:148
-#, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
+#: src/util/gnunet-scrypt.c:299
+msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/plugin.c:223
-#, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
+#: src/util/gnunet-scrypt.c:313
+msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/plugin.c:382
-msgid "Could not determine plugin installation path.\n"
+#: src/util/gnunet-service-resolver.c:1287
+msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/program.c:246 src/util/service.c:1452
+#: src/util/gnunet-uri.c:88
 #, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
+msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/program.c:258 src/util/service.c:1467
+#: src/util/gnunet-uri.c:94
 #, c-format
-msgid "Could not access configuration file `%s'\n"
-msgstr ""
-
-#: src/util/program.c:263 src/util/service.c:1462
-msgid "Malformed configuration, exit ...\n"
+msgid "Invalid URI: does not start with `%s'\n"
 msgstr ""
 
-#: src/util/resolver_api.c:198
+#: src/util/gnunet-uri.c:101
 #, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
+msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/resolver_api.c:216
+#: src/util/gnunet-uri.c:108
 #, c-format
-msgid "Must specify `%s' or numeric IP address for `%s' of `%s' in 
configuration!\n"
+msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/resolver_api.c:348
-#, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
+#: src/util/gnunet-uri.c:178
+msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/resolver_api.c:352
+#: src/util/helper.c:323
 #, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
+msgid "Error reading from `%s': %s\n"
 msgstr ""
 
-#: src/util/resolver_api.c:908
+#: src/util/helper.c:375
 #, c-format
-msgid "Could not resolve our FQDN : %s\n"
+msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/util/scheduler.c:813
-msgid "Looks like we're busy waiting...\n"
+#: src/util/helper.c:606
+#, c-format
+msgid "Error writing to `%s': %s\n"
 msgstr ""
 
-#: src/util/scheduler.c:948
+#: src/util/network.c:163
 #, c-format
-msgid "Attempt to cancel dead task %llu!\n"
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/server.c:484
+#: src/util/network.c:1306
 #, c-format
-msgid "`%s' failed for port %d (%s).\n"
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/server.c:493
+#: src/util/os_installation.c:415
 #, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
 msgstr ""
 
-#: src/util/server.c:499
+#: src/util/os_installation.c:786
 #, c-format
-msgid "`%s' failed for `%s': address already in use\n"
+msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/server.c:892
+#: src/util/os_installation.c:819
 #, c-format
-msgid "Processing code for message of type %u did not call 
`GNUNET_SERVER_receive_done' after %s\n"
+msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/util/service.c:347
+#: src/util/plugin.c:86
 #, c-format
-msgid "Unknown address family %d\n"
+msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/service.c:354
+#: src/util/plugin.c:156
 #, c-format
-msgid "Access from `%s' denied to service `%s'\n"
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/service.c:409
+#: src/util/plugin.c:234
 #, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/service.c:446
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+#: src/util/plugin.c:414
+msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/service.c:563
+#: src/util/program.c:286
 #, c-format
-msgid "Disabling IPv6 support for service `%s', failed to create IPv6 socket: 
%s\n"
+msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr ""
 
-#: src/util/service.c:653
+#: src/util/program.c:298
 #, c-format
-msgid "Disabling UNIX domain socket support for service `%s', failed to create 
UNIX domain socket: %s\n"
+msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr ""
 
-#: src/util/service.c:669
+#: src/util/program.c:313
 #, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr ""
 
-#: src/util/service.c:903
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
+#: src/util/program.c:328
+msgid "Malformed configuration. Exiting ...\n"
 msgstr ""
 
-#: src/util/service.c:952 src/util/service.c:970
+#: src/util/regex.c:139
 #, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
+msgid "Bad mask: %d\n"
+msgstr "Masque érroné : %d\n"
 
-#: src/util/service.c:995
+#: src/util/resolver_api.c:220
 #, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/service.c:1165
+#: src/util/resolver_api.c:242
 #, c-format
-msgid "Failed to start `%s' at `%s'\n"
+msgid ""
+"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
+"resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/service.c:1207
+#: src/util/resolver_api.c:887
 #, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr ""
-
-#: src/util/service.c:1256
-msgid "Service process failed to initialize\n"
+msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/service.c:1260
-msgid "Service process could not initialize server function\n"
+#: src/util/resolver_api.c:900
+#, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/service.c:1264
-msgid "Service process failed to report status\n"
+#: src/util/resolver_api.c:1085
+msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/service.c:1319
-msgid "No such user"
-msgstr "Aucun utilisateur trouvé"
+#: src/util/resolver_api.c:1174 src/util/resolver_api.c:1197
+#: src/util/resolver_api.c:1211
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/util/service.c:1332
+#: src/util/service.c:653
 #, c-format
-msgid "Cannot change user/group to `%s': %s\n"
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1402
-msgid "do daemonize (detach from terminal)"
+#: src/util/service.c:1572
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/signal.c:89
+#: src/util/socks.c:635
 #, c-format
-msgid "signal (%d, %p) returned %d.\n"
+msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/strings.c:145
-msgid "b"
-msgstr "o"
+#: src/util/socks.c:652
+#, c-format
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
+msgstr ""
 
-#: src/util/strings.c:433
+#: src/util/strings.c:395
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:561
+#: src/util/strings.c:487
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:658
-msgid "µs"
-msgstr "µs"
-
-#: src/util/strings.c:662
-msgid "forever"
-msgstr "perpetuel"
-
-#: src/util/strings.c:664
-msgid "0 ms"
-msgstr "0 ms"
-
-#: src/util/strings.c:670
-msgid "ms"
-msgstr "ms"
-
-#: src/util/strings.c:676
-msgid "s"
-msgstr "s"
-
-#: src/util/strings.c:682
-msgid "m"
-msgstr "m"
-
-#: src/util/strings.c:688
-msgid "h"
-msgstr "h"
-
-#: src/util/strings.c:695
-msgid "day"
-msgstr "jour"
-
-#: src/util/strings.c:697
-msgid "days"
-msgstr "jours"
-
-#: src/util/strings.c:726
-msgid "end of time"
-msgstr "fin du temps"
-
-#: src/util/strings.c:1159
+#: src/util/strings.c:1023
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1167
+#: src/util/strings.c:1031
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1173
+#: src/util/strings.c:1038
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1180
+#: src/util/strings.c:1046
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1189
+#: src/util/strings.c:1055
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1395 src/util/strings.c:1411
+#: src/util/strings.c:1237 src/util/strings.c:1248
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1420
+#: src/util/strings.c:1257
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1503 src/util/strings.c:1534 src/util/strings.c:1582
-#: src/util/strings.c:1603
+#: src/util/strings.c:1328 src/util/strings.c:1357 src/util/strings.c:1404
+#: src/util/strings.c:1424
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1560
+#: src/util/strings.c:1382
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1612
+#: src/util/strings.c:1433
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/strings.c:1664
+#: src/util/strings.c:1475
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1714
+#: src/util/strings.c:1525
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1745
+#: src/util/strings.c:1556
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
+#: src/util/time.c:863 src/util/time.c:891
+#, c-format
+msgid "Failed to map `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/util/time.c:899
+#, c-format
+msgid ""
+"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:524 src/vpn/gnunet-service-vpn.c:1799
 msgid "# Active channels"
 msgstr "# Canaux actifs"
 
-#: src/vpn/gnunet-service-vpn.c:642
-msgid "# Bytes given to mesh for transmission"
+#: src/vpn/gnunet-service-vpn.c:583
+msgid "# Messages dropped in cadet queue (overflow)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:736
+msgid "# ICMP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:680
-msgid "# Bytes dropped in mesh queue (overflow)"
+#: src/vpn/gnunet-service-vpn.c:1112
+msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:753
-msgid "# Mesh channels created"
+#: src/vpn/gnunet-service-vpn.c:1262
+msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:784
-msgid "Failed to setup mesh channel!\n"
+#: src/vpn/gnunet-service-vpn.c:1461
+msgid "# Cadet channels created"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:978
+#: src/vpn/gnunet-service-vpn.c:1685
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1305
+#: src/vpn/gnunet-service-vpn.c:1821
+msgid "# Packets dropped (channel not yet online)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2019
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1326
+#: src/vpn/gnunet-service-vpn.c:2045
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1531
+#: src/vpn/gnunet-service-vpn.c:2282
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:2316 src/vpn/gnunet-service-vpn.c:2348
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1610
+#: src/vpn/gnunet-service-vpn.c:2355
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1624
+#: src/vpn/gnunet-service-vpn.c:2371
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1706
-msgid "# ICMP packets received from mesh"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:2045
-msgid "# UDP packets received from mesh"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:2200
-msgid "# TCP packets received from mesh"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:2351
+#: src/vpn/gnunet-service-vpn.c:2411
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2406
+#: src/vpn/gnunet-service-vpn.c:2463
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
+#: src/vpn/gnunet-service-vpn.c:2497 src/vpn/gnunet-service-vpn.c:2705
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2715
+#: src/vpn/gnunet-service-vpn.c:2750
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2982
+#: src/vpn/gnunet-service-vpn.c:3008
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3006
+#: src/vpn/gnunet-service-vpn.c:3036
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3014
+#: src/vpn/gnunet-service-vpn.c:3046
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3027
+#: src/vpn/gnunet-service-vpn.c:3062
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3040
+#: src/vpn/gnunet-service-vpn.c:3079
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3050
+#: src/vpn/gnunet-service-vpn.c:3091
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:147
+#: src/vpn/gnunet-vpn.c:143
 msgid "Error creating tunnel\n"
 msgstr "Erreur de création du tunnel\n"
 
-#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
+#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:226
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
@@ -8188,69 +8651,127 @@ msgstr ""
 msgid "Option `%s' or `%s' is required.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:215
+#: src/vpn/gnunet-vpn.c:217
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:235
+#: src/vpn/gnunet-vpn.c:240
 #, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:255
+#: src/vpn/gnunet-vpn.c:259
 #, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:290
+#: src/vpn/gnunet-vpn.c:296
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:293
+#: src/vpn/gnunet-vpn.c:302
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:309
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:299
+#: src/vpn/gnunet-vpn.c:316
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:323
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:305
+#: src/vpn/gnunet-vpn.c:330
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:308
+#: src/vpn/gnunet-vpn.c:335
 msgid "service is offered via TCP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:311
+#: src/vpn/gnunet-vpn.c:340
 msgid "service is offered via UDP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:354
 msgid "Setup tunnels via VPN."
 msgstr "Configurer des tunnels via VPN."
 
-#: 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"
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:418
+#: src/zonemaster/gnunet-service-zonemaster.c:847
+msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:593
+#~ msgid "ARM API is busy"
+#~ msgstr "API ARM occupé"
+
 #, c-format
-msgid "External protocol violation detected at %s:%d.\n"
-msgstr ""
+#~ msgid "Received last message for %s \n"
+#~ msgstr "Dernier message reçu de %s\n"
+
+#~ msgid "Benchmarking done\n"
+#~ msgstr "Benchmark terminé\n"
+
+#~ msgid "Stop logging\n"
+#~ msgstr "Arrêter la journalisation\n"
 
-#: 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 ""
+#~ msgid "Start logging `%s'\n"
+#~ msgstr "Démarrer la journalisation « %s »\n"
+
+#, c-format
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+
+#, c-format
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d"
+
+#~ msgid "malformed"
+#~ msgstr "malformé"
+
+#~ msgid "b"
+#~ msgstr "o"
+
+#~ msgid "µs"
+#~ msgstr "µs"
+
+#~ msgid "forever"
+#~ msgstr "perpetuel"
+
+#~ msgid "0 ms"
+#~ msgstr "0 ms"
+
+#~ msgid "ms"
+#~ msgstr "ms"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "m"
+#~ msgstr "m"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "day"
+#~ msgstr "jour"
+
+#~ msgid "days"
+#~ msgstr "jours"
+
+#~ msgid "end of time"
+#~ msgstr "fin du temps"
diff --git a/po/it.po b/po/it.po
index 3aea1cf32..8537d1afe 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-10-15 10:46+0200\n"
+"POT-Creation-Date: 2022-01-10 15:13+0100\n"
 "PO-Revision-Date: 2019-10-16 11:00+0200\n"
 "Last-Translator: Sebastiano Pistore <sebastianopistore.info@protonmail.ch>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -20,127 +20,131 @@ msgstr ""
 "X-Generator: Poedit 2.2.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1302
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1304
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:901
+#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
 #, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:560 src/abd/gnunet-service-abd.c:1747
-#: src/namestore/gnunet-namestore-fcfsd.c:1067
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
 #: src/namestore/gnunet-namestore.c:1001
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:840 src/abd/gnunet-abd.c:891
+#: src/abd/gnunet-abd.c:566
+msgid "Ego does not exist!\n"
+msgstr ""
+
+#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
 #, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:849 src/abd/gnunet-abd.c:910
+#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
 #, fuzzy, c-format
 msgid "Failed to connect to ABD\n"
 msgstr "Impossibile avviare il servizio.\n"
 
-#: src/abd/gnunet-abd.c:855
+#: src/abd/gnunet-abd.c:865
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:862
+#: src/abd/gnunet-abd.c:872
 #, c-format
 msgid "ego required\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:872
+#: src/abd/gnunet-abd.c:882
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:881
+#: src/abd/gnunet-abd.c:890
 #, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:916
+#: src/abd/gnunet-abd.c:924
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:975
+#: src/abd/gnunet-abd.c:983
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:996
+#: src/abd/gnunet-abd.c:1004
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1003
+#: src/abd/gnunet-abd.c:1011
 msgid ""
 "The public key of the subject to lookup thecredential for, or for issuer "
 "side storage: subject and its attributes"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1010
+#: src/abd/gnunet-abd.c:1018
 msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1017
+#: src/abd/gnunet-abd.c:1025
 msgid "The public key of the authority to verify the credential against"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1022
+#: src/abd/gnunet-abd.c:1030
 msgid "The ego/zone name to use"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1028
+#: src/abd/gnunet-abd.c:1036
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1034
+#: src/abd/gnunet-abd.c:1042
 msgid ""
 "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1039
+#: src/abd/gnunet-abd.c:1047
 msgid "collect credentials"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1044
+#: src/abd/gnunet-abd.c:1052
 msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1049
+#: src/abd/gnunet-abd.c:1057
 msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1054
+#: src/abd/gnunet-abd.c:1062
 msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1061
+#: src/abd/gnunet-abd.c:1069
 msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1065
+#: src/abd/gnunet-abd.c:1073
 msgid "Create private record entry."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1071 src/abd/gnunet-abd.c:1077
+#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
 msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1090
+#: src/abd/gnunet-abd.c:1098
 msgid "GNUnet abd resolver tool"
 msgstr ""
 
-#: src/abd/gnunet-service-abd.c:1742 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr ""
@@ -376,28 +380,28 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1129
 #: src/transport/plugin_transport_tcp.c:3706
 #: src/transport/tcp_service_legacy.c:594
-#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1090
-#: src/util/service.c:1096
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1094
+#: src/util/service.c:1100
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
 #: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
-#: src/util/service.c:1129
+#: src/util/service.c:1133
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
 #: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
-#: src/util/service.c:1133
+#: src/util/service.c:1137
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
-#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1153
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1157
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -405,7 +409,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
-#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1171
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1175
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -413,7 +417,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:536
 #: src/transport/plugin_transport_http_server.c:2718
 #: src/transport/plugin_transport_tcp.c:1244
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1202
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1206
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr ""
@@ -421,7 +425,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:555
 #: src/transport/plugin_transport_http_server.c:2736
 #: src/transport/plugin_transport_tcp.c:1263
-#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1221
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1225
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
@@ -1296,33 +1300,33 @@ msgstr ""
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:329
+#: src/core/gnunet-service-core.c:328
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:355
+#: src/core/gnunet-service-core.c:354
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
+#: src/core/gnunet-service-core.c:418
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:506
+#: src/core/gnunet-service-core.c:504
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:825
+#: src/core/gnunet-service-core.c:823
 #, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:927
+#: src/core/gnunet-service-core.c:925
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:955
+#: src/core/gnunet-service-core.c:953
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Avvio del servizio '%s' in corso\n"
@@ -1465,9 +1469,7 @@ msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/dht/gnunet-service-dht_neighbours.c:740
-#: src/dht/gnunet-service-dht_neighbours.c:803
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1522
+#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1520
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1496,49 +1498,44 @@ msgstr ""
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:299
-#: src/datastore/gnunet-service-datastore.c:742
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:275
+#: src/datastore/gnunet-service-datastore.c:743
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:303
+#: src/datacache/datacache.c:121 src/datacache/datacache.c:279
 msgid "# items stored"
 msgstr "# elementi memorizzati"
 
-#: src/datacache/datacache.c:190
+#: src/datacache/datacache.c:185
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:208
+#: src/datacache/datacache.c:203
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:332
+#: src/datacache/datacache.c:297
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:343
+#: src/datacache/datacache.c:308
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/datacache.c:370
-#, fuzzy
-msgid "# requests for random value received"
-msgstr "# richieste GET ricevute"
-
-#: src/datacache/datacache.c:400
+#: src/datacache/datacache.c:329
 #, fuzzy
 msgid "# proximity search requests received"
 msgstr "# richieste GET ricevute"
 
-#: src/datacache/plugin_datacache_heap.c:554
+#: src/datacache/plugin_datacache_heap.c:527
 msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:123
-#: src/datacache/plugin_datacache_sqlite.c:144
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:139
 #: src/datastore/plugin_datastore_mysql.c:890
 #: src/datastore/plugin_datastore_sqlite.c:63
 #: src/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:81 src/my/my.c:93
@@ -1555,7 +1552,7 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:783
+#: src/datacache/plugin_datacache_sqlite.c:693
 #: src/datastore/plugin_datastore_sqlite.c:531
 #: src/namecache/plugin_namecache_sqlite.c:237
 #: src/namestore/plugin_namestore_sqlite.c:273
@@ -1711,131 +1708,131 @@ msgid ""
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:605
+#: src/datastore/gnunet-service-datastore.c:606
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:611
+#: src/datastore/gnunet-service-datastore.c:612
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:618
+#: src/datastore/gnunet-service-datastore.c:619
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:625
-#: src/datastore/gnunet-service-datastore.c:676
-#: src/datastore/gnunet-service-datastore.c:819
-#: src/datastore/gnunet-service-datastore.c:1428
+#: src/datastore/gnunet-service-datastore.c:626
+#: src/datastore/gnunet-service-datastore.c:677
+#: src/datastore/gnunet-service-datastore.c:820
+#: src/datastore/gnunet-service-datastore.c:1429
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:692
+#: src/datastore/gnunet-service-datastore.c:693
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:757
+#: src/datastore/gnunet-service-datastore.c:758
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:857
+#: src/datastore/gnunet-service-datastore.c:858
 msgid "# GET requests received"
 msgstr "# richieste GET ricevute"
 
-#: src/datastore/gnunet-service-datastore.c:887
+#: src/datastore/gnunet-service-datastore.c:888
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# richieste GET ricevute"
 
-#: src/datastore/gnunet-service-datastore.c:898
+#: src/datastore/gnunet-service-datastore.c:899
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:939
+#: src/datastore/gnunet-service-datastore.c:940
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:970
+#: src/datastore/gnunet-service-datastore.c:971
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1011
+#: src/datastore/gnunet-service-datastore.c:1012
 msgid "Content not found"
 msgstr "Contenuto non trovato"
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1019
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1058
+#: src/datastore/gnunet-service-datastore.c:1059
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/datastore/gnunet-service-datastore.c:1108
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1282
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/datastore/gnunet-service-datastore.c:1168
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/datastore/gnunet-service-datastore.c:1177
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1236
+#: src/datastore/gnunet-service-datastore.c:1237
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1288
+#: src/datastore/gnunet-service-datastore.c:1289
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1298
+#: src/datastore/gnunet-service-datastore.c:1299
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/datastore/gnunet-service-datastore.c:1464
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1472
+#: src/datastore/gnunet-service-datastore.c:1473
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1476
 msgid "# cache size"
 msgstr "# dimensione cache"
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/datastore/gnunet-service-datastore.c:1492
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/datastore/gnunet-service-datastore.c:1513
+#: src/datastore/gnunet-service-datastore.c:1535
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1573
+#: src/datastore/gnunet-service-datastore.c:1574
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
@@ -1927,52 +1924,52 @@ msgstr ""
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:158
+#: src/dht/gnunet-dht-get.c:159
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:160
 #, c-format
 msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:197
+#: src/dht/gnunet-dht-get.c:209
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:203 src/dht/gnunet-dht-monitor.c:255
+#: src/dht/gnunet-dht-get.c:217 src/dht/gnunet-dht-monitor.c:255
 msgid "Failed to connect to DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:213
+#: src/dht/gnunet-dht-get.c:227
 msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:260 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:251
+#: src/dht/gnunet-dht-get.c:266
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:256 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:272 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:262
+#: src/dht/gnunet-dht-get.c:278
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-get.c:284 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:301
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -2003,237 +2000,30 @@ msgstr "Impossibile avviare il servizio.\n"
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:187
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:193
+#: src/dht/gnunet-dht-put.c:194
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:212
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:212
+#: src/dht/gnunet-dht-put.c:217
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-put.c:223
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:232
+#: src/dht/gnunet-dht-put.c:241
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:367
-msgid "# GET requests from clients injected"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:483
-msgid "# PUT requests received from clients"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:616
-msgid "# GET requests received from clients"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:848
-msgid "# GET STOP requests received from clients"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1033
-msgid "# Key match, type mismatches in REPLY to CLIENT"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1049
-msgid "# Duplicate REPLIES to CLIENT request dropped"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1102
-#, c-format
-msgid "Unsupported block type (%u) in request!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1110
-msgid "# RESULTS queued for clients"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1191
-msgid "# REPLIES ignored for CLIENTS (no match)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:73
-#, c-format
-msgid "%s request received, but have no datacache!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:83
-msgid "# ITEMS stored in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:206
-msgid "# Good RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:220
-msgid "# Duplicate RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:228
-msgid "# Invalid RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:236
-msgid "# Irrelevant RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:252
-msgid "# Unsupported RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:256
-#, c-format
-msgid "Unsupported block type (%u) in local response!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:291
-msgid "# GET requests given to datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_hello.c:86
-msgid "# HELLOs obtained from peerinfo"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:678
-msgid "# FIND PEER messages initiated"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:855
-msgid "# requests TTL-dropped"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1042
-#: src/dht/gnunet-service-dht_neighbours.c:1079
-msgid "# Peers excluded from routing due to Bloomfilter"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1095
-msgid "# Peer selection failed"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1253
-msgid "# PUT requests routed"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1287
-msgid "# PUT messages queued for transmission"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1299
-#: src/dht/gnunet-service-dht_neighbours.c:1441
-#: src/dht/gnunet-service-dht_neighbours.c:1545
-msgid "# P2P messages dropped due to full queue"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1384
-msgid "# GET requests routed"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1428
-msgid "# GET messages queued for transmission"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1560
-msgid "# RESULT messages queued for transmission"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1663
-msgid "# Expired PUTs discarded"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1671
-msgid "# P2P PUT requests received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1675
-msgid "# P2P PUT bytes received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1907
-msgid "# FIND PEER requests ignored due to Bloomfilter"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1916
-msgid "# FIND PEER requests ignored due to lack of HELLO"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2079
-msgid "# P2P GET requests received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2083
-msgid "# P2P GET bytes received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2149
-msgid "# P2P FIND PEER requests processed"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2170
-msgid "# P2P GET requests ONLY routed"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2348
-msgid "# Expired results discarded"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2365
-msgid "# P2P RESULTS received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2369
-msgid "# P2P RESULT bytes received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_nse.c:59
-msgid "# Network size estimates received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Good REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:236
-msgid "# Duplicate REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:244
-msgid "# Invalid REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:252
-msgid "# Irrelevant REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:268
-msgid "# Unsupported REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:347
-msgid "# Entries removed from routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:422
-msgid "# Entries added to routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:444
-msgid "# DHT requests combined"
-msgstr ""
-
 #: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
@@ -2280,17 +2070,17 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:189
+#: src/dht/plugin_block_dht.c:328
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:198
+#: src/dht/plugin_block_dht.c:337
 #, c-format
 msgid "Size mismatch for block with type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:209
+#: src/dht/plugin_block_dht.c:348
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -3521,7 +3311,7 @@ msgstr ""
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1345
+#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
@@ -3529,59 +3319,43 @@ msgstr ""
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:869
-msgid "# replies dropped due to type mismatch"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:877
-msgid "# replies received for other peers"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:892
-msgid "# replies dropped due to insufficient cover traffic"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:940
-msgid "# P2P searches destroyed due to ultimate reply"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1011
+#: src/fs/gnunet-service-fs_cp.c:1009
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1036
+#: src/fs/gnunet-service-fs_cp.c:1034
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1046
+#: src/fs/gnunet-service-fs_cp.c:1044
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1141
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1199
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1225
+#: src/fs/gnunet-service-fs_cp.c:1223
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1239
+#: src/fs/gnunet-service-fs_cp.c:1237
 msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1296
+#: src/fs/gnunet-service-fs_cp.c:1294
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1341
+#: src/fs/gnunet-service-fs_cp.c:1339
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1711
+#: src/fs/gnunet-service-fs_cp.c:1709
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3659,102 +3433,89 @@ msgstr ""
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:656
+#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:658
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:832
+#: src/fs/gnunet-service-fs_pr.c:838
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:880
-msgid "# duplicate replies discarded (bloomfilter)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:889
-msgid "# irrelevant replies discarded"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:908
-#, c-format
-msgid "Unsupported block type %u\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:921
+#: src/fs/gnunet-service-fs_pr.c:916
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1055
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1084
+#: src/fs/gnunet-service-fs_pr.c:1079
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1123
+#: src/fs/gnunet-service-fs_pr.c:1118
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1259
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1318
+#: src/fs/gnunet-service-fs_pr.c:1313
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1339
+#: src/fs/gnunet-service-fs_pr.c:1334
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1402
+#: src/fs/gnunet-service-fs_pr.c:1401
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1464
+#: src/fs/gnunet-service-fs_pr.c:1463
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1519
+#: src/fs/gnunet-service-fs_pr.c:1518
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1534
+#: src/fs/gnunet-service-fs_pr.c:1533
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1557
+#: src/fs/gnunet-service-fs_pr.c:1556
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1574
+#: src/fs/gnunet-service-fs_pr.c:1573
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1594
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1600
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1642
+#: src/fs/gnunet-service-fs_pr.c:1641
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1655
+#: src/fs/gnunet-service-fs_pr.c:1654
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1706
+#: src/fs/gnunet-service-fs_pr.c:1705
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1756
+#: src/fs/gnunet-service-fs_pr.c:1755
 msgid "# GAP PUT messages received"
 msgstr ""
 
@@ -3793,31 +3554,25 @@ msgstr ""
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:134
-#, c-format
-msgid "Refusing `%s' request to HTTP server\n"
-msgstr ""
-
-#: src/gns/gnunet-bcd.c:347
-#, c-format
-msgid "Invalid port number %u.  Exiting.\n"
-msgstr ""
+#: src/gns/gnunet-bcd.c:571
+#, fuzzy, c-format
+msgid "Invalid port number %u\n"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/gns/gnunet-bcd.c:352
-#, c-format
-msgid "Businesscard HTTP server starts on %u\n"
-msgstr ""
+#: src/gns/gnunet-bcd.c:612 src/namestore/gnunet-namestore-fcfsd.c:1113
+#, fuzzy
+msgid "Unable to set up the daemon\n"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/gns/gnunet-bcd.c:372
-#, c-format
-msgid "Could not start businesscard HTTP server on port %u\n"
-msgstr ""
+#: src/gns/gnunet-bcd.c:635 src/namestore/gnunet-namestore-fcfsd.c:987
+msgid "Failed to start HTTP server\n"
+msgstr "Impossibile avviare il server HTTP\n"
 
-#: src/gns/gnunet-bcd.c:509
-msgid "Run HTTP serve on port PORT (default is 8888)"
+#: src/gns/gnunet-bcd.c:658
+msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:522
+#: src/gns/gnunet-bcd.c:667
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
@@ -4580,61 +4335,78 @@ msgstr "`%s' non è un indirizzo IP valido.\n"
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:214
+#: src/identity/gnunet-identity.c:231
 #, c-format
 msgid "Failed to create ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:255
+#: src/identity/gnunet-identity.c:272
 #, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:461
+#: src/identity/gnunet-identity.c:646
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:466
+#: src/identity/gnunet-identity.c:651
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:472
+#: src/identity/gnunet-identity.c:657
 msgid ""
 "set the private key for the identity to PRIVATE_KEY (use together with -C)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:477
+#: src/identity/gnunet-identity.c:663
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:669
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:674
 msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:481
+#: src/identity/gnunet-identity.c:678
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:485
+#: src/identity/gnunet-identity.c:682
 msgid "reduce output"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:492
+#: src/identity/gnunet-identity.c:689
 msgid ""
 "set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
-"s) or restrict results to NAME (use together with -d)"
+"s), restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:695
+msgid "The public key of the recipient (with -W)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:496
+#: src/identity/gnunet-identity.c:699
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:500
+#: src/identity/gnunet-identity.c:703
 msgid "display private keys as well"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:507
+#: src/identity/gnunet-identity.c:710
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:522
+#: src/identity/gnunet-identity.c:725
 msgid "Maintain egos"
 msgstr ""
 
@@ -4694,6 +4466,12 @@ msgstr ""
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
+#: src/messenger/plugin_gnsrecord_messenger.c:118
+#: src/messenger/plugin_gnsrecord_messenger.c:133
+#, fuzzy, c-format
+msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
 #: src/my/my.c:196 src/my/my.c:215
 #, c-format
 msgid "%s failed at %s:%d with error: %s\n"
@@ -4734,7 +4512,7 @@ msgstr "# messaggi PONG ricevuti"
 msgid "You must specify a name\n"
 msgstr "È necessario specificare un nome\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1639
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1641
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4742,7 +4520,7 @@ msgstr ""
 msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1700
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1702
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
@@ -4789,107 +4567,98 @@ msgstr ""
 msgid "Failed to setup database at `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:359
+#: src/namestore/gnunet-namestore-fcfsd.c:368
 msgid "can not search the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:413
-#: src/namestore/gnunet-namestore-fcfsd.c:554
+#: src/namestore/gnunet-namestore-fcfsd.c:422
+#: src/namestore/gnunet-namestore-fcfsd.c:563
 msgid "unable to scan namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:441
+#: src/namestore/gnunet-namestore-fcfsd.c:450
 #, fuzzy, c-format
 msgid "Failed to create record for `%s': %s\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:453
+#: src/namestore/gnunet-namestore-fcfsd.c:462
 #, fuzzy
 msgid "no errors"
 msgstr "errore sconosciuto"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:489
+#: src/namestore/gnunet-namestore-fcfsd.c:498
 #, c-format
 msgid "The requested key `%s' exists as `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/namestore/gnunet-namestore-fcfsd.c:505
 msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:513
+#: src/namestore/gnunet-namestore-fcfsd.c:522
 #, fuzzy
 msgid "Error creating record data\n"
 msgstr "Errore interno."
 
-#: src/namestore/gnunet-namestore-fcfsd.c:517
+#: src/namestore/gnunet-namestore-fcfsd.c:526
 #, fuzzy
 msgid "unable to store record"
 msgstr "Impossibile avviare il servizio.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:588
+#: src/namestore/gnunet-namestore-fcfsd.c:597
 #, c-format
 msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:594
+#: src/namestore/gnunet-namestore-fcfsd.c:603
 msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:780
+#: src/namestore/gnunet-namestore-fcfsd.c:789
 msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
+#: src/namestore/gnunet-namestore-fcfsd.c:800
 msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:806
+#: src/namestore/gnunet-namestore-fcfsd.c:819
 #, fuzzy
 msgid "invalid parameters"
 msgstr "argomento non valido"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:823
+#: src/namestore/gnunet-namestore-fcfsd.c:836
 #, fuzzy
 msgid "invalid name"
 msgstr "argomento non valido"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
+#: src/namestore/gnunet-namestore-fcfsd.c:847
 #, fuzzy, c-format
 msgid "Unable to parse key %s\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:838
+#: src/namestore/gnunet-namestore-fcfsd.c:851
 #, fuzzy
 msgid "unable to parse key"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:949
+#: src/namestore/gnunet-namestore-fcfsd.c:962
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:974
-msgid "Failed to start HTTP server\n"
-msgstr "Impossibile avviare il server HTTP\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1058
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
 msgid "No port specified, using default value\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1076
+#: src/namestore/gnunet-namestore-fcfsd.c:1089
 msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1100
-#, fuzzy
-msgid "Unable to set up the daemon\n"
-msgstr "Generazione statistiche fallita\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1123
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
 msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1132
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
@@ -4966,7 +4735,7 @@ msgstr ""
 #: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1066
 #: src/namestore/gnunet-namestore.c:1076 src/namestore/gnunet-namestore.c:1105
 #: src/namestore/gnunet-namestore.c:1126 src/namestore/gnunet-namestore.c:1153
-#: src/namestore/gnunet-namestore.c:1228
+#: src/namestore/gnunet-namestore.c:1230
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
@@ -4982,7 +4751,7 @@ msgstr ""
 
 #: src/namestore/gnunet-namestore.c:1068 src/namestore/gnunet-namestore.c:1078
 #: src/namestore/gnunet-namestore.c:1107 src/namestore/gnunet-namestore.c:1128
-#: src/namestore/gnunet-namestore.c:1230
+#: src/namestore/gnunet-namestore.c:1232
 msgid "add"
 msgstr ""
 
@@ -5001,7 +4770,7 @@ msgstr ""
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1237
+#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1239
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
@@ -5015,18 +4784,18 @@ msgstr ""
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1220
+#: src/namestore/gnunet-namestore.c:1222
 #: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1290
+#: src/namestore/gnunet-namestore.c:1292
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1340
+#: src/namestore/gnunet-namestore.c:1342
 #, c-format
 msgid ""
 "No default identity configured for `namestore' subsystem\n"
@@ -5034,99 +4803,99 @@ msgid ""
 "Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1405
+#: src/namestore/gnunet-namestore.c:1407
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1434
+#: src/namestore/gnunet-namestore.c:1436
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1483
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1493
+#: src/namestore/gnunet-namestore.c:1495
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1505 src/namestore/gnunet-namestore.c:1521
-#: src/namestore/gnunet-namestore.c:1538
+#: src/namestore/gnunet-namestore.c:1507 src/namestore/gnunet-namestore.c:1523
+#: src/namestore/gnunet-namestore.c:1540
 #, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1513
+#: src/namestore/gnunet-namestore.c:1515
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/namestore/gnunet-namestore.c:1551
+#: src/namestore/gnunet-namestore.c:1553
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Indirizzo IPv6 non valido: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1608
+#: src/namestore/gnunet-namestore.c:1610
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1611
+#: src/namestore/gnunet-namestore.c:1613
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1615
+#: src/namestore/gnunet-namestore.c:1617
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1622
+#: src/namestore/gnunet-namestore.c:1624
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1628
+#: src/namestore/gnunet-namestore.c:1630
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1633
+#: src/namestore/gnunet-namestore.c:1635
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1645
+#: src/namestore/gnunet-namestore.c:1647
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1652
+#: src/namestore/gnunet-namestore.c:1654
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1658
+#: src/namestore/gnunet-namestore.c:1660
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1663
+#: src/namestore/gnunet-namestore.c:1665
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1669
+#: src/namestore/gnunet-namestore.c:1671
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1673
+#: src/namestore/gnunet-namestore.c:1675
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1679
+#: src/namestore/gnunet-namestore.c:1681
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1685
+#: src/namestore/gnunet-namestore.c:1687
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5464,8 +5233,8 @@ msgstr ""
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1450
-#: src/revocation/gnunet-service-revocation.c:883 src/util/gnunet-scrypt.c:260
+#: src/nse/gnunet-service-nse.c:1441
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5657,11 +5426,6 @@ msgstr ""
 msgid "Unable to create indices: %s.\n"
 msgstr "Generazione statistiche fallita\n"
 
-#: src/pq/pq_prepare.c:109
-#, c-format
-msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
-msgstr ""
-
 #: src/pt/gnunet-daemon-pt.c:418
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
@@ -5717,86 +5481,86 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:801
+#: src/reclaim/gnunet-reclaim.c:802
 #, c-format
 msgid "Ego is required\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:808
+#: src/reclaim/gnunet-reclaim.c:809
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:815
+#: src/reclaim/gnunet-reclaim.c:816
 #, c-format
 msgid "Requesting party key is required!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:833
-msgid "Add an attribute NAME"
+#: src/reclaim/gnunet-reclaim.c:834
+msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:838
+#: src/reclaim/gnunet-reclaim.c:839
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:843
+#: src/reclaim/gnunet-reclaim.c:844
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:848
+#: src/reclaim/gnunet-reclaim.c:849
 msgid "The EGO to use"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:854
+#: src/reclaim/gnunet-reclaim.c:855
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:858
+#: src/reclaim/gnunet-reclaim.c:859
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:862
+#: src/reclaim/gnunet-reclaim.c:863
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:868
+#: src/reclaim/gnunet-reclaim.c:869
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:873
+#: src/reclaim/gnunet-reclaim.c:874
 msgid "Credential name"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:879
+#: src/reclaim/gnunet-reclaim.c:880
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:884
+#: src/reclaim/gnunet-reclaim.c:885
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:889
+#: src/reclaim/gnunet-reclaim.c:890
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:894
+#: src/reclaim/gnunet-reclaim.c:895
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:899
+#: src/reclaim/gnunet-reclaim.c:900
 msgid "Type of credential"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:903
+#: src/reclaim/gnunet-reclaim.c:904
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:909
+#: src/reclaim/gnunet-reclaim.c:910
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:917
+#: src/reclaim/gnunet-reclaim.c:918
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -5822,56 +5586,56 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1392
+#: src/regex/gnunet-regex-profiler.c:1388
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1434
+#: src/regex/gnunet-regex-profiler.c:1430
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1440
+#: src/regex/gnunet-regex-profiler.c:1436
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1448
+#: src/regex/gnunet-regex-profiler.c:1444
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1453
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1477
+#: src/regex/gnunet-regex-profiler.c:1473
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1565
+#: src/regex/gnunet-regex-profiler.c:1562
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1572
+#: src/regex/gnunet-regex-profiler.c:1569
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1578
+#: src/regex/gnunet-regex-profiler.c:1575
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1586
+#: src/regex/gnunet-regex-profiler.c:1582
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1593
+#: src/regex/gnunet-regex-profiler.c:1589
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1606
+#: src/regex/gnunet-regex-profiler.c:1604
 msgid "Profiler for regex"
 msgstr ""
 
@@ -6036,33 +5800,33 @@ msgstr ""
 msgid "number of epochs to calculate for"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:502
+#: src/revocation/gnunet-service-revocation.c:507
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:512
+#: src/revocation/gnunet-service-revocation.c:517
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/revocation/gnunet-service-revocation.c:517
+#: src/revocation/gnunet-service-revocation.c:522
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:521
+#: src/revocation/gnunet-service-revocation.c:526
 msgid "# revocation set unions failed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:529
+#: src/revocation/gnunet-service-revocation.c:534
 msgid "# revocation set unions completed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:567
+#: src/revocation/gnunet-service-revocation.c:572
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:920
+#: src/revocation/gnunet-service-revocation.c:925
 msgid "Could not open revocation database file!"
 msgstr ""
 
@@ -6584,17 +6348,17 @@ msgid ""
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2643
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2651
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2659
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
@@ -6790,9 +6554,9 @@ msgstr ""
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:3329
-#: src/transport/gnunet-communicator-udp.c:3814
-#: src/transport/gnunet-service-tng.c:10388
+#: src/transport/gnunet-communicator-tcp.c:3338
+#: src/transport/gnunet-communicator-udp.c:3856
+#: src/transport/gnunet-service-tng.c:10512
 #: src/transport/gnunet-service-transport.c:2627
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
@@ -6801,7 +6565,7 @@ msgstr ""
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:3889
+#: src/transport/gnunet-communicator-udp.c:3931
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7770,17 +7534,17 @@ msgstr ""
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1396
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1400
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1408
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1412
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1415
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1419
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
@@ -7792,7 +7556,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:833
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7802,23 +7566,23 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:946
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:950
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:451 src/util/service.c:987
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:991
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:890
-#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1476
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1480
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1500
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1504
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -7833,45 +7597,45 @@ msgstr ""
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1746
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1750
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1751
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1756
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
 msgid "Service process failed to report status\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1220
-#: src/util/service.c:1637
+#: src/util/service.c:1641
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1639
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1643
 msgid "No such user"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1653
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:1996
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2000
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1397
-#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2072
-#: src/util/service.c:2084
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2076
+#: src/util/service.c:2088
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2094
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2098
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
@@ -8117,7 +7881,7 @@ msgstr ""
 msgid "failed to load configuration defaults"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:553
+#: src/util/container_bloomfilter.c:547
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8134,7 +7898,7 @@ msgstr ""
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:273
+#: src/util/crypto_ecc_setup.c:280
 msgid "Could not load peer's private key\n"
 msgstr ""
 
@@ -8143,12 +7907,12 @@ msgstr ""
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:862
+#: src/util/crypto_rsa.c:901
 #, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1162
+#: src/util/crypto_rsa.c:1201
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
@@ -8253,82 +8017,92 @@ msgstr ""
 msgid "Missing mandatory option `%s'.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:69
+#: src/util/getopt_helpers.c:63
 msgid "print the version number"
 msgstr ""
 
-#: src/util/getopt_helpers.c:116
+#: src/util/getopt_helpers.c:110
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:208
+#: src/util/getopt_helpers.c:196
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:288
+#: src/util/getopt_helpers.c:261
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:429
+#: src/util/getopt_helpers.c:377
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:510
+#: src/util/getopt_helpers.c:444
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:532
+#: src/util/getopt_helpers.c:461
 msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:859
-#: src/util/getopt_helpers.c:924
+#: src/util/getopt_helpers.c:497 src/util/getopt_helpers.c:811
+#: src/util/getopt_helpers.c:867
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:649
+#: src/util/getopt_helpers.c:569
 #, c-format
 msgid ""
 "You must pass a relative time (optionally with sign) to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:656
+#: src/util/getopt_helpers.c:576
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:683
+#: src/util/getopt_helpers.c:594
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:685
+#: src/util/getopt_helpers.c:596
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:720
+#: src/util/getopt_helpers.c:630
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:785
+#: src/util/getopt_helpers.c:684
 #, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:852
+#: src/util/getopt_helpers.c:741
+#, c-format
+msgid "You must pass a timestamp to the `%s' option.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:748
+#, c-format
+msgid "The maximum precision allowed for timestamps is seconds.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:804
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:931
+#: src/util/getopt_helpers.c:874
 #, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:1018
+#: src/util/getopt_helpers.c:952
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
@@ -8454,31 +8228,84 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet-qr.c:145 src/util/gnunet-uri.c:94
+#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
+#, fuzzy, c-format
+msgid "Failed to add URI %s\n"
+msgstr "Impossibile leggere il file"
+
+#: src/util/gnunet-qr.c:133
 #, c-format
-msgid "Invalid URI: does not start with `%s'\n"
+msgid "Added URI %s\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:152 src/util/gnunet-uri.c:101
+#: src/util/gnunet-qr.c:160
 #, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
+msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:159 src/util/gnunet-uri.c:108
+#: src/util/gnunet-qr.c:170
 #, c-format
-msgid "No handler known for subsystem `%s'\n"
+msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:357
-msgid "use video-device DEVICE (default: /dev/video0"
+#: src/util/gnunet-qr.c:181
+#, c-format
+msgid "No known handler for subsystem `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:217
+#, fuzzy, c-format
+msgid "Unable to start child process `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/util/gnunet-qr.c:246
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/util/gnunet-qr.c:260
+#, fuzzy
+msgid "Capturing...\n"
+msgstr "Avvio di %s in corso...\n"
+
+#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+msgid "No captured images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:362
-msgid "do not show preview windows"
+#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#, c-format
+msgid "Got %d images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:372
-msgid "Scan a QR code using a video device and import the uri read"
+#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#, c-format
+msgid "Found %s: \"%s\"\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:364 src/util/gnunet-qr.c:366
+#, fuzzy, c-format
+msgid "%s is not a PNG file\n"
+msgstr "`%s' non è un indirizzo IP valido.\n"
+
+#: src/util/gnunet-qr.c:545
+#, fuzzy
+msgid "No data found\n"
+msgstr "upnpc non trovato\n"
+
+#: src/util/gnunet-qr.c:561
+msgid "Dispatching the URI\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:572
+msgid "use the video device DEVICE (defaults to /dev/video0)"
+msgstr ""
+
+#: src/util/gnunet-qr.c:579
+msgid "read from the PNG-encoded file FILE"
+msgstr ""
+
+#: src/util/gnunet-qr.c:590
+msgid "Scan a QR code and import the URI read"
 msgstr ""
 
 #: src/util/gnunet-resolver.c:168
@@ -8489,28 +8316,28 @@ msgstr ""
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:232
+#: src/util/gnunet-scrypt.c:215
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:304
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:310
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:330
+#: src/util/gnunet-scrypt.c:313
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
@@ -8523,6 +8350,21 @@ msgstr ""
 msgid "No URI specified on command line\n"
 msgstr ""
 
+#: src/util/gnunet-uri.c:94
+#, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:101
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:108
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
 #: src/util/gnunet-uri.c:178
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
@@ -8542,12 +8384,12 @@ msgstr ""
 msgid "Error writing to `%s': %s\n"
 msgstr ""
 
-#: src/util/network.c:178
+#: src/util/network.c:163
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1359
+#: src/util/network.c:1306
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8560,12 +8402,12 @@ msgid ""
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:802
+#: src/util/os_installation.c:786
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:835
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8575,36 +8417,36 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/plugin.c:162
+#: src/util/plugin.c:156
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:240
+#: src/util/plugin.c:234
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:420
+#: src/util/plugin.c:414
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/program.c:251
+#: src/util/program.c:286
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/program.c:263
+#: src/util/program.c:298
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/program.c:278
+#: src/util/program.c:313
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/program.c:293
+#: src/util/program.c:328
 #, fuzzy
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
@@ -8654,7 +8496,7 @@ msgid ""
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1568
+#: src/util/service.c:1572
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
@@ -8669,82 +8511,82 @@ msgstr ""
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:409
+#: src/util/strings.c:395
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:501
+#: src/util/strings.c:487
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:1036
+#: src/util/strings.c:1023
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1044
+#: src/util/strings.c:1031
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1051
+#: src/util/strings.c:1038
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1059
+#: src/util/strings.c:1046
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1068
+#: src/util/strings.c:1055
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1250 src/util/strings.c:1261
+#: src/util/strings.c:1237 src/util/strings.c:1248
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1270
+#: src/util/strings.c:1257
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1341 src/util/strings.c:1370 src/util/strings.c:1417
-#: src/util/strings.c:1437
+#: src/util/strings.c:1328 src/util/strings.c:1357 src/util/strings.c:1404
+#: src/util/strings.c:1424
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1395
+#: src/util/strings.c:1382
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1446
+#: src/util/strings.c:1433
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1488
+#: src/util/strings.c:1475
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1538
+#: src/util/strings.c:1525
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1569
+#: src/util/strings.c:1556
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/util/time.c:699 src/util/time.c:727
+#: src/util/time.c:863 src/util/time.c:891
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:735
+#: src/util/time.c:899
 #, c-format
 msgid ""
 "Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
@@ -8923,6 +8765,10 @@ msgstr ""
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "# requests for random value received"
+#~ msgstr "# richieste GET ricevute"
+
 #~ msgid "µs"
 #~ msgstr "µs"
 
diff --git a/po/sr.po b/po/sr.po
index 2599a0289..4109ed3ed 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-10-15 10:46+0200\n"
+"POT-Creation-Date: 2022-01-10 15:13+0100\n"
 "PO-Revision-Date: 2020-10-23 18:39+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -18,129 +18,134 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1302
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1304
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "Его „%s“ није познат услузи идентитета\n"
 
-#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:901
+#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
 #, fuzzy, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "Јавни кључ „%s“ није добро оформљен\n"
 
-#: src/abd/gnunet-abd.c:560 src/abd/gnunet-service-abd.c:1747
-#: src/namestore/gnunet-namestore-fcfsd.c:1067
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
 #: src/namestore/gnunet-namestore.c:1001
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Нисам успео да се повежем са смештајем назива\n"
 
-#: src/abd/gnunet-abd.c:840 src/abd/gnunet-abd.c:891
+#: src/abd/gnunet-abd.c:566
+#, fuzzy
+msgid "Ego does not exist!\n"
+msgstr "Број кључа %u не постоји\n"
+
+#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "Јавни кључ „%s“ није добро оформљен\n"
 
-#: src/abd/gnunet-abd.c:849 src/abd/gnunet-abd.c:910
+#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
 #, fuzzy, c-format
 msgid "Failed to connect to ABD\n"
 msgstr "Нисам успео да се повежем са ГНС-ом\n"
 
-#: src/abd/gnunet-abd.c:855
+#: src/abd/gnunet-abd.c:865
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:862
+#: src/abd/gnunet-abd.c:872
 #, fuzzy, c-format
 msgid "ego required\n"
 msgstr "Потребна је исправна врста\n"
 
-#: src/abd/gnunet-abd.c:872
+#: src/abd/gnunet-abd.c:882
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:881
+#: src/abd/gnunet-abd.c:890
 #, fuzzy, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr "Јавни кључ „%s“ није добро оформљен\n"
 
-#: src/abd/gnunet-abd.c:916
+#: src/abd/gnunet-abd.c:924
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:975
+#: src/abd/gnunet-abd.c:983
 #, fuzzy, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr "Наведите назив за тражење!\n"
 
-#: src/abd/gnunet-abd.c:996
+#: src/abd/gnunet-abd.c:1004
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1003
+#: src/abd/gnunet-abd.c:1011
 msgid ""
 "The public key of the subject to lookup thecredential for, or for issuer "
 "side storage: subject and its attributes"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1010
+#: src/abd/gnunet-abd.c:1018
 msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1017
+#: src/abd/gnunet-abd.c:1025
 #, fuzzy
 msgid "The public key of the authority to verify the credential against"
 msgstr "Наводи јавни кључ зоне у којој ће се тражити запис"
 
-#: src/abd/gnunet-abd.c:1022
+#: src/abd/gnunet-abd.c:1030
 msgid "The ego/zone name to use"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1028
+#: src/abd/gnunet-abd.c:1036
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1034
+#: src/abd/gnunet-abd.c:1042
 msgid ""
 "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1039
+#: src/abd/gnunet-abd.c:1047
 msgid "collect credentials"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1044
+#: src/abd/gnunet-abd.c:1052
 msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1049
+#: src/abd/gnunet-abd.c:1057
 msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1054
+#: src/abd/gnunet-abd.c:1062
 msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1061
+#: src/abd/gnunet-abd.c:1069
 msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1065
+#: src/abd/gnunet-abd.c:1073
 msgid "Create private record entry."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1071 src/abd/gnunet-abd.c:1077
+#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
 msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1090
+#: src/abd/gnunet-abd.c:1098
 #, fuzzy
 msgid "GNUnet abd resolver tool"
 msgstr "Алат ГНУнет ГНС решавача"
 
-#: src/abd/gnunet-service-abd.c:1742 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Нисам успео да се повежем са ГНС-ом\n"
@@ -384,28 +389,28 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1129
 #: src/transport/plugin_transport_tcp.c:3706
 #: src/transport/tcp_service_legacy.c:594
-#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1090
-#: src/util/service.c:1096
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1094
+#: src/util/service.c:1100
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr "Захтева исправан број прикључника за услугу „%s“ у подешавањима!\n"
 
 #: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
 #: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
-#: src/util/service.c:1129
+#: src/util/service.c:1133
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr "ЈУНИКС_ПУТАЊА „%s“ је предуга, највећа дужина је %llu\n"
 
 #: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
 #: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
-#: src/util/service.c:1133
+#: src/util/service.c:1137
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr "Користим зато „%s“\n"
 
 #: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
-#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1153
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1157
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -415,7 +420,7 @@ msgstr ""
 "направим прикључницу ЈУНИКС домена: %s\n"
 
 #: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
-#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1171
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1175
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -424,7 +429,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:536
 #: src/transport/plugin_transport_http_server.c:2718
 #: src/transport/plugin_transport_tcp.c:1244
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1202
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1206
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Нисам успео да решим „%s“: %s\n"
@@ -432,7 +437,7 @@ msgstr "Нисам успео да решим „%s“: %s\n"
 #: src/arm/gnunet-service-arm.c:555
 #: src/transport/plugin_transport_http_server.c:2736
 #: src/transport/plugin_transport_tcp.c:1263
-#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1221
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1225
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Нисам успео да нађем %s адресу за „%s“.\n"
@@ -1350,34 +1355,34 @@ msgstr "обезбеђује податке о свим тренутним ве
 msgid "Print information about connected peers."
 msgstr "Исписује податке о повезаним парњацима."
 
-#: src/core/gnunet-service-core.c:329
+#: src/core/gnunet-service-core.c:328
 msgid "# send requests dropped (disconnected)"
 msgstr "# захтеви слања су одбачени (веза је прекинута)"
 
-#: src/core/gnunet-service-core.c:355
+#: src/core/gnunet-service-core.c:354
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
+#: src/core/gnunet-service-core.c:418
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# бајтови порука врсте %u су примљени"
 
-#: src/core/gnunet-service-core.c:506
+#: src/core/gnunet-service-core.c:504
 msgid "# messages discarded (session disconnected)"
 msgstr "# поруке су одбачене (сесија је ископчана)"
 
-#: src/core/gnunet-service-core.c:825
+#: src/core/gnunet-service-core.c:823
 #, fuzzy, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# бајтови порука врсте %u су примљени"
 
-#: src/core/gnunet-service-core.c:927
+#: src/core/gnunet-service-core.c:925
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Услузи језгра недостаје поставка подешавања КЉУЧА_ДОМАЋИНА.  Излазим.\n"
 
-#: src/core/gnunet-service-core.c:955
+#: src/core/gnunet-service-core.c:953
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Кључна услуга „%4s“ је спремна.\n"
@@ -1524,9 +1529,7 @@ msgstr "# бајтови утовара су дешифровани"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/dht/gnunet-service-dht_neighbours.c:740
-#: src/dht/gnunet-service-dht_neighbours.c:803
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1522
+#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1520
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1557,49 +1560,44 @@ msgstr "# мапе врсте су примљене"
 msgid "# updates to my type map"
 msgstr "# ажурирања за моју мапу врсте"
 
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:299
-#: src/datastore/gnunet-service-datastore.c:742
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:275
+#: src/datastore/gnunet-service-datastore.c:743
 msgid "# bytes stored"
 msgstr "# бајтови су смештени"
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:303
+#: src/datacache/datacache.c:121 src/datacache/datacache.c:279
 msgid "# items stored"
 msgstr "# ставке су смештене"
 
-#: src/datacache/datacache.c:190
+#: src/datacache/datacache.c:185
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr "Учитавам прикључак „%s“ оставе података\n"
 
-#: src/datacache/datacache.c:208
+#: src/datacache/datacache.c:203
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Нисам успео да учитам прикључак оставе података за „%s“\n"
 
-#: src/datacache/datacache.c:332
+#: src/datacache/datacache.c:297
 msgid "# requests received"
 msgstr "# захтеви су примљени"
 
-#: src/datacache/datacache.c:343
+#: src/datacache/datacache.c:308
 msgid "# requests filtered by bloom filter"
 msgstr "# захтеви су филтрирани блум филтером"
 
-#: src/datacache/datacache.c:370
-#, fuzzy
-msgid "# requests for random value received"
-msgstr "# захтеви су примљени"
-
-#: src/datacache/datacache.c:400
+#: src/datacache/datacache.c:329
 #, fuzzy
 msgid "# proximity search requests received"
 msgstr "# претраге клијента су примљене"
 
-#: src/datacache/plugin_datacache_heap.c:554
+#: src/datacache/plugin_datacache_heap.c:527
 msgid "Heap datacache running\n"
 msgstr "Остава података скупине ради\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:123
-#: src/datacache/plugin_datacache_sqlite.c:144
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:139
 #: src/datastore/plugin_datastore_mysql.c:890
 #: src/datastore/plugin_datastore_sqlite.c:63
 #: src/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:81 src/my/my.c:93
@@ -1616,7 +1614,7 @@ msgstr "Остава података скупине ради\n"
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "„%s“ није успело на %s:%d са грешком: %s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:783
+#: src/datacache/plugin_datacache_sqlite.c:693
 #: src/datastore/plugin_datastore_sqlite.c:531
 #: src/namecache/plugin_namecache_sqlite.c:237
 #: src/namestore/plugin_namestore_sqlite.c:273
@@ -1775,7 +1773,7 @@ msgstr ""
 "Недовољно простора (доступних бајтова %llu) за задовољавање „%s“ захтева за "
 "%llu бајта\n"
 
-#: src/datastore/gnunet-service-datastore.c:605
+#: src/datastore/gnunet-service-datastore.c:606
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1783,7 +1781,7 @@ msgid ""
 msgstr ""
 "Захтевана количина (%llu бајта) је већа од величине оставе (%llu бајта)\n"
 
-#: src/datastore/gnunet-service-datastore.c:611
+#: src/datastore/gnunet-service-datastore.c:612
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
@@ -1791,120 +1789,120 @@ msgstr ""
 "Недовољно простора за задовољавање захтева а захтевана количина је већа од "
 "величине оставе"
 
-#: src/datastore/gnunet-service-datastore.c:618
+#: src/datastore/gnunet-service-datastore.c:619
 msgid "Insufficient space to satisfy request"
 msgstr "Недовољно простора за задовољавање захтева"
 
-#: src/datastore/gnunet-service-datastore.c:625
-#: src/datastore/gnunet-service-datastore.c:676
-#: src/datastore/gnunet-service-datastore.c:819
-#: src/datastore/gnunet-service-datastore.c:1428
+#: src/datastore/gnunet-service-datastore.c:626
+#: src/datastore/gnunet-service-datastore.c:677
+#: src/datastore/gnunet-service-datastore.c:820
+#: src/datastore/gnunet-service-datastore.c:1429
 msgid "# reserved"
 msgstr "# је резервисано"
 
-#: src/datastore/gnunet-service-datastore.c:692
+#: src/datastore/gnunet-service-datastore.c:693
 msgid "Could not find matching reservation"
 msgstr "Не могу да нађем одговарајућу резервацију"
 
-#: src/datastore/gnunet-service-datastore.c:757
+#: src/datastore/gnunet-service-datastore.c:758
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 "Потребна су још %llu бајта простора (%llu је дозвољено, користим %llu)\n"
 
-#: src/datastore/gnunet-service-datastore.c:857
+#: src/datastore/gnunet-service-datastore.c:858
 msgid "# GET requests received"
 msgstr "# захтеви ДОБАВИ су примљени"
 
-#: src/datastore/gnunet-service-datastore.c:887
+#: src/datastore/gnunet-service-datastore.c:888
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# захтеви ДОБАВИ су примљени"
 
-#: src/datastore/gnunet-service-datastore.c:898
+#: src/datastore/gnunet-service-datastore.c:899
 msgid "# requests filtered by bloomfilter"
 msgstr "# захтеви су филтрирани блумфилтером"
 
-#: src/datastore/gnunet-service-datastore.c:939
+#: src/datastore/gnunet-service-datastore.c:940
 msgid "# GET REPLICATION requests received"
 msgstr "# захтеви ДОБАВИ ПРЕСЛИКАНОСТ су примљени"
 
-#: src/datastore/gnunet-service-datastore.c:970
+#: src/datastore/gnunet-service-datastore.c:971
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# захтеви ДОБАВИ НУЛТУ АНОНИМНОСТ су примљени"
 
-#: src/datastore/gnunet-service-datastore.c:1011
+#: src/datastore/gnunet-service-datastore.c:1012
 msgid "Content not found"
 msgstr "Нисам нашао садржај"
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1019
 msgid "# bytes removed (explicit request)"
 msgstr "# бајта је уклоњено (изричити захтев)"
 
-#: src/datastore/gnunet-service-datastore.c:1058
+#: src/datastore/gnunet-service-datastore.c:1059
 msgid "# REMOVE requests received"
 msgstr "# захтеви УКЛОНИ су уклоњени"
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/datastore/gnunet-service-datastore.c:1108
 #, fuzzy, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 "Утовар смештаја података није тачан (%lld < %lld).  Покушавам да поправим.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1282
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/datastore/gnunet-service-datastore.c:1168
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr "Учитавам прикључак „%s“ смештаја података\n"
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/datastore/gnunet-service-datastore.c:1177
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Нисам успео да учитам прикључак смештаја података за „%s“\n"
 
-#: src/datastore/gnunet-service-datastore.c:1236
+#: src/datastore/gnunet-service-datastore.c:1237
 msgid "Bloomfilter construction complete.\n"
 msgstr "Изградња блумфилтера је завршена.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1288
+#: src/datastore/gnunet-service-datastore.c:1289
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr "Поново градим блумфилтер.  Будите стрпљиви.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1298
+#: src/datastore/gnunet-service-datastore.c:1299
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr "Прикључак не подржава функцију „get_keys“. Поправите то!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/datastore/gnunet-service-datastore.c:1464
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# бајтови су коришћени у смештају података дељења датотека „%s“"
 
-#: src/datastore/gnunet-service-datastore.c:1472
+#: src/datastore/gnunet-service-datastore.c:1473
 msgid "# quota"
 msgstr "# квота"
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1476
 msgid "# cache size"
 msgstr "# величина кеша"
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/datastore/gnunet-service-datastore.c:1492
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr "Не могу да користим наведени назив датотеке „%s“ за блумфилтер.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/datastore/gnunet-service-datastore.c:1513
+#: src/datastore/gnunet-service-datastore.c:1535
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Нисам успео да уклоним лажну датотеку блумфилтера „%s“\n"
 
-#: src/datastore/gnunet-service-datastore.c:1573
+#: src/datastore/gnunet-service-datastore.c:1574
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Нисам успео да покренем блумфилтер.\n"
 
@@ -2000,7 +1998,7 @@ msgstr "База података Скулајта ради\n"
 msgid "Template database running\n"
 msgstr "База података шаблона ради\n"
 
-#: src/dht/gnunet-dht-get.c:158
+#: src/dht/gnunet-dht-get.c:159
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -2009,48 +2007,48 @@ msgstr ""
 "Резултат %d, врста %d:\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:160
 #, fuzzy, c-format
 msgid "Result %d, type %d:\n"
 msgstr ""
 "Резултат %d, врста %d:\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:197
+#: src/dht/gnunet-dht-get.c:209
 msgid "Must provide key for DHT GET!\n"
 msgstr "Морате доставити кључ за ДХТ ДОБАВИ!\n"
 
-#: src/dht/gnunet-dht-get.c:203 src/dht/gnunet-dht-monitor.c:255
+#: src/dht/gnunet-dht-get.c:217 src/dht/gnunet-dht-monitor.c:255
 msgid "Failed to connect to DHT service!\n"
 msgstr "Нисам успео да се повежем са „DHT“ услугом!\n"
 
-#: src/dht/gnunet-dht-get.c:213
+#: src/dht/gnunet-dht-get.c:227
 #, fuzzy
 msgid "Issuing DHT GET with key"
 msgstr "Издајем ДХТ ДОБАВИ са кључем"
 
-#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:260 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr "кључ упита"
 
-#: src/dht/gnunet-dht-get.c:251
+#: src/dht/gnunet-dht-get.c:266
 msgid "how many parallel requests (replicas) to create"
 msgstr "колико паралелних захтева (реплика) да направи"
 
-#: src/dht/gnunet-dht-get.c:256 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:272 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr "врста података за тражење"
 
-#: src/dht/gnunet-dht-get.c:262
+#: src/dht/gnunet-dht-get.c:278
 msgid "how long to execute this query before giving up?"
 msgstr "колико дуго да извршава овај упит пре одустајања?"
 
-#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-get.c:284 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr "користи опцију ДХТ-а демултиплексирај свуда"
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:301
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr "Издаје ДОБАВИ захтев ГНУнет ДХТ-у, исписује резултате."
 
@@ -2081,240 +2079,31 @@ msgstr "Не могу да се повежем са „%s“ услугом!\n"
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr "Издајем захтев стављања за „%s“ са подацима „%s“!\n"
 
-#: src/dht/gnunet-dht-put.c:187
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr "подаци за уметање под кључем"
 
-#: src/dht/gnunet-dht-put.c:193
+#: src/dht/gnunet-dht-put.c:194
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr "колико ће дуго да држи овај унос у дхт-у (у секундама)"
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:212
 msgid "how many replicas to create"
 msgstr "број реплика за стварање"
 
-#: src/dht/gnunet-dht-put.c:212
+#: src/dht/gnunet-dht-put.c:217
 #, fuzzy
 msgid "use DHT's record route option"
 msgstr "користи опцију ДХТ-а демултиплексирај свуда"
 
-#: src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-put.c:223
 msgid "the type to insert data as"
 msgstr "врста за уметање података"
 
-#: src/dht/gnunet-dht-put.c:232
+#: src/dht/gnunet-dht-put.c:241
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr "Издаје захтев СТАВИ у ГНУнет ДХТ уметак ПОДАТАКА под КЉУЧЕМ."
 
-#: src/dht/gnunet-service-dht_clients.c:367
-msgid "# GET requests from clients injected"
-msgstr "# захтеви ДОБАВИ од клијената су убризгани"
-
-#: src/dht/gnunet-service-dht_clients.c:483
-msgid "# PUT requests received from clients"
-msgstr "# захтеви СТАВИ су примљени од клијената"
-
-#: src/dht/gnunet-service-dht_clients.c:616
-msgid "# GET requests received from clients"
-msgstr "# захтеви ДОБАВИ су примљени од клијената"
-
-#: src/dht/gnunet-service-dht_clients.c:848
-msgid "# GET STOP requests received from clients"
-msgstr "# захтеви ДОБАВИ СТОП су примљени од клијената"
-
-#: src/dht/gnunet-service-dht_clients.c:1033
-msgid "# Key match, type mismatches in REPLY to CLIENT"
-msgstr "# Кључ се поклапа, врсте се не поклапају у ОДГОВОР КЛИЈНЕТУ"
-
-#: src/dht/gnunet-service-dht_clients.c:1049
-msgid "# Duplicate REPLIES to CLIENT request dropped"
-msgstr "# Двоструки захтев ОДГОВОРИ КЛИЈЕНТУ је одбачен"
-
-#: src/dht/gnunet-service-dht_clients.c:1102
-#, c-format
-msgid "Unsupported block type (%u) in request!\n"
-msgstr "Неподржана врста блока (%u) у захтеву!\n"
-
-#: src/dht/gnunet-service-dht_clients.c:1110
-msgid "# RESULTS queued for clients"
-msgstr "# РЕЗУЛТАТИ су стављени у ред за клијенте"
-
-#: src/dht/gnunet-service-dht_clients.c:1191
-msgid "# REPLIES ignored for CLIENTS (no match)"
-msgstr "# ОДГОВОРИ су занемарени за КЛИЈЕНТЕ (нема поклапања)"
-
-#: src/dht/gnunet-service-dht_datacache.c:73
-#, c-format
-msgid "%s request received, but have no datacache!\n"
-msgstr "„%s“ захтев је примљен, али нема оставу података!\n"
-
-#: src/dht/gnunet-service-dht_datacache.c:83
-msgid "# ITEMS stored in datacache"
-msgstr "# СТАВКЕ су смештене у оставу података"
-
-#: src/dht/gnunet-service-dht_datacache.c:206
-msgid "# Good RESULTS found in datacache"
-msgstr "# Добри РЕЗУЛТАТИ су нађени у остави података"
-
-#: src/dht/gnunet-service-dht_datacache.c:220
-msgid "# Duplicate RESULTS found in datacache"
-msgstr "# Двоструки РЕЗУЛТАТИ су нађени у остави података"
-
-#: src/dht/gnunet-service-dht_datacache.c:228
-msgid "# Invalid RESULTS found in datacache"
-msgstr "# Неисправни РЕЗУЛТАТИ су нађени у остави података"
-
-#: src/dht/gnunet-service-dht_datacache.c:236
-msgid "# Irrelevant RESULTS found in datacache"
-msgstr "# Неважни РЕЗУЛТАТИ су нађени у остави података"
-
-#: src/dht/gnunet-service-dht_datacache.c:252
-msgid "# Unsupported RESULTS found in datacache"
-msgstr "# Неподржани РЕЗУЛТАТИ су нађени у остави података"
-
-#: src/dht/gnunet-service-dht_datacache.c:256
-#, c-format
-msgid "Unsupported block type (%u) in local response!\n"
-msgstr "Неподржана врста блока (%u) у локалном одговору!\n"
-
-#: src/dht/gnunet-service-dht_datacache.c:291
-msgid "# GET requests given to datacache"
-msgstr "# ДОБАВИ захтеви су дати остави података"
-
-#: src/dht/gnunet-service-dht_hello.c:86
-msgid "# HELLOs obtained from peerinfo"
-msgstr "# „HELLO“-и су добијени из података парњака"
-
-#: src/dht/gnunet-service-dht_neighbours.c:678
-msgid "# FIND PEER messages initiated"
-msgstr "# НАЂИ ПАРЊАКА поруке су покренуте"
-
-#: src/dht/gnunet-service-dht_neighbours.c:855
-msgid "# requests TTL-dropped"
-msgstr "# захтеви ТТЛ су одбачени"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1042
-#: src/dht/gnunet-service-dht_neighbours.c:1079
-msgid "# Peers excluded from routing due to Bloomfilter"
-msgstr "# Парњаци су изузети из рутирања због Блумфилтера"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1095
-msgid "# Peer selection failed"
-msgstr "# Бирање парњака није успело"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1253
-msgid "# PUT requests routed"
-msgstr "# захтеви СТАВИ су рутирани"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1287
-msgid "# PUT messages queued for transmission"
-msgstr "# СТАВИ поруке су у реду за пренос"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1299
-#: src/dht/gnunet-service-dht_neighbours.c:1441
-#: src/dht/gnunet-service-dht_neighbours.c:1545
-msgid "# P2P messages dropped due to full queue"
-msgstr "# П2П поруке су одбачене због пуног реда"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1384
-msgid "# GET requests routed"
-msgstr "# захтеви ДОБАВИ су рутирани"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1428
-msgid "# GET messages queued for transmission"
-msgstr "# ДОБАВИ поруке су у реду за пренос"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1560
-msgid "# RESULT messages queued for transmission"
-msgstr "# РЕЗУЛТАТ поруке су у реду за пренос"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1663
-#, fuzzy
-msgid "# Expired PUTs discarded"
-msgstr "# небитни одговори су одбачени"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1671
-msgid "# P2P PUT requests received"
-msgstr "# захтеви П2П СТАВИ су примљени"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1675
-msgid "# P2P PUT bytes received"
-msgstr "# бајтови П2П СТАВИ су примљени"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1907
-msgid "# FIND PEER requests ignored due to Bloomfilter"
-msgstr "# захтеви НАЂИ ПАРЊАКА су занемарени због Блумфилтера"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1916
-msgid "# FIND PEER requests ignored due to lack of HELLO"
-msgstr "# захтеви НАЂИ ПАРЊАКА су занемарени због недостатка „HELLO“-а"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2079
-msgid "# P2P GET requests received"
-msgstr "# захтеви П2П ДОБАВИ су примљени"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2083
-msgid "# P2P GET bytes received"
-msgstr "# бајтови П2П ДОБАВИ су примљени"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2149
-msgid "# P2P FIND PEER requests processed"
-msgstr "# захтеви П2П НАЂИ ПАРЊАКА су обрађени"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2170
-msgid "# P2P GET requests ONLY routed"
-msgstr "# захтеви П2П ДОБАВИ су САМО рутирани"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2348
-#, fuzzy
-msgid "# Expired results discarded"
-msgstr "# небитни одговори су одбачени"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2365
-msgid "# P2P RESULTS received"
-msgstr "# П2П РЕЗУЛТАТИ су примљени"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2369
-msgid "# P2P RESULT bytes received"
-msgstr "# бајтови П2П РЕЗУЛТАТ су примљени"
-
-#: src/dht/gnunet-service-dht_nse.c:59
-msgid "# Network size estimates received"
-msgstr "# Процене величине мреже су примљене"
-
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Good REPLIES matched against routing table"
-msgstr "# Добри ОДГОВОРИ су поклопљени наспрам табеле рутирања"
-
-#: src/dht/gnunet-service-dht_routing.c:236
-msgid "# Duplicate REPLIES matched against routing table"
-msgstr "# Двоструки ОДГОВОРИ су поклопљени наспрам табеле рутирања"
-
-#: src/dht/gnunet-service-dht_routing.c:244
-msgid "# Invalid REPLIES matched against routing table"
-msgstr "# Неисправни ОДГОВОРИ су поклопљени наспрам табеле рутирања"
-
-#: src/dht/gnunet-service-dht_routing.c:252
-msgid "# Irrelevant REPLIES matched against routing table"
-msgstr "# Неважни ОДГОВОРИ су поклопљени наспрам табеле рутирања"
-
-#: src/dht/gnunet-service-dht_routing.c:268
-msgid "# Unsupported REPLIES matched against routing table"
-msgstr "# Неподржани ОДГОВОРИ су поклопљени наспрам табеле рутирања"
-
-#: src/dht/gnunet-service-dht_routing.c:347
-msgid "# Entries removed from routing table"
-msgstr "# Уноси су уклоњени из табеле рутирања"
-
-#: src/dht/gnunet-service-dht_routing.c:422
-msgid "# Entries added to routing table"
-msgstr "# Уноси су додати у табелу рутирања"
-
-#: src/dht/gnunet-service-dht_routing.c:444
-msgid "# DHT requests combined"
-msgstr "# ДХТ захтеви су комбиновани"
-
 #: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
@@ -2364,17 +2153,17 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "Мери квалитет и учинковитост НСЕ услуге."
 
-#: src/dht/plugin_block_dht.c:189
+#: src/dht/plugin_block_dht.c:328
 #, c-format
 msgid "Block not of type %u\n"
 msgstr "Блок није врсте %u\n"
 
-#: src/dht/plugin_block_dht.c:198
+#: src/dht/plugin_block_dht.c:337
 #, fuzzy, c-format
 msgid "Size mismatch for block with type %u\n"
 msgstr "Величин не одговара за блок\n"
 
-#: src/dht/plugin_block_dht.c:209
+#: src/dht/plugin_block_dht.c:348
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr "Блок врсте %u је лош\n"
@@ -3671,7 +3460,7 @@ msgstr "# поруке заустављања миграције су примљ
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr "Премештање садржаја за парњака „%s“ је блокирано за %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1345
+#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr "# П2П претраге су активне"
 
@@ -3679,60 +3468,44 @@ msgstr "# П2П претраге су активне"
 msgid "# artificial delays introduced (ms)"
 msgstr "# вештачка кашњења су уведена (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:869
-msgid "# replies dropped due to type mismatch"
-msgstr "# одговори су одбачени услед непоклапања врсте"
-
-#: src/fs/gnunet-service-fs_cp.c:877
-msgid "# replies received for other peers"
-msgstr "# одговори су примљени за друге парњаке"
-
-#: src/fs/gnunet-service-fs_cp.c:892
-msgid "# replies dropped due to insufficient cover traffic"
-msgstr "# одговори су одбачени услед недовољног покривног саобраћаја"
-
-#: src/fs/gnunet-service-fs_cp.c:940
-msgid "# P2P searches destroyed due to ultimate reply"
-msgstr "# П2П претраге су уништене због крајњег одговора"
-
-#: src/fs/gnunet-service-fs_cp.c:1011
+#: src/fs/gnunet-service-fs_cp.c:1009
 msgid "# requests done for free (low load)"
 msgstr "# захтева је готово за џабе (слабо учитавање)"
 
-#: src/fs/gnunet-service-fs_cp.c:1036
+#: src/fs/gnunet-service-fs_cp.c:1034
 msgid "# request dropped, priority insufficient"
 msgstr "# захтева је одбачено, недовољно хитности"
 
-#: src/fs/gnunet-service-fs_cp.c:1046
+#: src/fs/gnunet-service-fs_cp.c:1044
 msgid "# requests done for a price (normal load)"
 msgstr "# захтева је готово за цену (нормално учитавање)"
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1141
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# захтеви су одбачени услед вишег-ТТЛ захтева"
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1199
 msgid "# GET requests received (from other peers)"
 msgstr "# „GET“ захтеви су примљени (од других парњака)"
 
-#: src/fs/gnunet-service-fs_cp.c:1225
+#: src/fs/gnunet-service-fs_cp.c:1223
 msgid "# requests dropped due to missing reverse route"
 msgstr "# захтеви су одбачени јер недостаје повратна рута"
 
-#: src/fs/gnunet-service-fs_cp.c:1239
+#: src/fs/gnunet-service-fs_cp.c:1237
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# П2П поруке су одбачене због пуног реда"
 
-#: src/fs/gnunet-service-fs_cp.c:1296
+#: src/fs/gnunet-service-fs_cp.c:1294
 msgid "# requests dropped due TTL underflow"
 msgstr "# захтеви су одбачени услед ниског ТТЛ тока"
 
-#: src/fs/gnunet-service-fs_cp.c:1341
+#: src/fs/gnunet-service-fs_cp.c:1339
 msgid "# P2P query messages received and processed"
 msgstr "# поруке П2П упита су примљене и обрађене"
 
-#: src/fs/gnunet-service-fs_cp.c:1711
+#: src/fs/gnunet-service-fs_cp.c:1709
 msgid "# migration stop messages sent"
 msgstr "# поруке зауставља миграције су послате"
 
@@ -3813,103 +3586,90 @@ msgstr "# пропитује обичне уносе"
 msgid "# Pending requests created"
 msgstr "# Захтеви на чекању су створени"
 
-#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:656
+#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:658
 msgid "# Pending requests active"
 msgstr "# Захтеви на чекању су активни"
 
-#: src/fs/gnunet-service-fs_pr.c:832
+#: src/fs/gnunet-service-fs_pr.c:838
 msgid "# replies received and matched"
 msgstr "# одговори су примљени и подударени"
 
-#: src/fs/gnunet-service-fs_pr.c:880
-msgid "# duplicate replies discarded (bloomfilter)"
-msgstr "# двоструки одговори су одбачени (bloomfilter)"
-
-#: src/fs/gnunet-service-fs_pr.c:889
-msgid "# irrelevant replies discarded"
-msgstr "# небитни одговори су одбачени"
-
-#: src/fs/gnunet-service-fs_pr.c:908
-#, c-format
-msgid "Unsupported block type %u\n"
-msgstr "Неподржана врста блока %u\n"
-
-#: src/fs/gnunet-service-fs_pr.c:921
+#: src/fs/gnunet-service-fs_pr.c:916
 msgid "# results found locally"
 msgstr "# резултати су пронађени локално"
 
-#: src/fs/gnunet-service-fs_pr.c:1055
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr "# Неуспеси „СТАВИ“ смештаја података"
 
-#: src/fs/gnunet-service-fs_pr.c:1084
+#: src/fs/gnunet-service-fs_pr.c:1079
 msgid "# storage requests dropped due to high load"
 msgstr "# захтеви смештаја су одбачени услед високог утовара"
 
-#: src/fs/gnunet-service-fs_pr.c:1123
+#: src/fs/gnunet-service-fs_pr.c:1118
 msgid "# Replies received from DHT"
 msgstr "# Одговори су примљени од DHT-а"
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1259
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Одговори су примљени од DHT-а"
 
-#: src/fs/gnunet-service-fs_pr.c:1318
+#: src/fs/gnunet-service-fs_pr.c:1313
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr "Претрага смештаја података је већ узела „%s“!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1339
+#: src/fs/gnunet-service-fs_pr.c:1334
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr "Претрага на-захтев је већ узела „%s“!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1402
+#: src/fs/gnunet-service-fs_pr.c:1401
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr "# захтевани DBLOCK или IBLOCK нису нађени"
 
-#: src/fs/gnunet-service-fs_pr.c:1464
+#: src/fs/gnunet-service-fs_pr.c:1463
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr "# Претраге смештаја података су закључене (грешка стављања у ред)"
 
-#: src/fs/gnunet-service-fs_pr.c:1519
+#: src/fs/gnunet-service-fs_pr.c:1518
 msgid "# Datastore lookups concluded (no results)"
 msgstr "# Претраге смештаја података су закључене (нема резултата)"
 
-#: src/fs/gnunet-service-fs_pr.c:1534
+#: src/fs/gnunet-service-fs_pr.c:1533
 msgid "# Datastore lookups concluded (seen all)"
 msgstr "# Претраге смештаја података су закључене (видех све)"
 
-#: src/fs/gnunet-service-fs_pr.c:1557
+#: src/fs/gnunet-service-fs_pr.c:1556
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr "# Претраге смештаја података су прекинуте (више од „MAX_RESULTS“)"
 
-#: src/fs/gnunet-service-fs_pr.c:1574
+#: src/fs/gnunet-service-fs_pr.c:1573
 msgid "# on-demand blocks matched requests"
 msgstr "# блокови на-захтев одговарају захтевима"
 
-#: src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1594
 msgid "# on-demand lookups performed successfully"
 msgstr "# претраге на-захтев су обављене успешно"
 
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1600
 msgid "# on-demand lookups failed"
 msgstr "# претраге на-захтев нису успеле"
 
-#: src/fs/gnunet-service-fs_pr.c:1642
+#: src/fs/gnunet-service-fs_pr.c:1641
 msgid "# Datastore lookups concluded (found last result)"
 msgstr "# Претраге смештаја података су закључене (нађох последњи резултат)"
 
-#: src/fs/gnunet-service-fs_pr.c:1655
+#: src/fs/gnunet-service-fs_pr.c:1654
 msgid "# Datastore lookups concluded (load too high)"
 msgstr "# Претраге смештаја података су закључене (утовар је превелик)"
 
-#: src/fs/gnunet-service-fs_pr.c:1706
+#: src/fs/gnunet-service-fs_pr.c:1705
 msgid "# Datastore lookups initiated"
 msgstr "# Претраге смештаја података су покренуте"
 
-#: src/fs/gnunet-service-fs_pr.c:1756
+#: src/fs/gnunet-service-fs_pr.c:1755
 msgid "# GAP PUT messages received"
 msgstr "# поруке ЈАЗ СТАВИ су примљене"
 
@@ -3952,31 +3712,26 @@ msgstr ""
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:134
-#, c-format
-msgid "Refusing `%s' request to HTTP server\n"
-msgstr "Одбијам „%s“ захтев за ХТТП сервер\n"
-
-#: src/gns/gnunet-bcd.c:347
+#: src/gns/gnunet-bcd.c:571
 #, fuzzy, c-format
-msgid "Invalid port number %u.  Exiting.\n"
+msgid "Invalid port number %u\n"
 msgstr "Неисправан број прикључника %llu.  Излазим.\n"
 
-#: src/gns/gnunet-bcd.c:352
-#, fuzzy, c-format
-msgid "Businesscard HTTP server starts on %u\n"
-msgstr "ХТТП сервер пословне картице почиње на %llu\n"
+#: src/gns/gnunet-bcd.c:612 src/namestore/gnunet-namestore-fcfsd.c:1113
+#, fuzzy
+msgid "Unable to set up the daemon\n"
+msgstr "Не могу да увезем приватни кључ из датотеке „%s“\n"
 
-#: src/gns/gnunet-bcd.c:372
-#, c-format
-msgid "Could not start businesscard HTTP server on port %u\n"
-msgstr "Не могу да покренем ХТТП сервер пословне картице на прикључнику %u\n"
+#: src/gns/gnunet-bcd.c:635 src/namestore/gnunet-namestore-fcfsd.c:987
+msgid "Failed to start HTTP server\n"
+msgstr "Нисам успео да покренем ХТТП сервер\n"
 
-#: src/gns/gnunet-bcd.c:509
-msgid "Run HTTP serve on port PORT (default is 8888)"
+#: src/gns/gnunet-bcd.c:658
+#, fuzzy
+msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr "Покрећем ХТТП сервер на прикључнику ПРИКЉУЧНИК (основно је 8888)"
 
-#: src/gns/gnunet-bcd.c:522
+#: src/gns/gnunet-bcd.c:667
 msgid "GNUnet HTTP server to create business cards"
 msgstr "ГНУнет ХТТП сервер за стварање бизнис картица"
 
@@ -4757,69 +4512,86 @@ msgstr "„%s“ није исправна ИП адреса! Занемаруј
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Не могу да покренем ХТТП сервер списка домаћина на прикључнику %u\n"
 
-#: src/identity/gnunet-identity.c:214
+#: src/identity/gnunet-identity.c:231
 #, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Нисам успео да направим его: %s\n"
 
-#: src/identity/gnunet-identity.c:255
+#: src/identity/gnunet-identity.c:272
 #, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Нисам успео да поставим основни его: %s\n"
 
-#: src/identity/gnunet-identity.c:461
+#: src/identity/gnunet-identity.c:646
 msgid "create ego NAME"
 msgstr "ствара НАЗИВ ега"
 
-#: src/identity/gnunet-identity.c:466
+#: src/identity/gnunet-identity.c:651
 msgid "delete ego NAME "
 msgstr "брише НАЗИВ ега "
 
-#: src/identity/gnunet-identity.c:472
+#: src/identity/gnunet-identity.c:657
 msgid ""
 "set the private key for the identity to PRIVATE_KEY (use together with -C)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:477
+#: src/identity/gnunet-identity.c:663
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:669
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:674
 msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
 msgstr ""
 
 #
 # File: util/dialtest.c++, line: 134
-#: src/identity/gnunet-identity.c:481
+#: src/identity/gnunet-identity.c:678
 msgid "display all egos"
 msgstr "приказује све егое"
 
-#: src/identity/gnunet-identity.c:485
+#: src/identity/gnunet-identity.c:682
 #, fuzzy
 msgid "reduce output"
 msgstr "опширан излаз"
 
-#: src/identity/gnunet-identity.c:492
+#: src/identity/gnunet-identity.c:689
 #, fuzzy
 msgid ""
 "set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
-"s) or restrict results to NAME (use together with -d)"
+"s), restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
 msgstr ""
 "поставља основни идентитет на ЕГО за подсистем ПОДСИСТЕМ (користите заједно "
 "са -s)"
 
-#: src/identity/gnunet-identity.c:496
+#: src/identity/gnunet-identity.c:695
+msgid "The public key of the recipient (with -W)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:699
 msgid "run in monitor mode egos"
 msgstr "ради у режиму праћења егоа"
 
-#: src/identity/gnunet-identity.c:500
+#: src/identity/gnunet-identity.c:703
 msgid "display private keys as well"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:507
+#: src/identity/gnunet-identity.c:710
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 "поставља основни идентитет на ЕГО за подсистем ПОДСИСТЕМ (користите заједно "
 "са -e)"
 
-#: src/identity/gnunet-identity.c:522
+#: src/identity/gnunet-identity.c:725
 msgid "Maintain egos"
 msgstr "Одржава егое"
 
@@ -4880,6 +4652,12 @@ msgstr ""
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
 msgstr "Нисам успео да обрадим „HELLO“ у датотеци „%s“: %s\n"
 
+#: src/messenger/plugin_gnsrecord_messenger.c:118
+#: src/messenger/plugin_gnsrecord_messenger.c:133
+#, fuzzy, c-format
+msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
+msgstr "Не могу да обрадим „SOA“ запис „%s“\n"
+
 #: src/my/my.c:196 src/my/my.c:215
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
@@ -4920,7 +4698,7 @@ msgstr "Неисправан јавни кључ за обратну претр
 msgid "You must specify a name\n"
 msgstr "Морате навести назив\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1639
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1641
 msgid "name of the record to add/delete/display"
 msgstr "назив записа за додавање/брисање/приказ"
 
@@ -4929,7 +4707,7 @@ msgstr "назив записа за додавање/брисање/прика
 msgid "specifies the public key of the zone to look in"
 msgstr "наводи јавни кључ зоне за претраживање"
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1700
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1702
 msgid "GNUnet zone manipulation tool"
 msgstr "Алат манипуслисања ГНУнет зоном"
 
@@ -4977,109 +4755,100 @@ msgstr ""
 msgid "Failed to setup database at `%s'\n"
 msgstr "Нисам успео да покренем „%s“ на „%s“\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:359
+#: src/namestore/gnunet-namestore-fcfsd.c:368
 #, fuzzy
 msgid "can not search the namestore"
 msgstr "Не могу да покренем главног контролора"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:413
-#: src/namestore/gnunet-namestore-fcfsd.c:554
+#: src/namestore/gnunet-namestore-fcfsd.c:422
+#: src/namestore/gnunet-namestore-fcfsd.c:563
 #, fuzzy
 msgid "unable to scan namestore"
 msgstr "Нисам успео да се повежем са смештајем назива\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:441
+#: src/namestore/gnunet-namestore-fcfsd.c:450
 #, fuzzy, c-format
 msgid "Failed to create record for `%s': %s\n"
 msgstr "Нисам успео да направим запис за домен „%s“: %s\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:453
+#: src/namestore/gnunet-namestore-fcfsd.c:462
 #, fuzzy
 msgid "no errors"
 msgstr "непозната грешка"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:489
+#: src/namestore/gnunet-namestore-fcfsd.c:498
 #, fuzzy, c-format
 msgid "The requested key `%s' exists as `%s'\n"
 msgstr "Скупови знакова се захтевају где је „%s“–>„%s“\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/namestore/gnunet-namestore-fcfsd.c:505
 msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:513
+#: src/namestore/gnunet-namestore-fcfsd.c:522
 #, fuzzy
 msgid "Error creating record data\n"
 msgstr "Грешка стварања тунела\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:517
+#: src/namestore/gnunet-namestore-fcfsd.c:526
 #, fuzzy
 msgid "unable to store record"
 msgstr "Смештај назива није успео да смести запис\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:588
+#: src/namestore/gnunet-namestore-fcfsd.c:597
 #, c-format
 msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:594
+#: src/namestore/gnunet-namestore-fcfsd.c:603
 msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:780
+#: src/namestore/gnunet-namestore-fcfsd.c:789
 msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
+#: src/namestore/gnunet-namestore-fcfsd.c:800
 msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:806
+#: src/namestore/gnunet-namestore-fcfsd.c:819
 #, fuzzy
 msgid "invalid parameters"
 msgstr "Неисправан аргумент „%s“\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:823
+#: src/namestore/gnunet-namestore-fcfsd.c:836
 #, fuzzy
 msgid "invalid name"
 msgstr "Неисправан аргумент „%s“\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
+#: src/namestore/gnunet-namestore-fcfsd.c:847
 #, fuzzy, c-format
 msgid "Unable to parse key %s\n"
 msgstr "Не могу да обрадим „MX“ запис „%s“\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:838
+#: src/namestore/gnunet-namestore-fcfsd.c:851
 #, fuzzy
 msgid "unable to parse key"
 msgstr "Не могу да обрадим „MX“ запис „%s“\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:949
+#: src/namestore/gnunet-namestore-fcfsd.c:962
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr "Није подешен его за „fcfsd“ подсистем\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:974
-msgid "Failed to start HTTP server\n"
-msgstr "Нисам успео да покренем ХТТП сервер\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1058
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
 msgid "No port specified, using default value\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1076
+#: src/namestore/gnunet-namestore-fcfsd.c:1089
 msgid "Failed to connect to identity\n"
 msgstr "Нисам успео да се повежем са идентитетом\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1100
-#, fuzzy
-msgid "Unable to set up the daemon\n"
-msgstr "Не могу да увезем приватни кључ из датотеке „%s“\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1123
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
 msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1132
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 #, fuzzy
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr "Услуга регистрације назива Први Стиже Први Служи ГНУ Система Назива"
@@ -5157,7 +4926,7 @@ msgstr "Нису дате опције\n"
 #: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1066
 #: src/namestore/gnunet-namestore.c:1076 src/namestore/gnunet-namestore.c:1105
 #: src/namestore/gnunet-namestore.c:1126 src/namestore/gnunet-namestore.c:1153
-#: src/namestore/gnunet-namestore.c:1228
+#: src/namestore/gnunet-namestore.c:1230
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Недостаје опција „%s“ за радњу „%s“\n"
@@ -5173,7 +4942,7 @@ msgstr "Неисправан надимак „%s“\n"
 
 #: src/namestore/gnunet-namestore.c:1068 src/namestore/gnunet-namestore.c:1078
 #: src/namestore/gnunet-namestore.c:1107 src/namestore/gnunet-namestore.c:1128
-#: src/namestore/gnunet-namestore.c:1230
+#: src/namestore/gnunet-namestore.c:1232
 msgid "add"
 msgstr "додај"
 
@@ -5192,7 +4961,7 @@ msgstr ""
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "Вредност „%s“ је неисправна за врсту записа „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1237
+#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1239
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Неисправан формат времена „%s“\n"
@@ -5206,18 +4975,18 @@ msgstr "обриши"
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Неисправан јавни кључ за обратну претрагу „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1220
+#: src/namestore/gnunet-namestore.c:1222
 #: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Неисправан УРИ „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1290
+#: src/namestore/gnunet-namestore.c:1292
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1340
+#: src/namestore/gnunet-namestore.c:1342
 #, c-format
 msgid ""
 "No default identity configured for `namestore' subsystem\n"
@@ -5225,100 +4994,100 @@ msgid ""
 "Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1405
+#: src/namestore/gnunet-namestore.c:1407
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1434
+#: src/namestore/gnunet-namestore.c:1436
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Не могу да се повежем са услугом идентитета\n"
 
-#: src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1483
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1493
+#: src/namestore/gnunet-namestore.c:1495
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1505 src/namestore/gnunet-namestore.c:1521
-#: src/namestore/gnunet-namestore.c:1538
+#: src/namestore/gnunet-namestore.c:1507 src/namestore/gnunet-namestore.c:1523
+#: src/namestore/gnunet-namestore.c:1540
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Недостаје функција „%s“ у прикључку преноса за „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1513
+#: src/namestore/gnunet-namestore.c:1515
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Непозната наредба „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1551
+#: src/namestore/gnunet-namestore.c:1553
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Неисправан формат за ИП: „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1608
+#: src/namestore/gnunet-namestore.c:1610
 msgid "add record"
 msgstr "додаје запис"
 
-#: src/namestore/gnunet-namestore.c:1611
+#: src/namestore/gnunet-namestore.c:1613
 msgid "delete record"
 msgstr "брише запис"
 
-#: src/namestore/gnunet-namestore.c:1615
+#: src/namestore/gnunet-namestore.c:1617
 msgid "display records"
 msgstr "приказује записе"
 
-#: src/namestore/gnunet-namestore.c:1622
+#: src/namestore/gnunet-namestore.c:1624
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr "време истека записа за коришћење (само за додавање), „never“ је могуће"
 
-#: src/namestore/gnunet-namestore.c:1628
+#: src/namestore/gnunet-namestore.c:1630
 msgid "set the desired nick name for the zone"
 msgstr "поставља жељени назив надимка за зону"
 
-#: src/namestore/gnunet-namestore.c:1633
+#: src/namestore/gnunet-namestore.c:1635
 msgid "monitor changes in the namestore"
 msgstr "прати измене у смештају назива"
 
-#: src/namestore/gnunet-namestore.c:1645
+#: src/namestore/gnunet-namestore.c:1647
 msgid "determine our name for the given PKEY"
 msgstr "одређује наш назив за дати „PKEY“"
 
-#: src/namestore/gnunet-namestore.c:1652
+#: src/namestore/gnunet-namestore.c:1654
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1658
+#: src/namestore/gnunet-namestore.c:1660
 msgid "type of the record to add/delete/display"
 msgstr "врста записа за додавање/брисање/приказ"
 
-#: src/namestore/gnunet-namestore.c:1663
+#: src/namestore/gnunet-namestore.c:1665
 msgid "URI to import into our zone"
 msgstr "УРИ за увоз у нашу зону"
 
-#: src/namestore/gnunet-namestore.c:1669
+#: src/namestore/gnunet-namestore.c:1671
 msgid "value of the record to add/delete"
 msgstr "вредност записа за додавање/брисање"
 
-#: src/namestore/gnunet-namestore.c:1673
+#: src/namestore/gnunet-namestore.c:1675
 msgid "create or list public record"
 msgstr "ствара или исписује јавни запис"
 
-#: src/namestore/gnunet-namestore.c:1679
+#: src/namestore/gnunet-namestore.c:1681
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 "прави сеновити запис (важи само ако су сви остали записи исте врсте истекли"
 
-#: src/namestore/gnunet-namestore.c:1685
+#: src/namestore/gnunet-namestore.c:1687
 msgid "name of the ego controlling the zone"
 msgstr "назив егоа који контролише зону"
 
@@ -5674,8 +5443,8 @@ msgstr "Мери квалитет и учинковитост НСЕ услуг
 msgid "Show network size estimates from NSE service."
 msgstr "Показује процене величине мреже из НСЕ услуге."
 
-#: src/nse/gnunet-service-nse.c:1450
-#: src/revocation/gnunet-service-revocation.c:883 src/util/gnunet-scrypt.c:260
+#: src/nse/gnunet-service-nse.c:1441
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr "Вредност је превелика.\n"
 
@@ -5874,11 +5643,6 @@ msgstr ""
 msgid "Unable to create indices: %s.\n"
 msgstr "Нисам успео да направим индексе\n"
 
-#: src/pq/pq_prepare.c:109
-#, fuzzy, c-format
-msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
-msgstr "„%s“ за „%s“ није успело на %s:%d са грешком: %s\n"
-
 #: src/pt/gnunet-daemon-pt.c:418
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Нисам успео да упакујем ДНС захтев.  Одбацујем.\n"
@@ -5935,86 +5699,86 @@ msgstr "Нисам успео да се повежем са „%s“ услуг
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr "Демон за покретање за обављање превода ИП протокола у ГНУнет"
 
-#: src/reclaim/gnunet-reclaim.c:801
+#: src/reclaim/gnunet-reclaim.c:802
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "Потребна је исправна врста\n"
 
-#: src/reclaim/gnunet-reclaim.c:808
+#: src/reclaim/gnunet-reclaim.c:809
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:815
+#: src/reclaim/gnunet-reclaim.c:816
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "аргумент „--section“ је потребан\n"
 
-#: src/reclaim/gnunet-reclaim.c:833
-msgid "Add an attribute NAME"
+#: src/reclaim/gnunet-reclaim.c:834
+msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:838
+#: src/reclaim/gnunet-reclaim.c:839
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:843
+#: src/reclaim/gnunet-reclaim.c:844
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:848
+#: src/reclaim/gnunet-reclaim.c:849
 msgid "The EGO to use"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:854
+#: src/reclaim/gnunet-reclaim.c:855
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:858
+#: src/reclaim/gnunet-reclaim.c:859
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:862
+#: src/reclaim/gnunet-reclaim.c:863
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:868
+#: src/reclaim/gnunet-reclaim.c:869
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:873
+#: src/reclaim/gnunet-reclaim.c:874
 msgid "Credential name"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:879
+#: src/reclaim/gnunet-reclaim.c:880
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:884
+#: src/reclaim/gnunet-reclaim.c:885
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:889
+#: src/reclaim/gnunet-reclaim.c:890
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:894
+#: src/reclaim/gnunet-reclaim.c:895
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:899
+#: src/reclaim/gnunet-reclaim.c:900
 msgid "Type of credential"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:903
+#: src/reclaim/gnunet-reclaim.c:904
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:909
+#: src/reclaim/gnunet-reclaim.c:910
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:917
+#: src/reclaim/gnunet-reclaim.c:918
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -6041,56 +5805,56 @@ msgstr "„%s“ услузи недостају поставке подешав
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr "Демон за најаву регуларних израза за парњака који користи меш."
 
-#: src/regex/gnunet-regex-profiler.c:1392
+#: src/regex/gnunet-regex-profiler.c:1388
 msgid "No configuration file given. Exiting\n"
 msgstr "Није дата датотека подешавања. Излазим\n"
 
-#: src/regex/gnunet-regex-profiler.c:1434
+#: src/regex/gnunet-regex-profiler.c:1430
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr "На линији наредби није наведен директоријум политике. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1440
+#: src/regex/gnunet-regex-profiler.c:1436
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Наведени директоријум политике не постоји. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1448
+#: src/regex/gnunet-regex-profiler.c:1444
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "Нисам нашао датотеке у „%s“\n"
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1453
 msgid "No search strings file given. Exiting.\n"
 msgstr "Није дата датотека ниски претраге. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1477
+#: src/regex/gnunet-regex-profiler.c:1473
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Грешка учитавања ниски претраге. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1565
+#: src/regex/gnunet-regex-profiler.c:1562
 msgid "name of the file for writing statistics"
 msgstr "назив датотеке за записивање статистике"
 
-#: src/regex/gnunet-regex-profiler.c:1572
+#: src/regex/gnunet-regex-profiler.c:1569
 msgid "wait TIMEOUT before ending the experiment"
 msgstr "чека ВРЕМЕ_ИСТЕКА пре завршавања експеримента"
 
-#: src/regex/gnunet-regex-profiler.c:1578
+#: src/regex/gnunet-regex-profiler.c:1575
 msgid "directory with policy files"
 msgstr "директоријум са датотекама политике"
 
-#: src/regex/gnunet-regex-profiler.c:1586
+#: src/regex/gnunet-regex-profiler.c:1582
 msgid "name of file with input strings"
 msgstr "назив датотеке са улазним нискама"
 
-#: src/regex/gnunet-regex-profiler.c:1593
+#: src/regex/gnunet-regex-profiler.c:1589
 msgid "name of file with hosts' names"
 msgstr "назив датотеке са називима домаћина"
 
-#: src/regex/gnunet-regex-profiler.c:1606
+#: src/regex/gnunet-regex-profiler.c:1604
 msgid "Profiler for regex"
 msgstr "Профилатор за регуларни израз"
 
@@ -6258,36 +6022,36 @@ msgstr "тестира да ли је јавни кључ КЉУЧ опозва
 msgid "number of epochs to calculate for"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:502
+#: src/revocation/gnunet-service-revocation.c:507
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "Двоструки опзив је примљен од парњака. Занемарено.\n"
 
-#: src/revocation/gnunet-service-revocation.c:512
+#: src/revocation/gnunet-service-revocation.c:517
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# поруке ПОДАТАКА су примљене путем блутута"
 
-#: src/revocation/gnunet-service-revocation.c:517
+#: src/revocation/gnunet-service-revocation.c:522
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr "Грешка прорачуна уније скупа опозивања са %s\n"
 
-#: src/revocation/gnunet-service-revocation.c:521
+#: src/revocation/gnunet-service-revocation.c:526
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# Бирање парњака није успело"
 
-#: src/revocation/gnunet-service-revocation.c:529
+#: src/revocation/gnunet-service-revocation.c:534
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# преноси расцепканости су завршени"
 
-#: src/revocation/gnunet-service-revocation.c:567
+#: src/revocation/gnunet-service-revocation.c:572
 msgid "SET service crashed, terminating revocation service\n"
 msgstr "Услуга ПОСТАВИ се урушила, окончавам услугу опозивања\n"
 
-#: src/revocation/gnunet-service-revocation.c:920
+#: src/revocation/gnunet-service-revocation.c:925
 msgid "Could not open revocation database file!"
 msgstr "Не могу да отворим датотеку базе података опозивања!"
 
@@ -6858,17 +6622,17 @@ msgstr ""
 "Број ивица које се могу успоставити приликом додавања новог чвора у "
 "слободном размештају лествице не може бити већи од %u.  Дато је „%s = %llu“"
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2643
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr "Нисам нашао датотеку размештаја „%s“\n"
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2651
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Датотека размештаја „%s“ нема података\n"
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2659
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Не могу да прочитам датотеку размештаја „%s“\n"
@@ -7081,9 +6845,9 @@ msgstr "# „HELLO“ поруке су примљене"
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:3329
-#: src/transport/gnunet-communicator-udp.c:3814
-#: src/transport/gnunet-service-tng.c:10388
+#: src/transport/gnunet-communicator-tcp.c:3338
+#: src/transport/gnunet-communicator-udp.c:3856
+#: src/transport/gnunet-service-tng.c:10512
 #: src/transport/gnunet-service-transport.c:2627
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Услузи преноса недостају поставке подешавања кључа. Излазим.\n"
@@ -7092,7 +6856,7 @@ msgstr "Услузи преноса недостају поставке поде
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:3889
+#: src/transport/gnunet-communicator-udp.c:3931
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -8115,17 +7879,17 @@ msgstr "Приступ је збрањен за „%s“\n"
 msgid "Accepting connection from `%s': %p\n"
 msgstr "Прихватам везу са „%s“: %p\n"
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1396
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1400
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "„%s“ није успело за прикључник %d (%s).\n"
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1408
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1412
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "„%s“ није успело за прикључник %d (%s): адреса је већ у употреби\n"
 
-#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1415
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1419
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "„%s“ није успело за „%s“: адреса је већ у употреби\n"
@@ -8139,7 +7903,7 @@ msgstr ""
 "Обрађивачки код за поруку врсте %u није позвао „GNUNET_SERVER_receive_done“ "
 "након „%s“\n"
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:833
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr "Непозната породица адресе „%d“\n"
@@ -8149,23 +7913,23 @@ msgstr "Непозната породица адресе „%d“\n"
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr "Приступ из „%s“ је забрањен за услугу „%s“\n"
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:946
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:950
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr "Не могу да обрадим спецификацију ИПв4 мреже „%s“ за `%s:%s'\n"
 
-#: src/transport/tcp_service_legacy.c:451 src/util/service.c:987
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:991
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr "Не могу да обрадим спецификацију ИПв6 мреже „%s“ за `%s:%s'\n"
 
 #: src/transport/tcp_service_legacy.c:890
-#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1476
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1480
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr "Наведена вредност за „%s“ услуге „%s“ је неисправна\n"
 
-#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1500
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1504
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8182,45 +7946,45 @@ msgstr "Нисам успео да покренем „%s“ на „%s“\n"
 msgid "Service `%s' runs at %s\n"
 msgstr "Услуга „%s“ ради на „%s“\n"
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1746
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1750
 msgid "Service process failed to initialize\n"
 msgstr "Процес услуге није успео да се покрене\n"
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1751
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
 msgid "Service process could not initialize server function\n"
 msgstr "Процес услуге не може да покрене функцију сервера\n"
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1756
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
 msgid "Service process failed to report status\n"
 msgstr "Процес услуге није успео да извести о стању\n"
 
 #: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1220
-#: src/util/service.c:1637
+#: src/util/service.c:1641
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Не могу да добијем податке о кориснику „%s“: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1639
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1643
 msgid "No such user"
 msgstr "Нема таквог корисника"
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1653
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Не могу да променим власника/групу на „%s“: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:1996
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2000
 msgid "do daemonize (detach from terminal)"
 msgstr "ради демонизацију (откачиње од терминала)"
 
 #: src/transport/tcp_service_legacy.c:1397
-#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2072
-#: src/util/service.c:2084
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2076
+#: src/util/service.c:2088
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2094
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2098
 msgid "Malformed configuration, exit ...\n"
 msgstr "Лоше подешавање, излазим ...\n"
 
@@ -8471,7 +8235,7 @@ msgstr "аргумент „--option“ је потребан за постав
 msgid "failed to load configuration defaults"
 msgstr "Нисам успео да учитам подешавање за „%s“\n"
 
-#: src/util/container_bloomfilter.c:553
+#: src/util/container_bloomfilter.c:547
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8490,7 +8254,7 @@ msgstr "„ECC“ потписивање није успело на %s:%d: %s\n"
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "Провера „ECDSA“ потписа није успела на %s:%d: %s\n"
 
-#: src/util/crypto_ecc_setup.c:273
+#: src/util/crypto_ecc_setup.c:280
 msgid "Could not load peer's private key\n"
 msgstr "Не могу да учитам лични кључ парњака\n"
 
@@ -8499,12 +8263,12 @@ msgstr "Не могу да учитам лични кључ парњака\n"
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "„libgcrypt“ није очекиваног издања (издање %s је потребно).\n"
 
-#: src/util/crypto_rsa.c:862
+#: src/util/crypto_rsa.c:901
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "„EdDSA“ потписивање није успело на %s:%d: %s\n"
 
-#: src/util/crypto_rsa.c:1162
+#: src/util/crypto_rsa.c:1201
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Провера „ECDSA“ потписа није успела на %s:%d: %s\n"
@@ -8609,84 +8373,94 @@ msgstr "Опција „%s“ нема смисла без опције „%s“
 msgid "Missing mandatory option `%s'.\n"
 msgstr "Недостаје опција „%s“ за радњу „%s“\n"
 
-#: src/util/getopt_helpers.c:69
+#: src/util/getopt_helpers.c:63
 msgid "print the version number"
 msgstr ""
 
-#: src/util/getopt_helpers.c:116
+#: src/util/getopt_helpers.c:110
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 "Аргументи обавезни за дуге опције су такође обавезни за кратке опције.\n"
 
-#: src/util/getopt_helpers.c:208
+#: src/util/getopt_helpers.c:196
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:288
+#: src/util/getopt_helpers.c:261
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:429
+#: src/util/getopt_helpers.c:377
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:510
+#: src/util/getopt_helpers.c:444
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:532
+#: src/util/getopt_helpers.c:461
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "ствара јединствене датотеке подешавања"
 
-#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:859
-#: src/util/getopt_helpers.c:924
+#: src/util/getopt_helpers.c:497 src/util/getopt_helpers.c:811
+#: src/util/getopt_helpers.c:867
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Морате да проследите број опцији „%s“.\n"
 
-#: src/util/getopt_helpers.c:649
+#: src/util/getopt_helpers.c:569
 #, fuzzy, c-format
 msgid ""
 "You must pass a relative time (optionally with sign) to the `%s' option.\n"
 msgstr "Морате да проследите релативно време опцији „%s“.\n"
 
-#: src/util/getopt_helpers.c:656
+#: src/util/getopt_helpers.c:576
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:683
+#: src/util/getopt_helpers.c:594
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:685
+#: src/util/getopt_helpers.c:596
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:720
+#: src/util/getopt_helpers.c:630
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Морате да проследите релативно време опцији „%s“.\n"
 
-#: src/util/getopt_helpers.c:785
+#: src/util/getopt_helpers.c:684
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "Морате да проследите релативно време опцији „%s“.\n"
 
-#: src/util/getopt_helpers.c:852
+#: src/util/getopt_helpers.c:741
+#, fuzzy, c-format
+msgid "You must pass a timestamp to the `%s' option.\n"
+msgstr "Морате да проследите број опцији „%s“.\n"
+
+#: src/util/getopt_helpers.c:748
+#, c-format
+msgid "The maximum precision allowed for timestamps is seconds.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:804
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:931
+#: src/util/getopt_helpers.c:874
 #, fuzzy, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr "Морате да проследите број опцији „%s“.\n"
 
-#: src/util/getopt_helpers.c:1018
+#: src/util/getopt_helpers.c:952
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
@@ -8818,31 +8592,84 @@ msgstr "исписује примере ЕЦЦ операција (корист
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Управља ГНУнет датотекама личног ЕЦЦ кључа"
 
-#: src/util/gnunet-qr.c:145 src/util/gnunet-uri.c:94
-#, c-format
-msgid "Invalid URI: does not start with `%s'\n"
+#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
+#, fuzzy, c-format
+msgid "Failed to add URI %s\n"
+msgstr "Нисам успео да обрадим УРИ: %s\n"
+
+#: src/util/gnunet-qr.c:133
+#, fuzzy, c-format
+msgid "Added URI %s\n"
+msgstr "Неисправан УРИ „%s“\n"
+
+#: src/util/gnunet-qr.c:160
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr "Неисправна путања: не почиње са „%s“\n"
 
-#: src/util/gnunet-qr.c:152 src/util/gnunet-uri.c:101
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
+#: src/util/gnunet-qr.c:170
+#, fuzzy, c-format
+msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr "Неисправна путања: није успело навођење подсистема\n"
 
-#: src/util/gnunet-qr.c:159 src/util/gnunet-uri.c:108
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
+#: src/util/gnunet-qr.c:181
+#, fuzzy, c-format
+msgid "No known handler for subsystem `%s'\n"
 msgstr "Није познат руковалац за подсистем „%s“\n"
 
-#: src/util/gnunet-qr.c:357
-msgid "use video-device DEVICE (default: /dev/video0"
+#: src/util/gnunet-qr.c:217
+#, fuzzy, c-format
+msgid "Unable to start child process `%s'\n"
+msgstr "Не могу да обрадим ИПв4 адресу „%s“\n"
+
+#: src/util/gnunet-qr.c:246
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "Нисам успео да отворим „%s“: %s\n"
+
+#: src/util/gnunet-qr.c:260
+#, fuzzy
+msgid "Capturing...\n"
+msgstr "Покрећем %s...\n"
+
+#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+msgid "No captured images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:362
-msgid "do not show preview windows"
+#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#, c-format
+msgid "Got %d images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:372
-msgid "Scan a QR code using a video device and import the uri read"
+#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#, c-format
+msgid "Found %s: \"%s\"\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:364 src/util/gnunet-qr.c:366
+#, fuzzy, c-format
+msgid "%s is not a PNG file\n"
+msgstr "„%s“ није ГНУнет директоријум\n"
+
+#: src/util/gnunet-qr.c:545
+#, fuzzy
+msgid "No data found\n"
+msgstr "нисам нашао „upnpc“\n"
+
+#: src/util/gnunet-qr.c:561
+msgid "Dispatching the URI\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:572
+msgid "use the video device DEVICE (defaults to /dev/video0)"
+msgstr ""
+
+#: src/util/gnunet-qr.c:579
+msgid "read from the PNG-encoded file FILE"
+msgstr ""
+
+#: src/util/gnunet-qr.c:590
+msgid "Scan a QR code and import the URI read"
 msgstr ""
 
 #: src/util/gnunet-resolver.c:168
@@ -8854,28 +8681,28 @@ msgstr "обавља повратну претрагу"
 msgid "Use built-in GNUnet stub resolver"
 msgstr "Користи уграђеног заменског решавача ГНУнет-а"
 
-#: src/util/gnunet-scrypt.c:232
+#: src/util/gnunet-scrypt.c:215
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Учитавање кључа домаћина из „%s“ није успело.\n"
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr "број битова за тражење доказивања о раду"
 
-#: src/util/gnunet-scrypt.c:304
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr "датотека са личним кључем, у супротном користи се основна"
 
-#: src/util/gnunet-scrypt.c:310
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr "датотека са доказом о раду, у супротном користи се основна"
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr "време за чекање између прорачуна"
 
-#: src/util/gnunet-scrypt.c:330
+#: src/util/gnunet-scrypt.c:313
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Управља ГНУнет датотекама доказа о раду"
 
@@ -8888,6 +8715,21 @@ msgstr ""
 msgid "No URI specified on command line\n"
 msgstr "Није наведена путања на линији наредби\n"
 
+#: src/util/gnunet-uri.c:94
+#, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "Неисправна путања: не почиње са „%s“\n"
+
+#: src/util/gnunet-uri.c:101
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr "Неисправна путања: није успело навођење подсистема\n"
+
+#: src/util/gnunet-uri.c:108
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr "Није познат руковалац за подсистем „%s“\n"
+
 #: src/util/gnunet-uri.c:178
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Обавља основне радње за путање ГНУнет-а"
@@ -8907,13 +8749,13 @@ msgstr "Нисам успео да обрадим долазну поруку с
 msgid "Error writing to `%s': %s\n"
 msgstr "Грешка писања у „%s“: %s\n"
 
-#: src/util/network.c:178
+#: src/util/network.c:163
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 "Не могу да скратим јуникс путању „%s“ док задржавам назив јединственим\n"
 
-#: src/util/network.c:1359
+#: src/util/network.c:1306
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8930,12 +8772,12 @@ msgstr ""
 "Не могу да одредим путању инсталирања за „%s“.  Поставите „%s“ променљиву "
 "окружења.\n"
 
-#: src/util/os_installation.c:802
+#: src/util/os_installation.c:786
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Не могу да нађем извршну „%s“ у ПУТАЊИ!\n"
 
-#: src/util/os_installation.c:835
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8945,36 +8787,36 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Покретање механизма прикључка није успело: %s!\n"
 
-#: src/util/plugin.c:162
+#: src/util/plugin.c:156
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "„%s“ није успело да реши метод '%s' са грешком: %s\n"
 
-#: src/util/plugin.c:240
+#: src/util/plugin.c:234
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "„%s“ није успело за библиотеку '%s' са грешком: %s\n"
 
-#: src/util/plugin.c:420
+#: src/util/plugin.c:414
 msgid "Could not determine plugin installation path.\n"
 msgstr "Не могу да одредим путању инсталирања прикључка.\n"
 
-#: src/util/program.c:251
+#: src/util/program.c:286
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
 
-#: src/util/program.c:263
+#: src/util/program.c:298
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
 
-#: src/util/program.c:278
+#: src/util/program.c:313
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
 
-#: src/util/program.c:293
+#: src/util/program.c:328
 #, fuzzy
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Лоше подешавање, излазим ...\n"
@@ -9028,7 +8870,7 @@ msgstr ""
 "Обрађивачки код за поруку врсте %u није позвао „GNUNET_SERVER_receive_done“ "
 "након „%s“\n"
 
-#: src/util/service.c:1568
+#: src/util/service.c:1572
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
@@ -9043,83 +8885,83 @@ msgstr ""
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:409
+#: src/util/strings.c:395
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr "Скупови знакова се захтевају где је „%s“–>„%s“\n"
 
-#: src/util/strings.c:501
+#: src/util/strings.c:487
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Нисам успео да раширим „$HOME“: променљива окружења „HOME“ није постављена"
 
-#: src/util/strings.c:1036
+#: src/util/strings.c:1023
 msgid "IPv6 address did not start with `['\n"
 msgstr "ИПв6 адреса не почиње са [\n"
 
-#: src/util/strings.c:1044
+#: src/util/strings.c:1031
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr "ИПв6 адреса садржи : за раздвајање броја прикључника\n"
 
-#: src/util/strings.c:1051
+#: src/util/strings.c:1038
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr "ИПв6 адреса садржи ] пре : за раздвајање броја прикључника\n"
 
-#: src/util/strings.c:1059
+#: src/util/strings.c:1046
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr "ИПв6 адреса садржи исправан број прикључника након последње „:“\n"
 
-#: src/util/strings.c:1068
+#: src/util/strings.c:1055
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Неисправна ИПв6 адреса „%s“: %s\n"
 
-#: src/util/strings.c:1250 src/util/strings.c:1261
+#: src/util/strings.c:1237 src/util/strings.c:1248
 msgid "Port not in range\n"
 msgstr "Прикључник није у опсегу\n"
 
-#: src/util/strings.c:1270
+#: src/util/strings.c:1257
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Лоша политика прикључника „%s“\n"
 
-#: src/util/strings.c:1341 src/util/strings.c:1370 src/util/strings.c:1417
-#: src/util/strings.c:1437
+#: src/util/strings.c:1328 src/util/strings.c:1357 src/util/strings.c:1404
+#: src/util/strings.c:1424
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Неисправан формат за ИП: „%s“\n"
 
-#: src/util/strings.c:1395
+#: src/util/strings.c:1382
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Неисправна напомена мреже („/%d“ није исправно у ИПв4 ЦИДР-у)."
 
-#: src/util/strings.c:1446
+#: src/util/strings.c:1433
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Неисправан формат: „%s“\n"
 
-#: src/util/strings.c:1488
+#: src/util/strings.c:1475
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Неисправна напомена мреже (не завршава се са „;“: „%s“)\n"
 
-#: src/util/strings.c:1538
+#: src/util/strings.c:1525
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Погрешан формат „%s“ за мрежну маску\n"
 
-#: src/util/strings.c:1569
+#: src/util/strings.c:1556
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Погрешан формат „%s“ за мрежу\n"
 
-#: src/util/time.c:699 src/util/time.c:727
+#: src/util/time.c:863 src/util/time.c:891
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:735
+#: src/util/time.c:899
 #, c-format
 msgid ""
 "Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
@@ -9300,6 +9142,204 @@ msgstr "Поставља тунеле путем ВПН-а."
 msgid "Failed to connect to the namestore!\n"
 msgstr "Нисам успео да се повежем са смештајем назива!\n"
 
+#, fuzzy
+#~ msgid "# requests for random value received"
+#~ msgstr "# захтеви су примљени"
+
+#~ msgid "# GET requests from clients injected"
+#~ msgstr "# захтеви ДОБАВИ од клијената су убризгани"
+
+#~ msgid "# PUT requests received from clients"
+#~ msgstr "# захтеви СТАВИ су примљени од клијената"
+
+#~ msgid "# GET requests received from clients"
+#~ msgstr "# захтеви ДОБАВИ су примљени од клијената"
+
+#~ msgid "# GET STOP requests received from clients"
+#~ msgstr "# захтеви ДОБАВИ СТОП су примљени од клијената"
+
+#~ msgid "# Key match, type mismatches in REPLY to CLIENT"
+#~ msgstr "# Кључ се поклапа, врсте се не поклапају у ОДГОВОР КЛИЈНЕТУ"
+
+#~ msgid "# Duplicate REPLIES to CLIENT request dropped"
+#~ msgstr "# Двоструки захтев ОДГОВОРИ КЛИЈЕНТУ је одбачен"
+
+#, c-format
+#~ msgid "Unsupported block type (%u) in request!\n"
+#~ msgstr "Неподржана врста блока (%u) у захтеву!\n"
+
+#~ msgid "# RESULTS queued for clients"
+#~ msgstr "# РЕЗУЛТАТИ су стављени у ред за клијенте"
+
+#~ msgid "# REPLIES ignored for CLIENTS (no match)"
+#~ msgstr "# ОДГОВОРИ су занемарени за КЛИЈЕНТЕ (нема поклапања)"
+
+#, c-format
+#~ msgid "%s request received, but have no datacache!\n"
+#~ msgstr "„%s“ захтев је примљен, али нема оставу података!\n"
+
+#~ msgid "# ITEMS stored in datacache"
+#~ msgstr "# СТАВКЕ су смештене у оставу података"
+
+#~ msgid "# Good RESULTS found in datacache"
+#~ msgstr "# Добри РЕЗУЛТАТИ су нађени у остави података"
+
+#~ msgid "# Duplicate RESULTS found in datacache"
+#~ msgstr "# Двоструки РЕЗУЛТАТИ су нађени у остави података"
+
+#~ msgid "# Invalid RESULTS found in datacache"
+#~ msgstr "# Неисправни РЕЗУЛТАТИ су нађени у остави података"
+
+#~ msgid "# Irrelevant RESULTS found in datacache"
+#~ msgstr "# Неважни РЕЗУЛТАТИ су нађени у остави података"
+
+#~ msgid "# Unsupported RESULTS found in datacache"
+#~ msgstr "# Неподржани РЕЗУЛТАТИ су нађени у остави података"
+
+#, c-format
+#~ msgid "Unsupported block type (%u) in local response!\n"
+#~ msgstr "Неподржана врста блока (%u) у локалном одговору!\n"
+
+#~ msgid "# GET requests given to datacache"
+#~ msgstr "# ДОБАВИ захтеви су дати остави података"
+
+#~ msgid "# HELLOs obtained from peerinfo"
+#~ msgstr "# „HELLO“-и су добијени из података парњака"
+
+#~ msgid "# FIND PEER messages initiated"
+#~ msgstr "# НАЂИ ПАРЊАКА поруке су покренуте"
+
+#~ msgid "# requests TTL-dropped"
+#~ msgstr "# захтеви ТТЛ су одбачени"
+
+#~ msgid "# Peers excluded from routing due to Bloomfilter"
+#~ msgstr "# Парњаци су изузети из рутирања због Блумфилтера"
+
+#~ msgid "# Peer selection failed"
+#~ msgstr "# Бирање парњака није успело"
+
+#~ msgid "# PUT requests routed"
+#~ msgstr "# захтеви СТАВИ су рутирани"
+
+#~ msgid "# PUT messages queued for transmission"
+#~ msgstr "# СТАВИ поруке су у реду за пренос"
+
+#~ msgid "# P2P messages dropped due to full queue"
+#~ msgstr "# П2П поруке су одбачене због пуног реда"
+
+#~ msgid "# GET requests routed"
+#~ msgstr "# захтеви ДОБАВИ су рутирани"
+
+#~ msgid "# GET messages queued for transmission"
+#~ msgstr "# ДОБАВИ поруке су у реду за пренос"
+
+#~ msgid "# RESULT messages queued for transmission"
+#~ msgstr "# РЕЗУЛТАТ поруке су у реду за пренос"
+
+#, fuzzy
+#~ msgid "# Expired PUTs discarded"
+#~ msgstr "# небитни одговори су одбачени"
+
+#~ msgid "# P2P PUT requests received"
+#~ msgstr "# захтеви П2П СТАВИ су примљени"
+
+#~ msgid "# P2P PUT bytes received"
+#~ msgstr "# бајтови П2П СТАВИ су примљени"
+
+#~ msgid "# FIND PEER requests ignored due to Bloomfilter"
+#~ msgstr "# захтеви НАЂИ ПАРЊАКА су занемарени због Блумфилтера"
+
+#~ msgid "# FIND PEER requests ignored due to lack of HELLO"
+#~ msgstr "# захтеви НАЂИ ПАРЊАКА су занемарени због недостатка „HELLO“-а"
+
+#~ msgid "# P2P GET requests received"
+#~ msgstr "# захтеви П2П ДОБАВИ су примљени"
+
+#~ msgid "# P2P GET bytes received"
+#~ msgstr "# бајтови П2П ДОБАВИ су примљени"
+
+#~ msgid "# P2P FIND PEER requests processed"
+#~ msgstr "# захтеви П2П НАЂИ ПАРЊАКА су обрађени"
+
+#~ msgid "# P2P GET requests ONLY routed"
+#~ msgstr "# захтеви П2П ДОБАВИ су САМО рутирани"
+
+#, fuzzy
+#~ msgid "# Expired results discarded"
+#~ msgstr "# небитни одговори су одбачени"
+
+#~ msgid "# P2P RESULTS received"
+#~ msgstr "# П2П РЕЗУЛТАТИ су примљени"
+
+#~ msgid "# P2P RESULT bytes received"
+#~ msgstr "# бајтови П2П РЕЗУЛТАТ су примљени"
+
+#~ msgid "# Network size estimates received"
+#~ msgstr "# Процене величине мреже су примљене"
+
+#~ msgid "# Good REPLIES matched against routing table"
+#~ msgstr "# Добри ОДГОВОРИ су поклопљени наспрам табеле рутирања"
+
+#~ msgid "# Duplicate REPLIES matched against routing table"
+#~ msgstr "# Двоструки ОДГОВОРИ су поклопљени наспрам табеле рутирања"
+
+#~ msgid "# Invalid REPLIES matched against routing table"
+#~ msgstr "# Неисправни ОДГОВОРИ су поклопљени наспрам табеле рутирања"
+
+#~ msgid "# Irrelevant REPLIES matched against routing table"
+#~ msgstr "# Неважни ОДГОВОРИ су поклопљени наспрам табеле рутирања"
+
+#~ msgid "# Unsupported REPLIES matched against routing table"
+#~ msgstr "# Неподржани ОДГОВОРИ су поклопљени наспрам табеле рутирања"
+
+#~ msgid "# Entries removed from routing table"
+#~ msgstr "# Уноси су уклоњени из табеле рутирања"
+
+#~ msgid "# Entries added to routing table"
+#~ msgstr "# Уноси су додати у табелу рутирања"
+
+#~ msgid "# DHT requests combined"
+#~ msgstr "# ДХТ захтеви су комбиновани"
+
+#~ msgid "# replies dropped due to type mismatch"
+#~ msgstr "# одговори су одбачени услед непоклапања врсте"
+
+#~ msgid "# replies received for other peers"
+#~ msgstr "# одговори су примљени за друге парњаке"
+
+#~ msgid "# replies dropped due to insufficient cover traffic"
+#~ msgstr "# одговори су одбачени услед недовољног покривног саобраћаја"
+
+#~ msgid "# P2P searches destroyed due to ultimate reply"
+#~ msgstr "# П2П претраге су уништене због крајњег одговора"
+
+#~ msgid "# duplicate replies discarded (bloomfilter)"
+#~ msgstr "# двоструки одговори су одбачени (bloomfilter)"
+
+#~ msgid "# irrelevant replies discarded"
+#~ msgstr "# небитни одговори су одбачени"
+
+#, c-format
+#~ msgid "Unsupported block type %u\n"
+#~ msgstr "Неподржана врста блока %u\n"
+
+#, c-format
+#~ msgid "Refusing `%s' request to HTTP server\n"
+#~ msgstr "Одбијам „%s“ захтев за ХТТП сервер\n"
+
+#, fuzzy, c-format
+#~ msgid "Businesscard HTTP server starts on %u\n"
+#~ msgstr "ХТТП сервер пословне картице почиње на %llu\n"
+
+#, c-format
+#~ msgid "Could not start businesscard HTTP server on port %u\n"
+#~ msgstr ""
+#~ "Не могу да покренем ХТТП сервер пословне картице на прикључнику %u\n"
+
+#, fuzzy, c-format
+#~ msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
+#~ msgstr "„%s“ за „%s“ није успело на %s:%d са грешком: %s\n"
+
 #~ msgid "Waiting for child to exit.\n"
 #~ msgstr "Чекам на пород да изађе.\n"
 
diff --git a/po/sv.po b/po/sv.po
index c87ec92ee..267613776 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-10-15 10:46+0200\n"
+"POT-Creation-Date: 2022-01-10 15:13+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -16,131 +16,136 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1302
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1304
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:901
+#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
 #, fuzzy, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/abd/gnunet-abd.c:560 src/abd/gnunet-service-abd.c:1747
-#: src/namestore/gnunet-namestore-fcfsd.c:1067
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
 #: src/namestore/gnunet-namestore.c:1001
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/abd/gnunet-abd.c:840 src/abd/gnunet-abd.c:891
+#: src/abd/gnunet-abd.c:566
+#, fuzzy
+msgid "Ego does not exist!\n"
+msgstr "antal meddelanden att använda per iteration"
+
+#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/abd/gnunet-abd.c:849 src/abd/gnunet-abd.c:910
+#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
 #, fuzzy, c-format
 msgid "Failed to connect to ABD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/abd/gnunet-abd.c:855
+#: src/abd/gnunet-abd.c:865
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:862
+#: src/abd/gnunet-abd.c:872
 #, c-format
 msgid "ego required\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:872
+#: src/abd/gnunet-abd.c:882
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:881
+#: src/abd/gnunet-abd.c:890
 #, fuzzy, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/abd/gnunet-abd.c:916
+#: src/abd/gnunet-abd.c:924
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:975
+#: src/abd/gnunet-abd.c:983
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:996
+#: src/abd/gnunet-abd.c:1004
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1003
+#: src/abd/gnunet-abd.c:1011
 #, fuzzy
 msgid ""
 "The public key of the subject to lookup thecredential for, or for issuer "
 "side storage: subject and its attributes"
 msgstr "ange prioritet för innehållet"
 
-#: src/abd/gnunet-abd.c:1010
+#: src/abd/gnunet-abd.c:1018
 msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1017
+#: src/abd/gnunet-abd.c:1025
 #, fuzzy
 msgid "The public key of the authority to verify the credential against"
 msgstr "ange prioritet för innehållet"
 
-#: src/abd/gnunet-abd.c:1022
+#: src/abd/gnunet-abd.c:1030
 #, fuzzy
 msgid "The ego/zone name to use"
 msgstr "meddelandestorlek"
 
-#: src/abd/gnunet-abd.c:1028
+#: src/abd/gnunet-abd.c:1036
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1034
+#: src/abd/gnunet-abd.c:1042
 msgid ""
 "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1039
+#: src/abd/gnunet-abd.c:1047
 msgid "collect credentials"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1044
+#: src/abd/gnunet-abd.c:1052
 msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1049
+#: src/abd/gnunet-abd.c:1057
 msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1054
+#: src/abd/gnunet-abd.c:1062
 msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1061
+#: src/abd/gnunet-abd.c:1069
 msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1065
+#: src/abd/gnunet-abd.c:1073
 msgid "Create private record entry."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1071 src/abd/gnunet-abd.c:1077
+#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
 msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1090
+#: src/abd/gnunet-abd.c:1098
 #, fuzzy
 msgid "GNUnet abd resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/abd/gnunet-service-abd.c:1742 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -385,28 +390,28 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1129
 #: src/transport/plugin_transport_tcp.c:3706
 #: src/transport/tcp_service_legacy.c:594
-#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1090
-#: src/util/service.c:1096
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1094
+#: src/util/service.c:1100
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
 #: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
-#: src/util/service.c:1129
+#: src/util/service.c:1133
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
 #: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
-#: src/util/service.c:1133
+#: src/util/service.c:1137
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
 #: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
-#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1153
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1157
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -414,7 +419,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
-#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1171
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1175
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -422,7 +427,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:536
 #: src/transport/plugin_transport_http_server.c:2718
 #: src/transport/plugin_transport_tcp.c:1244
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1202
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1206
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -430,7 +435,7 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 #: src/arm/gnunet-service-arm.c:555
 #: src/transport/plugin_transport_http_server.c:2736
 #: src/transport/plugin_transport_tcp.c:1263
-#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1221
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1225
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
@@ -1339,35 +1344,35 @@ msgstr "Skriv ut information om GNUnets motparter."
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-service-core.c:329
+#: src/core/gnunet-service-core.c:328
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:355
+#: src/core/gnunet-service-core.c:354
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
+#: src/core/gnunet-service-core.c:418
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core.c:506
+#: src/core/gnunet-service-core.c:504
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core.c:825
+#: src/core/gnunet-service-core.c:823
 #, fuzzy, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core.c:927
+#: src/core/gnunet-service-core.c:925
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/core/gnunet-service-core.c:955
+#: src/core/gnunet-service-core.c:953
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "\"%s\" är inte en fil.\n"
@@ -1530,9 +1535,7 @@ msgstr "# byte dekrypterade"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/dht/gnunet-service-dht_neighbours.c:740
-#: src/dht/gnunet-service-dht_neighbours.c:803
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1522
+#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1520
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1565,52 +1568,47 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:299
-#: src/datastore/gnunet-service-datastore.c:742
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:275
+#: src/datastore/gnunet-service-datastore.c:743
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# byte krypterade"
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:303
+#: src/datacache/datacache.c:121 src/datacache/datacache.c:279
 #, fuzzy
 msgid "# items stored"
 msgstr "# byte krypterade"
 
-#: src/datacache/datacache.c:190
+#: src/datacache/datacache.c:185
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:208
+#: src/datacache/datacache.c:203
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/datacache/datacache.c:332
+#: src/datacache/datacache.c:297
 #, fuzzy
 msgid "# requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datacache/datacache.c:343
+#: src/datacache/datacache.c:308
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/datacache.c:370
-#, fuzzy
-msgid "# requests for random value received"
-msgstr "# byte mottogs via TCP"
-
-#: src/datacache/datacache.c:400
+#: src/datacache/datacache.c:329
 #, fuzzy
 msgid "# proximity search requests received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/datacache/plugin_datacache_heap.c:554
+#: src/datacache/plugin_datacache_heap.c:527
 msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:123
-#: src/datacache/plugin_datacache_sqlite.c:144
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:139
 #: src/datastore/plugin_datastore_mysql.c:890
 #: src/datastore/plugin_datastore_sqlite.c:63
 #: src/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:81 src/my/my.c:93
@@ -1627,7 +1625,7 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:783
+#: src/datacache/plugin_datacache_sqlite.c:693
 #: src/datastore/plugin_datastore_sqlite.c:531
 #: src/namecache/plugin_namecache_sqlite.c:237
 #: src/namestore/plugin_namestore_sqlite.c:273
@@ -1790,134 +1788,134 @@ msgid ""
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:605
+#: src/datastore/gnunet-service-datastore.c:606
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:611
+#: src/datastore/gnunet-service-datastore.c:612
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:618
+#: src/datastore/gnunet-service-datastore.c:619
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:625
-#: src/datastore/gnunet-service-datastore.c:676
-#: src/datastore/gnunet-service-datastore.c:819
-#: src/datastore/gnunet-service-datastore.c:1428
+#: src/datastore/gnunet-service-datastore.c:626
+#: src/datastore/gnunet-service-datastore.c:677
+#: src/datastore/gnunet-service-datastore.c:820
+#: src/datastore/gnunet-service-datastore.c:1429
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:692
+#: src/datastore/gnunet-service-datastore.c:693
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:757
+#: src/datastore/gnunet-service-datastore.c:758
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:857
+#: src/datastore/gnunet-service-datastore.c:858
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:887
+#: src/datastore/gnunet-service-datastore.c:888
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:898
+#: src/datastore/gnunet-service-datastore.c:899
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:939
+#: src/datastore/gnunet-service-datastore.c:940
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:970
+#: src/datastore/gnunet-service-datastore.c:971
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1011
+#: src/datastore/gnunet-service-datastore.c:1012
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1019
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1058
+#: src/datastore/gnunet-service-datastore.c:1059
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/datastore/gnunet-service-datastore.c:1108
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1282
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/datastore/gnunet-service-datastore.c:1168
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/datastore/gnunet-service-datastore.c:1177
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1236
+#: src/datastore/gnunet-service-datastore.c:1237
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1288
+#: src/datastore/gnunet-service-datastore.c:1289
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1298
+#: src/datastore/gnunet-service-datastore.c:1299
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/datastore/gnunet-service-datastore.c:1464
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:1472
+#: src/datastore/gnunet-service-datastore.c:1473
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1476
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/datastore/gnunet-service-datastore.c:1492
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/datastore/gnunet-service-datastore.c:1513
+#: src/datastore/gnunet-service-datastore.c:1535
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/gnunet-service-datastore.c:1573
+#: src/datastore/gnunet-service-datastore.c:1574
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -2013,53 +2011,53 @@ msgstr ""
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:158
+#: src/dht/gnunet-dht-get.c:159
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:160
 #, c-format
 msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:197
+#: src/dht/gnunet-dht-get.c:209
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:203 src/dht/gnunet-dht-monitor.c:255
+#: src/dht/gnunet-dht-get.c:217 src/dht/gnunet-dht-monitor.c:255
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:213
+#: src/dht/gnunet-dht-get.c:227
 msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:260 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:251
+#: src/dht/gnunet-dht-get.c:266
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:256 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:272 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:262
+#: src/dht/gnunet-dht-get.c:278
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-get.c:284 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:301
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -2090,262 +2088,30 @@ msgstr "Kunde inte ansluta till gnunetd.\n"
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:187
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:193
+#: src/dht/gnunet-dht-put.c:194
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:212
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:212
+#: src/dht/gnunet-dht-put.c:217
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-put.c:223
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:232
+#: src/dht/gnunet-dht-put.c:241
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:367
-#, fuzzy
-msgid "# GET requests from clients injected"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-service-dht_clients.c:483
-#, fuzzy
-msgid "# PUT requests received from clients"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:616
-#, fuzzy
-msgid "# GET requests received from clients"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:848
-#, fuzzy
-msgid "# GET STOP requests received from clients"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:1033
-msgid "# Key match, type mismatches in REPLY to CLIENT"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1049
-msgid "# Duplicate REPLIES to CLIENT request dropped"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1102
-#, c-format
-msgid "Unsupported block type (%u) in request!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1110
-#, fuzzy
-msgid "# RESULTS queued for clients"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/dht/gnunet-service-dht_clients.c:1191
-msgid "# REPLIES ignored for CLIENTS (no match)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:73
-#, fuzzy, c-format
-msgid "%s request received, but have no datacache!\n"
-msgstr "# byte mottagna av typen %d"
-
-#: src/dht/gnunet-service-dht_datacache.c:83
-msgid "# ITEMS stored in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:206
-msgid "# Good RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:220
-msgid "# Duplicate RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:228
-msgid "# Invalid RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:236
-msgid "# Irrelevant RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:252
-msgid "# Unsupported RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:256
-#, c-format
-msgid "Unsupported block type (%u) in local response!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:291
-#, fuzzy
-msgid "# GET requests given to datacache"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-service-dht_hello.c:86
-#, fuzzy
-msgid "# HELLOs obtained from peerinfo"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/dht/gnunet-service-dht_neighbours.c:678
-#, fuzzy
-msgid "# FIND PEER messages initiated"
-msgstr "# PING-meddelanden skapade"
-
-#: src/dht/gnunet-service-dht_neighbours.c:855
-#, fuzzy
-msgid "# requests TTL-dropped"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1042
-#: src/dht/gnunet-service-dht_neighbours.c:1079
-msgid "# Peers excluded from routing due to Bloomfilter"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1095
-msgid "# Peer selection failed"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1253
-#, fuzzy
-msgid "# PUT requests routed"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1287
-#, fuzzy
-msgid "# PUT messages queued for transmission"
-msgstr "# PING-meddelanden skapade"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1299
-#: src/dht/gnunet-service-dht_neighbours.c:1441
-#: src/dht/gnunet-service-dht_neighbours.c:1545
-#, fuzzy
-msgid "# P2P messages dropped due to full queue"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1384
-#, fuzzy
-msgid "# GET requests routed"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1428
-#, fuzzy
-msgid "# GET messages queued for transmission"
-msgstr "# PING-meddelanden skapade"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1560
-#, fuzzy
-msgid "# RESULT messages queued for transmission"
-msgstr "# PING-meddelanden skapade"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1663
-msgid "# Expired PUTs discarded"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1671
-#, fuzzy
-msgid "# P2P PUT requests received"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1675
-#, fuzzy
-msgid "# P2P PUT bytes received"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1907
-msgid "# FIND PEER requests ignored due to Bloomfilter"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1916
-msgid "# FIND PEER requests ignored due to lack of HELLO"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2079
-#, fuzzy
-msgid "# P2P GET requests received"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2083
-#, fuzzy
-msgid "# P2P GET bytes received"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2149
-#, fuzzy
-msgid "# P2P FIND PEER requests processed"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2170
-#, fuzzy
-msgid "# P2P GET requests ONLY routed"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2348
-msgid "# Expired results discarded"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2365
-#, fuzzy
-msgid "# P2P RESULTS received"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2369
-#, fuzzy
-msgid "# P2P RESULT bytes received"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/dht/gnunet-service-dht_nse.c:59
-#, fuzzy
-msgid "# Network size estimates received"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Good REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:236
-msgid "# Duplicate REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:244
-msgid "# Invalid REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:252
-msgid "# Irrelevant REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:268
-msgid "# Unsupported REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:347
-msgid "# Entries removed from routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:422
-msgid "# Entries added to routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:444
-#, fuzzy
-msgid "# DHT requests combined"
-msgstr "# byte mottogs via TCP"
-
 #: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
@@ -2394,17 +2160,17 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/dht/plugin_block_dht.c:189
+#: src/dht/plugin_block_dht.c:328
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/dht/plugin_block_dht.c:198
+#: src/dht/plugin_block_dht.c:337
 #, c-format
 msgid "Size mismatch for block with type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:209
+#: src/dht/plugin_block_dht.c:348
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -3689,7 +3455,7 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1345
+#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
@@ -3697,63 +3463,45 @@ msgstr ""
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:869
-#, fuzzy
-msgid "# replies dropped due to type mismatch"
-msgstr "# byte mottagna av typen %d"
-
-#: src/fs/gnunet-service-fs_cp.c:877
-#, fuzzy
-msgid "# replies received for other peers"
-msgstr "# byte mottagna av typen %d"
-
-#: src/fs/gnunet-service-fs_cp.c:892
-msgid "# replies dropped due to insufficient cover traffic"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:940
-msgid "# P2P searches destroyed due to ultimate reply"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1011
+#: src/fs/gnunet-service-fs_cp.c:1009
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1036
+#: src/fs/gnunet-service-fs_cp.c:1034
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1046
+#: src/fs/gnunet-service-fs_cp.c:1044
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1141
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1199
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1225
+#: src/fs/gnunet-service-fs_cp.c:1223
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1239
+#: src/fs/gnunet-service-fs_cp.c:1237
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1296
+#: src/fs/gnunet-service-fs_cp.c:1294
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1341
+#: src/fs/gnunet-service-fs_cp.c:1339
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1711
+#: src/fs/gnunet-service-fs_cp.c:1709
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -3837,106 +3585,93 @@ msgstr ""
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:656
+#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:658
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:832
+#: src/fs/gnunet-service-fs_pr.c:838
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:880
-msgid "# duplicate replies discarded (bloomfilter)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:889
-msgid "# irrelevant replies discarded"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:908
-#, c-format
-msgid "Unsupported block type %u\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:921
+#: src/fs/gnunet-service-fs_pr.c:916
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1055
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1084
+#: src/fs/gnunet-service-fs_pr.c:1079
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1123
+#: src/fs/gnunet-service-fs_pr.c:1118
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1259
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1318
+#: src/fs/gnunet-service-fs_pr.c:1313
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1339
+#: src/fs/gnunet-service-fs_pr.c:1334
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1402
+#: src/fs/gnunet-service-fs_pr.c:1401
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1464
+#: src/fs/gnunet-service-fs_pr.c:1463
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1519
+#: src/fs/gnunet-service-fs_pr.c:1518
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1534
+#: src/fs/gnunet-service-fs_pr.c:1533
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1557
+#: src/fs/gnunet-service-fs_pr.c:1556
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1574
+#: src/fs/gnunet-service-fs_pr.c:1573
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1594
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1600
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1642
+#: src/fs/gnunet-service-fs_pr.c:1641
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1655
+#: src/fs/gnunet-service-fs_pr.c:1654
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1706
+#: src/fs/gnunet-service-fs_pr.c:1705
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1756
+#: src/fs/gnunet-service-fs_pr.c:1755
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -3980,31 +3715,26 @@ msgstr ""
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:134
-#, c-format
-msgid "Refusing `%s' request to HTTP server\n"
-msgstr ""
-
-#: src/gns/gnunet-bcd.c:347
+#: src/gns/gnunet-bcd.c:571
 #, fuzzy, c-format
-msgid "Invalid port number %u.  Exiting.\n"
+msgid "Invalid port number %u\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/gns/gnunet-bcd.c:352
-#, fuzzy, c-format
-msgid "Businesscard HTTP server starts on %u\n"
-msgstr "Misslyckades att starta samling.\n"
+#: src/gns/gnunet-bcd.c:612 src/namestore/gnunet-namestore-fcfsd.c:1113
+#, fuzzy
+msgid "Unable to set up the daemon\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/gns/gnunet-bcd.c:372
-#, fuzzy, c-format
-msgid "Could not start businesscard HTTP server on port %u\n"
+#: src/gns/gnunet-bcd.c:635 src/namestore/gnunet-namestore-fcfsd.c:987
+#, fuzzy
+msgid "Failed to start HTTP server\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-bcd.c:509
-msgid "Run HTTP serve on port PORT (default is 8888)"
+#: src/gns/gnunet-bcd.c:658
+msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:522
+#: src/gns/gnunet-bcd.c:667
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
@@ -4787,61 +4517,78 @@ msgstr "\"%s\" är inte tillgänglig."
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:214
+#: src/identity/gnunet-identity.c:231
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/identity/gnunet-identity.c:255
+#: src/identity/gnunet-identity.c:272
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/identity/gnunet-identity.c:461
+#: src/identity/gnunet-identity.c:646
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:466
+#: src/identity/gnunet-identity.c:651
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:472
+#: src/identity/gnunet-identity.c:657
 msgid ""
 "set the private key for the identity to PRIVATE_KEY (use together with -C)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:477
+#: src/identity/gnunet-identity.c:663
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:669
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:674
 msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:481
+#: src/identity/gnunet-identity.c:678
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:485
+#: src/identity/gnunet-identity.c:682
 msgid "reduce output"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:492
+#: src/identity/gnunet-identity.c:689
 msgid ""
 "set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
-"s) or restrict results to NAME (use together with -d)"
+"s), restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:695
+msgid "The public key of the recipient (with -W)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:496
+#: src/identity/gnunet-identity.c:699
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:500
+#: src/identity/gnunet-identity.c:703
 msgid "display private keys as well"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:507
+#: src/identity/gnunet-identity.c:710
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:522
+#: src/identity/gnunet-identity.c:725
 msgid "Maintain egos"
 msgstr ""
 
@@ -4902,6 +4649,12 @@ msgstr " Anslutning misslyckades\n"
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
+#: src/messenger/plugin_gnsrecord_messenger.c:118
+#: src/messenger/plugin_gnsrecord_messenger.c:133
+#, fuzzy, c-format
+msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
 #: src/my/my.c:196 src/my/my.c:215
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
@@ -4942,7 +4695,7 @@ msgstr "Ogiltigt argument: \"%s\"\n"
 msgid "You must specify a name\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1639
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1641
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4951,7 +4704,7 @@ msgstr ""
 msgid "specifies the public key of the zone to look in"
 msgstr "ange prioritet för innehållet"
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1700
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1702
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -5000,112 +4753,102 @@ msgstr ""
 msgid "Failed to setup database at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:359
+#: src/namestore/gnunet-namestore-fcfsd.c:368
 #, fuzzy
 msgid "can not search the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:413
-#: src/namestore/gnunet-namestore-fcfsd.c:554
+#: src/namestore/gnunet-namestore-fcfsd.c:422
+#: src/namestore/gnunet-namestore-fcfsd.c:563
 #, fuzzy
 msgid "unable to scan namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:441
+#: src/namestore/gnunet-namestore-fcfsd.c:450
 #, fuzzy, c-format
 msgid "Failed to create record for `%s': %s\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:453
+#: src/namestore/gnunet-namestore-fcfsd.c:462
 #, fuzzy
 msgid "no errors"
 msgstr "Okänt fel"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:489
+#: src/namestore/gnunet-namestore-fcfsd.c:498
 #, fuzzy, c-format
 msgid "The requested key `%s' exists as `%s'\n"
 msgstr "Skapade post \"%s\" i namnrymd \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/namestore/gnunet-namestore-fcfsd.c:505
 msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:513
+#: src/namestore/gnunet-namestore-fcfsd.c:522
 #, fuzzy
 msgid "Error creating record data\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:517
+#: src/namestore/gnunet-namestore-fcfsd.c:526
 #, fuzzy
 msgid "unable to store record"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:588
+#: src/namestore/gnunet-namestore-fcfsd.c:597
 #, c-format
 msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:594
+#: src/namestore/gnunet-namestore-fcfsd.c:603
 msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:780
+#: src/namestore/gnunet-namestore-fcfsd.c:789
 msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
+#: src/namestore/gnunet-namestore-fcfsd.c:800
 msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:806
+#: src/namestore/gnunet-namestore-fcfsd.c:819
 #, fuzzy
 msgid "invalid parameters"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:823
+#: src/namestore/gnunet-namestore-fcfsd.c:836
 #, fuzzy
 msgid "invalid name"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
+#: src/namestore/gnunet-namestore-fcfsd.c:847
 #, fuzzy, c-format
 msgid "Unable to parse key %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:838
+#: src/namestore/gnunet-namestore-fcfsd.c:851
 #, fuzzy
 msgid "unable to parse key"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:949
+#: src/namestore/gnunet-namestore-fcfsd.c:962
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:974
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1058
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
 #, fuzzy
 msgid "No port specified, using default value\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1076
+#: src/namestore/gnunet-namestore-fcfsd.c:1089
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1100
-#, fuzzy
-msgid "Unable to set up the daemon\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1123
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
 msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1132
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
@@ -5188,7 +4931,7 @@ msgstr ""
 #: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1066
 #: src/namestore/gnunet-namestore.c:1076 src/namestore/gnunet-namestore.c:1105
 #: src/namestore/gnunet-namestore.c:1126 src/namestore/gnunet-namestore.c:1153
-#: src/namestore/gnunet-namestore.c:1228
+#: src/namestore/gnunet-namestore.c:1230
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
@@ -5204,7 +4947,7 @@ msgstr "Ogiltiga argument: "
 
 #: src/namestore/gnunet-namestore.c:1068 src/namestore/gnunet-namestore.c:1078
 #: src/namestore/gnunet-namestore.c:1107 src/namestore/gnunet-namestore.c:1128
-#: src/namestore/gnunet-namestore.c:1230
+#: src/namestore/gnunet-namestore.c:1232
 msgid "add"
 msgstr ""
 
@@ -5223,7 +4966,7 @@ msgstr ""
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
 
-#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1237
+#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1239
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
@@ -5237,18 +4980,18 @@ msgstr ""
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1220
+#: src/namestore/gnunet-namestore.c:1222
 #: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:1290
+#: src/namestore/gnunet-namestore.c:1292
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1340
+#: src/namestore/gnunet-namestore.c:1342
 #, c-format
 msgid ""
 "No default identity configured for `namestore' subsystem\n"
@@ -5256,102 +4999,102 @@ msgid ""
 "Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1405
+#: src/namestore/gnunet-namestore.c:1407
 #, fuzzy, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr "Onödiga argument (ignorerade).\n"
 
-#: src/namestore/gnunet-namestore.c:1434
+#: src/namestore/gnunet-namestore.c:1436
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1483
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1493
+#: src/namestore/gnunet-namestore.c:1495
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1505 src/namestore/gnunet-namestore.c:1521
-#: src/namestore/gnunet-namestore.c:1538
+#: src/namestore/gnunet-namestore.c:1507 src/namestore/gnunet-namestore.c:1523
+#: src/namestore/gnunet-namestore.c:1540
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/namestore/gnunet-namestore.c:1513
+#: src/namestore/gnunet-namestore.c:1515
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1551
+#: src/namestore/gnunet-namestore.c:1553
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1608
+#: src/namestore/gnunet-namestore.c:1610
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1611
+#: src/namestore/gnunet-namestore.c:1613
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1615
+#: src/namestore/gnunet-namestore.c:1617
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1622
+#: src/namestore/gnunet-namestore.c:1624
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1628
+#: src/namestore/gnunet-namestore.c:1630
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1633
+#: src/namestore/gnunet-namestore.c:1635
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1645
+#: src/namestore/gnunet-namestore.c:1647
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1652
+#: src/namestore/gnunet-namestore.c:1654
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1658
+#: src/namestore/gnunet-namestore.c:1660
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1663
+#: src/namestore/gnunet-namestore.c:1665
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1669
+#: src/namestore/gnunet-namestore.c:1671
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1673
+#: src/namestore/gnunet-namestore.c:1675
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1679
+#: src/namestore/gnunet-namestore.c:1681
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1685
+#: src/namestore/gnunet-namestore.c:1687
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
@@ -5709,8 +5452,8 @@ msgstr "Kan inte tillgå tjänsten"
 msgid "Show network size estimates from NSE service."
 msgstr "# byte mottogs via TCP"
 
-#: src/nse/gnunet-service-nse.c:1450
-#: src/revocation/gnunet-service-revocation.c:883 src/util/gnunet-scrypt.c:260
+#: src/nse/gnunet-service-nse.c:1441
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5907,11 +5650,6 @@ msgstr "Fel vid skapandet av användare"
 msgid "Unable to create indices: %s.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/pq/pq_prepare.c:109
-#, fuzzy, c-format
-msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
-msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
-
 #: src/pt/gnunet-daemon-pt.c:418
 #, fuzzy
 msgid "Failed to pack DNS request.  Dropping.\n"
@@ -5976,87 +5714,87 @@ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:801
+#: src/reclaim/gnunet-reclaim.c:802
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/reclaim/gnunet-reclaim.c:808
+#: src/reclaim/gnunet-reclaim.c:809
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:815
+#: src/reclaim/gnunet-reclaim.c:816
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/reclaim/gnunet-reclaim.c:833
-msgid "Add an attribute NAME"
+#: src/reclaim/gnunet-reclaim.c:834
+msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:838
+#: src/reclaim/gnunet-reclaim.c:839
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:843
+#: src/reclaim/gnunet-reclaim.c:844
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:848
+#: src/reclaim/gnunet-reclaim.c:849
 #, fuzzy
 msgid "The EGO to use"
 msgstr "meddelandestorlek"
 
-#: src/reclaim/gnunet-reclaim.c:854
+#: src/reclaim/gnunet-reclaim.c:855
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:858
+#: src/reclaim/gnunet-reclaim.c:859
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:862
+#: src/reclaim/gnunet-reclaim.c:863
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:868
+#: src/reclaim/gnunet-reclaim.c:869
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:873
+#: src/reclaim/gnunet-reclaim.c:874
 msgid "Credential name"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:879
+#: src/reclaim/gnunet-reclaim.c:880
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:884
+#: src/reclaim/gnunet-reclaim.c:885
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:889
+#: src/reclaim/gnunet-reclaim.c:890
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:894
+#: src/reclaim/gnunet-reclaim.c:895
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:899
+#: src/reclaim/gnunet-reclaim.c:900
 msgid "Type of credential"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:903
+#: src/reclaim/gnunet-reclaim.c:904
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:909
+#: src/reclaim/gnunet-reclaim.c:910
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:917
+#: src/reclaim/gnunet-reclaim.c:918
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -6084,61 +5822,61 @@ msgstr "GNUnet-konfiguration"
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1392
+#: src/regex/gnunet-regex-profiler.c:1388
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/regex/gnunet-regex-profiler.c:1434
+#: src/regex/gnunet-regex-profiler.c:1430
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1440
+#: src/regex/gnunet-regex-profiler.c:1436
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1448
+#: src/regex/gnunet-regex-profiler.c:1444
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1453
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1477
+#: src/regex/gnunet-regex-profiler.c:1473
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1565
+#: src/regex/gnunet-regex-profiler.c:1562
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1572
+#: src/regex/gnunet-regex-profiler.c:1569
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1578
+#: src/regex/gnunet-regex-profiler.c:1575
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1586
+#: src/regex/gnunet-regex-profiler.c:1582
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1593
+#: src/regex/gnunet-regex-profiler.c:1589
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1606
+#: src/regex/gnunet-regex-profiler.c:1604
 msgid "Profiler for regex"
 msgstr ""
 
@@ -6312,36 +6050,36 @@ msgstr ""
 msgid "number of epochs to calculate for"
 msgstr "antal iterationer"
 
-#: src/revocation/gnunet-service-revocation.c:502
+#: src/revocation/gnunet-service-revocation.c:507
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "# byte mottogs via TCP"
 
-#: src/revocation/gnunet-service-revocation.c:512
+#: src/revocation/gnunet-service-revocation.c:517
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/revocation/gnunet-service-revocation.c:517
+#: src/revocation/gnunet-service-revocation.c:522
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:521
+#: src/revocation/gnunet-service-revocation.c:526
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/revocation/gnunet-service-revocation.c:529
+#: src/revocation/gnunet-service-revocation.c:534
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/revocation/gnunet-service-revocation.c:567
+#: src/revocation/gnunet-service-revocation.c:572
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:920
+#: src/revocation/gnunet-service-revocation.c:925
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -6873,17 +6611,17 @@ msgid ""
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2643
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2651
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2659
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
@@ -7088,9 +6826,9 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:3329
-#: src/transport/gnunet-communicator-udp.c:3814
-#: src/transport/gnunet-service-tng.c:10388
+#: src/transport/gnunet-communicator-tcp.c:3338
+#: src/transport/gnunet-communicator-udp.c:3856
+#: src/transport/gnunet-service-tng.c:10512
 #: src/transport/gnunet-service-transport.c:2627
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
@@ -7100,7 +6838,7 @@ msgstr "GNUnet-konfiguration"
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:3889
+#: src/transport/gnunet-communicator-udp.c:3931
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -8133,17 +7871,17 @@ msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1396
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1400
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1408
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1412
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1415
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1419
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
@@ -8155,7 +7893,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:833
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
@@ -8165,23 +7903,23 @@ msgstr "Okänd operation \"%s\"\n"
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:946
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:950
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:451 src/util/service.c:987
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:991
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:890
-#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1476
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1480
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1500
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1504
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8196,45 +7934,45 @@ msgstr "Fel vid %s:%d.\n"
 msgid "Service `%s' runs at %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1746
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1750
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1751
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1756
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
 msgid "Service process failed to report status\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1220
-#: src/util/service.c:1637
+#: src/util/service.c:1641
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1639
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1643
 msgid "No such user"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1653
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:1996
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2000
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1397
-#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2072
-#: src/util/service.c:2084
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2076
+#: src/util/service.c:2088
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2094
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2098
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -8483,7 +8221,7 @@ msgstr ""
 msgid "failed to load configuration defaults"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/container_bloomfilter.c:553
+#: src/util/container_bloomfilter.c:547
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8500,7 +8238,7 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc_setup.c:273
+#: src/util/crypto_ecc_setup.c:280
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
@@ -8510,12 +8248,12 @@ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/util/crypto_rsa.c:862
+#: src/util/crypto_rsa.c:901
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_rsa.c:1162
+#: src/util/crypto_rsa.c:1201
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -8620,11 +8358,11 @@ msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 msgid "Missing mandatory option `%s'.\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/getopt_helpers.c:69
+#: src/util/getopt_helpers.c:63
 msgid "print the version number"
 msgstr "skriv ut versionsnummer"
 
-#: src/util/getopt_helpers.c:116
+#: src/util/getopt_helpers.c:110
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8632,73 +8370,83 @@ msgstr ""
 "Argument som är obligatoriska för långa flaggor är också obligatoriska för "
 "korta flaggor.\n"
 
-#: src/util/getopt_helpers.c:208
+#: src/util/getopt_helpers.c:196
 msgid "print this help"
 msgstr "skriv ut denna hjälp"
 
-#: src/util/getopt_helpers.c:288
+#: src/util/getopt_helpers.c:261
 msgid "be verbose"
 msgstr "var informativ"
 
-#: src/util/getopt_helpers.c:429
+#: src/util/getopt_helpers.c:377
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:510
+#: src/util/getopt_helpers.c:444
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:532
+#: src/util/getopt_helpers.c:461
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:859
-#: src/util/getopt_helpers.c:924
+#: src/util/getopt_helpers.c:497 src/util/getopt_helpers.c:811
+#: src/util/getopt_helpers.c:867
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:649
+#: src/util/getopt_helpers.c:569
 #, fuzzy, c-format
 msgid ""
 "You must pass a relative time (optionally with sign) to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:656
+#: src/util/getopt_helpers.c:576
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:683
+#: src/util/getopt_helpers.c:594
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:685
+#: src/util/getopt_helpers.c:596
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:720
+#: src/util/getopt_helpers.c:630
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:785
+#: src/util/getopt_helpers.c:684
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:852
+#: src/util/getopt_helpers.c:741
+#, fuzzy, c-format
+msgid "You must pass a timestamp to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+
+#: src/util/getopt_helpers.c:748
+#, c-format
+msgid "The maximum precision allowed for timestamps is seconds.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:804
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:931
+#: src/util/getopt_helpers.c:874
 #, fuzzy, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:1018
+#: src/util/getopt_helpers.c:952
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
@@ -8824,31 +8572,84 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-qr.c:145 src/util/gnunet-uri.c:94
+#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
 #, fuzzy, c-format
-msgid "Invalid URI: does not start with `%s'\n"
+msgid "Failed to add URI %s\n"
+msgstr "Fil \"%s\" har URI: %s\n"
+
+#: src/util/gnunet-qr.c:133
+#, fuzzy, c-format
+msgid "Added URI %s\n"
+msgstr "Ogiltiga argument: "
+
+#: src/util/gnunet-qr.c:160
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/gnunet-qr.c:152 src/util/gnunet-uri.c:101
+#: src/util/gnunet-qr.c:170
 #, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
+msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:159 src/util/gnunet-uri.c:108
+#: src/util/gnunet-qr.c:181
 #, c-format
-msgid "No handler known for subsystem `%s'\n"
+msgid "No known handler for subsystem `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:217
+#, fuzzy, c-format
+msgid "Unable to start child process `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/util/gnunet-qr.c:246
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/util/gnunet-qr.c:260
+#, fuzzy
+msgid "Capturing...\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+msgid "No captured images\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#, c-format
+msgid "Got %d images\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#, fuzzy, c-format
+msgid "Found %s: \"%s\"\n"
+msgstr "Jag är ändpunkt \"%s\".\n"
+
+#: src/util/gnunet-qr.c:364 src/util/gnunet-qr.c:366
+#, fuzzy, c-format
+msgid "%s is not a PNG file\n"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: src/util/gnunet-qr.c:545
+#, fuzzy
+msgid "No data found\n"
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/util/gnunet-qr.c:561
+msgid "Dispatching the URI\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:357
-msgid "use video-device DEVICE (default: /dev/video0"
+#: src/util/gnunet-qr.c:572
+msgid "use the video device DEVICE (defaults to /dev/video0)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:362
-msgid "do not show preview windows"
+#: src/util/gnunet-qr.c:579
+msgid "read from the PNG-encoded file FILE"
 msgstr ""
 
-#: src/util/gnunet-qr.c:372
-msgid "Scan a QR code using a video device and import the uri read"
+#: src/util/gnunet-qr.c:590
+msgid "Scan a QR code and import the URI read"
 msgstr ""
 
 #: src/util/gnunet-resolver.c:168
@@ -8859,28 +8660,28 @@ msgstr ""
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:232
+#: src/util/gnunet-scrypt.c:215
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:304
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:310
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:330
+#: src/util/gnunet-scrypt.c:313
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -8894,6 +8695,21 @@ msgstr ""
 msgid "No URI specified on command line\n"
 msgstr ""
 
+#: src/util/gnunet-uri.c:94
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
+
+#: src/util/gnunet-uri.c:101
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:108
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
 #: src/util/gnunet-uri.c:178
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
@@ -8913,12 +8729,12 @@ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/network.c:178
+#: src/util/network.c:163
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1359
+#: src/util/network.c:1306
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8931,12 +8747,12 @@ msgid ""
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:802
+#: src/util/os_installation.c:786
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/util/os_installation.c:835
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8946,37 +8762,37 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/util/plugin.c:162
+#: src/util/plugin.c:156
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
-#: src/util/plugin.c:240
+#: src/util/plugin.c:234
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/plugin.c:420
+#: src/util/plugin.c:414
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/util/program.c:251
+#: src/util/program.c:286
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/program.c:263
+#: src/util/program.c:298
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/program.c:278
+#: src/util/program.c:313
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/program.c:293
+#: src/util/program.c:328
 #, fuzzy
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -9028,7 +8844,7 @@ msgid ""
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1568
+#: src/util/service.c:1572
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
@@ -9043,82 +8859,82 @@ msgstr ""
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:409
+#: src/util/strings.c:395
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:501
+#: src/util/strings.c:487
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:1036
+#: src/util/strings.c:1023
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1044
+#: src/util/strings.c:1031
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1051
+#: src/util/strings.c:1038
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1059
+#: src/util/strings.c:1046
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1068
+#: src/util/strings.c:1055
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/strings.c:1250 src/util/strings.c:1261
+#: src/util/strings.c:1237 src/util/strings.c:1248
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1270
+#: src/util/strings.c:1257
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/strings.c:1341 src/util/strings.c:1370 src/util/strings.c:1417
-#: src/util/strings.c:1437
+#: src/util/strings.c:1328 src/util/strings.c:1357 src/util/strings.c:1404
+#: src/util/strings.c:1424
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1395
+#: src/util/strings.c:1382
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
 
-#: src/util/strings.c:1446
+#: src/util/strings.c:1433
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1488
+#: src/util/strings.c:1475
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/strings.c:1538
+#: src/util/strings.c:1525
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/strings.c:1569
+#: src/util/strings.c:1556
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
 
-#: src/util/time.c:699 src/util/time.c:727
+#: src/util/time.c:863 src/util/time.c:891
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:735
+#: src/util/time.c:899
 #, c-format
 msgid ""
 "Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
@@ -9308,6 +9124,134 @@ msgstr ""
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
+#, fuzzy
+#~ msgid "# requests for random value received"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# GET requests from clients injected"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# PUT requests received from clients"
+#~ msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#, fuzzy
+#~ msgid "# GET requests received from clients"
+#~ msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#, fuzzy
+#~ msgid "# GET STOP requests received from clients"
+#~ msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#, fuzzy
+#~ msgid "# RESULTS queued for clients"
+#~ msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#, fuzzy, c-format
+#~ msgid "%s request received, but have no datacache!\n"
+#~ msgstr "# byte mottagna av typen %d"
+
+#, fuzzy
+#~ msgid "# GET requests given to datacache"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# HELLOs obtained from peerinfo"
+#~ msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#, fuzzy
+#~ msgid "# FIND PEER messages initiated"
+#~ msgstr "# PING-meddelanden skapade"
+
+#, fuzzy
+#~ msgid "# requests TTL-dropped"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# PUT requests routed"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# PUT messages queued for transmission"
+#~ msgstr "# PING-meddelanden skapade"
+
+#, fuzzy
+#~ msgid "# P2P messages dropped due to full queue"
+#~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#, fuzzy
+#~ msgid "# GET requests routed"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# GET messages queued for transmission"
+#~ msgstr "# PING-meddelanden skapade"
+
+#, fuzzy
+#~ msgid "# RESULT messages queued for transmission"
+#~ msgstr "# PING-meddelanden skapade"
+
+#, fuzzy
+#~ msgid "# P2P PUT requests received"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# P2P PUT bytes received"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# P2P GET requests received"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# P2P GET bytes received"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# P2P FIND PEER requests processed"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# P2P GET requests ONLY routed"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# P2P RESULTS received"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# P2P RESULT bytes received"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# Network size estimates received"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# DHT requests combined"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# replies dropped due to type mismatch"
+#~ msgstr "# byte mottagna av typen %d"
+
+#, fuzzy
+#~ msgid "# replies received for other peers"
+#~ msgstr "# byte mottagna av typen %d"
+
+#, fuzzy, c-format
+#~ msgid "Businesscard HTTP server starts on %u\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy, c-format
+#~ msgid "Could not start businesscard HTTP server on port %u\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy, c-format
+#~ msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
+#~ msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
+
 #, fuzzy
 #~ msgid "Waiting for child to exit.\n"
 #~ msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
@@ -10832,10 +10776,6 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 #~ msgid "Could not start `%s' process to create hostkey.\n"
 #~ msgstr "Kunde inte skapa värdnyckel!\n"
 
-#, fuzzy
-#~ msgid "Failed to start `ssh' process.\n"
-#~ msgstr "Misslyckades att starta samling.\n"
-
 #, fuzzy
 #~ msgid "Malformed output from gnunet-peerinfo!\n"
 #~ msgstr "Misslyckades att starta samling.\n"
@@ -11029,10 +10969,6 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 #~ msgid "Failed to load dhtlog plugin for `%s'\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#, fuzzy
-#~ msgid "Found peer `%s'\n"
-#~ msgstr "Jag är ändpunkt \"%s\".\n"
-
 #, fuzzy
 #~ msgid "Loading udp transport plugin\n"
 #~ msgstr "Testar transport(er) %s\n"
diff --git a/po/vi.po b/po/vi.po
index 1d8f84f90..a24e83e72 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-10-15 10:46+0200\n"
+"POT-Creation-Date: 2022-01-10 15:13+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -19,131 +19,136 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1302
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1304
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:901
+#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
 #, fuzzy, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/abd/gnunet-abd.c:560 src/abd/gnunet-service-abd.c:1747
-#: src/namestore/gnunet-namestore-fcfsd.c:1067
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
 #: src/namestore/gnunet-namestore.c:1001
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/abd/gnunet-abd.c:840 src/abd/gnunet-abd.c:891
+#: src/abd/gnunet-abd.c:566
+#, fuzzy
+msgid "Ego does not exist!\n"
+msgstr "đặt số trình nền cần khởi chạy"
+
+#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/abd/gnunet-abd.c:849 src/abd/gnunet-abd.c:910
+#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
 #, fuzzy, c-format
 msgid "Failed to connect to ABD\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/abd/gnunet-abd.c:855
+#: src/abd/gnunet-abd.c:865
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:862
+#: src/abd/gnunet-abd.c:872
 #, c-format
 msgid "ego required\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:872
+#: src/abd/gnunet-abd.c:882
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:881
+#: src/abd/gnunet-abd.c:890
 #, fuzzy, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/abd/gnunet-abd.c:916
+#: src/abd/gnunet-abd.c:924
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:975
+#: src/abd/gnunet-abd.c:983
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:996
+#: src/abd/gnunet-abd.c:1004
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1003
+#: src/abd/gnunet-abd.c:1011
 #, fuzzy
 msgid ""
 "The public key of the subject to lookup thecredential for, or for issuer "
 "side storage: subject and its attributes"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/abd/gnunet-abd.c:1010
+#: src/abd/gnunet-abd.c:1018
 msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1017
+#: src/abd/gnunet-abd.c:1025
 #, fuzzy
 msgid "The public key of the authority to verify the credential against"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/abd/gnunet-abd.c:1022
+#: src/abd/gnunet-abd.c:1030
 #, fuzzy
 msgid "The ego/zone name to use"
 msgstr "kích cỡ tin nhắn"
 
-#: src/abd/gnunet-abd.c:1028
+#: src/abd/gnunet-abd.c:1036
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1034
+#: src/abd/gnunet-abd.c:1042
 msgid ""
 "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1039
+#: src/abd/gnunet-abd.c:1047
 msgid "collect credentials"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1044
+#: src/abd/gnunet-abd.c:1052
 msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1049
+#: src/abd/gnunet-abd.c:1057
 msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1054
+#: src/abd/gnunet-abd.c:1062
 msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1061
+#: src/abd/gnunet-abd.c:1069
 msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1065
+#: src/abd/gnunet-abd.c:1073
 msgid "Create private record entry."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1071 src/abd/gnunet-abd.c:1077
+#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
 msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1090
+#: src/abd/gnunet-abd.c:1098
 #, fuzzy
 msgid "GNUnet abd resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
 
-#: src/abd/gnunet-service-abd.c:1742 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -392,28 +397,28 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1129
 #: src/transport/plugin_transport_tcp.c:3706
 #: src/transport/tcp_service_legacy.c:594
-#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1090
-#: src/util/service.c:1096
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1094
+#: src/util/service.c:1100
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
 #: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
-#: src/util/service.c:1129
+#: src/util/service.c:1133
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
 #: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
-#: src/util/service.c:1133
+#: src/util/service.c:1137
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
 #: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
-#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1153
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1157
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -421,7 +426,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
-#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1171
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1175
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -429,7 +434,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:536
 #: src/transport/plugin_transport_http_server.c:2718
 #: src/transport/plugin_transport_tcp.c:1244
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1202
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1206
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -437,7 +442,7 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 #: src/arm/gnunet-service-arm.c:555
 #: src/transport/plugin_transport_http_server.c:2736
 #: src/transport/plugin_transport_tcp.c:1263
-#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1221
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1225
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
@@ -1345,36 +1350,36 @@ msgstr "In ra thông tin về các đồng đẳng GNUnet."
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-service-core.c:329
+#: src/core/gnunet-service-core.c:328
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core.c:355
+#: src/core/gnunet-service-core.c:354
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
+#: src/core/gnunet-service-core.c:418
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core.c:506
+#: src/core/gnunet-service-core.c:504
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core.c:825
+#: src/core/gnunet-service-core.c:823
 #, fuzzy, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core.c:927
+#: src/core/gnunet-service-core.c:925
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/core/gnunet-service-core.c:955
+#: src/core/gnunet-service-core.c:953
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
@@ -1537,9 +1542,7 @@ msgstr "# các byte đã giải mã"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/dht/gnunet-service-dht_neighbours.c:740
-#: src/dht/gnunet-service-dht_neighbours.c:803
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1522
+#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1520
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1573,53 +1576,48 @@ msgstr "# các thông báo phát hiện dht được nhận"
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:299
-#: src/datastore/gnunet-service-datastore.c:742
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:275
+#: src/datastore/gnunet-service-datastore.c:743
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:303
+#: src/datacache/datacache.c:121 src/datacache/datacache.c:279
 #, fuzzy
 msgid "# items stored"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datacache/datacache.c:190
+#: src/datacache/datacache.c:185
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:208
+#: src/datacache/datacache.c:203
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/datacache/datacache.c:332
+#: src/datacache/datacache.c:297
 #, fuzzy
 msgid "# requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datacache/datacache.c:343
+#: src/datacache/datacache.c:308
 msgid "# requests filtered by bloom filter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/datacache/datacache.c:370
-#, fuzzy
-msgid "# requests for random value received"
-msgstr "# tổng số yêu cầu lỗ hổng được nhận"
-
-#: src/datacache/datacache.c:400
+#: src/datacache/datacache.c:329
 #, fuzzy
 msgid "# proximity search requests received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/datacache/plugin_datacache_heap.c:554
+#: src/datacache/plugin_datacache_heap.c:527
 #, fuzzy
 msgid "Heap datacache running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/datacache/plugin_datacache_sqlite.c:123
-#: src/datacache/plugin_datacache_sqlite.c:144
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:139
 #: src/datastore/plugin_datastore_mysql.c:890
 #: src/datastore/plugin_datastore_sqlite.c:63
 #: src/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:81 src/my/my.c:93
@@ -1636,7 +1634,7 @@ msgstr "kho dữ liệu sqlite"
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:783
+#: src/datacache/plugin_datacache_sqlite.c:693
 #: src/datastore/plugin_datastore_sqlite.c:531
 #: src/namecache/plugin_namecache_sqlite.c:237
 #: src/namestore/plugin_namestore_sqlite.c:273
@@ -1805,136 +1803,136 @@ msgid ""
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:605
+#: src/datastore/gnunet-service-datastore.c:606
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:611
+#: src/datastore/gnunet-service-datastore.c:612
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:618
+#: src/datastore/gnunet-service-datastore.c:619
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:625
-#: src/datastore/gnunet-service-datastore.c:676
-#: src/datastore/gnunet-service-datastore.c:819
-#: src/datastore/gnunet-service-datastore.c:1428
+#: src/datastore/gnunet-service-datastore.c:626
+#: src/datastore/gnunet-service-datastore.c:677
+#: src/datastore/gnunet-service-datastore.c:820
+#: src/datastore/gnunet-service-datastore.c:1429
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:692
+#: src/datastore/gnunet-service-datastore.c:693
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:757
+#: src/datastore/gnunet-service-datastore.c:758
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:857
+#: src/datastore/gnunet-service-datastore.c:858
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:887
+#: src/datastore/gnunet-service-datastore.c:888
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:898
+#: src/datastore/gnunet-service-datastore.c:899
 #, fuzzy
 msgid "# requests filtered by bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/datastore/gnunet-service-datastore.c:939
+#: src/datastore/gnunet-service-datastore.c:940
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:970
+#: src/datastore/gnunet-service-datastore.c:971
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1011
+#: src/datastore/gnunet-service-datastore.c:1012
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1019
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1058
+#: src/datastore/gnunet-service-datastore.c:1059
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/datastore/gnunet-service-datastore.c:1108
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1282
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/datastore/gnunet-service-datastore.c:1168
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/datastore/gnunet-service-datastore.c:1177
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:1236
+#: src/datastore/gnunet-service-datastore.c:1237
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1288
+#: src/datastore/gnunet-service-datastore.c:1289
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1298
+#: src/datastore/gnunet-service-datastore.c:1299
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/datastore/gnunet-service-datastore.c:1464
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# các byte được phép trong kho dữ liệu"
 
-#: src/datastore/gnunet-service-datastore.c:1472
+#: src/datastore/gnunet-service-datastore.c:1473
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1476
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/datastore/gnunet-service-datastore.c:1492
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/datastore/gnunet-service-datastore.c:1513
+#: src/datastore/gnunet-service-datastore.c:1535
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/datastore/gnunet-service-datastore.c:1573
+#: src/datastore/gnunet-service-datastore.c:1574
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -2034,53 +2032,53 @@ msgstr "kho dữ liệu sqlite"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:158
+#: src/dht/gnunet-dht-get.c:159
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:160
 #, c-format
 msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:197
+#: src/dht/gnunet-dht-get.c:209
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:203 src/dht/gnunet-dht-monitor.c:255
+#: src/dht/gnunet-dht-get.c:217 src/dht/gnunet-dht-monitor.c:255
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:213
+#: src/dht/gnunet-dht-get.c:227
 msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:260 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:251
+#: src/dht/gnunet-dht-get.c:266
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:256 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:272 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:262
+#: src/dht/gnunet-dht-get.c:278
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-get.c:284 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:301
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -2111,263 +2109,30 @@ msgstr "Không thể kết nối tới %s:%u: %s\n"
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:187
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:193
+#: src/dht/gnunet-dht-put.c:194
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:212
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:212
+#: src/dht/gnunet-dht-put.c:217
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-put.c:223
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:232
+#: src/dht/gnunet-dht-put.c:241
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:367
-#, fuzzy
-msgid "# GET requests from clients injected"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/dht/gnunet-service-dht_clients.c:483
-#, fuzzy
-msgid "# PUT requests received from clients"
-msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
-
-#: src/dht/gnunet-service-dht_clients.c:616
-#, fuzzy
-msgid "# GET requests received from clients"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/dht/gnunet-service-dht_clients.c:848
-#, fuzzy
-msgid "# GET STOP requests received from clients"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/dht/gnunet-service-dht_clients.c:1033
-msgid "# Key match, type mismatches in REPLY to CLIENT"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1049
-msgid "# Duplicate REPLIES to CLIENT request dropped"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1102
-#, c-format
-msgid "Unsupported block type (%u) in request!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1110
-msgid "# RESULTS queued for clients"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1191
-msgid "# REPLIES ignored for CLIENTS (no match)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:73
-#, fuzzy, c-format
-msgid "%s request received, but have no datacache!\n"
-msgstr "# các byte kiểu %d được nhận"
-
-#: src/dht/gnunet-service-dht_datacache.c:83
-msgid "# ITEMS stored in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:206
-msgid "# Good RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:220
-msgid "# Duplicate RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:228
-msgid "# Invalid RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:236
-msgid "# Irrelevant RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:252
-msgid "# Unsupported RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:256
-#, c-format
-msgid "Unsupported block type (%u) in local response!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:291
-#, fuzzy
-msgid "# GET requests given to datacache"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/dht/gnunet-service-dht_hello.c:86
-#, fuzzy
-msgid "# HELLOs obtained from peerinfo"
-msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
-
-#: src/dht/gnunet-service-dht_neighbours.c:678
-#, fuzzy
-msgid "# FIND PEER messages initiated"
-msgstr "# các thông báo PING được tạo"
-
-#: src/dht/gnunet-service-dht_neighbours.c:855
-#, fuzzy
-msgid "# requests TTL-dropped"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1042
-#: src/dht/gnunet-service-dht_neighbours.c:1079
-msgid "# Peers excluded from routing due to Bloomfilter"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1095
-#, fuzzy
-msgid "# Peer selection failed"
-msgstr "# các cuộc gọi HTTP select (lựa chọn)"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1253
-#, fuzzy
-msgid "# PUT requests routed"
-msgstr "# các yêu cầu dht được định tuyến"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1287
-#, fuzzy
-msgid "# PUT messages queued for transmission"
-msgstr "# các thông báo PING được tạo"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1299
-#: src/dht/gnunet-service-dht_neighbours.c:1441
-#: src/dht/gnunet-service-dht_neighbours.c:1545
-#, fuzzy
-msgid "# P2P messages dropped due to full queue"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1384
-#, fuzzy
-msgid "# GET requests routed"
-msgstr "# các yêu cầu dht được định tuyến"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1428
-#, fuzzy
-msgid "# GET messages queued for transmission"
-msgstr "# các thông báo PING được tạo"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1560
-#, fuzzy
-msgid "# RESULT messages queued for transmission"
-msgstr "# các thông báo PING được tạo"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1663
-msgid "# Expired PUTs discarded"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1671
-#, fuzzy
-msgid "# P2P PUT requests received"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1675
-#, fuzzy
-msgid "# P2P PUT bytes received"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1907
-#, fuzzy
-msgid "# FIND PEER requests ignored due to Bloomfilter"
-msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
-
-#: src/dht/gnunet-service-dht_neighbours.c:1916
-msgid "# FIND PEER requests ignored due to lack of HELLO"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2079
-#, fuzzy
-msgid "# P2P GET requests received"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2083
-#, fuzzy
-msgid "# P2P GET bytes received"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2149
-#, fuzzy
-msgid "# P2P FIND PEER requests processed"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2170
-#, fuzzy
-msgid "# P2P GET requests ONLY routed"
-msgstr "# các yêu cầu dht được định tuyến"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2348
-msgid "# Expired results discarded"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2365
-#, fuzzy
-msgid "# P2P RESULTS received"
-msgstr "# Tín hiệu HTTP PUT được nhận"
-
-#: src/dht/gnunet-service-dht_neighbours.c:2369
-#, fuzzy
-msgid "# P2P RESULT bytes received"
-msgstr "# Tín hiệu HTTP PUT được nhận"
-
-#: src/dht/gnunet-service-dht_nse.c:59
-#, fuzzy
-msgid "# Network size estimates received"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Good REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:236
-msgid "# Duplicate REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:244
-msgid "# Invalid REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:252
-msgid "# Irrelevant REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:268
-msgid "# Unsupported REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:347
-msgid "# Entries removed from routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:422
-msgid "# Entries added to routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:444
-#, fuzzy
-msgid "# DHT requests combined"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
 #: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
@@ -2416,17 +2181,17 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/dht/plugin_block_dht.c:189
+#: src/dht/plugin_block_dht.c:328
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Không biết truyền tải nào kiểu %d.\n"
 
-#: src/dht/plugin_block_dht.c:198
+#: src/dht/plugin_block_dht.c:337
 #, c-format
 msgid "Size mismatch for block with type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:209
+#: src/dht/plugin_block_dht.c:348
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -3727,7 +3492,7 @@ msgstr "# các thông báo phát hiện dht được nhận"
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1345
+#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
@@ -3735,68 +3500,50 @@ msgstr ""
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:869
-#, fuzzy
-msgid "# replies dropped due to type mismatch"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-
-#: src/fs/gnunet-service-fs_cp.c:877
-#, fuzzy
-msgid "# replies received for other peers"
-msgstr "# các byte kiểu %d được nhận"
-
-#: src/fs/gnunet-service-fs_cp.c:892
-msgid "# replies dropped due to insufficient cover traffic"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:940
-msgid "# P2P searches destroyed due to ultimate reply"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1011
+#: src/fs/gnunet-service-fs_cp.c:1009
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1036
+#: src/fs/gnunet-service-fs_cp.c:1034
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1046
+#: src/fs/gnunet-service-fs_cp.c:1044
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1141
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1199
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1225
+#: src/fs/gnunet-service-fs_cp.c:1223
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1239
+#: src/fs/gnunet-service-fs_cp.c:1237
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1296
+#: src/fs/gnunet-service-fs_cp.c:1294
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1341
+#: src/fs/gnunet-service-fs_cp.c:1339
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1711
+#: src/fs/gnunet-service-fs_cp.c:1709
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -3881,108 +3628,95 @@ msgstr ""
 msgid "# Pending requests created"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:656
+#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:658
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:832
+#: src/fs/gnunet-service-fs_pr.c:838
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:880
-msgid "# duplicate replies discarded (bloomfilter)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:889
-msgid "# irrelevant replies discarded"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:908
-#, c-format
-msgid "Unsupported block type %u\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:921
+#: src/fs/gnunet-service-fs_pr.c:916
 #, fuzzy
 msgid "# results found locally"
 msgstr "# nội dung lỗ hổng được tìm cục bộ"
 
-#: src/fs/gnunet-service-fs_pr.c:1055
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1084
+#: src/fs/gnunet-service-fs_pr.c:1079
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_pr.c:1123
+#: src/fs/gnunet-service-fs_pr.c:1118
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1259
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1318
+#: src/fs/gnunet-service-fs_pr.c:1313
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1339
+#: src/fs/gnunet-service-fs_pr.c:1334
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1402
+#: src/fs/gnunet-service-fs_pr.c:1401
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1464
+#: src/fs/gnunet-service-fs_pr.c:1463
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1519
+#: src/fs/gnunet-service-fs_pr.c:1518
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1534
+#: src/fs/gnunet-service-fs_pr.c:1533
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1557
+#: src/fs/gnunet-service-fs_pr.c:1556
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1574
+#: src/fs/gnunet-service-fs_pr.c:1573
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1594
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1600
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1642
+#: src/fs/gnunet-service-fs_pr.c:1641
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1655
+#: src/fs/gnunet-service-fs_pr.c:1654
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1706
+#: src/fs/gnunet-service-fs_pr.c:1705
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1756
+#: src/fs/gnunet-service-fs_pr.c:1755
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -4026,31 +3760,26 @@ msgstr ""
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:134
+#: src/gns/gnunet-bcd.c:571
 #, fuzzy, c-format
-msgid "Refusing `%s' request to HTTP server\n"
-msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
-
-#: src/gns/gnunet-bcd.c:347
-#, c-format
-msgid "Invalid port number %u.  Exiting.\n"
-msgstr ""
+msgid "Invalid port number %u\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/gns/gnunet-bcd.c:352
-#, fuzzy, c-format
-msgid "Businesscard HTTP server starts on %u\n"
-msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
+#: src/gns/gnunet-bcd.c:612 src/namestore/gnunet-namestore-fcfsd.c:1113
+#, fuzzy
+msgid "Unable to set up the daemon\n"
+msgstr "Không thể tạo tài khoản người dùng cho trình nền."
 
-#: src/gns/gnunet-bcd.c:372
-#, fuzzy, c-format
-msgid "Could not start businesscard HTTP server on port %u\n"
-msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
+#: src/gns/gnunet-bcd.c:635 src/namestore/gnunet-namestore-fcfsd.c:987
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-bcd.c:509
-msgid "Run HTTP serve on port PORT (default is 8888)"
+#: src/gns/gnunet-bcd.c:658
+msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:522
+#: src/gns/gnunet-bcd.c:667
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
@@ -4846,62 +4575,79 @@ msgstr "« %s » không sẵn sàng.\n"
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 
-#: src/identity/gnunet-identity.c:214
+#: src/identity/gnunet-identity.c:231
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/identity/gnunet-identity.c:255
+#: src/identity/gnunet-identity.c:272
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/identity/gnunet-identity.c:461
+#: src/identity/gnunet-identity.c:646
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:466
+#: src/identity/gnunet-identity.c:651
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:472
+#: src/identity/gnunet-identity.c:657
 msgid ""
 "set the private key for the identity to PRIVATE_KEY (use together with -C)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:477
+#: src/identity/gnunet-identity.c:663
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:669
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:674
 msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:481
+#: src/identity/gnunet-identity.c:678
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:485
+#: src/identity/gnunet-identity.c:682
 msgid "reduce output"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:492
+#: src/identity/gnunet-identity.c:689
 msgid ""
 "set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
-"s) or restrict results to NAME (use together with -d)"
+"s), restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:695
+msgid "The public key of the recipient (with -W)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:496
+#: src/identity/gnunet-identity.c:699
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:500
+#: src/identity/gnunet-identity.c:703
 #, fuzzy
 msgid "display private keys as well"
 msgstr "hiển thị giá trị tổng kiểm của tập tin"
 
-#: src/identity/gnunet-identity.c:507
+#: src/identity/gnunet-identity.c:710
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:522
+#: src/identity/gnunet-identity.c:725
 msgid "Maintain egos"
 msgstr ""
 
@@ -4962,6 +4708,12 @@ msgstr "Lỗi sơ khởi lõi.\n"
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
+#: src/messenger/plugin_gnsrecord_messenger.c:118
+#: src/messenger/plugin_gnsrecord_messenger.c:133
+#, fuzzy, c-format
+msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
 #: src/my/my.c:196 src/my/my.c:215
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
@@ -5002,7 +4754,7 @@ msgstr "Đối số không hợp lệ cho « %s ».\n"
 msgid "You must specify a name\n"
 msgstr "Phải ghi rõ tên hiệu\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1639
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1641
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -5011,7 +4763,7 @@ msgstr ""
 msgid "specifies the public key of the zone to look in"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1700
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1702
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
@@ -5061,112 +4813,102 @@ msgstr "kho dữ liệu sqlite"
 msgid "Failed to setup database at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:359
+#: src/namestore/gnunet-namestore-fcfsd.c:368
 #, fuzzy
 msgid "can not search the namestore"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/namestore/gnunet-namestore-fcfsd.c:413
-#: src/namestore/gnunet-namestore-fcfsd.c:554
+#: src/namestore/gnunet-namestore-fcfsd.c:422
+#: src/namestore/gnunet-namestore-fcfsd.c:563
 #, fuzzy
 msgid "unable to scan namestore"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/namestore/gnunet-namestore-fcfsd.c:441
+#: src/namestore/gnunet-namestore-fcfsd.c:450
 #, fuzzy, c-format
 msgid "Failed to create record for `%s': %s\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:453
+#: src/namestore/gnunet-namestore-fcfsd.c:462
 #, fuzzy
 msgid "no errors"
 msgstr "Lỗi không rõ"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:489
+#: src/namestore/gnunet-namestore-fcfsd.c:498
 #, fuzzy, c-format
 msgid "The requested key `%s' exists as `%s'\n"
 msgstr "Đã tạo mục nhập « %s » trong không gian tên « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/namestore/gnunet-namestore-fcfsd.c:505
 msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:513
+#: src/namestore/gnunet-namestore-fcfsd.c:522
 #, fuzzy
 msgid "Error creating record data\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:517
+#: src/namestore/gnunet-namestore-fcfsd.c:526
 #, fuzzy
 msgid "unable to store record"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:588
+#: src/namestore/gnunet-namestore-fcfsd.c:597
 #, c-format
 msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:594
+#: src/namestore/gnunet-namestore-fcfsd.c:603
 msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:780
+#: src/namestore/gnunet-namestore-fcfsd.c:789
 msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
+#: src/namestore/gnunet-namestore-fcfsd.c:800
 msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:806
+#: src/namestore/gnunet-namestore-fcfsd.c:819
 #, fuzzy
 msgid "invalid parameters"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:823
+#: src/namestore/gnunet-namestore-fcfsd.c:836
 #, fuzzy
 msgid "invalid name"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
+#: src/namestore/gnunet-namestore-fcfsd.c:847
 #, fuzzy, c-format
 msgid "Unable to parse key %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:838
+#: src/namestore/gnunet-namestore-fcfsd.c:851
 #, fuzzy
 msgid "unable to parse key"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:949
+#: src/namestore/gnunet-namestore-fcfsd.c:962
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:974
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1058
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
 #, fuzzy
 msgid "No port specified, using default value\n"
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1076
+#: src/namestore/gnunet-namestore-fcfsd.c:1089
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1100
-#, fuzzy
-msgid "Unable to set up the daemon\n"
-msgstr "Không thể tạo tài khoản người dùng cho trình nền."
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1123
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
 msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1132
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
@@ -5243,7 +4985,7 @@ msgstr "chưa đưa ra tên"
 #: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1066
 #: src/namestore/gnunet-namestore.c:1076 src/namestore/gnunet-namestore.c:1105
 #: src/namestore/gnunet-namestore.c:1126 src/namestore/gnunet-namestore.c:1153
-#: src/namestore/gnunet-namestore.c:1228
+#: src/namestore/gnunet-namestore.c:1230
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
@@ -5259,7 +5001,7 @@ msgstr "Dữ liệu nhập không hợp lệ.\n"
 
 #: src/namestore/gnunet-namestore.c:1068 src/namestore/gnunet-namestore.c:1078
 #: src/namestore/gnunet-namestore.c:1107 src/namestore/gnunet-namestore.c:1128
-#: src/namestore/gnunet-namestore.c:1230
+#: src/namestore/gnunet-namestore.c:1232
 msgid "add"
 msgstr ""
 
@@ -5278,7 +5020,7 @@ msgstr ""
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1237
+#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1239
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
@@ -5292,18 +5034,18 @@ msgstr ""
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/namestore/gnunet-namestore.c:1220
+#: src/namestore/gnunet-namestore.c:1222
 #: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore.c:1290
+#: src/namestore/gnunet-namestore.c:1292
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1340
+#: src/namestore/gnunet-namestore.c:1342
 #, c-format
 msgid ""
 "No default identity configured for `namestore' subsystem\n"
@@ -5311,102 +5053,102 @@ msgid ""
 "Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1405
+#: src/namestore/gnunet-namestore.c:1407
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1434
+#: src/namestore/gnunet-namestore.c:1436
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1483
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1493
+#: src/namestore/gnunet-namestore.c:1495
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1505 src/namestore/gnunet-namestore.c:1521
-#: src/namestore/gnunet-namestore.c:1538
+#: src/namestore/gnunet-namestore.c:1507 src/namestore/gnunet-namestore.c:1523
+#: src/namestore/gnunet-namestore.c:1540
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:1513
+#: src/namestore/gnunet-namestore.c:1515
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/namestore/gnunet-namestore.c:1551
+#: src/namestore/gnunet-namestore.c:1553
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1608
+#: src/namestore/gnunet-namestore.c:1610
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1611
+#: src/namestore/gnunet-namestore.c:1613
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1615
+#: src/namestore/gnunet-namestore.c:1617
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1622
+#: src/namestore/gnunet-namestore.c:1624
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1628
+#: src/namestore/gnunet-namestore.c:1630
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/namestore/gnunet-namestore.c:1633
+#: src/namestore/gnunet-namestore.c:1635
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/namestore/gnunet-namestore.c:1645
+#: src/namestore/gnunet-namestore.c:1647
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/namestore/gnunet-namestore.c:1652
+#: src/namestore/gnunet-namestore.c:1654
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1658
+#: src/namestore/gnunet-namestore.c:1660
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1663
+#: src/namestore/gnunet-namestore.c:1665
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1669
+#: src/namestore/gnunet-namestore.c:1671
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1673
+#: src/namestore/gnunet-namestore.c:1675
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1679
+#: src/namestore/gnunet-namestore.c:1681
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1685
+#: src/namestore/gnunet-namestore.c:1687
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5760,8 +5502,8 @@ msgstr "Không thể truy cập đến dịch vụ"
 msgid "Show network size estimates from NSE service."
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/nse/gnunet-service-nse.c:1450
-#: src/revocation/gnunet-service-revocation.c:883 src/util/gnunet-scrypt.c:260
+#: src/nse/gnunet-service-nse.c:1441
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "Giá trị không nằm trong phạm vi được phép."
@@ -5964,11 +5706,6 @@ msgstr "Gặp lỗi khi tạo người dùng"
 msgid "Unable to create indices: %s.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/pq/pq_prepare.c:109
-#, fuzzy, c-format
-msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
-msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
-
 #: src/pt/gnunet-daemon-pt.c:418
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
@@ -6032,87 +5769,87 @@ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:801
+#: src/reclaim/gnunet-reclaim.c:802
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/reclaim/gnunet-reclaim.c:808
+#: src/reclaim/gnunet-reclaim.c:809
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:815
+#: src/reclaim/gnunet-reclaim.c:816
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "đặt tên hiệu cần dùng (cần thiết)"
 
-#: src/reclaim/gnunet-reclaim.c:833
-msgid "Add an attribute NAME"
+#: src/reclaim/gnunet-reclaim.c:834
+msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:838
+#: src/reclaim/gnunet-reclaim.c:839
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:843
+#: src/reclaim/gnunet-reclaim.c:844
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:848
+#: src/reclaim/gnunet-reclaim.c:849
 #, fuzzy
 msgid "The EGO to use"
 msgstr "kích cỡ tin nhắn"
 
-#: src/reclaim/gnunet-reclaim.c:854
+#: src/reclaim/gnunet-reclaim.c:855
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:858
+#: src/reclaim/gnunet-reclaim.c:859
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:862
+#: src/reclaim/gnunet-reclaim.c:863
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:868
+#: src/reclaim/gnunet-reclaim.c:869
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:873
+#: src/reclaim/gnunet-reclaim.c:874
 msgid "Credential name"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:879
+#: src/reclaim/gnunet-reclaim.c:880
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:884
+#: src/reclaim/gnunet-reclaim.c:885
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:889
+#: src/reclaim/gnunet-reclaim.c:890
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:894
+#: src/reclaim/gnunet-reclaim.c:895
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:899
+#: src/reclaim/gnunet-reclaim.c:900
 msgid "Type of credential"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:903
+#: src/reclaim/gnunet-reclaim.c:904
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:909
+#: src/reclaim/gnunet-reclaim.c:910
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:917
+#: src/reclaim/gnunet-reclaim.c:918
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -6140,61 +5877,61 @@ msgstr "Lưu cấu hình ngay bây giờ không?"
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1392
+#: src/regex/gnunet-regex-profiler.c:1388
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/regex/gnunet-regex-profiler.c:1434
+#: src/regex/gnunet-regex-profiler.c:1430
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1440
+#: src/regex/gnunet-regex-profiler.c:1436
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1448
+#: src/regex/gnunet-regex-profiler.c:1444
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1453
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1477
+#: src/regex/gnunet-regex-profiler.c:1473
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1565
+#: src/regex/gnunet-regex-profiler.c:1562
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1572
+#: src/regex/gnunet-regex-profiler.c:1569
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1578
+#: src/regex/gnunet-regex-profiler.c:1575
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1586
+#: src/regex/gnunet-regex-profiler.c:1582
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1593
+#: src/regex/gnunet-regex-profiler.c:1589
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1606
+#: src/regex/gnunet-regex-profiler.c:1604
 msgid "Profiler for regex"
 msgstr ""
 
@@ -6367,36 +6104,36 @@ msgstr ""
 msgid "number of epochs to calculate for"
 msgstr "số lần lặp lại"
 
-#: src/revocation/gnunet-service-revocation.c:502
+#: src/revocation/gnunet-service-revocation.c:507
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/revocation/gnunet-service-revocation.c:512
+#: src/revocation/gnunet-service-revocation.c:517
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/revocation/gnunet-service-revocation.c:517
+#: src/revocation/gnunet-service-revocation.c:522
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:521
+#: src/revocation/gnunet-service-revocation.c:526
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/revocation/gnunet-service-revocation.c:529
+#: src/revocation/gnunet-service-revocation.c:534
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/revocation/gnunet-service-revocation.c:567
+#: src/revocation/gnunet-service-revocation.c:572
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:920
+#: src/revocation/gnunet-service-revocation.c:925
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "« %s »: Không thể kết nối.\n"
@@ -6928,17 +6665,17 @@ msgid ""
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2643
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2651
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2659
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
@@ -7149,9 +6886,9 @@ msgstr "# các thông báo PONG đã mật mã được nhận"
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:3329
-#: src/transport/gnunet-communicator-udp.c:3814
-#: src/transport/gnunet-service-tng.c:10388
+#: src/transport/gnunet-communicator-tcp.c:3338
+#: src/transport/gnunet-communicator-udp.c:3856
+#: src/transport/gnunet-service-tng.c:10512
 #: src/transport/gnunet-service-transport.c:2627
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
@@ -7161,7 +6898,7 @@ msgstr "Lưu cấu hình ngay bây giờ không?"
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:3889
+#: src/transport/gnunet-communicator-udp.c:3931
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -8188,17 +7925,17 @@ msgstr "Không đủ quyền cho « %s ».\n"
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1396
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1400
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1408
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1412
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1415
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1419
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
@@ -8210,7 +7947,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:833
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
@@ -8220,23 +7957,23 @@ msgstr "\tKhông rõ miền tên « %s »\n"
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:946
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:950
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:451 src/util/service.c:987
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:991
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:890
-#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1476
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1480
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1500
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1504
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8251,45 +7988,45 @@ msgstr "Lỗi chạy %s: %s %d\n"
 msgid "Service `%s' runs at %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1746
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1750
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1751
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1756
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
 msgid "Service process failed to report status\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1220
-#: src/util/service.c:1637
+#: src/util/service.c:1641
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1639
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1643
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1653
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:1996
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2000
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1397
-#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2072
-#: src/util/service.c:2084
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2076
+#: src/util/service.c:2088
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2094
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2098
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -8541,7 +8278,7 @@ msgstr ""
 msgid "failed to load configuration defaults"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/container_bloomfilter.c:553
+#: src/util/container_bloomfilter.c:547
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8558,7 +8295,7 @@ msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/crypto_ecc_setup.c:273
+#: src/util/crypto_ecc_setup.c:280
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
@@ -8568,12 +8305,12 @@ msgstr "Không thể truy cập đến tập tin gnunet-directory 
« %s »\n"
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/crypto_rsa.c:862
+#: src/util/crypto_rsa.c:901
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_rsa.c:1162
+#: src/util/crypto_rsa.c:1201
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
@@ -8679,11 +8416,11 @@ msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy 
chọn « %s
 msgid "Missing mandatory option `%s'.\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/util/getopt_helpers.c:69
+#: src/util/getopt_helpers.c:63
 msgid "print the version number"
 msgstr "hiển thị số thứ tự phiên bản"
 
-#: src/util/getopt_helpers.c:116
+#: src/util/getopt_helpers.c:110
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8691,74 +8428,84 @@ msgstr ""
 "Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
 "ngắn.\n"
 
-#: src/util/getopt_helpers.c:208
+#: src/util/getopt_helpers.c:196
 msgid "print this help"
 msgstr "hiển thị trợ giúp này"
 
-#: src/util/getopt_helpers.c:288
+#: src/util/getopt_helpers.c:261
 msgid "be verbose"
 msgstr "xuất chi tiết"
 
-#: src/util/getopt_helpers.c:429
+#: src/util/getopt_helpers.c:377
 msgid "configure logging to use LOGLEVEL"
 msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
 
-#: src/util/getopt_helpers.c:510
+#: src/util/getopt_helpers.c:444
 #, fuzzy
 msgid "configure logging to write logs to FILENAME"
 msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
 
-#: src/util/getopt_helpers.c:532
+#: src/util/getopt_helpers.c:461
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:859
-#: src/util/getopt_helpers.c:924
+#: src/util/getopt_helpers.c:497 src/util/getopt_helpers.c:811
+#: src/util/getopt_helpers.c:867
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/util/getopt_helpers.c:649
+#: src/util/getopt_helpers.c:569
 #, fuzzy, c-format
 msgid ""
 "You must pass a relative time (optionally with sign) to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/util/getopt_helpers.c:656
+#: src/util/getopt_helpers.c:576
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:683
+#: src/util/getopt_helpers.c:594
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:685
+#: src/util/getopt_helpers.c:596
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:720
+#: src/util/getopt_helpers.c:630
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/util/getopt_helpers.c:785
+#: src/util/getopt_helpers.c:684
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/util/getopt_helpers.c:852
+#: src/util/getopt_helpers.c:741
+#, fuzzy, c-format
+msgid "You must pass a timestamp to the `%s' option.\n"
+msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
+
+#: src/util/getopt_helpers.c:748
+#, c-format
+msgid "The maximum precision allowed for timestamps is seconds.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:804
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:931
+#: src/util/getopt_helpers.c:874
 #, fuzzy, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/util/getopt_helpers.c:1018
+#: src/util/getopt_helpers.c:952
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
@@ -8884,31 +8631,83 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/gnunet-qr.c:145 src/util/gnunet-uri.c:94
+#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
 #, fuzzy, c-format
-msgid "Invalid URI: does not start with `%s'\n"
+msgid "Failed to add URI %s\n"
+msgstr "Tập tin « %s » có URI: %s\n"
+
+#: src/util/gnunet-qr.c:133
+#, fuzzy, c-format
+msgid "Added URI %s\n"
+msgstr "Dữ liệu nhập không hợp lệ.\n"
+
+#: src/util/gnunet-qr.c:160
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/gnunet-qr.c:152 src/util/gnunet-uri.c:101
+#: src/util/gnunet-qr.c:170
 #, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
+msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:159 src/util/gnunet-uri.c:108
+#: src/util/gnunet-qr.c:181
 #, c-format
-msgid "No handler known for subsystem `%s'\n"
+msgid "No known handler for subsystem `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:217
+#, fuzzy, c-format
+msgid "Unable to start child process `%s'\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/util/gnunet-qr.c:246
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/util/gnunet-qr.c:260
+#, fuzzy
+msgid "Capturing...\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+msgid "No captured images\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#, c-format
+msgid "Got %d images\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#, fuzzy, c-format
+msgid "Found %s: \"%s\"\n"
+msgstr "Tôi là đồng đẳng « %s ».\n"
+
+#: src/util/gnunet-qr.c:364 src/util/gnunet-qr.c:366
+#, fuzzy, c-format
+msgid "%s is not a PNG file\n"
+msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
+
+#: src/util/gnunet-qr.c:545
+msgid "No data found\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:357
-msgid "use video-device DEVICE (default: /dev/video0"
+#: src/util/gnunet-qr.c:561
+msgid "Dispatching the URI\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:362
-msgid "do not show preview windows"
+#: src/util/gnunet-qr.c:572
+msgid "use the video device DEVICE (defaults to /dev/video0)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:372
-msgid "Scan a QR code using a video device and import the uri read"
+#: src/util/gnunet-qr.c:579
+msgid "read from the PNG-encoded file FILE"
+msgstr ""
+
+#: src/util/gnunet-qr.c:590
+msgid "Scan a QR code and import the URI read"
 msgstr ""
 
 #: src/util/gnunet-resolver.c:168
@@ -8919,28 +8718,28 @@ msgstr ""
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:232
+#: src/util/gnunet-scrypt.c:215
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:304
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:310
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:330
+#: src/util/gnunet-scrypt.c:313
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -8954,6 +8753,21 @@ msgstr ""
 msgid "No URI specified on command line\n"
 msgstr ""
 
+#: src/util/gnunet-uri.c:94
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
+
+#: src/util/gnunet-uri.c:101
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:108
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
 #: src/util/gnunet-uri.c:178
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
@@ -8973,12 +8787,12 @@ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/network.c:178
+#: src/util/network.c:163
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1359
+#: src/util/network.c:1306
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8991,12 +8805,12 @@ msgid ""
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:802
+#: src/util/os_installation.c:786
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/util/os_installation.c:835
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -9006,37 +8820,37 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
 
-#: src/util/plugin.c:162
+#: src/util/plugin.c:156
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n"
 
-#: src/util/plugin.c:240
+#: src/util/plugin.c:234
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n"
 
-#: src/util/plugin.c:420
+#: src/util/plugin.c:414
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/util/program.c:251
+#: src/util/program.c:286
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/program.c:263
+#: src/util/program.c:298
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/program.c:278
+#: src/util/program.c:313
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/program.c:293
+#: src/util/program.c:328
 #, fuzzy
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -9086,7 +8900,7 @@ msgid ""
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1568
+#: src/util/service.c:1572
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
@@ -9101,83 +8915,83 @@ msgstr ""
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:409
+#: src/util/strings.c:395
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:501
+#: src/util/strings.c:487
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Lỗi mở rộng biến môi trường « $HOME »: chưa đặt biến môi trường « HOME »"
 
-#: src/util/strings.c:1036
+#: src/util/strings.c:1023
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1044
+#: src/util/strings.c:1031
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1051
+#: src/util/strings.c:1038
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1059
+#: src/util/strings.c:1046
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1068
+#: src/util/strings.c:1055
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/util/strings.c:1250 src/util/strings.c:1261
+#: src/util/strings.c:1237 src/util/strings.c:1248
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1270
+#: src/util/strings.c:1257
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/util/strings.c:1341 src/util/strings.c:1370 src/util/strings.c:1417
-#: src/util/strings.c:1437
+#: src/util/strings.c:1328 src/util/strings.c:1357 src/util/strings.c:1404
+#: src/util/strings.c:1424
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1395
+#: src/util/strings.c:1382
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
 
-#: src/util/strings.c:1446
+#: src/util/strings.c:1433
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1488
+#: src/util/strings.c:1475
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/strings.c:1538
+#: src/util/strings.c:1525
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/strings.c:1569
+#: src/util/strings.c:1556
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/time.c:699 src/util/time.c:727
+#: src/util/time.c:863 src/util/time.c:891
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:735
+#: src/util/time.c:899
 #, c-format
 msgid ""
 "Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
@@ -9367,6 +9181,142 @@ msgstr ""
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
+#, fuzzy
+#~ msgid "# requests for random value received"
+#~ msgstr "# tổng số yêu cầu lỗ hổng được nhận"
+
+#, fuzzy
+#~ msgid "# GET requests from clients injected"
+#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#, fuzzy
+#~ msgid "# PUT requests received from clients"
+#~ msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
+
+#, fuzzy
+#~ msgid "# GET requests received from clients"
+#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#, fuzzy
+#~ msgid "# GET STOP requests received from clients"
+#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#, fuzzy, c-format
+#~ msgid "%s request received, but have no datacache!\n"
+#~ msgstr "# các byte kiểu %d được nhận"
+
+#, fuzzy
+#~ msgid "# GET requests given to datacache"
+#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#, fuzzy
+#~ msgid "# HELLOs obtained from peerinfo"
+#~ msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
+
+#, fuzzy
+#~ msgid "# FIND PEER messages initiated"
+#~ msgstr "# các thông báo PING được tạo"
+
+#, fuzzy
+#~ msgid "# requests TTL-dropped"
+#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#, fuzzy
+#~ msgid "# Peer selection failed"
+#~ msgstr "# các cuộc gọi HTTP select (lựa chọn)"
+
+#, fuzzy
+#~ msgid "# PUT requests routed"
+#~ msgstr "# các yêu cầu dht được định tuyến"
+
+#, fuzzy
+#~ msgid "# PUT messages queued for transmission"
+#~ msgstr "# các thông báo PING được tạo"
+
+#, fuzzy
+#~ msgid "# P2P messages dropped due to full queue"
+#~ msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#, fuzzy
+#~ msgid "# GET requests routed"
+#~ msgstr "# các yêu cầu dht được định tuyến"
+
+#, fuzzy
+#~ msgid "# GET messages queued for transmission"
+#~ msgstr "# các thông báo PING được tạo"
+
+#, fuzzy
+#~ msgid "# RESULT messages queued for transmission"
+#~ msgstr "# các thông báo PING được tạo"
+
+#, fuzzy
+#~ msgid "# P2P PUT requests received"
+#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#, fuzzy
+#~ msgid "# P2P PUT bytes received"
+#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#, fuzzy
+#~ msgid "# FIND PEER requests ignored due to Bloomfilter"
+#~ msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
+
+#, fuzzy
+#~ msgid "# P2P GET requests received"
+#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#, fuzzy
+#~ msgid "# P2P GET bytes received"
+#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#, fuzzy
+#~ msgid "# P2P FIND PEER requests processed"
+#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#, fuzzy
+#~ msgid "# P2P GET requests ONLY routed"
+#~ msgstr "# các yêu cầu dht được định tuyến"
+
+#, fuzzy
+#~ msgid "# P2P RESULTS received"
+#~ msgstr "# Tín hiệu HTTP PUT được nhận"
+
+#, fuzzy
+#~ msgid "# P2P RESULT bytes received"
+#~ msgstr "# Tín hiệu HTTP PUT được nhận"
+
+#, fuzzy
+#~ msgid "# Network size estimates received"
+#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#, fuzzy
+#~ msgid "# DHT requests combined"
+#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#, fuzzy
+#~ msgid "# replies dropped due to type mismatch"
+#~ msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#, fuzzy
+#~ msgid "# replies received for other peers"
+#~ msgstr "# các byte kiểu %d được nhận"
+
+#, fuzzy, c-format
+#~ msgid "Refusing `%s' request to HTTP server\n"
+#~ msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
+
+#, fuzzy, c-format
+#~ msgid "Businesscard HTTP server starts on %u\n"
+#~ msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
+
+#, fuzzy, c-format
+#~ msgid "Could not start businesscard HTTP server on port %u\n"
+#~ msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
+
+#, fuzzy, c-format
+#~ msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
+#~ msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
+
 #, fuzzy
 #~ msgid "Waiting for child to exit.\n"
 #~ msgstr "Đang đợi các đồng đẳng kết nối"
@@ -11061,10 +11011,6 @@ msgstr "Không kết nối được đến trình nền gnunetd."
 #~ msgid "Could not start `%s' process to create hostkey.\n"
 #~ msgstr "Lỗi bắt đầu thu thập.\n"
 
-#, fuzzy
-#~ msgid "Failed to start `ssh' process.\n"
-#~ msgstr "Lỗi bắt đầu thu thập.\n"
-
 #, fuzzy
 #~ msgid "Error reading from gnunet-peerinfo: %s\n"
 #~ msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
@@ -11323,10 +11269,6 @@ msgstr "Không kết nối được đến trình nền gnunetd."
 #~ msgid "Failed to load dhtlog plugin for `%s'\n"
 #~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#, fuzzy
-#~ msgid "Found peer `%s'\n"
-#~ msgstr "Tôi là đồng đẳng « %s ».\n"
-
 #, fuzzy
 #~ msgid "Failed to initialize MySQL database connection for dhtlog.\n"
 #~ msgstr "Lỗi sơ khởi kết nối cơ sở dữ liệu MySQL cho kho dữ liệu.\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1cd864c94..a7784f73d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-10-15 10:46+0200\n"
+"POT-Creation-Date: 2022-01-10 15:13+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -16,129 +16,133 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1302
+#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore.c:1304
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:901
+#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
 #, fuzzy, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/abd/gnunet-abd.c:560 src/abd/gnunet-service-abd.c:1747
-#: src/namestore/gnunet-namestore-fcfsd.c:1067
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
+#: src/namestore/gnunet-namestore-fcfsd.c:1080
 #: src/namestore/gnunet-namestore.c:1001
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/abd/gnunet-abd.c:840 src/abd/gnunet-abd.c:891
+#: src/abd/gnunet-abd.c:566
+msgid "Ego does not exist!\n"
+msgstr ""
+
+#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/abd/gnunet-abd.c:849 src/abd/gnunet-abd.c:910
+#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
 #, fuzzy, c-format
 msgid "Failed to connect to ABD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/abd/gnunet-abd.c:855
+#: src/abd/gnunet-abd.c:865
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:862
+#: src/abd/gnunet-abd.c:872
 #, c-format
 msgid "ego required\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:872
+#: src/abd/gnunet-abd.c:882
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:881
+#: src/abd/gnunet-abd.c:890
 #, fuzzy, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/abd/gnunet-abd.c:916
+#: src/abd/gnunet-abd.c:924
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:975
+#: src/abd/gnunet-abd.c:983
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:996
+#: src/abd/gnunet-abd.c:1004
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1003
+#: src/abd/gnunet-abd.c:1011
 msgid ""
 "The public key of the subject to lookup thecredential for, or for issuer "
 "side storage: subject and its attributes"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1010
+#: src/abd/gnunet-abd.c:1018
 msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1017
+#: src/abd/gnunet-abd.c:1025
 msgid "The public key of the authority to verify the credential against"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1022
+#: src/abd/gnunet-abd.c:1030
 #, fuzzy
 msgid "The ego/zone name to use"
 msgstr "消息尺寸"
 
-#: src/abd/gnunet-abd.c:1028
+#: src/abd/gnunet-abd.c:1036
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1034
+#: src/abd/gnunet-abd.c:1042
 msgid ""
 "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1039
+#: src/abd/gnunet-abd.c:1047
 msgid "collect credentials"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1044
+#: src/abd/gnunet-abd.c:1052
 msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1049
+#: src/abd/gnunet-abd.c:1057
 msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1054
+#: src/abd/gnunet-abd.c:1062
 msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1061
+#: src/abd/gnunet-abd.c:1069
 msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1065
+#: src/abd/gnunet-abd.c:1073
 msgid "Create private record entry."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1071 src/abd/gnunet-abd.c:1077
+#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
 msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1090
+#: src/abd/gnunet-abd.c:1098
 #, fuzzy
 msgid "GNUnet abd resolver tool"
 msgstr "GNUnet 错误日志"
 
-#: src/abd/gnunet-service-abd.c:1742 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -377,28 +381,28 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1129
 #: src/transport/plugin_transport_tcp.c:3706
 #: src/transport/tcp_service_legacy.c:594
-#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1090
-#: src/util/service.c:1096
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1094
+#: src/util/service.c:1100
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
 #: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
-#: src/util/service.c:1129
+#: src/util/service.c:1133
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
 #: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
-#: src/util/service.c:1133
+#: src/util/service.c:1137
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s：选项“%s”有歧义\n"
 
 #: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
-#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1153
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1157
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -406,7 +410,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
-#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1171
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1175
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -414,7 +418,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:536
 #: src/transport/plugin_transport_http_server.c:2718
 #: src/transport/plugin_transport_tcp.c:1244
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1202
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1206
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
@@ -422,7 +426,7 @@ msgstr "打开日志文件“%s”失败：%s\n"
 #: src/arm/gnunet-service-arm.c:555
 #: src/transport/plugin_transport_http_server.c:2736
 #: src/transport/plugin_transport_tcp.c:1263
-#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1221
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1225
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -1319,34 +1323,34 @@ msgstr ""
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:329
+#: src/core/gnunet-service-core.c:328
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:355
+#: src/core/gnunet-service-core.c:354
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
+#: src/core/gnunet-service-core.c:418
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:506
+#: src/core/gnunet-service-core.c:504
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:825
+#: src/core/gnunet-service-core.c:823
 #, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:927
+#: src/core/gnunet-service-core.c:925
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/core/gnunet-service-core.c:955
+#: src/core/gnunet-service-core.c:953
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "服务已删除。\n"
@@ -1487,9 +1491,7 @@ msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/dht/gnunet-service-dht_neighbours.c:740
-#: src/dht/gnunet-service-dht_neighbours.c:803
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1522
+#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1520
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1520,48 +1522,44 @@ msgstr ""
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:299
-#: src/datastore/gnunet-service-datastore.c:742
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:275
+#: src/datastore/gnunet-service-datastore.c:743
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:303
+#: src/datacache/datacache.c:121 src/datacache/datacache.c:279
 msgid "# items stored"
 msgstr ""
 
-#: src/datacache/datacache.c:190
+#: src/datacache/datacache.c:185
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:208
+#: src/datacache/datacache.c:203
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:332
+#: src/datacache/datacache.c:297
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:343
+#: src/datacache/datacache.c:308
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/datacache.c:370
-msgid "# requests for random value received"
-msgstr ""
-
-#: src/datacache/datacache.c:400
+#: src/datacache/datacache.c:329
 msgid "# proximity search requests received"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:554
+#: src/datacache/plugin_datacache_heap.c:527
 #, fuzzy
 msgid "Heap datacache running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datacache/plugin_datacache_sqlite.c:123
-#: src/datacache/plugin_datacache_sqlite.c:144
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:139
 #: src/datastore/plugin_datastore_mysql.c:890
 #: src/datastore/plugin_datastore_sqlite.c:63
 #: src/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:81 src/my/my.c:93
@@ -1578,7 +1576,7 @@ msgstr "sqlite 数据仓库"
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:783
+#: src/datacache/plugin_datacache_sqlite.c:693
 #: src/datastore/plugin_datastore_sqlite.c:531
 #: src/namecache/plugin_namecache_sqlite.c:237
 #: src/namestore/plugin_namestore_sqlite.c:273
@@ -1735,130 +1733,130 @@ msgid ""
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:605
+#: src/datastore/gnunet-service-datastore.c:606
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:611
+#: src/datastore/gnunet-service-datastore.c:612
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:618
+#: src/datastore/gnunet-service-datastore.c:619
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:625
-#: src/datastore/gnunet-service-datastore.c:676
-#: src/datastore/gnunet-service-datastore.c:819
-#: src/datastore/gnunet-service-datastore.c:1428
+#: src/datastore/gnunet-service-datastore.c:626
+#: src/datastore/gnunet-service-datastore.c:677
+#: src/datastore/gnunet-service-datastore.c:820
+#: src/datastore/gnunet-service-datastore.c:1429
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:692
+#: src/datastore/gnunet-service-datastore.c:693
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:757
+#: src/datastore/gnunet-service-datastore.c:758
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:857
+#: src/datastore/gnunet-service-datastore.c:858
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:887
+#: src/datastore/gnunet-service-datastore.c:888
 msgid "# GET KEY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:898
+#: src/datastore/gnunet-service-datastore.c:899
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:939
+#: src/datastore/gnunet-service-datastore.c:940
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:970
+#: src/datastore/gnunet-service-datastore.c:971
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1011
+#: src/datastore/gnunet-service-datastore.c:1012
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1019
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1058
+#: src/datastore/gnunet-service-datastore.c:1059
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/datastore/gnunet-service-datastore.c:1108
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1282
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/datastore/gnunet-service-datastore.c:1168
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/datastore/gnunet-service-datastore.c:1177
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1236
+#: src/datastore/gnunet-service-datastore.c:1237
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1288
+#: src/datastore/gnunet-service-datastore.c:1289
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1298
+#: src/datastore/gnunet-service-datastore.c:1299
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/datastore/gnunet-service-datastore.c:1464
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1472
+#: src/datastore/gnunet-service-datastore.c:1473
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1476
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/datastore/gnunet-service-datastore.c:1492
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/datastore/gnunet-service-datastore.c:1513
+#: src/datastore/gnunet-service-datastore.c:1535
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1573
+#: src/datastore/gnunet-service-datastore.c:1574
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -1956,53 +1954,53 @@ msgstr "sqlite 数据仓库"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:158
+#: src/dht/gnunet-dht-get.c:159
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:160
 #, c-format
 msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:197
+#: src/dht/gnunet-dht-get.c:209
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:203 src/dht/gnunet-dht-monitor.c:255
+#: src/dht/gnunet-dht-get.c:217 src/dht/gnunet-dht-monitor.c:255
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-dht-get.c:213
+#: src/dht/gnunet-dht-get.c:227
 msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:260 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:251
+#: src/dht/gnunet-dht-get.c:266
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:256 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:272 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:262
+#: src/dht/gnunet-dht-get.c:278
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-get.c:284 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:301
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -2033,237 +2031,30 @@ msgstr "无法连接到 %s:%u：%s\n"
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:187
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:193
+#: src/dht/gnunet-dht-put.c:194
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:212
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:212
+#: src/dht/gnunet-dht-put.c:217
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-put.c:223
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:232
+#: src/dht/gnunet-dht-put.c:241
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:367
-msgid "# GET requests from clients injected"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:483
-msgid "# PUT requests received from clients"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:616
-msgid "# GET requests received from clients"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:848
-msgid "# GET STOP requests received from clients"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1033
-msgid "# Key match, type mismatches in REPLY to CLIENT"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1049
-msgid "# Duplicate REPLIES to CLIENT request dropped"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1102
-#, c-format
-msgid "Unsupported block type (%u) in request!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1110
-msgid "# RESULTS queued for clients"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_clients.c:1191
-msgid "# REPLIES ignored for CLIENTS (no match)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:73
-#, c-format
-msgid "%s request received, but have no datacache!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:83
-msgid "# ITEMS stored in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:206
-msgid "# Good RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:220
-msgid "# Duplicate RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:228
-msgid "# Invalid RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:236
-msgid "# Irrelevant RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:252
-msgid "# Unsupported RESULTS found in datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:256
-#, c-format
-msgid "Unsupported block type (%u) in local response!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:291
-msgid "# GET requests given to datacache"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_hello.c:86
-msgid "# HELLOs obtained from peerinfo"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:678
-msgid "# FIND PEER messages initiated"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:855
-msgid "# requests TTL-dropped"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1042
-#: src/dht/gnunet-service-dht_neighbours.c:1079
-msgid "# Peers excluded from routing due to Bloomfilter"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1095
-msgid "# Peer selection failed"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1253
-msgid "# PUT requests routed"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1287
-msgid "# PUT messages queued for transmission"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1299
-#: src/dht/gnunet-service-dht_neighbours.c:1441
-#: src/dht/gnunet-service-dht_neighbours.c:1545
-msgid "# P2P messages dropped due to full queue"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1384
-msgid "# GET requests routed"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1428
-msgid "# GET messages queued for transmission"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1560
-msgid "# RESULT messages queued for transmission"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1663
-msgid "# Expired PUTs discarded"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1671
-msgid "# P2P PUT requests received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1675
-msgid "# P2P PUT bytes received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1907
-msgid "# FIND PEER requests ignored due to Bloomfilter"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1916
-msgid "# FIND PEER requests ignored due to lack of HELLO"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2079
-msgid "# P2P GET requests received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2083
-msgid "# P2P GET bytes received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2149
-msgid "# P2P FIND PEER requests processed"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2170
-msgid "# P2P GET requests ONLY routed"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2348
-msgid "# Expired results discarded"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2365
-msgid "# P2P RESULTS received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2369
-msgid "# P2P RESULT bytes received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_nse.c:59
-msgid "# Network size estimates received"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Good REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:236
-msgid "# Duplicate REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:244
-msgid "# Invalid REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:252
-msgid "# Irrelevant REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:268
-msgid "# Unsupported REPLIES matched against routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:347
-msgid "# Entries removed from routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:422
-msgid "# Entries added to routing table"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_routing.c:444
-msgid "# DHT requests combined"
-msgstr ""
-
 #: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
@@ -2312,17 +2103,17 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "无法访问该服务"
 
-#: src/dht/plugin_block_dht.c:189
+#: src/dht/plugin_block_dht.c:328
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:198
+#: src/dht/plugin_block_dht.c:337
 #, c-format
 msgid "Size mismatch for block with type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:209
+#: src/dht/plugin_block_dht.c:348
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -3562,7 +3353,7 @@ msgstr ""
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1345
+#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
@@ -3570,59 +3361,43 @@ msgstr ""
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:869
-msgid "# replies dropped due to type mismatch"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:877
-msgid "# replies received for other peers"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:892
-msgid "# replies dropped due to insufficient cover traffic"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:940
-msgid "# P2P searches destroyed due to ultimate reply"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1011
+#: src/fs/gnunet-service-fs_cp.c:1009
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1036
+#: src/fs/gnunet-service-fs_cp.c:1034
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1046
+#: src/fs/gnunet-service-fs_cp.c:1044
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1141
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1199
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1225
+#: src/fs/gnunet-service-fs_cp.c:1223
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1239
+#: src/fs/gnunet-service-fs_cp.c:1237
 msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1296
+#: src/fs/gnunet-service-fs_cp.c:1294
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1341
+#: src/fs/gnunet-service-fs_cp.c:1339
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1711
+#: src/fs/gnunet-service-fs_cp.c:1709
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3700,102 +3475,89 @@ msgstr ""
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:656
+#: src/fs/gnunet-service-fs_pr.c:421 src/fs/gnunet-service-fs_pr.c:658
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:832
+#: src/fs/gnunet-service-fs_pr.c:838
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:880
-msgid "# duplicate replies discarded (bloomfilter)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:889
-msgid "# irrelevant replies discarded"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:908
-#, c-format
-msgid "Unsupported block type %u\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:921
+#: src/fs/gnunet-service-fs_pr.c:916
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1055
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1084
+#: src/fs/gnunet-service-fs_pr.c:1079
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1123
+#: src/fs/gnunet-service-fs_pr.c:1118
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1259
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1318
+#: src/fs/gnunet-service-fs_pr.c:1313
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1339
+#: src/fs/gnunet-service-fs_pr.c:1334
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1402
+#: src/fs/gnunet-service-fs_pr.c:1401
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1464
+#: src/fs/gnunet-service-fs_pr.c:1463
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1519
+#: src/fs/gnunet-service-fs_pr.c:1518
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1534
+#: src/fs/gnunet-service-fs_pr.c:1533
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1557
+#: src/fs/gnunet-service-fs_pr.c:1556
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1574
+#: src/fs/gnunet-service-fs_pr.c:1573
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1594
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1600
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1642
+#: src/fs/gnunet-service-fs_pr.c:1641
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1655
+#: src/fs/gnunet-service-fs_pr.c:1654
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1706
+#: src/fs/gnunet-service-fs_pr.c:1705
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1756
+#: src/fs/gnunet-service-fs_pr.c:1755
 msgid "# GAP PUT messages received"
 msgstr ""
 
@@ -3834,31 +3596,26 @@ msgstr ""
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:134
-#, c-format
-msgid "Refusing `%s' request to HTTP server\n"
-msgstr ""
-
-#: src/gns/gnunet-bcd.c:347
-#, c-format
-msgid "Invalid port number %u.  Exiting.\n"
-msgstr ""
-
-#: src/gns/gnunet-bcd.c:352
+#: src/gns/gnunet-bcd.c:571
 #, fuzzy, c-format
-msgid "Businesscard HTTP server starts on %u\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Invalid port number %u\n"
+msgstr "“%s”的参数无效。\n"
 
-#: src/gns/gnunet-bcd.c:372
-#, fuzzy, c-format
-msgid "Could not start businesscard HTTP server on port %u\n"
+#: src/gns/gnunet-bcd.c:612 src/namestore/gnunet-namestore-fcfsd.c:1113
+#, fuzzy
+msgid "Unable to set up the daemon\n"
+msgstr "发送消息失败。\n"
+
+#: src/gns/gnunet-bcd.c:635 src/namestore/gnunet-namestore-fcfsd.c:987
+#, fuzzy
+msgid "Failed to start HTTP server\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-bcd.c:509
-msgid "Run HTTP serve on port PORT (default is 8888)"
+#: src/gns/gnunet-bcd.c:658
+msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:522
+#: src/gns/gnunet-bcd.c:667
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
@@ -4631,62 +4388,79 @@ msgstr "“%s”不可用。\n"
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:214
+#: src/identity/gnunet-identity.c:231
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/identity/gnunet-identity.c:255
+#: src/identity/gnunet-identity.c:272
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/identity/gnunet-identity.c:461
+#: src/identity/gnunet-identity.c:646
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:466
+#: src/identity/gnunet-identity.c:651
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:472
+#: src/identity/gnunet-identity.c:657
 msgid ""
 "set the private key for the identity to PRIVATE_KEY (use together with -C)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:477
+#: src/identity/gnunet-identity.c:663
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:669
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:674
 msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:481
+#: src/identity/gnunet-identity.c:678
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:485
+#: src/identity/gnunet-identity.c:682
 msgid "reduce output"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:492
+#: src/identity/gnunet-identity.c:689
 msgid ""
 "set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
-"s) or restrict results to NAME (use together with -d)"
+"s), restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:695
+msgid "The public key of the recipient (with -W)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:496
+#: src/identity/gnunet-identity.c:699
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:500
+#: src/identity/gnunet-identity.c:703
 #, fuzzy
 msgid "display private keys as well"
 msgstr "显示一个文件的散列值"
 
-#: src/identity/gnunet-identity.c:507
+#: src/identity/gnunet-identity.c:710
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:522
+#: src/identity/gnunet-identity.c:725
 msgid "Maintain egos"
 msgstr ""
 
@@ -4746,6 +4520,12 @@ msgstr ""
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
 msgstr "解析配置文件“%s”失败\n"
 
+#: src/messenger/plugin_gnsrecord_messenger.c:118
+#: src/messenger/plugin_gnsrecord_messenger.c:133
+#, fuzzy, c-format
+msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/my/my.c:196 src/my/my.c:215
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
@@ -4786,7 +4566,7 @@ msgstr "“%s”的参数无效。\n"
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方！\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1639
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1641
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4794,7 +4574,7 @@ msgstr ""
 msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1700
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1702
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
@@ -4844,112 +4624,102 @@ msgstr "sqlite 数据仓库"
 msgid "Failed to setup database at `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:359
+#: src/namestore/gnunet-namestore-fcfsd.c:368
 #, fuzzy
 msgid "can not search the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:413
-#: src/namestore/gnunet-namestore-fcfsd.c:554
+#: src/namestore/gnunet-namestore-fcfsd.c:422
+#: src/namestore/gnunet-namestore-fcfsd.c:563
 #, fuzzy
 msgid "unable to scan namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:441
+#: src/namestore/gnunet-namestore-fcfsd.c:450
 #, fuzzy, c-format
 msgid "Failed to create record for `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:453
+#: src/namestore/gnunet-namestore-fcfsd.c:462
 #, fuzzy
 msgid "no errors"
 msgstr "未知错误"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:489
+#: src/namestore/gnunet-namestore-fcfsd.c:498
 #, c-format
 msgid "The requested key `%s' exists as `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/namestore/gnunet-namestore-fcfsd.c:505
 msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:513
+#: src/namestore/gnunet-namestore-fcfsd.c:522
 #, fuzzy
 msgid "Error creating record data\n"
 msgstr "未知错误。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:517
+#: src/namestore/gnunet-namestore-fcfsd.c:526
 #, fuzzy
 msgid "unable to store record"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:588
+#: src/namestore/gnunet-namestore-fcfsd.c:597
 #, c-format
 msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:594
+#: src/namestore/gnunet-namestore-fcfsd.c:603
 msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:780
+#: src/namestore/gnunet-namestore-fcfsd.c:789
 msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
+#: src/namestore/gnunet-namestore-fcfsd.c:800
 msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:806
+#: src/namestore/gnunet-namestore-fcfsd.c:819
 #, fuzzy
 msgid "invalid parameters"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:823
+#: src/namestore/gnunet-namestore-fcfsd.c:836
 #, fuzzy
 msgid "invalid name"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
+#: src/namestore/gnunet-namestore-fcfsd.c:847
 #, fuzzy, c-format
 msgid "Unable to parse key %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:838
+#: src/namestore/gnunet-namestore-fcfsd.c:851
 #, fuzzy
 msgid "unable to parse key"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:949
+#: src/namestore/gnunet-namestore-fcfsd.c:962
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:974
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1058
+#: src/namestore/gnunet-namestore-fcfsd.c:1071
 #, fuzzy
 msgid "No port specified, using default value\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1076
+#: src/namestore/gnunet-namestore-fcfsd.c:1089
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1100
-#, fuzzy
-msgid "Unable to set up the daemon\n"
-msgstr "发送消息失败。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1123
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
 msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1132
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
@@ -5026,7 +4796,7 @@ msgstr ""
 #: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1066
 #: src/namestore/gnunet-namestore.c:1076 src/namestore/gnunet-namestore.c:1105
 #: src/namestore/gnunet-namestore.c:1126 src/namestore/gnunet-namestore.c:1153
-#: src/namestore/gnunet-namestore.c:1228
+#: src/namestore/gnunet-namestore.c:1230
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
@@ -5042,7 +4812,7 @@ msgstr "无效条目。\n"
 
 #: src/namestore/gnunet-namestore.c:1068 src/namestore/gnunet-namestore.c:1078
 #: src/namestore/gnunet-namestore.c:1107 src/namestore/gnunet-namestore.c:1128
-#: src/namestore/gnunet-namestore.c:1230
+#: src/namestore/gnunet-namestore.c:1232
 msgid "add"
 msgstr ""
 
@@ -5061,7 +4831,7 @@ msgstr ""
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1237
+#: src/namestore/gnunet-namestore.c:1135 src/namestore/gnunet-namestore.c:1239
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
@@ -5075,18 +4845,18 @@ msgstr ""
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-namestore.c:1220
+#: src/namestore/gnunet-namestore.c:1222
 #: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:1290
+#: src/namestore/gnunet-namestore.c:1292
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1340
+#: src/namestore/gnunet-namestore.c:1342
 #, c-format
 msgid ""
 "No default identity configured for `namestore' subsystem\n"
@@ -5094,102 +4864,102 @@ msgid ""
 "Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1405
+#: src/namestore/gnunet-namestore.c:1407
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1434
+#: src/namestore/gnunet-namestore.c:1436
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1483
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1493
+#: src/namestore/gnunet-namestore.c:1495
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1505 src/namestore/gnunet-namestore.c:1521
-#: src/namestore/gnunet-namestore.c:1538
+#: src/namestore/gnunet-namestore.c:1507 src/namestore/gnunet-namestore.c:1523
+#: src/namestore/gnunet-namestore.c:1540
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore.c:1513
+#: src/namestore/gnunet-namestore.c:1515
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:1551
+#: src/namestore/gnunet-namestore.c:1553
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:1608
+#: src/namestore/gnunet-namestore.c:1610
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1611
+#: src/namestore/gnunet-namestore.c:1613
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1615
+#: src/namestore/gnunet-namestore.c:1617
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1622
+#: src/namestore/gnunet-namestore.c:1624
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1628
+#: src/namestore/gnunet-namestore.c:1630
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1633
+#: src/namestore/gnunet-namestore.c:1635
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:1645
+#: src/namestore/gnunet-namestore.c:1647
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1652
+#: src/namestore/gnunet-namestore.c:1654
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1658
+#: src/namestore/gnunet-namestore.c:1660
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1663
+#: src/namestore/gnunet-namestore.c:1665
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1669
+#: src/namestore/gnunet-namestore.c:1671
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1673
+#: src/namestore/gnunet-namestore.c:1675
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1679
+#: src/namestore/gnunet-namestore.c:1681
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1685
+#: src/namestore/gnunet-namestore.c:1687
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5537,8 +5307,8 @@ msgstr "无法访问该服务"
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1450
-#: src/revocation/gnunet-service-revocation.c:883 src/util/gnunet-scrypt.c:260
+#: src/nse/gnunet-service-nse.c:1441
+#: src/revocation/gnunet-service-revocation.c:888 src/util/gnunet-scrypt.c:243
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值不在合法范围内。"
@@ -5735,11 +5505,6 @@ msgstr "创建用户出错"
 msgid "Unable to create indices: %s.\n"
 msgstr "发送消息失败。\n"
 
-#: src/pq/pq_prepare.c:109
-#, fuzzy, c-format
-msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
-
 #: src/pt/gnunet-daemon-pt.c:418
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
@@ -5795,87 +5560,87 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:801
+#: src/reclaim/gnunet-reclaim.c:802
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/reclaim/gnunet-reclaim.c:808
+#: src/reclaim/gnunet-reclaim.c:809
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:815
+#: src/reclaim/gnunet-reclaim.c:816
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "设置要使用的昵称(必须)"
 
-#: src/reclaim/gnunet-reclaim.c:833
-msgid "Add an attribute NAME"
+#: src/reclaim/gnunet-reclaim.c:834
+msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:838
+#: src/reclaim/gnunet-reclaim.c:839
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:843
+#: src/reclaim/gnunet-reclaim.c:844
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:848
+#: src/reclaim/gnunet-reclaim.c:849
 #, fuzzy
 msgid "The EGO to use"
 msgstr "消息尺寸"
 
-#: src/reclaim/gnunet-reclaim.c:854
+#: src/reclaim/gnunet-reclaim.c:855
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:858
+#: src/reclaim/gnunet-reclaim.c:859
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:862
+#: src/reclaim/gnunet-reclaim.c:863
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:868
+#: src/reclaim/gnunet-reclaim.c:869
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:873
+#: src/reclaim/gnunet-reclaim.c:874
 msgid "Credential name"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:879
+#: src/reclaim/gnunet-reclaim.c:880
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:884
+#: src/reclaim/gnunet-reclaim.c:885
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:889
+#: src/reclaim/gnunet-reclaim.c:890
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:894
+#: src/reclaim/gnunet-reclaim.c:895
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:899
+#: src/reclaim/gnunet-reclaim.c:900
 msgid "Type of credential"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:903
+#: src/reclaim/gnunet-reclaim.c:904
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:909
+#: src/reclaim/gnunet-reclaim.c:910
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:917
+#: src/reclaim/gnunet-reclaim.c:918
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -5901,60 +5666,60 @@ msgstr "立即保存配置？"
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1392
+#: src/regex/gnunet-regex-profiler.c:1388
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1434
+#: src/regex/gnunet-regex-profiler.c:1430
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1440
+#: src/regex/gnunet-regex-profiler.c:1436
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1448
+#: src/regex/gnunet-regex-profiler.c:1444
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1453
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1477
+#: src/regex/gnunet-regex-profiler.c:1473
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:1565
+#: src/regex/gnunet-regex-profiler.c:1562
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1572
+#: src/regex/gnunet-regex-profiler.c:1569
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1578
+#: src/regex/gnunet-regex-profiler.c:1575
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1586
+#: src/regex/gnunet-regex-profiler.c:1582
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1593
+#: src/regex/gnunet-regex-profiler.c:1589
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1606
+#: src/regex/gnunet-regex-profiler.c:1604
 msgid "Profiler for regex"
 msgstr ""
 
@@ -6124,35 +5889,35 @@ msgstr ""
 msgid "number of epochs to calculate for"
 msgstr "迭代次数"
 
-#: src/revocation/gnunet-service-revocation.c:502
+#: src/revocation/gnunet-service-revocation.c:507
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:512
+#: src/revocation/gnunet-service-revocation.c:517
 msgid "# revocation messages received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:517
+#: src/revocation/gnunet-service-revocation.c:522
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:521
+#: src/revocation/gnunet-service-revocation.c:526
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/revocation/gnunet-service-revocation.c:529
+#: src/revocation/gnunet-service-revocation.c:534
 msgid "# revocation set unions completed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:567
+#: src/revocation/gnunet-service-revocation.c:572
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:920
+#: src/revocation/gnunet-service-revocation.c:925
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u：%s\n"
@@ -6683,17 +6448,17 @@ msgid ""
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2643
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2651
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2659
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
@@ -6898,9 +6663,9 @@ msgstr ""
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:3329
-#: src/transport/gnunet-communicator-udp.c:3814
-#: src/transport/gnunet-service-tng.c:10388
+#: src/transport/gnunet-communicator-tcp.c:3338
+#: src/transport/gnunet-communicator-udp.c:3856
+#: src/transport/gnunet-service-tng.c:10512
 #: src/transport/gnunet-service-transport.c:2627
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
@@ -6910,7 +6675,7 @@ msgstr "立即保存配置？"
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:3889
+#: src/transport/gnunet-communicator-udp.c:3931
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7884,17 +7649,17 @@ msgstr "“%s”已连接到“%s”。\n"
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1396
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1400
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1408
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1412
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1415
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1419
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
@@ -7906,7 +7671,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:833
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7916,23 +7681,23 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:946
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:950
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:451 src/util/service.c:987
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:991
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:890
-#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1476
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1480
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1500
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1504
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -7947,45 +7712,45 @@ msgstr "运行 %s失败：%s %d\n"
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1746
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1750
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1751
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1756
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
 msgid "Service process failed to report status\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1220
-#: src/util/service.c:1637
+#: src/util/service.c:1641
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1639
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1643
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1653
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”：%s\n"
 
-#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:1996
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2000
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1397
-#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2072
-#: src/util/service.c:2084
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2076
+#: src/util/service.c:2088
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2094
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2098
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -8233,7 +7998,7 @@ msgstr ""
 msgid "failed to load configuration defaults"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/container_bloomfilter.c:553
+#: src/util/container_bloomfilter.c:547
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8250,7 +8015,7 @@ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/crypto_ecc_setup.c:273
+#: src/util/crypto_ecc_setup.c:280
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -8260,12 +8025,12 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/crypto_rsa.c:862
+#: src/util/crypto_rsa.c:901
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/crypto_rsa.c:1162
+#: src/util/crypto_rsa.c:1201
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
@@ -8370,83 +8135,93 @@ msgstr ""
 msgid "Missing mandatory option `%s'.\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/util/getopt_helpers.c:69
+#: src/util/getopt_helpers.c:63
 msgid "print the version number"
 msgstr ""
 
-#: src/util/getopt_helpers.c:116
+#: src/util/getopt_helpers.c:110
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "长选项的必选参数对短选项也是必选的。\n"
 
-#: src/util/getopt_helpers.c:208
+#: src/util/getopt_helpers.c:196
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:288
+#: src/util/getopt_helpers.c:261
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:429
+#: src/util/getopt_helpers.c:377
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:510
+#: src/util/getopt_helpers.c:444
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:532
+#: src/util/getopt_helpers.c:461
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:859
-#: src/util/getopt_helpers.c:924
+#: src/util/getopt_helpers.c:497 src/util/getopt_helpers.c:811
+#: src/util/getopt_helpers.c:867
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:649
+#: src/util/getopt_helpers.c:569
 #, fuzzy, c-format
 msgid ""
 "You must pass a relative time (optionally with sign) to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:656
+#: src/util/getopt_helpers.c:576
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:683
+#: src/util/getopt_helpers.c:594
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:685
+#: src/util/getopt_helpers.c:596
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:720
+#: src/util/getopt_helpers.c:630
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:785
+#: src/util/getopt_helpers.c:684
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:852
+#: src/util/getopt_helpers.c:741
+#, fuzzy, c-format
+msgid "You must pass a timestamp to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+
+#: src/util/getopt_helpers.c:748
+#, c-format
+msgid "The maximum precision allowed for timestamps is seconds.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:804
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:931
+#: src/util/getopt_helpers.c:874
 #, fuzzy, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:1018
+#: src/util/getopt_helpers.c:952
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
@@ -8572,31 +8347,83 @@ msgstr ""
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-qr.c:145 src/util/gnunet-uri.c:94
+#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
 #, fuzzy, c-format
-msgid "Invalid URI: does not start with `%s'\n"
+msgid "Failed to add URI %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/util/gnunet-qr.c:133
+#, fuzzy, c-format
+msgid "Added URI %s\n"
+msgstr "无效条目。\n"
+
+#: src/util/gnunet-qr.c:160
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/util/gnunet-qr.c:152 src/util/gnunet-uri.c:101
+#: src/util/gnunet-qr.c:170
 #, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
+msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:159 src/util/gnunet-uri.c:108
+#: src/util/gnunet-qr.c:181
 #, c-format
-msgid "No handler known for subsystem `%s'\n"
+msgid "No known handler for subsystem `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:217
+#, fuzzy, c-format
+msgid "Unable to start child process `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/util/gnunet-qr.c:246
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/util/gnunet-qr.c:260
+#, fuzzy
+msgid "Capturing...\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+msgid "No captured images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:357
-msgid "use video-device DEVICE (default: /dev/video0"
+#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#, c-format
+msgid "Got %d images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:362
-msgid "do not show preview windows"
+#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#, c-format
+msgid "Found %s: \"%s\"\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:372
-msgid "Scan a QR code using a video device and import the uri read"
+#: src/util/gnunet-qr.c:364 src/util/gnunet-qr.c:366
+#, fuzzy, c-format
+msgid "%s is not a PNG file\n"
+msgstr "更改 GNUnet 目录的权限出错"
+
+#: src/util/gnunet-qr.c:545
+msgid "No data found\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:561
+msgid "Dispatching the URI\n"
+msgstr ""
+
+#: src/util/gnunet-qr.c:572
+msgid "use the video device DEVICE (defaults to /dev/video0)"
+msgstr ""
+
+#: src/util/gnunet-qr.c:579
+msgid "read from the PNG-encoded file FILE"
+msgstr ""
+
+#: src/util/gnunet-qr.c:590
+msgid "Scan a QR code and import the URI read"
 msgstr ""
 
 #: src/util/gnunet-resolver.c:168
@@ -8607,28 +8434,28 @@ msgstr ""
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:232
+#: src/util/gnunet-scrypt.c:215
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:304
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:310
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:330
+#: src/util/gnunet-scrypt.c:313
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "更改配置文件中的一个值"
@@ -8642,6 +8469,21 @@ msgstr ""
 msgid "No URI specified on command line\n"
 msgstr ""
 
+#: src/util/gnunet-uri.c:94
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
+
+#: src/util/gnunet-uri.c:101
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:108
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
 #: src/util/gnunet-uri.c:178
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
@@ -8661,12 +8503,12 @@ msgstr "打开日志文件“%s”失败：%s\n"
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/network.c:178
+#: src/util/network.c:163
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1359
+#: src/util/network.c:1306
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8679,12 +8521,12 @@ msgid ""
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:802
+#: src/util/os_installation.c:786
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/os_installation.c:835
+#: src/util/os_installation.c:819
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8694,37 +8536,37 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "插件机构初始化失败：%s！\n"
 
-#: src/util/plugin.c:162
+#: src/util/plugin.c:156
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:240
+#: src/util/plugin.c:234
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:420
+#: src/util/plugin.c:414
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:251
+#: src/util/program.c:286
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/program.c:263
+#: src/util/program.c:298
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/program.c:278
+#: src/util/program.c:313
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/program.c:293
+#: src/util/program.c:328
 #, fuzzy
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -8774,7 +8616,7 @@ msgid ""
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1568
+#: src/util/service.c:1572
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
@@ -8789,82 +8631,82 @@ msgstr ""
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:409
+#: src/util/strings.c:395
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:501
+#: src/util/strings.c:487
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 
-#: src/util/strings.c:1036
+#: src/util/strings.c:1023
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1044
+#: src/util/strings.c:1031
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1051
+#: src/util/strings.c:1038
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1059
+#: src/util/strings.c:1046
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1068
+#: src/util/strings.c:1055
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/util/strings.c:1250 src/util/strings.c:1261
+#: src/util/strings.c:1237 src/util/strings.c:1248
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1270
+#: src/util/strings.c:1257
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/strings.c:1341 src/util/strings.c:1370 src/util/strings.c:1417
-#: src/util/strings.c:1437
+#: src/util/strings.c:1328 src/util/strings.c:1357 src/util/strings.c:1404
+#: src/util/strings.c:1424
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1395
+#: src/util/strings.c:1382
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/strings.c:1446
+#: src/util/strings.c:1433
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1488
+#: src/util/strings.c:1475
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/util/strings.c:1538
+#: src/util/strings.c:1525
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/strings.c:1569
+#: src/util/strings.c:1556
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
 
-#: src/util/time.c:699 src/util/time.c:727
+#: src/util/time.c:863 src/util/time.c:891
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:735
+#: src/util/time.c:899
 #, c-format
 msgid ""
 "Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
@@ -9046,6 +8888,18 @@ msgstr ""
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
+#, fuzzy, c-format
+#~ msgid "Businesscard HTTP server starts on %u\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy, c-format
+#~ msgid "Could not start businesscard HTTP server on port %u\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy, c-format
+#~ msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
+#~ msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+
 #, fuzzy
 #~ msgid "Spawning process `%s'\n"
 #~ msgstr "卸载 GNUnet 服务"
@@ -10090,10 +9944,6 @@ msgstr "初始化“%s”服务失败。\n"
 #~ msgid "Could not start `%s' process to create hostkey.\n"
 #~ msgstr "初始化“%s”服务失败。\n"
 
-#, fuzzy
-#~ msgid "Failed to start `ssh' process.\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
 #, fuzzy
 #~ msgid "Could not start `%s' process to start GNUnet.\n"
 #~ msgstr "初始化“%s”服务失败。\n"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread]
Current Thread
[Next in Thread]
[gnunet] branch master updated: -.po update, gnunet <=
Prev by Date: [gnunet] branch master updated: -ign
Next by Date: [taler-merchant-backoffice] 02/02: transactions list pagination (WIP)
Previous by thread: [gnunet] branch master updated: -ign
Next by thread: [taler-merchant-backoffice] branch master updated (5de299e -> 4d9b35b)
Index(es):
- Date
- Thread