-fix test ftbfs

50 files changed, 6251 insertions, 6303 deletions

diff --git a/po/de.po b/po/de.po
index d8368cb34..6758cc237 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: 2022-12-04 14:58+0900\n"
+"POT-Creation-Date: 2022-12-05 17:21+0900\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"
@@ -33,9 +33,9 @@ msgstr "`%s': unbekannter Dienst: %s\n"
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1958
+#: src/namestore/gnunet-namestore.c:1957
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -150,7 +150,7 @@ msgstr ""
 msgid "GNUnet abd resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -170,15 +170,15 @@ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1133
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1136
 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:1137
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1138
 msgid "Unknown request status"
 msgstr "Unbekannter Anfragestatus"
 
@@ -390,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:1094
-#: src/util/service.c:1100
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1095
+#: src/util/service.c:1101
 #, 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:530
-#: src/util/service.c:1133
+#: src/transport/tcp_service_legacy.c:634 src/util/client.c:531
+#: src/util/service.c:1134
 #, 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:535
-#: src/util/service.c:1137
+#: src/transport/tcp_service_legacy.c:638 src/util/client.c:536
+#: src/util/service.c:1138
 #, 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
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1158
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -419,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:1175
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1176
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -427,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:1206
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1207
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
@@ -435,7 +435,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:1225
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1226
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -1115,7 +1115,7 @@ msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:664
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr "Fehler beim Lesen aus STDIN: %d %s\n"
@@ -1548,10 +1548,10 @@ msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:128
 #: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_mysql.c:890
+#: src/datastore/plugin_datastore_mysql.c:891
 #: 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/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:82 src/my/my.c:94
+#: src/mysql/mysql.c:47 src/mysql/mysql.c:65
 #: src/namecache/plugin_namecache_sqlite.c:54
 #: src/namestore/plugin_namestore_sqlite.c:56
 #: src/peerstore/plugin_peerstore_sqlite.c:54
@@ -1559,7 +1559,7 @@ msgstr ""
 #: 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
+#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "»%s« schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -1865,24 +1865,24 @@ msgstr "Bloomfilter konnte nicht initialisiert werden.\n"
 msgid "Heap database running\n"
 msgstr "Heap-Datenbank läuft\n"
 
-#: src/datastore/plugin_datastore_mysql.c:371
-#: src/datastore/plugin_datastore_mysql.c:423
-#: src/datastore/plugin_datastore_mysql.c:1071
+#: src/datastore/plugin_datastore_mysql.c:372
+#: src/datastore/plugin_datastore_mysql.c:424
+#: src/datastore/plugin_datastore_mysql.c:1072
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:410
+#: src/datastore/plugin_datastore_mysql.c:411
 #: src/datastore/plugin_datastore_sqlite.c:675
 #, fuzzy
 msgid "Data too large"
 msgstr "Anzahl der Werte"
 
-#: src/datastore/plugin_datastore_mysql.c:847
+#: src/datastore/plugin_datastore_mysql.c:848
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1179
+#: src/datastore/plugin_datastore_mysql.c:1180
 msgid "Mysql database running\n"
 msgstr "MySQL-Datenbank läuft\n"
 
@@ -2010,7 +2010,7 @@ msgstr ""
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:359
+#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
 #: src/nse/gnunet-nse-profiler.c:894
 msgid "be verbose (print progress information)"
 msgstr ""
@@ -2100,284 +2100,284 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:371 src/dns/gnunet-dns-monitor.c:376
+#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:388
+#: src/dns/gnunet-dns-monitor.c:387
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:241
+#: src/dns/gnunet-dns-redirector.c:240
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:246
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:260
+#: src/dns/gnunet-dns-redirector.c:259
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:466
+#: src/dns/gnunet-service-dns.c:463
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:620
+#: src/dns/gnunet-service-dns.c:617
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:756
+#: src/dns/gnunet-service-dns.c:753
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:832
+#: src/dns/gnunet-service-dns.c:829
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:951
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:973
+#: src/dns/gnunet-service-dns.c:970
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:984
+#: src/dns/gnunet-service-dns.c:981
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:996
+#: src/dns/gnunet-service-dns.c:993
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:999
+#: src/dns/gnunet-service-dns.c:996
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069
+#: src/dns/gnunet-service-dns.c:1066
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
+#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1128
+#: src/dns/gnunet-service-dns.c:1125
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:971
+#: src/exit/gnunet-daemon-exit.c:968
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1077
+#: src/exit/gnunet-daemon-exit.c:1074
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1371
+#: src/exit/gnunet-daemon-exit.c:1368
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
+#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
+#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
+#: src/exit/gnunet-daemon-exit.c:2283
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1507
+#: src/exit/gnunet-daemon-exit.c:1504
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1619
+#: src/exit/gnunet-daemon-exit.c:1616
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1661
+#: src/exit/gnunet-daemon-exit.c:1658
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1752
+#: src/exit/gnunet-daemon-exit.c:1749
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1840
+#: src/exit/gnunet-daemon-exit.c:1837
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:1879
+#: src/exit/gnunet-daemon-exit.c:1876
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2020
+#: src/exit/gnunet-daemon-exit.c:2017
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
+#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
+#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
+#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
+#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2290
+#: src/exit/gnunet-daemon-exit.c:2287
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2349 src/vpn/gnunet-service-vpn.c:995
-#: src/vpn/gnunet-service-vpn.c:2122
+#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
+#: src/vpn/gnunet-service-vpn.c:2121
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
+#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2498 src/exit/gnunet-daemon-exit.c:3199
+#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/exit/gnunet-daemon-exit.c:2619
+#: src/exit/gnunet-daemon-exit.c:2616
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2639
+#: src/exit/gnunet-daemon-exit.c:2636
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/exit/gnunet-daemon-exit.c:2831
+#: src/exit/gnunet-daemon-exit.c:2828
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2840
+#: src/exit/gnunet-daemon-exit.c:2837
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2916
+#: src/exit/gnunet-daemon-exit.c:2913
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2990
+#: src/exit/gnunet-daemon-exit.c:2987
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3039
+#: src/exit/gnunet-daemon-exit.c:3036
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:3054
+#: src/exit/gnunet-daemon-exit.c:3051
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:3081
+#: src/exit/gnunet-daemon-exit.c:3078
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "IPv4-Paketoptionen empfangen, werden ignoriert.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3112
+#: src/exit/gnunet-daemon-exit.c:3109
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3164
+#: src/exit/gnunet-daemon-exit.c:3161
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3173
+#: src/exit/gnunet-daemon-exit.c:3170
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
+#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Option »%s« für Domain »%s« ist nicht korrekt formatiert!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
+#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3451
+#: src/exit/gnunet-daemon-exit.c:3448
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
+#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3495
+#: src/exit/gnunet-daemon-exit.c:3492
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3640
+#: src/exit/gnunet-daemon-exit.c:3637
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3649
+#: src/exit/gnunet-daemon-exit.c:3646
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3657
+#: src/exit/gnunet-daemon-exit.c:3654
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3661
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3835
+#: src/exit/gnunet-daemon-exit.c:3832
 msgid "Must be a number"
 msgstr "Muss eine Zahl sein"
 
-#: src/exit/gnunet-daemon-exit.c:3951
+#: src/exit/gnunet-daemon-exit.c:3948
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4117
+#: src/exit/gnunet-daemon-exit.c:4114
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2400,170 +2400,170 @@ msgstr "# Bytes empfangen über TCP"
 msgid "# messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/fragmentation/fragmentation.c:240
+#: src/fragmentation/fragmentation.c:239
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:245
+#: src/fragmentation/fragmentation.c:244
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:278
+#: src/fragmentation/fragmentation.c:277
 #, fuzzy
 msgid "# fragments wrap arounds"
 msgstr "# verworfener Nachrichten"
 
-#: src/fragmentation/fragmentation.c:325
+#: src/fragmentation/fragmentation.c:324
 msgid "# messages fragmented"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/fragmentation/fragmentation.c:331
+#: src/fragmentation/fragmentation.c:330
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:459
+#: src/fragmentation/fragmentation.c:458
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/fragmentation/fragmentation.c:466
+#: src/fragmentation/fragmentation.c:465
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:490
+#: src/fragmentation/fragmentation.c:489
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:481
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:492
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/fs_api.c:499
+#: src/fs/fs_api.c:500
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1156
+#: src/fs/fs_api.c:1157
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1707
+#: src/fs/fs_api.c:1708
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1722
+#: src/fs/fs_api.c:1723
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2451
+#: src/fs/fs_api.c:2452
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2462
+#: src/fs/fs_api.c:2463
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
+#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2628
+#: src/fs/fs_api.c:2629
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
+#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2846
+#: src/fs/fs_api.c:2847
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3107
+#: src/fs/fs_api.c:3108
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:215
+#: src/fs/fs_directory.c:216
 #, fuzzy
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:311
 #, fuzzy
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr "Rekursiver Download des Verzeichnisses `%s' bei %llu von %llu Bytes.\n"
 
-#: src/fs/fs_download.c:332
+#: src/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:346
+#: src/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directory contents of `%s' for recursive download\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/fs_download.c:528 src/fs/fs_download.c:541
+#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:960
+#: src/fs/fs_download.c:961
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/fs_download.c:1044
+#: src/fs/fs_download.c:1045
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1066
+#: src/fs/fs_download.c:1067
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1089
+#: src/fs/fs_download.c:1090
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1100
+#: src/fs/fs_download.c:1101
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1110
+#: src/fs/fs_download.c:1111
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1218
+#: src/fs/fs_download.c:1219
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1889
+#: src/fs/fs_download.c:1890
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -2575,109 +2575,109 @@ msgid ""
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:190
+#: src/fs/fs_list_indexed.c:191
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_misc.c:128
+#: src/fs/fs_misc.c:129
 #, fuzzy, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/fs/fs_namespace.c:202
+#: src/fs/fs_namespace.c:203
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_namespace.c:233
+#: src/fs/fs_namespace.c:234
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:330
+#: src/fs/fs_namespace.c:331
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:457
+#: src/fs/fs_namespace.c:458
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_publish.c:128 src/fs/fs_publish.c:438
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:731
+#: src/fs/fs_publish.c:732
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\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
+#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/fs/fs_publish.c:790
+#: src/fs/fs_publish.c:791
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "Anfrage an den Transportdienst konnte nicht gestellt werden\n"
 
-#: src/fs/fs_publish.c:836
+#: src/fs/fs_publish.c:837
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:857
 msgid "filename too long"
 msgstr "Dateiname zu lang"
 
-#: src/fs/fs_publish.c:888
+#: src/fs/fs_publish.c:889
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:915
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_publish.c:1003 src/fs/fs_publish.c:1040
+#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1107
+#: src/fs/fs_publish.c:1108
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/fs/fs_publish.c:1115
+#: src/fs/fs_publish.c:1116
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:1156
+#: src/fs/fs_publish.c:1157
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1396
+#: src/fs/fs_publish.c:1397
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "Verbindung fehlgeschlagen: %s\n"
 
-#: src/fs/fs_publish.c:1488
+#: src/fs/fs_publish.c:1489
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:212
+#: src/fs/fs_publish_ksk.c:213
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -2687,155 +2687,155 @@ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_search.c:829 src/fs/fs_search.c:900
+#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_search.c:993
+#: src/fs/fs_search.c:994
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:64
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:68
+#: src/fs/fs_unindex.c:69
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/fs/fs_unindex.c:275
+#: src/fs/fs_unindex.c:276
 #, fuzzy
 msgid "Error communicating with `fs' service."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/fs/fs_unindex.c:326
+#: src/fs/fs_unindex.c:327
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:389
+#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/fs_unindex.c:385
+#: src/fs/fs_unindex.c:386
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/fs/fs_unindex.c:446
+#: src/fs/fs_unindex.c:447
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_unindex.c:592 src/fs/fs_unindex.c:656
+#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:670
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:708
+#: src/fs/fs_unindex.c:709
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_uri.c:231
+#: src/fs/fs_uri.c:232
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:290
+#: src/fs/fs_uri.c:291
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:308
+#: src/fs/fs_uri.c:309
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:315
+#: src/fs/fs_uri.c:316
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:382
+#: src/fs/fs_uri.c:383
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:423
+#: src/fs/fs_uri.c:424
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:440
+#: src/fs/fs_uri.c:441
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:517
+#: src/fs/fs_uri.c:518
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:534
+#: src/fs/fs_uri.c:535
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:561
+#: src/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:567
+#: src/fs/fs_uri.c:568
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:574
+#: src/fs/fs_uri.c:575
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:592
+#: src/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:612
+#: src/fs/fs_uri.c:613
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:645
+#: src/fs/fs_uri.c:646
 #, fuzzy
 msgid "invalid argument"
 msgstr "Ungültiges Argument »%s«\n"
 
-#: src/fs/fs_uri.c:665
+#: src/fs/fs_uri.c:666
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1093
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2871,7 +2871,7 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:896
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad LEVEL an Sender-Anonymität festlegen"
 
@@ -2879,15 +2879,15 @@ msgstr "Gewünschten Grad LEVEL an Sender-Anonymität festlegen"
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:946
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:959
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2895,131 +2895,131 @@ msgstr ""
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:667
+#: src/fs/gnunet-daemon-fsprofiler.c:668
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:54
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:105
+#: src/fs/gnunet-directory.c:106
 #, fuzzy, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr "==> Verzeichnis `%s':\n"
 
-#: src/fs/gnunet-directory.c:108
+#: src/fs/gnunet-directory.c:109
 #, fuzzy, c-format
 msgid "Directory `%s' contents:\n"
 msgstr "==> Verzeichnis `%s':\n"
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-directory.c:146
 #, fuzzy
 msgid "You must specify a filename to inspect.\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/fs/gnunet-directory.c:159
+#: src/fs/gnunet-directory.c:160
 #, fuzzy, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-directory.c:169
+#: src/fs/gnunet-directory.c:170
 #, fuzzy, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/gnunet-directory.c:200
+#: src/fs/gnunet-directory.c:201
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/gnunet-download.c:130
+#: src/fs/gnunet-download.c:131
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-download.c:142
+#: src/fs/gnunet-download.c:143
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/gnunet-download.c:154
+#: src/fs/gnunet-download.c:155
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-download.c:188
+#: src/fs/gnunet-download.c:189
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/fs/gnunet-download.c:206 src/fs/gnunet-publish.c:299
-#: src/fs/gnunet-search.c:543 src/fs/gnunet-unindex.c:117
+#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
+#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:234
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:715
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:716
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:247
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:254
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:271 src/fs/gnunet-publish.c:869
-#: src/fs/gnunet-unindex.c:154
+#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-unindex.c:155
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-download.c:318
+#: src/fs/gnunet-download.c:319
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:325
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:330 src/fs/gnunet-search.c:745
+#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:335
+#: src/fs/gnunet-download.c:336
 msgid "write the file to FILENAME"
 msgstr "Die Datei in DATEINAME schreiben"
 
-#: src/fs/gnunet-download.c:342
+#: src/fs/gnunet-download.c:343
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:349
+#: src/fs/gnunet-download.c:350
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:354
+#: src/fs/gnunet-download.c:355
 msgid "download a GNUnet directory recursively"
 msgstr "Das GNUnet-Verzeichnis rekursiv herunterladen"
 
-#: src/fs/gnunet-download.c:373
+#: src/fs/gnunet-download.c:374
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -3041,156 +3041,156 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:164
+#: src/fs/gnunet-fs.c:165
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:179
+#: src/fs/gnunet-fs.c:180
 #, fuzzy
 msgid "Special file-sharing operations"
 msgstr "Alle Optionen anzeigen"
 
-#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:234
+#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:246
+#: src/fs/gnunet-publish.c:247
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-publish.c:254
+#: src/fs/gnunet-publish.c:255
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:258
+#: src/fs/gnunet-publish.c:259
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:265
 #, fuzzy, c-format
 msgid "Namespace URI is `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:279
+#: src/fs/gnunet-publish.c:280
 #, fuzzy
 msgid "Starting cleanup after abort\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-publish.c:287
 #, fuzzy
 msgid "Cleanup after abort completed.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:291
+#: src/fs/gnunet-publish.c:292
 #, fuzzy
 msgid "Cleanup after abort failed.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:425
+#: src/fs/gnunet-publish.c:426
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:428
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:582
+#: src/fs/gnunet-publish.c:583
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "`%s': Kann nicht senden.\n"
 
-#: src/fs/gnunet-publish.c:611
+#: src/fs/gnunet-publish.c:612
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:644
+#: src/fs/gnunet-publish.c:645
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "==> Verzeichnis `%s':\n"
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:647
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Binde Konfigurationsdatei `%s' ein\n"
 
-#: src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-publish.c:653
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:659
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/fs/gnunet-publish.c:664
+#: src/fs/gnunet-publish.c:665
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:670
+#: src/fs/gnunet-publish.c:671
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:678
+#: src/fs/gnunet-publish.c:679
 #, fuzzy
 msgid "Error scanning directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:706
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:737
+#: src/fs/gnunet-publish.c:738
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:755
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:810
+#: src/fs/gnunet-publish.c:811
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:817
+#: src/fs/gnunet-publish.c:818
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Sie dürfen nur eine einzige Datei zum Einfügen angeben.\n"
 
-#: src/fs/gnunet-publish.c:823
+#: src/fs/gnunet-publish.c:824
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-publish.c:832 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:208
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:853
+#: src/fs/gnunet-publish.c:845 src/fs/gnunet-publish.c:854
 #: 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 "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n"
 
-#: src/fs/gnunet-publish.c:906
+#: src/fs/gnunet-publish.c:907
 msgid "enable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3198,7 +3198,7 @@ msgstr ""
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:921
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3206,13 +3206,13 @@ msgstr ""
 "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-publish.c:927
+#: src/fs/gnunet-publish.c:928
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
 "setzen"
 
-#: src/fs/gnunet-publish.c:932
+#: src/fs/gnunet-publish.c:933
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3220,7 +3220,7 @@ msgstr ""
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet-Datenbank)"
 
-#: src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-publish.c:940
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3228,125 +3228,125 @@ msgstr ""
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlicht "
 "werden soll. (nur für das Einfügen in Namensräume)"
 
-#: src/fs/gnunet-publish.c:952
+#: src/fs/gnunet-publish.c:953
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namensraum)"
 
-#: src/fs/gnunet-publish.c:964
+#: src/fs/gnunet-publish.c:965
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:971
+#: src/fs/gnunet-publish.c:972
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "Die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namensräume)"
 
-#: src/fs/gnunet-publish.c:979
+#: src/fs/gnunet-publish.c:980
 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:997
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:443
+#: src/fs/gnunet-search.c:446
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:532
+#: src/fs/gnunet-search.c:535
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/fs/gnunet-search.c:592
+#: src/fs/gnunet-search.c:595
 #, c-format
 msgid "Conflicting options --bookmark-only and --silent.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:599
+#: src/fs/gnunet-search.c:602
 #, c-format
 msgid "Conflicting options --bookmark-only and --output.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:605
+#: src/fs/gnunet-search.c:608
 #, c-format
 msgid "An output file is mandatory for silent mode.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:626
+#: src/fs/gnunet-search.c:629
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:634
+#: src/fs/gnunet-search.c:637
 msgid ""
 "Invalid URI. Valid URIs for searching are keyword query URIs\n"
 "(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
 "\").\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:659
+#: src/fs/gnunet-search.c:662
 #, fuzzy, c-format
 msgid "Could not initialize the `%s` subsystem.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-search.c:673
+#: src/fs/gnunet-search.c:676
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/fs/gnunet-search.c:699
+#: src/fs/gnunet-search.c:702
 #, fuzzy
 msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
 msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 
-#: src/fs/gnunet-search.c:705
+#: src/fs/gnunet-search.c:708
 msgid "do not search, print only the URI that points to this search"
 msgstr ""
 
-#: src/fs/gnunet-search.c:712
+#: src/fs/gnunet-search.c:715
 msgid ""
 "write search results for directories according to FORMAT; accepted "
 "placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
 "printf when omitted or to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:722
+#: src/fs/gnunet-search.c:725
 msgid ""
 "write search results according to FORMAT; accepted placeholders are: %a, %f, "
 "%j, %l, %m, %n, %s; defaults to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:730
+#: src/fs/gnunet-search.c:733
 msgid ""
 "when the %a or %j placeholders appear in --printf or --dir-printf, list each "
 "metadata property according to FORMAT; accepted placeholders are: %i, %l, "
 "%n, %p"
 msgstr ""
 
-#: src/fs/gnunet-search.c:739
+#: src/fs/gnunet-search.c:742
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:751
+#: src/fs/gnunet-search.c:754
 msgid ""
 "create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
 "search --output=commons"
 msgstr ""
 
-#: src/fs/gnunet-search.c:758
+#: src/fs/gnunet-search.c:761
 msgid "silent mode (requires the --output argument)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:764
+#: src/fs/gnunet-search.c:767
 msgid ""
 "automatically terminate search after DELAY; the value given must be a number "
 "followed by a space and a time unit, for example \"500 ms\"; without a unit "
@@ -3354,54 +3354,54 @@ msgid ""
 "to wait for CTRL-C"
 msgstr ""
 
-#: src/fs/gnunet-search.c:773
+#: src/fs/gnunet-search.c:776
 #, c-format
 msgid ""
 "be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
 "arguments - ignored when these are provided by the user)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:786
+#: src/fs/gnunet-search.c:789
 msgid "Search for files that have been published on GNUnet\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:371 src/fs/gnunet-service-fs.c:878
+#: src/fs/gnunet-service-fs.c:370 src/fs/gnunet-service-fs.c:877
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:430
+#: src/fs/gnunet-service-fs.c:429
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/fs/gnunet-service-fs.c:596
+#: src/fs/gnunet-service-fs.c:595
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:648 src/fs/gnunet-service-fs_cp.c:558
+#: src/fs/gnunet-service-fs.c:647 src/fs/gnunet-service-fs_cp.c:558
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:831
+#: src/fs/gnunet-service-fs.c:830
 #, fuzzy
 msgid "# client searches received"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs.c:871
+#: src/fs/gnunet-service-fs.c:870
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1041
+#: src/fs/gnunet-service-fs.c:1040
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1288
+#: src/fs/gnunet-service-fs.c:1287
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/gnunet-service-fs.c:1322 src/hostlist/gnunet-daemon-hostlist.c:343
+#: src/fs/gnunet-service-fs.c:1321 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3505,42 +3505,42 @@ msgstr "# verschlüsselter PING Nachrichten empfangen"
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:188
+#: src/fs/gnunet-service-fs_indexing.c:129
+#: src/fs/gnunet-service-fs_indexing.c:187
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:147
+#: src/fs/gnunet-service-fs_indexing.c:146
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/fs/gnunet-service-fs_indexing.c:244
+#: src/fs/gnunet-service-fs_indexing.c:243
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:297
+#: src/fs/gnunet-service-fs_indexing.c:296
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:311
+#: src/fs/gnunet-service-fs_indexing.c:310
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Datei `%s' konnte nicht dekodiert werden bei %s:%d.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:315
+#: src/fs/gnunet-service-fs_indexing.c:314
 #, fuzzy
 msgid "not indexed"
 msgstr "Deindizierung schlug fehl."
 
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:328
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "FSUI Statusdatei `%s' hatte einen Syntaxfehler bei Offset %u.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:435
+#: src/fs/gnunet-service-fs_indexing.c:434
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3679,37 +3679,56 @@ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:93
+#: src/fs/gnunet-unindex.c:94
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:102
+#: src/fs/gnunet-unindex.c:103
 #, fuzzy, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 "\n"
 "Fehler beim Deindizieren der Datei: %s\n"
 
-#: src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-unindex.c:109
 #, fuzzy
 msgid "Unindexing done.\n"
 msgstr "Dateien deindizieren."
 
-#: src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-unindex.c:142
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-unindex.c:161
+#: src/fs/gnunet-unindex.c:162
 #, fuzzy
 msgid "Could not start unindex operation.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/fs/gnunet-unindex.c:194
+#: src/fs/gnunet-unindex.c:195
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
+#: src/fs/meta_data.c:1063 src/fs/meta_data.c:1116 src/fs/meta_data.c:1131
+msgid "metadata length"
+msgstr ""
+
+#: src/fs/meta_data.c:1074
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
+msgstr ""
+
+#: src/fs/meta_data.c:1091
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/fs/meta_data.c:1126
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
 #: src/gns/gns_tld_api.c:293
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
@@ -3737,45 +3756,45 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:298
+#: src/gns/gnunet-dns2gns.c:296
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:379
+#: src/gns/gnunet-dns2gns.c:377
 #, fuzzy
 msgid "Failed to parse DNS response!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/gns/gnunet-dns2gns.c:453
+#: src/gns/gnunet-dns2gns.c:451
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:656
+#: src/gns/gnunet-dns2gns.c:654
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:672
+#: src/gns/gnunet-dns2gns.c:670
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/gns/gnunet-dns2gns.c:680
+#: src/gns/gnunet-dns2gns.c:678
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:841
+#: src/gns/gnunet-dns2gns.c:839
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:1001
+#: src/gns/gnunet-dns2gns.c:999
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1018
+#: src/gns/gnunet-dns2gns.c:1016
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3911,171 +3930,171 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:257
+#: src/gns/gnunet-gns.c:256
 #, fuzzy, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/gns/gnunet-gns.c:267 src/util/dnsparser.c:253
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:281
+#: src/gns/gnunet-gns.c:280
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:305
+#: src/gns/gnunet-gns.c:304
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:340
+#: src/gns/gnunet-gns.c:339
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:346
+#: src/gns/gnunet-gns.c:345
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:352
+#: src/gns/gnunet-gns.c:351
 #, fuzzy
 msgid "Specify a timeout for the lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:356
+#: src/gns/gnunet-gns.c:355
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:361
+#: src/gns/gnunet-gns.c:360
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:375
+#: src/gns/gnunet-gns.c:374
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/gns/gnunet-service-gns.c:519
+#: src/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1346
+#: src/gns/gnunet-service-gns.c:554
+#: src/zonemaster/gnunet-service-zonemaster.c:1345
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns.c:574
-#: src/zonemaster/gnunet-service-zonemaster.c:1385
+#: src/gns/gnunet-service-gns.c:573
+#: src/zonemaster/gnunet-service-zonemaster.c:1384
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:279
+#: src/gns/gnunet-service-gns_interceptor.c:278
 #, fuzzy
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:380
+#: src/gns/gnunet-service-gns_interceptor.c:379
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:672
+#: src/gns/gnunet-service-gns_resolver.c:669
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:684
+#: src/gns/gnunet-service-gns_resolver.c:681
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:690
+#: src/gns/gnunet-service-gns_resolver.c:687
 #, fuzzy, c-format
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:903
+#: src/gns/gnunet-service-gns_resolver.c:900
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1094
+#: src/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1870
+#: src/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1885
+#: src/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1918
+#: src/gns/gnunet-service-gns_resolver.c:1915
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2320
+#: src/gns/gnunet-service-gns_resolver.c:2317
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2325
+#: src/gns/gnunet-service-gns_resolver.c:2322
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2348
+#: src/gns/gnunet-service-gns_resolver.c:2345
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2515
+#: src/gns/gnunet-service-gns_resolver.c:2512
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2663
+#: src/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:138
+#: src/gns/plugin_gnsrecord_gns.c:137
 msgid "This is a memento of an older block for internal maintenance."
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:177
+#: src/gns/plugin_gnsrecord_gns.c:176
 #, fuzzy, c-format
 msgid "Unable to parse zone key record `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:191
+#: src/gns/plugin_gnsrecord_gns.c:190
 msgid "Record type does not match parsed record type\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:214
+#: src/gns/plugin_gnsrecord_gns.c:213
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:231
+#: src/gns/plugin_gnsrecord_gns.c:230
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:255
+#: src/gns/plugin_gnsrecord_gns.c:254
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/plugin_gnsrecord_gns.c:287
+#: src/gns/plugin_gnsrecord_gns.c:286
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -4085,109 +4104,109 @@ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 msgid "Gns REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/gnsrecord/gnsrecord_misc.c:53
+#: src/gnsrecord/gnsrecord_misc.c:51
 msgid "Label is NULL which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:58
+#: src/gnsrecord/gnsrecord_misc.c:56
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:481
+#: src/gnsrecord/gnsrecord_misc.c:479
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:489
+#: src/gnsrecord/gnsrecord_misc.c:487
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:499
+#: src/gnsrecord/gnsrecord_misc.c:497
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:515
+#: src/gnsrecord/gnsrecord_misc.c:513
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:526
+#: src/gnsrecord/gnsrecord_misc.c:524
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:548
+#: src/gnsrecord/gnsrecord_misc.c:546
 msgid "Mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:367
+#: src/gnsrecord/plugin_gnsrecord_dns.c:366
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:385
+#: src/gnsrecord/plugin_gnsrecord_dns.c:384
 #, fuzzy, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:406
+#: src/gnsrecord/plugin_gnsrecord_dns.c:405
 #, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:480
+#: src/gnsrecord/plugin_gnsrecord_dns.c:479
 #, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:516
+#: src/gnsrecord/plugin_gnsrecord_dns.c:515
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:533
+#: src/gnsrecord/plugin_gnsrecord_dns.c:532
 #, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:553
+#: src/gnsrecord/plugin_gnsrecord_dns.c:552
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:573
+#: src/gnsrecord/plugin_gnsrecord_dns.c:572
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:585
+#: src/gnsrecord/plugin_gnsrecord_dns.c:584
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:608
+#: src/gnsrecord/plugin_gnsrecord_dns.c:607
 #, fuzzy, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:621
+#: src/gnsrecord/plugin_gnsrecord_dns.c:620
 #, fuzzy, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:640
+#: src/gnsrecord/plugin_gnsrecord_dns.c:639
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:660
-#: src/gnsrecord/plugin_gnsrecord_dns.c:674
+#: src/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/gnsrecord/plugin_gnsrecord_dns.c:673
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:693
+#: src/gnsrecord/plugin_gnsrecord_dns.c:692
 #, fuzzy, c-format
 msgid "Unable to parse CAA record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -4664,65 +4683,65 @@ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/my/my.c:196 src/my/my.c:215
+#: src/my/my.c:197 src/my/my.c:216
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
 msgstr "»%s« schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/mysql/mysql.c:190
+#: src/mysql/mysql.c:191
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Versuchen, Datei »%s« für MySQL-Konfiguration zu verwenden.\n"
 
-#: src/mysql/mysql.c:198
+#: src/mysql/mysql.c:199
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/namecache/gnunet-namecache.c:106
+#: src/namecache/gnunet-namecache.c:105
 #, fuzzy, c-format
 msgid "No records found for `%s'"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/namecache/gnunet-namecache.c:119 src/namestore/gnunet-namestore.c:888
+#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:887
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:175
+#: src/namecache/gnunet-namecache.c:174
 #, fuzzy, c-format
 msgid "You must specify which zone should be accessed\n"
 msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
 
-#: src/namecache/gnunet-namecache.c:182
+#: src/namecache/gnunet-namecache.c:181
 #, fuzzy, c-format
 msgid "Invalid public key for zone `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namecache/gnunet-namecache.c:188
+#: src/namecache/gnunet-namecache.c:187
 #, fuzzy, c-format
 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:2020
+#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2019
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:221
+#: src/namecache/gnunet-namecache.c:220
 #, fuzzy
 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:2102
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2101
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
 
-#: src/namecache/namecache_api.c:285
+#: src/namecache/namecache_api.c:283
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:373
+#: src/namecache/namecache_api.c:371
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -4762,7 +4781,7 @@ msgid "Failed to setup database at `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
 #: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1951
+#: src/namestore/gnunet-namestore.c:1950
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
@@ -4935,245 +4954,245 @@ msgid "Failed to connect to IDENTITY\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
 #: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2087
+#: src/namestore/gnunet-namestore.c:2086
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:412
+#: src/namestore/gnunet-namestore.c:411
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/namestore/gnunet-namestore.c:420
+#: src/namestore/gnunet-namestore.c:419
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Unbekannter Befehl »%s«\n"
 
-#: src/namestore/gnunet-namestore.c:428 src/namestore/gnunet-namestore.c:443
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:435
+#: src/namestore/gnunet-namestore.c:434
 #, fuzzy, c-format
 msgid "Error parsing expiration time %s.\n"
 msgstr "Fehler beim Lesen von »%s«: %s\n"
 
-#: src/namestore/gnunet-namestore.c:465
+#: src/namestore/gnunet-namestore.c:464
 #, 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:667
+#: src/namestore/gnunet-namestore.c:666
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:685 src/namestore/gnunet-namestore.c:701
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/namestore/gnunet-namestore.c:1137
+#: src/namestore/gnunet-namestore.c:1136
 #, 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:1258
+#: src/namestore/gnunet-namestore.c:1257
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1301
+#: src/namestore/gnunet-namestore.c:1300
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1326
+#: src/namestore/gnunet-namestore.c:1325
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1355
+#: src/namestore/gnunet-namestore.c:1354
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1369
+#: src/namestore/gnunet-namestore.c:1368
 #, c-format
 msgid "Recordlines only work with option `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1378 src/namestore/gnunet-namestore.c:1430
-#: src/namestore/gnunet-namestore.c:1440 src/namestore/gnunet-namestore.c:1450
-#: src/namestore/gnunet-namestore.c:1479 src/namestore/gnunet-namestore.c:1500
-#: src/namestore/gnunet-namestore.c:1527 src/namestore/gnunet-namestore.c:1537
-#: src/namestore/gnunet-namestore.c:1570 src/namestore/gnunet-namestore.c:1595
-#: src/namestore/gnunet-namestore.c:1629 src/namestore/gnunet-namestore.c:1663
-#: src/namestore/gnunet-namestore.c:1686
+#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
+#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
+#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
+#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
+#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
+#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
+#: src/namestore/gnunet-namestore.c:1685
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1380
+#: src/namestore/gnunet-namestore.c:1379
 msgid "name"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1409
+#: src/namestore/gnunet-namestore.c:1408
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1432 src/namestore/gnunet-namestore.c:1442
-#: src/namestore/gnunet-namestore.c:1452 src/namestore/gnunet-namestore.c:1481
-#: src/namestore/gnunet-namestore.c:1502 src/namestore/gnunet-namestore.c:1688
+#: src/namestore/gnunet-namestore.c:1431 src/namestore/gnunet-namestore.c:1441
+#: src/namestore/gnunet-namestore.c:1451 src/namestore/gnunet-namestore.c:1480
+#: src/namestore/gnunet-namestore.c:1501 src/namestore/gnunet-namestore.c:1687
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1460
+#: src/namestore/gnunet-namestore.c:1459
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-namestore.c:1470
+#: src/namestore/gnunet-namestore.c:1469
 #, c-format
 msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1490
+#: src/namestore/gnunet-namestore.c:1489
 #, fuzzy, c-format
 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:1509 src/namestore/gnunet-namestore.c:1695
+#: src/namestore/gnunet-namestore.c:1508 src/namestore/gnunet-namestore.c:1694
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1529 src/namestore/gnunet-namestore.c:1539
+#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1571
 msgid "purge-zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1596
 msgid "list"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1631
+#: src/namestore/gnunet-namestore.c:1630
 msgid "reverse-pkey"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1641
+#: src/namestore/gnunet-namestore.c:1640
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1665
+#: src/namestore/gnunet-namestore.c:1664
 msgid "uri"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1678
+#: src/namestore/gnunet-namestore.c:1677
 #: 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:1966
+#: src/namestore/gnunet-namestore.c:1965
 #, 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:1985
+#: src/namestore/gnunet-namestore.c:1984
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1988
+#: src/namestore/gnunet-namestore.c:1987
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1992
+#: src/namestore/gnunet-namestore.c:1991
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1996
+#: src/namestore/gnunet-namestore.c:1995
 msgid "read commands from stdin"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2003
+#: src/namestore/gnunet-namestore.c:2002
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2009
+#: src/namestore/gnunet-namestore.c:2008
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2014
+#: src/namestore/gnunet-namestore.c:2013
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2024
+#: src/namestore/gnunet-namestore.c:2023
 msgid "Output in recordline format"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2030
+#: src/namestore/gnunet-namestore.c:2029
 msgid "determine our name for the given KEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2036
+#: src/namestore/gnunet-namestore.c:2035
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2041
+#: src/namestore/gnunet-namestore.c:2040
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2047
+#: src/namestore/gnunet-namestore.c:2046
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2051
+#: src/namestore/gnunet-namestore.c:2050
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2055
+#: src/namestore/gnunet-namestore.c:2054
 msgid "omit private records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2060
+#: src/namestore/gnunet-namestore.c:2059
 msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2065
+#: src/namestore/gnunet-namestore.c:2064
 msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2070
+#: src/namestore/gnunet-namestore.c:2069
 msgid ""
 "show private key for orphaned records for recovery using `gnunet-identity -C "
 "-P <key>'. Use in combination with --display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2075
+#: src/namestore/gnunet-namestore.c:2074
 msgid "delete all records in specified zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2081
+#: src/namestore/gnunet-namestore.c:2080
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1837
+#: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1843
+#: src/namestore/gnunet-zoneimport.c:1841
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
@@ -5522,7 +5541,7 @@ msgid "Show network size estimates from NSE service."
 msgstr ""
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:242
+#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5720,66 +5739,66 @@ msgstr ""
 msgid "Unable to create indices: %s.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/pt/gnunet-daemon-pt.c:418
+#: src/pt/gnunet-daemon-pt.c:416
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:424
+#: src/pt/gnunet-daemon-pt.c:422
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:478
+#: src/pt/gnunet-daemon-pt.c:476
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:673
+#: src/pt/gnunet-daemon-pt.c:671
 #, fuzzy
 msgid "# DNS replies intercepted"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/pt/gnunet-daemon-pt.c:680
+#: src/pt/gnunet-daemon-pt.c:678
 #, fuzzy
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/pt/gnunet-daemon-pt.c:718
+#: src/pt/gnunet-daemon-pt.c:716
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:773
+#: src/pt/gnunet-daemon-pt.c:771
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/pt/gnunet-daemon-pt.c:779
+#: src/pt/gnunet-daemon-pt.c:777
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:788
+#: src/pt/gnunet-daemon-pt.c:786
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:881
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/pt/gnunet-daemon-pt.c:900
+#: src/pt/gnunet-daemon-pt.c:898
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1227 src/pt/gnunet-daemon-pt.c:1236
-#: src/pt/gnunet-daemon-pt.c:1252 src/pt/gnunet-daemon-pt.c:1261
-#: src/pt/gnunet-daemon-pt.c:1270
+#: 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 ""
 "Es konnte keine Verbindung mit dem %s-Dienst hergestellt werden. Abbruch\n"
 
-#: src/pt/gnunet-daemon-pt.c:1316
+#: src/pt/gnunet-daemon-pt.c:1314
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -5906,7 +5925,7 @@ msgstr ""
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:3096
+#: src/reclaim/plugin_rest_openid_connect.c:3095
 #, fuzzy
 msgid "OpenID Connect REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -5916,7 +5935,7 @@ msgstr " Verbindung fehlgeschlagen\n"
 msgid "Identity Provider REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/reclaim/reclaim_api.c:545
+#: src/reclaim/reclaim_api.c:544
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
@@ -5935,13 +5954,13 @@ msgid "No configuration file given. Exiting\n"
 msgstr "Keine Konfigurationsdatei angegeben. Abbruch\n"
 
 #: src/regex/gnunet-regex-profiler.c:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:631
+#: src/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:639
+#: src/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
@@ -5983,15 +6002,15 @@ msgstr ""
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:700
+#: src/regex/gnunet-regex-simulation-profiler.c:701
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:706
+#: src/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:720
+#: src/regex/gnunet-regex-simulation-profiler.c:721
 msgid "Profiler for regex library"
 msgstr ""
 
@@ -6294,7 +6313,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
 #: src/setu/gnunet-service-setu.c:5389
 #, fuzzy
 msgid "Could not connect to CADET service\n"
@@ -6367,12 +6386,12 @@ msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr ""
 "`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
 
-#: src/statistics/gnunet-service-statistics.c:319
+#: src/statistics/gnunet-service-statistics.c:314
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-service-statistics.c:984
+#: src/statistics/gnunet-service-statistics.c:979
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
@@ -6554,7 +6573,7 @@ msgid ""
 msgstr ""
 
 #: 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
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:319
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6569,57 +6588,57 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1153
+#: src/testbed/gnunet-service-testbed_peers.c:1154
 #, c-format
 msgid "%s is stopped"
 msgstr "%s wurde gestoppt"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1156
+#: src/testbed/gnunet-service-testbed_peers.c:1157
 #, c-format
 msgid "%s is starting"
 msgstr "%s startet"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1159
+#: src/testbed/gnunet-service-testbed_peers.c:1160
 #, c-format
 msgid "%s is stopping"
 msgstr "%s wird gestoppt"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1162
+#: src/testbed/gnunet-service-testbed_peers.c:1163
 #, c-format
 msgid "%s is starting already"
 msgstr "%s ist bereits gestartet"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1166
 #, c-format
 msgid "%s is stopping already"
 msgstr "%s wird bereits gestoppt"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is started already"
 msgstr "%s ist bereits gestartet"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1172
 #, c-format
 msgid "%s is stopped already"
 msgstr "%s ist bereits gestoppt"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1178
 #, c-format
 msgid "%s service failed to start"
 msgstr "%s-Dienst konnte nicht gestartet werden"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1181
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1182
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -7920,17 +7939,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:1400
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1401
 #, 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:1412
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1413
 #, 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:1419
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1420
 #, 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"
@@ -7942,7 +7961,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:838
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7952,23 +7971,23 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:950
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:951
 #, 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:991
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:992
 #, 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:1480
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1481
 #, 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:1504
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1505
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -7983,45 +8002,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:1750
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1751
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1756
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1761
 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
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1219
+#: src/util/service.c:1642
 #, 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:1643
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1644
 msgid "No such user"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1658
 #, 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:2000
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2001
 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
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2077
+#: src/util/service.c:2089
 #, 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:2098
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2099
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "GNUnet Konfiguration"
@@ -8035,148 +8054,129 @@ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:228 src/util/bio.c:236
+#: src/util/bio.c:223 src/util/bio.c:231
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/bio.c:238
+#: src/util/bio.c:233
 msgid "End of file"
 msgstr "Dateiende"
 
-#: src/util/bio.c:267
+#: src/util/bio.c:262
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/util/bio.c:269
+#: src/util/bio.c:264
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:309
+#: src/util/bio.c:304
 #, fuzzy, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr "Ungültiges Befehlszeilenargument »%s«\n"
 
-#: src/util/bio.c:336 src/util/bio.c:840
+#: src/util/bio.c:331 src/util/bio.c:781
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:342
+#: src/util/bio.c:337
 #, fuzzy, c-format
 msgid "%s (while reading `%s')"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/util/bio.c:347
+#: src/util/bio.c:342
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:360
+#: src/util/bio.c:355
 #, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
-msgid "metadata length"
-msgstr ""
-
-#: src/util/bio.c:411
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
-msgstr ""
-
-#: src/util/bio.c:427
-#, fuzzy, c-format
-msgid "Failed to deserialize metadata `%s'"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/util/bio.c:669
+#: src/util/bio.c:610
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:731 src/util/bio.c:752
+#: src/util/bio.c:672 src/util/bio.c:693
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/util/bio.c:733
+#: src/util/bio.c:674
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:817
+#: src/util/bio.c:758
 #, fuzzy, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/bio.c:877
-#, fuzzy, c-format
-msgid "Failed to serialize metadata `%s'"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/util/client.c:750 src/util/client.c:941
+#: src/util/client.c:751 src/util/client.c:942
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1096
+#: src/util/client.c:1097
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:648 src/util/common_logging.c:687
+#: src/util/common_logging.c:647 src/util/common_logging.c:686
 #, c-format
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:911
+#: src/util/common_logging.c:910
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1104
+#: src/util/common_logging.c:1103
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1105
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1107
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1109
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1111
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1113
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:1115
+#: src/util/common_logging.c:1114
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1360
+#: src/util/common_logging.c:1359
 msgid "unknown address"
 msgstr "Unbekannte Adresse"
 
-#: src/util/common_logging.c:1405
+#: src/util/common_logging.c:1404
 msgid "invalid address"
 msgstr "Ungültige Adresse"
 
-#: src/util/common_logging.c:1417
+#: src/util/common_logging.c:1416
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/util/common_logging.c:1432
+#: src/util/common_logging.c:1431
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8184,95 +8184,95 @@ msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/util/configuration.c:790
+#: src/util/configuration.c:786
 #, c-format
 msgid "Illegal directive in line %u (parsing restricted section %s)\n"
 msgstr ""
 
-#: src/util/configuration.c:800
+#: src/util/configuration.c:796
 #, c-format
 msgid "Bad directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:853
+#: src/util/configuration.c:849
 #, c-format
 msgid "Bad inline-secret directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:875
+#: src/util/configuration.c:871
 #, c-format
 msgid "Unknown or malformed directive '%s' in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:905
+#: src/util/configuration.c:901
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u (option without section)\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:949
+#: src/util/configuration.c:945
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:1049
+#: src/util/configuration.c:1045
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/util/configuration.c:1062
+#: src/util/configuration.c:1058
 #, fuzzy, c-format
 msgid "Failed to parse configuration file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/util/configuration.c:1695
+#: src/util/configuration.c:1691
 msgid "Not a valid relative time specification"
 msgstr ""
 
-#: src/util/configuration.c:1765
+#: src/util/configuration.c:1761
 #, 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
+#: src/util/configuration.c:1856
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1892
+#: src/util/configuration.c:1888
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1958
+#: src/util/configuration.c:1954
 #, 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
+#: src/util/configuration_helper.c:134
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:147
+#: src/util/configuration_helper.c:148
 #, fuzzy, c-format
 msgid "%s, %s or %s argument is required\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/util/configuration_helper.c:218
+#: src/util/configuration_helper.c:219
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:262
+#: src/util/configuration_helper.c:263
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8289,7 +8289,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:281
+#: src/util/crypto_ecc_setup.c:282
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
@@ -8300,121 +8300,121 @@ 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:907
+#: src/util/crypto_rsa.c:908
 #, 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:1207
+#: src/util/crypto_rsa.c:1208
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/disk.c:843
+#: src/util/disk.c:842
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/dnsparser.c:909
+#: src/util/dnsparser.c:910
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 
-#: src/util/dnsstub.c:227
+#: src/util/dnsstub.c:228
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/util/dnsstub.c:370
+#: src/util/dnsstub.c:371
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr ""
 
-#: src/util/dnsstub.c:503
+#: src/util/dnsstub.c:504
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:509
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr ""
 
-#: src/util/getopt.c:565
+#: src/util/getopt.c:566
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: Option »%s« ist mehrdeutig\n"
 
-#: src/util/getopt.c:590
+#: src/util/getopt.c:591
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: Option »--%s« erlaubt kein Argument\n"
 
-#: src/util/getopt.c:596
+#: src/util/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: Option »%c%s« erlaubt kein Argument\n"
 
-#: src/util/getopt.c:616 src/util/getopt.c:797
+#: src/util/getopt.c:617 src/util/getopt.c:798
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: Option »%s« benötigt ein Argument\n"
 
-#: src/util/getopt.c:647
+#: src/util/getopt.c:648
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unbekannte Option »--%s«\n"
 
-#: src/util/getopt.c:653
+#: src/util/getopt.c:654
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unbekannte Option »%c%s«\n"
 
-#: src/util/getopt.c:680
+#: src/util/getopt.c:681
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: unerlaubte Option -- %c\n"
 
-#: src/util/getopt.c:682
+#: src/util/getopt.c:683
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 
-#: src/util/getopt.c:711 src/util/getopt.c:847
+#: src/util/getopt.c:712 src/util/getopt.c:848
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: Option benötigt ein Argument -- %c\n"
 
-#: src/util/getopt.c:761
+#: src/util/getopt.c:762
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: Option »-W %s« ist mehrdeutig\n"
 
-#: src/util/getopt.c:781
+#: src/util/getopt.c:782
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: Option »-W %s« erlaubt kein Argument\n"
 
-#: src/util/getopt.c:970
+#: src/util/getopt.c:971
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
 
-#: src/util/getopt.c:983
+#: src/util/getopt.c:984
 #, fuzzy, c-format
 msgid "Option `%s' can't be used with other options.\n"
 msgstr "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n"
 
-#: src/util/getopt.c:995
+#: src/util/getopt.c:996
 #, fuzzy, c-format
 msgid "Missing mandatory option `%s'.\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/util/getopt_helpers.c:63
+#: src/util/getopt_helpers.c:64
 msgid "print the version number"
 msgstr ""
 
-#: src/util/getopt_helpers.c:110
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8422,140 +8422,140 @@ msgstr ""
 "Argumente, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\n"
 
-#: src/util/getopt_helpers.c:197
+#: src/util/getopt_helpers.c:198
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:262
+#: src/util/getopt_helpers.c:263
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:378
+#: src/util/getopt_helpers.c:379
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:445
+#: src/util/getopt_helpers.c:446
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:462
+#: src/util/getopt_helpers.c:463
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/util/getopt_helpers.c:498 src/util/getopt_helpers.c:812
-#: src/util/getopt_helpers.c:868
+#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
+#: src/util/getopt_helpers.c:869
 #, 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:570
+#: src/util/getopt_helpers.c:571
 #, 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:577
+#: src/util/getopt_helpers.c:578
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:595
+#: src/util/getopt_helpers.c:596
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:597
+#: src/util/getopt_helpers.c:598
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:631
+#: src/util/getopt_helpers.c:632
 #, 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:685
+#: src/util/getopt_helpers.c:686
 #, 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:742
+#: src/util/getopt_helpers.c:743
 #, 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:749
+#: src/util/getopt_helpers.c:750
 #, c-format
 msgid "The maximum precision allowed for timestamps is seconds.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:805
+#: src/util/getopt_helpers.c:806
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:875
+#: src/util/getopt_helpers.c:876
 #, 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:953
+#: src/util/getopt_helpers.c:954
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-base32.c:46
+#: src/util/gnunet-base32.c:47
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/util/gnunet-config.c:153
+#: src/util/gnunet-config.c:154
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/util/gnunet-config.c:159
+#: src/util/gnunet-config.c:160
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:164
+#: src/util/gnunet-config.c:165
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:170
+#: src/util/gnunet-config.c:171
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:176
+#: src/util/gnunet-config.c:177
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:192
 msgid "Manipulate GNUnet configuration files"
 msgstr "GNUnet-Konfigurationsdateien bearbeiten"
 
-#: src/util/gnunet-crypto-tvg.c:1527
+#: src/util/gnunet-crypto-tvg.c:1528
 msgid "verify a test vector from stdin"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:94
+#: src/util/gnunet-ecc.c:95
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "»%s« kann nicht geöffnet werden: %s\n"
 
-#: src/util/gnunet-ecc.c:128
+#: src/util/gnunet-ecc.c:129
 #, c-format
 msgid "Generating %u keys like %s, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:136
+#: src/util/gnunet-ecc.c:137
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:177
+#: src/util/gnunet-ecc.c:178
 #, c-format
 msgid ""
 "\n"
@@ -8564,7 +8564,7 @@ msgstr ""
 "\n"
 "Schreiben in »%s« nicht möglich: %s\n"
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:185
 #, c-format
 msgid ""
 "\n"
@@ -8573,312 +8573,312 @@ msgstr ""
 "\n"
 "Abgeschlossen!\n"
 
-#: src/util/gnunet-ecc.c:186
+#: src/util/gnunet-ecc.c:187
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:303
+#: src/util/gnunet-ecc.c:304
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/util/gnunet-ecc.c:313
+#: src/util/gnunet-ecc.c:314
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:333
+#: src/util/gnunet-ecc.c:334
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/gnunet-ecc.c:387
+#: src/util/gnunet-ecc.c:388
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:451
+#: src/util/gnunet-ecc.c:452
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:457
+#: src/util/gnunet-ecc.c:458
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:463
+#: src/util/gnunet-ecc.c:464
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:468
+#: src/util/gnunet-ecc.c:469
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:473
+#: src/util/gnunet-ecc.c:474
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:478
+#: src/util/gnunet-ecc.c:479
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:484
+#: src/util/gnunet-ecc.c:485
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:498
+#: src/util/gnunet-ecc.c:499
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
+#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/util/gnunet-qr.c:133
+#: src/util/gnunet-qr.c:134
 #, fuzzy, c-format
 msgid "Added URI %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/gnunet-qr.c:160
+#: src/util/gnunet-qr.c:161
 #, fuzzy, c-format
 msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr "URL beginnt nicht mit »%s«\n"
 
-#: src/util/gnunet-qr.c:170
+#: src/util/gnunet-qr.c:171
 #, c-format
 msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:181
+#: src/util/gnunet-qr.c:182
 #, c-format
 msgid "No known handler for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:217
+#: src/util/gnunet-qr.c:218
 #, 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
+#: src/util/gnunet-qr.c:247
 #, 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
+#: src/util/gnunet-qr.c:261
 #, fuzzy
 msgid "Capturing...\n"
 msgstr "%s wird gestartet …\n"
 
-#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
 msgid "No captured images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
 #, c-format
 msgid "Got %d images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
 #, c-format
 msgid "Found %s: \"%s\"\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:364 src/util/gnunet-qr.c:366
+#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
 #, fuzzy, c-format
 msgid "%s is not a PNG file\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/util/gnunet-qr.c:545
+#: src/util/gnunet-qr.c:546
 #, fuzzy
 msgid "No data found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/util/gnunet-qr.c:561
+#: src/util/gnunet-qr.c:562
 msgid "Dispatching the URI\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:572
+#: src/util/gnunet-qr.c:573
 msgid "use the video device DEVICE (defaults to /dev/video0)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:579
+#: src/util/gnunet-qr.c:580
 msgid "read from the PNG-encoded file FILE"
 msgstr ""
 
-#: src/util/gnunet-qr.c:590
+#: src/util/gnunet-qr.c:591
 msgid "Scan a QR code and import the URI read"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:168
+#: src/util/gnunet-resolver.c:169
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:182
+#: src/util/gnunet-resolver.c:183
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:214
+#: 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:280
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:286
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:292
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:312
+#: src/util/gnunet-scrypt.c:313
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:1287
+#: src/util/gnunet-service-resolver.c:1288
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:88
+#: src/util/gnunet-uri.c:89
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:94
+#: src/util/gnunet-uri.c:95
 #, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "URL beginnt nicht mit »%s«\n"
 
-#: src/util/gnunet-uri.c:101
+#: src/util/gnunet-uri.c:102
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:108
+#: src/util/gnunet-uri.c:109
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:178
+#: src/util/gnunet-uri.c:179
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:59
+#: src/util/gnunet_error_codes.c:60
 msgid "No error (success)."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:65
+#: src/util/gnunet_error_codes.c:66
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "Unbekannter Anfragestatus"
 
-#: src/util/gnunet_error_codes.c:71
+#: src/util/gnunet_error_codes.c:72
 #, fuzzy
 msgid "Communication with service failed."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/util/gnunet_error_codes.c:77
+#: src/util/gnunet_error_codes.c:78
 #, fuzzy
 msgid "Ego not found."
 msgstr "Kein Inhalt gefunden"
 
-#: src/util/gnunet_error_codes.c:83
+#: src/util/gnunet_error_codes.c:84
 msgid "Identifier already in use for another ego."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:89
+#: src/util/gnunet_error_codes.c:90
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:95
+#: src/util/gnunet_error_codes.c:96
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "Unbekannter Anfragestatus"
 
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/util/gnunet_error_codes.c:107
+#: src/util/gnunet_error_codes.c:108
 #, fuzzy
 msgid "Zone not found."
 msgstr "Kein Inhalt gefunden"
 
-#: src/util/gnunet_error_codes.c:113
+#: src/util/gnunet_error_codes.c:114
 #, fuzzy
 msgid "Record not found."
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/util/gnunet_error_codes.c:125
+#: src/util/gnunet_error_codes.c:126
 msgid "Zone does not contain any records."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:131
+#: src/util/gnunet_error_codes.c:132
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/util/gnunet_error_codes.c:137
+#: src/util/gnunet_error_codes.c:138
 #, fuzzy
 msgid "No records given."
 msgstr "Kein Knoten angegeben!\n"
 
-#: src/util/gnunet_error_codes.c:143
+#: src/util/gnunet_error_codes.c:144
 msgid "Record data invalid."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:149
+#: src/util/gnunet_error_codes.c:150
 #, fuzzy
 msgid "No label given."
 msgstr "Kein Knoten angegeben!\n"
 
-#: src/util/gnunet_error_codes.c:155
+#: src/util/gnunet_error_codes.c:156
 #, fuzzy
 msgid "No results given."
 msgstr "# empfangene Ergebnisse"
 
-#: src/util/gnunet_error_codes.c:161
+#: src/util/gnunet_error_codes.c:162
 msgid "Record already exists."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:167
+#: src/util/gnunet_error_codes.c:168
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:173
+#: src/util/gnunet_error_codes.c:174
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:179
+#: src/util/gnunet_error_codes.c:180
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/util/gnunet_error_codes.c:185
+#: src/util/gnunet_error_codes.c:186
 msgid "Label invalid or malformed."
 msgstr ""
 
-#: src/util/helper.c:306
+#: src/util/helper.c:305
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fehler beim Lesen von »%s«: %s\n"
 
-#: src/util/helper.c:358
+#: src/util/helper.c:357
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/util/helper.c:573
+#: src/util/helper.c:572
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
@@ -8894,60 +8894,60 @@ msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:415
+#: src/util/os_installation.c:416
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:786
+#: src/util/os_installation.c:787
 #, 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:819
+#: src/util/os_installation.c:820
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/util/plugin.c:86
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initialisierung des Plugin-Mechanismus fehlgeschlagen: %s!\n"
 
-#: src/util/plugin.c:157
+#: src/util/plugin.c:158
 #, 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:214
+#: src/util/plugin.c:215
 #, 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:370
+#: src/util/plugin.c:371
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/program.c:286
+#: src/util/program.c:287
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/program.c:298
+#: src/util/program.c:299
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/program.c:313
+#: src/util/program.c:314
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/program.c:328
+#: src/util/program.c:329
 #, fuzzy
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "GNUnet Konfiguration"
@@ -8957,13 +8957,13 @@ msgstr "GNUnet Konfiguration"
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/resolver_api.c:220
+#: src/util/resolver_api.c:221
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:242
+#: src/util/resolver_api.c:243
 #, fuzzy, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
@@ -8972,310 +8972,310 @@ msgstr ""
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/util/resolver_api.c:887
+#: src/util/resolver_api.c:888
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/resolver_api.c:900
+#: src/util/resolver_api.c:901
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1085
+#: src/util/resolver_api.c:1086
 #, fuzzy
 msgid "Resolver not configured correctly.\n"
 msgstr "Standarddienst »%s« ist nicht korrekt eingerichtet!\n"
 
-#: src/util/resolver_api.c:1174 src/util/resolver_api.c:1197
-#: src/util/resolver_api.c:1211
+#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
+#: src/util/resolver_api.c:1212
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/service.c:653
+#: src/util/service.c:654
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1572
+#: src/util/service.c:1573
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/socks.c:635
+#: src/util/socks.c:636
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:652
+#: src/util/socks.c:653
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:395
+#: src/util/strings.c:394
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:514
+#: src/util/strings.c:513
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:1050
+#: src/util/strings.c:1049
 msgid "IPv6 address did not start with `['\n"
 msgstr "IPv6-Adresse beginnt nicht mit »[«\n"
 
-#: src/util/strings.c:1058
+#: src/util/strings.c:1057
 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:1065
+#: src/util/strings.c:1064
 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:1073
+#: src/util/strings.c:1072
 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:1082
+#: src/util/strings.c:1081
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 
-#: src/util/strings.c:1264 src/util/strings.c:1275
+#: src/util/strings.c:1263 src/util/strings.c:1274
 msgid "Port not in range\n"
 msgstr "Port außerhalb des Bereichs\n"
 
-#: src/util/strings.c:1284
+#: src/util/strings.c:1283
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1355 src/util/strings.c:1384 src/util/strings.c:1431
-#: src/util/strings.c:1451
+#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
+#: src/util/strings.c:1450
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: »%s«\n"
 
-#: src/util/strings.c:1409
+#: src/util/strings.c:1408
 #, 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:1460
+#: src/util/strings.c:1459
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/strings.c:1502
+#: src/util/strings.c:1501
 #, 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:1552
+#: src/util/strings.c:1551
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/strings.c:1583
+#: src/util/strings.c:1582
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
 
-#: src/util/time.c:900 src/util/time.c:928
+#: src/util/time.c:901 src/util/time.c:929
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:936
+#: src/util/time.c:937
 #, 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
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
 msgid "# Active channels"
 msgstr "# aktive Kanäle"
 
-#: src/vpn/gnunet-service-vpn.c:583
+#: src/vpn/gnunet-service-vpn.c:582
 #, fuzzy
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/vpn/gnunet-service-vpn.c:736
+#: src/vpn/gnunet-service-vpn.c:735
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-service-vpn.c:1112
+#: src/vpn/gnunet-service-vpn.c:1111
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-service-vpn.c:1262
+#: src/vpn/gnunet-service-vpn.c:1261
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-service-vpn.c:1461
+#: src/vpn/gnunet-service-vpn.c:1460
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/vpn/gnunet-service-vpn.c:1685
+#: src/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1821
+#: src/vpn/gnunet-service-vpn.c:1820
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/vpn/gnunet-service-vpn.c:2019
+#: src/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2045
+#: src/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2282
+#: src/vpn/gnunet-service-vpn.c:2281
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr ""
 "Die Formatüberprüfung des Pakets, das von %s:%d (UDP6) empfangen wurde, "
 "schlug fehl."
 
-#: src/vpn/gnunet-service-vpn.c:2316 src/vpn/gnunet-service-vpn.c:2348
+#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2355
+#: src/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2371
+#: src/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2411
+#: src/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2463
+#: src/vpn/gnunet-service-vpn.c:2462
 #, fuzzy
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
 
-#: src/vpn/gnunet-service-vpn.c:2497 src/vpn/gnunet-service-vpn.c:2705
+#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2750
+#: src/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3008
+#: src/vpn/gnunet-service-vpn.c:3007
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3036
+#: src/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3046
+#: src/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3062
+#: src/vpn/gnunet-service-vpn.c:3061
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3079
+#: src/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:143
+#: src/vpn/gnunet-vpn.c:142
 msgid "Error creating tunnel\n"
 msgstr "Fehler beim Anlegen des Tunnels\n"
 
-#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:226
+#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "Option »%s« ergibt keinen Sinn mit der Option »%s«.\n"
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:202
 #, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:217
+#: src/vpn/gnunet-vpn.c:216
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Option »%s« oder »%s« ergibt keinen Sinn mit der Option »%s«.\n"
 
-#: src/vpn/gnunet-vpn.c:240
+#: src/vpn/gnunet-vpn.c:239
 #, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "»%s« ist kein gültiger Knoten-Bezeichner.\n"
 
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:258
 #, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:295
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:301
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:308
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:315
 msgid "destination IP for the tunnel"
 msgstr "Ziel-IP des Tunnels"
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:322
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:330
+#: src/vpn/gnunet-vpn.c:329
 msgid "name of the service we would like to access"
 msgstr "Name des Dienstes, auf den zugegriffen werden soll"
 
-#: src/vpn/gnunet-vpn.c:335
+#: src/vpn/gnunet-vpn.c:334
 msgid "service is offered via TCP"
 msgstr "Dienst wird über TCP angeboten"
 
-#: src/vpn/gnunet-vpn.c:340
+#: src/vpn/gnunet-vpn.c:339
 msgid "service is offered via UDP"
 msgstr "Dienst wird über UDP angeboten"
 
-#: src/vpn/gnunet-vpn.c:354
+#: src/vpn/gnunet-vpn.c:353
 msgid "Setup tunnels via VPN."
 msgstr "Tunnel über VPN einrichten."
 
-#: src/zonemaster/gnunet-service-zonemaster.c:502
+#: src/zonemaster/gnunet-service-zonemaster.c:501
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1333
+#: src/zonemaster/gnunet-service-zonemaster.c:1332
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
diff --git a/po/es.po b/po/es.po
index 34ce0d7dc..d7fc8bff5 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: 2022-12-04 14:58+0900\n"
+"POT-Creation-Date: 2022-12-05 17:21+0900\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"
@@ -30,9 +30,9 @@ msgstr "'%s': servicio desconocido: %s\n"
 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:558 src/abd/gnunet-service-abd.c:1751
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1958
+#: src/namestore/gnunet-namestore.c:1957
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
@@ -149,7 +149,7 @@ msgstr ""
 msgid "GNUnet abd resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
@@ -169,17 +169,17 @@ msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Se produjo un fallo al eliminar el directorio «servicehome» %s.\n"
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1133
 #, fuzzy
 msgid "Message was sent successfully"
 msgstr "El almacén de nombres añadió el registro satisfactoriamente"
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1136
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1137
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1138
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Usuario desconocido «%s»\n"
@@ -402,8 +402,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:1094
-#: src/util/service.c:1100
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1095
+#: src/util/service.c:1101
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -411,22 +411,22 @@ msgstr ""
 "configuración!\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:530
-#: src/util/service.c:1133
+#: src/transport/tcp_service_legacy.c:634 src/util/client.c:531
+#: src/util/service.c:1134
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %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:535
-#: src/util/service.c:1137
+#: src/transport/tcp_service_legacy.c:638 src/util/client.c:536
+#: src/util/service.c:1138
 #, 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:1157
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1158
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -436,7 +436,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:1175
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1176
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -446,7 +446,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:1206
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1207
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
@@ -454,7 +454,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:1225
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1226
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "No se encontró la dirección %s para «%s».\n"
@@ -1178,7 +1178,7 @@ msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:664
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1616,10 +1616,10 @@ msgstr "Caché de datos de montículo (heap) ejecutándose\n"
 
 #: src/datacache/plugin_datacache_sqlite.c:128
 #: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_mysql.c:890
+#: src/datastore/plugin_datastore_mysql.c:891
 #: 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/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:82 src/my/my.c:94
+#: src/mysql/mysql.c:47 src/mysql/mysql.c:65
 #: src/namecache/plugin_namecache_sqlite.c:54
 #: src/namestore/plugin_namestore_sqlite.c:56
 #: src/peerstore/plugin_peerstore_sqlite.c:54
@@ -1627,7 +1627,7 @@ msgstr "Caché de datos de montículo (heap) ejecutándose\n"
 #: 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
+#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
@@ -1941,24 +1941,24 @@ msgstr "Se produjo un fallo al inicializar «bloomfilter».\n"
 msgid "Heap database running\n"
 msgstr "Base de datos de montículo ejecutándose\n"
 
-#: src/datastore/plugin_datastore_mysql.c:371
-#: src/datastore/plugin_datastore_mysql.c:423
-#: src/datastore/plugin_datastore_mysql.c:1071
+#: src/datastore/plugin_datastore_mysql.c:372
+#: src/datastore/plugin_datastore_mysql.c:424
+#: src/datastore/plugin_datastore_mysql.c:1072
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:410
+#: src/datastore/plugin_datastore_mysql.c:411
 #: src/datastore/plugin_datastore_sqlite.c:675
 #, fuzzy
 msgid "Data too large"
 msgstr "número de valores"
 
-#: src/datastore/plugin_datastore_mysql.c:847
+#: src/datastore/plugin_datastore_mysql.c:848
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» para «%s» falló en %s: %d con error: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1179
+#: src/datastore/plugin_datastore_mysql.c:1180
 msgid "Mysql database running\n"
 msgstr "Base de datos Mysql ejecutándose\n"
 
@@ -2097,7 +2097,7 @@ msgstr ""
 msgid "how long should the monitor command run"
 msgstr "cuanto tiempo debe ejecutarse el comando de monitorización"
 
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:359
+#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
 #: src/nse/gnunet-nse-profiler.c:894
 msgid "be verbose (print progress information)"
 msgstr "ser prolijo (imprime información de progreso)"
@@ -2191,247 +2191,247 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/dns/gnunet-dns-monitor.c:371 src/dns/gnunet-dns-monitor.c:376
+#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr "sólo monitorizar consultas DNS"
 
-#: src/dns/gnunet-dns-monitor.c:388
+#: src/dns/gnunet-dns-monitor.c:387
 msgid "Monitor DNS queries."
 msgstr "Monitorizar consultas DNS."
 
-#: src/dns/gnunet-dns-redirector.c:241
+#: src/dns/gnunet-dns-redirector.c:240
 msgid "set A records"
 msgstr "establece registros de clase A"
 
-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:246
 msgid "set AAAA records"
 msgstr "establece registros de clase AAAA"
 
-#: src/dns/gnunet-dns-redirector.c:260
+#: src/dns/gnunet-dns-redirector.c:259
 msgid "Change DNS replies to point elsewhere."
 msgstr "Cambiar las respuestas DNS apuntando a cualquier otro lado."
 
-#: src/dns/gnunet-service-dns.c:466
+#: src/dns/gnunet-service-dns.c:463
 msgid "# DNS requests answered via TUN interface"
 msgstr "# Peticiones DNS contestadas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:620
+#: src/dns/gnunet-service-dns.c:617
 msgid "# DNS exit failed (failed to open socket)"
 msgstr "# Salidas DNS fallidas (se produjo un fallo al abrir el «socket»)"
 
-#: src/dns/gnunet-service-dns.c:756
+#: src/dns/gnunet-service-dns.c:753
 msgid "# External DNS response discarded (no matching request)"
 msgstr "# Respuestas DNS externas descartadas (ninguna petición coincidente)"
 
-#: src/dns/gnunet-service-dns.c:832
+#: src/dns/gnunet-service-dns.c:829
 msgid "# Client response discarded (no matching request)"
 msgstr "# Respuestas de cliente descartadas (ninguna petición coincidente)"
 
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:951
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr "Recibido paquete UDP IPv4 mal formado en interfaz TUN.\n"
 
-#: src/dns/gnunet-service-dns.c:973
+#: src/dns/gnunet-service-dns.c:970
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr "Recibido paquete UDP IPv6 mal formado en interfaz TUN.\n"
 
-#: src/dns/gnunet-service-dns.c:984
+#: src/dns/gnunet-service-dns.c:981
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr "Se obtuvo un paquete no-IP con %u bytes y protocolo %u de TUN\n"
 
-#: src/dns/gnunet-service-dns.c:996
+#: src/dns/gnunet-service-dns.c:993
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:999
+#: src/dns/gnunet-service-dns.c:996
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr "# Paquetes UDP no-DNS recibidos vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:1069
+#: src/dns/gnunet-service-dns.c:1066
 msgid "# DNS requests received via TUN interface"
 msgstr "# Peticiones DNS recibidas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
+#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "se necesita una dirección IPv4 o IPv6 válida\n"
 
-#: src/dns/gnunet-service-dns.c:1128
+#: src/dns/gnunet-service-dns.c:1125
 #, fuzzy, c-format
 msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
 
-#: src/exit/gnunet-daemon-exit.c:971
+#: src/exit/gnunet-daemon-exit.c:968
 msgid "# TCP packets sent via TUN"
 msgstr "# Paquetes TCP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1077
+#: src/exit/gnunet-daemon-exit.c:1074
 msgid "# ICMP packets sent via TUN"
 msgstr "# Paquetes ICMP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1371
+#: src/exit/gnunet-daemon-exit.c:1368
 msgid "# UDP packets sent via TUN"
 msgstr "# Paquetes UDP enviados vía TUN"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
+#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
+#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
+#: src/exit/gnunet-daemon-exit.c:2283
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# Bytes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1507
+#: src/exit/gnunet-daemon-exit.c:1504
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Peticiones de salida IP por UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1619
+#: src/exit/gnunet-daemon-exit.c:1616
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# Peticiones de servicio UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1661
+#: src/exit/gnunet-daemon-exit.c:1658
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# Peticiones de creaciones de servicio TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1752
+#: src/exit/gnunet-daemon-exit.c:1749
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Peticiones de creación de salida IP por TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1840
+#: src/exit/gnunet-daemon-exit.c:1837
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# Peticiones de datos (DATA) TCP omitidas (no hay sesión)"
 
-#: src/exit/gnunet-daemon-exit.c:1879
+#: src/exit/gnunet-daemon-exit.c:1876
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# Peticiones de datos TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2020
+#: src/exit/gnunet-daemon-exit.c:2017
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Peticiones de salida IP por ICMP recibidas vía mesh"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
+#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
+#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (tipo no permitido)"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
+#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
+#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:2290
+#: src/exit/gnunet-daemon-exit.c:2287
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# Peticiones de servicio ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2349 src/vpn/gnunet-service-vpn.c:995
-#: src/vpn/gnunet-service-vpn.c:2122
+#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
+#: src/vpn/gnunet-service-vpn.c:2121
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr "# Paquetes ICMPv4 omitidos (imposible atravesar v6)"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
+#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr "# Paquetes ICMPv6 omitidos (imposible atravesar v4)"
 
-#: src/exit/gnunet-daemon-exit.c:2498 src/exit/gnunet-daemon-exit.c:3199
+#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# Túneles interiores MESH creados"
 
-#: src/exit/gnunet-daemon-exit.c:2619
+#: src/exit/gnunet-daemon-exit.c:2616
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr "Hay registros de servicios duplicados para «%s:%u»\n"
 
-#: src/exit/gnunet-daemon-exit.c:2639
+#: src/exit/gnunet-daemon-exit.c:2636
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# Bytes transmitidos vía túneles MESH"
 
-#: src/exit/gnunet-daemon-exit.c:2831
+#: src/exit/gnunet-daemon-exit.c:2828
 msgid "# ICMP packets dropped (not allowed)"
 msgstr "# Paquetes ICMP omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:2840
+#: src/exit/gnunet-daemon-exit.c:2837
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr "Paquete ICMP omitido, no hay información de conexiones coincidente\n"
 
-#: src/exit/gnunet-daemon-exit.c:2916
+#: src/exit/gnunet-daemon-exit.c:2913
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr "Paquete UDP omitido, no hay información de conexiones coincidente\n"
 
-#: src/exit/gnunet-daemon-exit.c:2990
+#: src/exit/gnunet-daemon-exit.c:2987
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr "Paquete TCP omitido, no hay información de conexiones coincidente\n"
 
-#: src/exit/gnunet-daemon-exit.c:3039
+#: src/exit/gnunet-daemon-exit.c:3036
 msgid "# Packets received from TUN"
 msgstr "# Paquetes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:3054
+#: src/exit/gnunet-daemon-exit.c:3051
 msgid "# Bytes received from TUN"
 msgstr "# Bytes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:3081
+#: src/exit/gnunet-daemon-exit.c:3078
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3112
+#: src/exit/gnunet-daemon-exit.c:3109
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 "Recibido paquete IPv4 con cabecera «next» no soportada %u.  Ignorado.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3164
+#: src/exit/gnunet-daemon-exit.c:3161
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 "Recibido paquete IPv6 con cabecera «next» no soportada %d.  Ignorado.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3173
+#: src/exit/gnunet-daemon-exit.c:3170
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr "Recibido paquete de protocolo desconocido %u.  Ignorado.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
+#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Las opción «%s» o «%s» es necesaria.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
+#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3451
+#: src/exit/gnunet-daemon-exit.c:3448
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 "¡No se encontraron direcciones para el nombre de máquina «%s» del servicio "
 "«%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
+#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr "¡Servicio «%s» configurado para IPv4, pero IPv4 está deshabilitado!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3495
+#: src/exit/gnunet-daemon-exit.c:3492
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 "¡No se encontraron direcciones IP para el nombre de máquina «%s» del "
 "servicio «%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3640
+#: src/exit/gnunet-daemon-exit.c:3637
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2439,7 +2439,7 @@ msgstr ""
 "Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3649
+#: src/exit/gnunet-daemon-exit.c:3646
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2447,7 +2447,7 @@ msgstr ""
 "Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3657
+#: src/exit/gnunet-daemon-exit.c:3654
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2455,7 +2455,7 @@ msgstr ""
 "No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre interfaz "
 "TUN, se usará ENABLE_IPv4=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3661
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2463,20 +2463,20 @@ msgstr ""
 "No se pudo habilitar la salida IPv6 pero se deshabilita IPv6 sobre interfaz "
 "TUN, se usará ENABLE_IPv6=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3835
+#: src/exit/gnunet-daemon-exit.c:3832
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3951
+#: src/exit/gnunet-daemon-exit.c:3948
 #, fuzzy, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
 
-#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
 msgid "No useful service enabled.  Exiting.\n"
 msgstr "Ningún servicio útil habilitado.  Saliendo.\n"
 
-#: src/exit/gnunet-daemon-exit.c:4117
+#: src/exit/gnunet-daemon-exit.c:4114
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr "Demonio a ejecutar para obtener un nodo de salida IP para la VPN"
 
@@ -2497,115 +2497,115 @@ msgstr "# fragmentos duplicados recibidos"
 msgid "# messages defragmented"
 msgstr "# mensajes defragmentados"
 
-#: src/fragmentation/fragmentation.c:240
+#: src/fragmentation/fragmentation.c:239
 msgid "# fragments transmitted"
 msgstr "# fragmentos transmitidos"
 
-#: src/fragmentation/fragmentation.c:245
+#: src/fragmentation/fragmentation.c:244
 msgid "# fragments retransmitted"
 msgstr "# fragmentos retransmitidos"
 
-#: src/fragmentation/fragmentation.c:278
+#: src/fragmentation/fragmentation.c:277
 msgid "# fragments wrap arounds"
 msgstr "# encajes de fragmentos"
 
-#: src/fragmentation/fragmentation.c:325
+#: src/fragmentation/fragmentation.c:324
 msgid "# messages fragmented"
 msgstr "# mensajes fragmentados"
 
-#: src/fragmentation/fragmentation.c:331
+#: src/fragmentation/fragmentation.c:330
 msgid "# total size of fragmented messages"
 msgstr "# tamaño total de los mensajes fragmentados"
 
-#: src/fragmentation/fragmentation.c:459
+#: src/fragmentation/fragmentation.c:458
 msgid "# fragment acknowledgements received"
 msgstr "# reconocimientos de fragmentos recibidos"
 
-#: src/fragmentation/fragmentation.c:466
+#: src/fragmentation/fragmentation.c:465
 msgid "# bits removed from fragmentation ACKs"
 msgstr "# bits eliminados de reconocimientos de fragmentos"
 
-#: src/fragmentation/fragmentation.c:490
+#: src/fragmentation/fragmentation.c:489
 msgid "# fragmentation transmissions completed"
 msgstr "# transmisiones de fragmentos completadas"
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:481
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr "No se pudo abrir el fichero «%s»: %s"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:492
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr "No se pudo leer el fichero «%s»: %s"
 
 # Short read??
-#: src/fs/fs_api.c:499
+#: src/fs/fs_api.c:500
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr "¡Lectura corta leyendo del fichero «%s»!"
 
-#: src/fs/fs_api.c:1156
+#: src/fs/fs_api.c:1157
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1707
+#: src/fs/fs_api.c:1708
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr "Fallo mientras se reiniciaba la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1722
+#: src/fs/fs_api.c:1723
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:2451
+#: src/fs/fs_api.c:2452
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de publicación «%s»: "
 "%s\n"
 
-#: src/fs/fs_api.c:2462
+#: src/fs/fs_api.c:2463
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de desindexado «%s»: %s\n"
 
-#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
+#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-descarga «%s»: %s\n"
 
-#: src/fs/fs_api.c:2628
+#: src/fs/fs_api.c:2629
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
+#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2846
+#: src/fs/fs_api.c:2847
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 "Se produjo un fallo al retomar la sub-descarga «%s»: no se pudo abrir el "
 "fichero «%s»\n"
 
-#: src/fs/fs_api.c:3107
+#: src/fs/fs_api.c:3108
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 "No se pudo retomar la búsqueda en ejecución, se retomará como una búsqueda "
 "en pausa\n"
 
-#: src/fs/fs_directory.c:215
+#: src/fs/fs_directory.c:216
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "No hay coincidencia con «MAGIC».  Esto no es un directorio GNUnet.\n"
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
@@ -2613,12 +2613,12 @@ msgstr ""
 "Las descargas recursivas de directorios mayores de 4GB no están soportadas "
 "en sistemas de 32 bits\n"
 
-#: src/fs/fs_download.c:332
+#: src/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 "Directorio demasiado grande para el espacio de direccionamiento del sistema\n"
 
-#: src/fs/fs_download.c:346
+#: src/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directory contents of `%s' for recursive download\n"
@@ -2626,19 +2626,19 @@ msgstr ""
 "Se produjo un fallo al crear el directorio para la descarga recursiva de "
 "«%s»\n"
 
-#: src/fs/fs_download.c:528 src/fs/fs_download.c:541
+#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Se produjo un fallo al abrir «%s» para escritura"
 
-#: src/fs/fs_download.c:960
+#: src/fs/fs_download.c:961
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 "Se produjo un fallo al crear el directorio para la descarga recursiva de "
 "«%s»\n"
 
-#: src/fs/fs_download.c:1044
+#: src/fs/fs_download.c:1045
 #, fuzzy, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
@@ -2647,33 +2647,33 @@ msgstr ""
 "Error interno o URI de descarga defectuosa (se esperaban %u bytes a "
 "profundidad %u y desplazamiento %llu/%llu, se obtuvieron %u bytes)"
 
-#: src/fs/fs_download.c:1066
+#: src/fs/fs_download.c:1067
 msgid "internal error decrypting content"
 msgstr "error interno descifrando el contenido"
 
-#: src/fs/fs_download.c:1089
+#: src/fs/fs_download.c:1090
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Descarga fallida: no se pudo abrir el fichero «%s»: %s"
 
-#: src/fs/fs_download.c:1100
+#: src/fs/fs_download.c:1101
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 "Se produjo un fallo al buscar en el desplazamiento %llu del fichero «%s»: %s"
 
-#: src/fs/fs_download.c:1110
+#: src/fs/fs_download.c:1111
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 "Se produjo un fallo al escribir el bloque de %u bytes en el desplazamiento "
 "%llu del fichero «%s»: %s"
 
-#: src/fs/fs_download.c:1218
+#: src/fs/fs_download.c:1219
 msgid "internal error decoding tree"
 msgstr "error interno decodificando árbol"
 
-#: src/fs/fs_download.c:1889
+#: src/fs/fs_download.c:1890
 msgid "Invalid URI"
 msgstr "URI no válida"
 
@@ -2686,105 +2686,105 @@ msgstr ""
 "Tipo de metadatos desconocido en la opción de metadatos «%s».  Usando el "
 "tipo de metadatos desconocido (unknown) en su lugar.\n"
 
-#: src/fs/fs_list_indexed.c:190
+#: src/fs/fs_list_indexed.c:191
 #, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
 
-#: src/fs/fs_misc.c:128
+#: src/fs/fs_misc.c:129
 #, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "No se encontró el tipo MIME «%s» en la lista de extensiones.\n"
 
-#: src/fs/fs_namespace.c:202
+#: src/fs/fs_namespace.c:203
 #, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Se produjo un fallo al abrir «%s» para escritura: %s\n"
 
-#: src/fs/fs_namespace.c:233
+#: src/fs/fs_namespace.c:234
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/fs/fs_namespace.c:330
+#: src/fs/fs_namespace.c:331
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/fs/fs_namespace.c:457
+#: src/fs/fs_namespace.c:458
 msgid "Failed to connect to datastore."
 msgstr "Se produjo un fallo al conectar con el almacén de datos."
 
-#: src/fs/fs_publish.c:128 src/fs/fs_publish.c:438
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
 #, c-format
 msgid "Publishing failed: %s"
 msgstr "Publicación fallida: %s"
 
-#: src/fs/fs_publish.c:731
+#: src/fs/fs_publish.c:732
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.\n"
 msgstr "Imposible abrir el fichero de configuración '%s'.\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
+#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "No se pudo indexar el fichero «%s»: %s.  Se intentará insertar.\n"
 
-#: src/fs/fs_publish.c:790
+#: src/fs/fs_publish.c:791
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr ""
 "expiración del plazo en la petición de inicio de indexado (index-start) al "
 "servicio «fs»"
 
-#: src/fs/fs_publish.c:836
+#: src/fs/fs_publish.c:837
 msgid "failed to compute hash"
 msgstr "se produjo un fallo al calcular el hash"
 
-#: src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:857
 msgid "filename too long"
 msgstr "nombre de fichero demasiado largo"
 
-#: src/fs/fs_publish.c:888
+#: src/fs/fs_publish.c:889
 msgid "could not connect to `fs' service"
 msgstr "no se pudo conectar con el servicio «fs»"
 
-#: src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:915
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/fs/fs_publish.c:1003 src/fs/fs_publish.c:1040
+#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1107
+#: src/fs/fs_publish.c:1108
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "La subida recursiva falló en «%s»: %s"
 
-#: src/fs/fs_publish.c:1115
+#: src/fs/fs_publish.c:1116
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Subida recursiva fallida: %s"
 
-#: src/fs/fs_publish.c:1156
+#: src/fs/fs_publish.c:1157
 msgid "needs to be an actual file"
 msgstr "tiene que ser un fichero de verdad"
 
-#: src/fs/fs_publish.c:1396
+#: src/fs/fs_publish.c:1397
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/fs_publish.c:1488
+#: src/fs/fs_publish.c:1489
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Reservando espacio para %u entradas y %llu bytes para publicación\n"
 
-#: src/fs/fs_publish_ksk.c:212
+#: src/fs/fs_publish_ksk.c:213
 msgid "Could not connect to datastore."
 msgstr "No se pudo conectar con el almacén de datos."
 
@@ -2792,167 +2792,167 @@ msgstr "No se pudo conectar con el almacén de datos."
 msgid "Internal error."
 msgstr "Error interno."
 
-#: src/fs/fs_search.c:829 src/fs/fs_search.c:900
+#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
 
-#: src/fs/fs_search.c:993
+#: src/fs/fs_search.c:994
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 "Se obtuvo un resultado con un tipo desconocido de bloque «%d», ignorándolo"
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:64
 msgid "Failed to find given position in file"
 msgstr "Se produjo un fallo al buscar la posición dada en el fichero"
 
-#: src/fs/fs_unindex.c:68
+#: src/fs/fs_unindex.c:69
 msgid "Failed to read file"
 msgstr "No se pudo leer el fichero"
 
 # Miguel: ¿Conectar y conexión?
-#: src/fs/fs_unindex.c:275
+#: src/fs/fs_unindex.c:276
 #, fuzzy
 msgid "Error communicating with `fs' service."
 msgstr "Error al comunicar con el servicio ARM.\n"
 
-#: src/fs/fs_unindex.c:326
+#: src/fs/fs_unindex.c:327
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 "Se produjo un fallo al conectar con el servicio «FS» para el desindexado."
 
-#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:389
+#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
 msgid "Failed to get KSKs from directory scan."
 msgstr "Se produjo un fallo al obtener KSKs de la búsqueda de directorios."
 
-#: src/fs/fs_unindex.c:385
+#: src/fs/fs_unindex.c:386
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "Error interno escaneando «%s».\n"
 
-#: src/fs/fs_unindex.c:446
+#: src/fs/fs_unindex.c:447
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Se produjo un fallo al eliminar el KBlock: %s\n"
 
-#: src/fs/fs_unindex.c:592 src/fs/fs_unindex.c:656
+#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 "Se produjo un fallo al conectar con el servicio de almacenamiento de datos "
 "(datastore)."
 
-#: src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:670
 msgid "Failed to open file for unindexing."
 msgstr "Se produjo un fallo al abrir el fichero para desindexado."
 
-#: src/fs/fs_unindex.c:708
+#: src/fs/fs_unindex.c:709
 msgid "Failed to compute hash of file."
 msgstr "Se produjo un fallo al calcular el hash del fichero."
 
 # Cadena erronea, corregida en SVN.
-#: src/fs/fs_uri.c:231
+#: src/fs/fs_uri.c:232
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "'%' debe ser seguido por un número hexadecimal"
 
-#: src/fs/fs_uri.c:290
+#: src/fs/fs_uri.c:291
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:308
+#: src/fs/fs_uri.c:309
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:315
+#: src/fs/fs_uri.c:316
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:382
+#: src/fs/fs_uri.c:383
 #, fuzzy
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:423
+#: src/fs/fs_uri.c:424
 #, fuzzy
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr "URI CHK mal formada"
 
-#: src/fs/fs_uri.c:440
+#: src/fs/fs_uri.c:441
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:517
+#: src/fs/fs_uri.c:518
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:534
+#: src/fs/fs_uri.c:535
 #, fuzzy
 msgid "LOC URI malformed (no CHK)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 #, fuzzy
 msgid "LOC URI malformed (missing LOC)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:561
+#: src/fs/fs_uri.c:562
 #, fuzzy
 msgid "LOC URI malformed (could not decode public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:567
+#: src/fs/fs_uri.c:568
 #, fuzzy
 msgid "LOC URI malformed (could not find signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:574
+#: src/fs/fs_uri.c:575
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 #, fuzzy
 msgid "LOC URI malformed (could not decode signature)"
 msgstr "URI SKS mal formada (no se pudo decodificar la firma)"
 
-#: src/fs/fs_uri.c:592
+#: src/fs/fs_uri.c:593
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:599
 #, fuzzy
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:612
+#: src/fs/fs_uri.c:613
 #, fuzzy
 msgid "LOC URI malformed (signature failed validation)"
 msgstr "URI SKS mal formada (se produjo un fallo al validar la firma)"
 
-#: src/fs/fs_uri.c:645
+#: src/fs/fs_uri.c:646
 #, fuzzy
 msgid "invalid argument"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/fs/fs_uri.c:665
+#: src/fs/fs_uri.c:666
 msgid "Unrecognized URI type"
 msgstr "Tipo de URI no reconocido"
 
-#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/fs/fs_uri.c:1093
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
@@ -2990,7 +2990,7 @@ msgstr ""
 "Debes especificar uno y solo un nombre de directorio para publicación "
 "automática.\n"
 
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:896
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del emisor"
 
@@ -2999,15 +2999,15 @@ msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 "deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
 
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
 msgid "do not use libextractor to add keywords or metadata"
 msgstr "no usar libextractor para añadir palabras clave o metadatos"
 
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:946
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
 msgid "specify the priority of the content"
 msgstr "especificar la prioridad del contenido"
 
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:959
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
 msgid "set the desired replication LEVEL"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
@@ -3015,53 +3015,53 @@ msgstr "establece el nivel LEVEL deseado de replicación"
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Publicar automáticamente ficheros de un directorio en GNUnet"
 
-#: src/fs/gnunet-daemon-fsprofiler.c:667
+#: src/fs/gnunet-daemon-fsprofiler.c:668
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr "Demonio para medir el rendimiento de usar compartición de archivos."
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:54
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr "\t<fichero original embebido en %u bytes de metadatos>\n"
 
-#: src/fs/gnunet-directory.c:105
+#: src/fs/gnunet-directory.c:106
 #, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr "Metadatos del directorio «%s»:\n"
 
-#: src/fs/gnunet-directory.c:108
+#: src/fs/gnunet-directory.c:109
 #, c-format
 msgid "Directory `%s' contents:\n"
 msgstr "Contenidos del directorio «%s»:\n"
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-directory.c:146
 msgid "You must specify a filename to inspect.\n"
 msgstr "Debes especificar un fichero a inspeccionar.\n"
 
-#: src/fs/gnunet-directory.c:159
+#: src/fs/gnunet-directory.c:160
 #, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr "Se produjo un fallo al leer el directorio «%s»\n"
 
-#: src/fs/gnunet-directory.c:169
+#: src/fs/gnunet-directory.c:170
 #, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "«%s» no es un directorio GNUnet\n"
 
-#: src/fs/gnunet-directory.c:200
+#: src/fs/gnunet-directory.c:201
 msgid "Display contents of a GNUnet directory"
 msgstr "Muestra los contenidos de un directorio GNUnet"
 
-#: src/fs/gnunet-download.c:130
+#: src/fs/gnunet-download.c:131
 #, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/fs/gnunet-download.c:142
+#: src/fs/gnunet-download.c:143
 msgid "<unknown time>"
 msgstr "<tiempo desconocido>"
 
-#: src/fs/gnunet-download.c:154
+#: src/fs/gnunet-download.c:155
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
@@ -3070,74 +3070,74 @@ msgstr ""
 "Descargando «%s» en %llu/%llu (%s restantes, %s/s). El bloque tardó %s en "
 "descargarse\n"
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Error descargando: %s.\n"
 
-#: src/fs/gnunet-download.c:188
+#: src/fs/gnunet-download.c:189
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Finalizada descarga «%s» (%s/s).\n"
 
-#: src/fs/gnunet-download.c:206 src/fs/gnunet-publish.c:299
-#: src/fs/gnunet-search.c:543 src/fs/gnunet-unindex.c:117
+#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
+#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Estado inesperado: %d\n"
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:234
 msgid "You need to specify a URI argument.\n"
 msgstr "Tiene que especificar una URI como parámetro.\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:715
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:716
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:247
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr "Sólo URI «CHK» o «LOC» soportadas.\n"
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:254
 msgid "Target filename must be specified.\n"
 msgstr "El nombre de fichero de destino debe ser especificado.\n"
 
-#: src/fs/gnunet-download.c:271 src/fs/gnunet-publish.c:869
-#: src/fs/gnunet-unindex.c:154
+#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-unindex.c:155
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "No se pudo inicializar el subsistema «%s».\n"
 
-#: src/fs/gnunet-download.c:318
+#: src/fs/gnunet-download.c:319
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del receptor"
 
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:325
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "borra descargas incompletas (cuando fueron abortadas con CTRL-C="
 
-#: src/fs/gnunet-download.c:330 src/fs/gnunet-search.c:745
+#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
 msgid "only search the local peer (no P2P network search)"
 msgstr "únicamente buscar en el par local (no buscar en la red P2P)"
 
-#: src/fs/gnunet-download.c:335
+#: src/fs/gnunet-download.c:336
 msgid "write the file to FILENAME"
 msgstr "escribe los datos al nombre del fichero proporcionado (FILENAME)"
 
-#: src/fs/gnunet-download.c:342
+#: src/fs/gnunet-download.c:343
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr "establece el número máximo de descargas paralelas permitido"
 
-#: src/fs/gnunet-download.c:349
+#: src/fs/gnunet-download.c:350
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr "establece el número máximo de peticiones de bloque paralelas permitido"
 
-#: src/fs/gnunet-download.c:354
+#: src/fs/gnunet-download.c:355
 msgid "download a GNUnet directory recursively"
 msgstr "descarga un directorio de GNUnet recursivamente"
 
-#: src/fs/gnunet-download.c:373
+#: src/fs/gnunet-download.c:374
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -3165,116 +3165,116 @@ msgstr ""
 "ejecuta una batería de pruebas para medir el rendimiento de la compartición "
 "de ficheros"
 
-#: src/fs/gnunet-fs.c:164
+#: src/fs/gnunet-fs.c:165
 msgid "print a list of all indexed files"
 msgstr "imprimir una lista de todos los ficheros indexados"
 
-#: src/fs/gnunet-fs.c:179
+#: src/fs/gnunet-fs.c:180
 msgid "Special file-sharing operations"
 msgstr "Operaciones especiales de compartición de ficheros"
 
-#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:234
+#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr "Publicando «%s» en %llu/%llu (%s restantes)\n"
 
-#: src/fs/gnunet-publish.c:246
+#: src/fs/gnunet-publish.c:247
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Error publicando: %s.\n"
 
-#: src/fs/gnunet-publish.c:254
+#: src/fs/gnunet-publish.c:255
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr "Publicación «%s» finalizada.\n"
 
-#: src/fs/gnunet-publish.c:258
+#: src/fs/gnunet-publish.c:259
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr "La URI es «%s».\n"
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:265
 #, fuzzy, c-format
 msgid "Namespace URI is `%s'.\n"
 msgstr "La URI es «%s».\n"
 
-#: src/fs/gnunet-publish.c:279
+#: src/fs/gnunet-publish.c:280
 #, fuzzy
 msgid "Starting cleanup after abort\n"
 msgstr "Limpieza completada\n"
 
-#: src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-publish.c:287
 #, fuzzy
 msgid "Cleanup after abort completed.\n"
 msgstr "Limpieza completada\n"
 
-#: src/fs/gnunet-publish.c:291
+#: src/fs/gnunet-publish.c:292
 #, fuzzy
 msgid "Cleanup after abort failed.\n"
 msgstr "Limpieza completada\n"
 
-#: src/fs/gnunet-publish.c:425
+#: src/fs/gnunet-publish.c:426
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Metadatos para el fichero «%s» (%s)\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:428
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Palabras clave para el fichero «%s» (%s)\n"
 
-#: src/fs/gnunet-publish.c:582
+#: src/fs/gnunet-publish.c:583
 msgid "Could not publish\n"
 msgstr "No se pudo publicar\n"
 
-#: src/fs/gnunet-publish.c:611
+#: src/fs/gnunet-publish.c:612
 msgid "Could not start publishing.\n"
 msgstr "No se pudo empezar a publicar.\n"
 
-#: src/fs/gnunet-publish.c:644
+#: src/fs/gnunet-publish.c:645
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:647
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Escaneando fichero «%s».\n"
 
-#: src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-publish.c:653
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr "Hubo un problema procesando el fichero «%s», omitiéndolo.\n"
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:659
 msgid "Preprocessing complete.\n"
 msgstr "Preprocesado completo.\n"
 
-#: src/fs/gnunet-publish.c:664
+#: src/fs/gnunet-publish.c:665
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Extracción de metadatos del fichero «%s» completa.\n"
 
-#: src/fs/gnunet-publish.c:670
+#: src/fs/gnunet-publish.c:671
 msgid "Meta data extraction has finished.\n"
 msgstr "La extracción de metadatos ha finalizado.\n"
 
-#: src/fs/gnunet-publish.c:678
+#: src/fs/gnunet-publish.c:679
 #, fuzzy
 msgid "Error scanning directory.\n"
 msgstr "Error interno escaneando directorio.\n"
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:706
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Espacio de nombres «%s» desconocido.\n"
 
-#: src/fs/gnunet-publish.c:737
+#: src/fs/gnunet-publish.c:738
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Se produjo un fallo al acceder «%s»: %s\n"
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:755
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
@@ -3282,39 +3282,39 @@ msgstr ""
 "Se produjo un fallo al iniciar el meta-escáner de directorios.  ¿Está "
 "«gnunet-helper-publish-fs» instalado?\n"
 
-#: src/fs/gnunet-publish.c:810
+#: src/fs/gnunet-publish.c:811
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "¡No se pueden extraer metadatos de una URI!\n"
 
-#: src/fs/gnunet-publish.c:817
+#: src/fs/gnunet-publish.c:818
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Se debe especificar uno y solo un nombre de fichero para insertar.\n"
 
-#: src/fs/gnunet-publish.c:823
+#: src/fs/gnunet-publish.c:824
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "No se puede especificar una URI y un nombre de fichero.\n"
 
-#: src/fs/gnunet-publish.c:832 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:208
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
 
-#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:853
+#: src/fs/gnunet-publish.c:845 src/fs/gnunet-publish.c:854
 #: 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 "La opción «%s» no tiene sentido sin la opción «%s».\n"
 
-#: src/fs/gnunet-publish.c:906
+#: src/fs/gnunet-publish.c:907
 #, fuzzy
 msgid "enable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 "deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
 
-#: src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3322,7 +3322,7 @@ msgstr ""
 "imprimir una lista de las palabras clave extraídas que podrían ser usadas, "
 "pero sin realizar la subida"
 
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:921
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3330,11 +3330,11 @@ msgstr ""
 "añadir una palabra clave adicional para el fichero del nivel más alto o el "
 "directorio (esta opción puede ser especificada varias veces)"
 
-#: src/fs/gnunet-publish.c:927
+#: src/fs/gnunet-publish.c:928
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "establece los metadatos para el tipo TYPE dado al valor VALUE dado"
 
-#: src/fs/gnunet-publish.c:932
+#: src/fs/gnunet-publish.c:933
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3342,7 +3342,7 @@ msgstr ""
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "cifrada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-publish.c:940
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3350,13 +3350,13 @@ msgstr ""
 "especificar la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio de nombres únicamente)"
 
-#: src/fs/gnunet-publish.c:952
+#: src/fs/gnunet-publish.c:953
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publicar los ficheros bajo el seudónimo NAME (coloca el fichero en el "
 "espacio)"
 
-#: src/fs/gnunet-publish.c:964
+#: src/fs/gnunet-publish.c:965
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
@@ -3364,14 +3364,14 @@ msgstr ""
 "únicamente simular el proceso pero no publicar nada realmente (útil para "
 "calcular URI)"
 
-#: src/fs/gnunet-publish.c:971
+#: src/fs/gnunet-publish.c:972
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "establece la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:979
+#: src/fs/gnunet-publish.c:980
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3379,101 +3379,101 @@ msgstr ""
 "URI a ser publicada (puede ser usado en vez de pasar un fichero para añadir "
 "claves con el fichero con la URI respectiva)"
 
-#: src/fs/gnunet-publish.c:997
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr "Publicar un fichero o un directorio en GNUnet"
 
-#: src/fs/gnunet-search.c:443
+#: src/fs/gnunet-search.c:446
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/fs/gnunet-search.c:532
+#: src/fs/gnunet-search.c:535
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr "Error buscando: %s.\n"
 
-#: src/fs/gnunet-search.c:592
+#: src/fs/gnunet-search.c:595
 #, c-format
 msgid "Conflicting options --bookmark-only and --silent.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:599
+#: src/fs/gnunet-search.c:602
 #, c-format
 msgid "Conflicting options --bookmark-only and --output.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:605
+#: src/fs/gnunet-search.c:608
 #, c-format
 msgid "An output file is mandatory for silent mode.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:626
+#: src/fs/gnunet-search.c:629
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "No se pudo crear URI de palabra clave a partir de los parámetros.\n"
 
-#: src/fs/gnunet-search.c:634
+#: src/fs/gnunet-search.c:637
 msgid ""
 "Invalid URI. Valid URIs for searching are keyword query URIs\n"
 "(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
 "\").\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:659
+#: src/fs/gnunet-search.c:662
 #, fuzzy, c-format
 msgid "Could not initialize the `%s` subsystem.\n"
 msgstr "No se pudo inicializar el subsistema «%s».\n"
 
-#: src/fs/gnunet-search.c:673
+#: src/fs/gnunet-search.c:676
 msgid "Could not start searching.\n"
 msgstr "No se pudo empezar a buscar.\n"
 
-#: src/fs/gnunet-search.c:699
+#: src/fs/gnunet-search.c:702
 #, fuzzy
 msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
 msgstr "establece el nivel LEVEL deseado de anonimato del receptor"
 
-#: src/fs/gnunet-search.c:705
+#: src/fs/gnunet-search.c:708
 msgid "do not search, print only the URI that points to this search"
 msgstr ""
 
-#: src/fs/gnunet-search.c:712
+#: src/fs/gnunet-search.c:715
 msgid ""
 "write search results for directories according to FORMAT; accepted "
 "placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
 "printf when omitted or to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:722
+#: src/fs/gnunet-search.c:725
 msgid ""
 "write search results according to FORMAT; accepted placeholders are: %a, %f, "
 "%j, %l, %m, %n, %s; defaults to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:730
+#: src/fs/gnunet-search.c:733
 msgid ""
 "when the %a or %j placeholders appear in --printf or --dir-printf, list each "
 "metadata property according to FORMAT; accepted placeholders are: %i, %l, "
 "%n, %p"
 msgstr ""
 
-#: src/fs/gnunet-search.c:739
+#: src/fs/gnunet-search.c:742
 msgid "automatically terminate search after VALUE results are found"
 msgstr "terminar búsqueda después de «VALUE» resultados encontrados"
 
-#: src/fs/gnunet-search.c:751
+#: src/fs/gnunet-search.c:754
 msgid ""
 "create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
 "search --output=commons"
 msgstr ""
 
-#: src/fs/gnunet-search.c:758
+#: src/fs/gnunet-search.c:761
 msgid "silent mode (requires the --output argument)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:764
+#: src/fs/gnunet-search.c:767
 msgid ""
 "automatically terminate search after DELAY; the value given must be a number "
 "followed by a space and a time unit, for example \"500 ms\"; without a unit "
@@ -3481,57 +3481,57 @@ msgid ""
 "to wait for CTRL-C"
 msgstr ""
 
-#: src/fs/gnunet-search.c:773
+#: src/fs/gnunet-search.c:776
 #, c-format
 msgid ""
 "be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
 "arguments - ignored when these are provided by the user)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:786
+#: src/fs/gnunet-search.c:789
 #, fuzzy
 msgid "Search for files that have been published on GNUnet\n"
 msgstr "Buscar en GNUnet ficheros que han sido publicados en GNUnet"
 
-#: src/fs/gnunet-service-fs.c:371 src/fs/gnunet-service-fs.c:878
+#: src/fs/gnunet-service-fs.c:370 src/fs/gnunet-service-fs.c:877
 msgid "# client searches active"
 msgstr "# búsquedas de clientes activas"
 
-#: src/fs/gnunet-service-fs.c:430
+#: src/fs/gnunet-service-fs.c:429
 msgid "# replies received for local clients"
 msgstr "# respuestas recibidas de clientes locales"
 
-#: src/fs/gnunet-service-fs.c:596
+#: src/fs/gnunet-service-fs.c:595
 msgid "# running average P2P latency (ms)"
 msgstr "# latencia media de P2P en ejecución (ms)"
 
-#: src/fs/gnunet-service-fs.c:648 src/fs/gnunet-service-fs_cp.c:558
+#: src/fs/gnunet-service-fs.c:647 src/fs/gnunet-service-fs_cp.c:558
 msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
 
-#: src/fs/gnunet-service-fs.c:831
+#: src/fs/gnunet-service-fs.c:830
 msgid "# client searches received"
 msgstr "# búsquedas de clientes recibidas"
 
-#: src/fs/gnunet-service-fs.c:871
+#: src/fs/gnunet-service-fs.c:870
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 "# búsquedas de clientes actualizadas (contenido unido visto en la lista)"
 
-#: src/fs/gnunet-service-fs.c:1041
+#: src/fs/gnunet-service-fs.c:1040
 #, fuzzy, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 "Hash no asociado intentando indexar el fichero «%s» que tiene hash «%s»\n"
 
-#: src/fs/gnunet-service-fs.c:1288
+#: src/fs/gnunet-service-fs.c:1287
 #, fuzzy
 msgid "FS 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/fs/gnunet-service-fs.c:1322 src/hostlist/gnunet-daemon-hostlist.c:343
+#: src/fs/gnunet-service-fs.c:1321 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3631,43 +3631,43 @@ msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:188
+#: src/fs/gnunet-service-fs_indexing.c:129
+#: src/fs/gnunet-service-fs_indexing.c:187
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr "No se pudo abrir «%s».\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:147
+#: src/fs/gnunet-service-fs_indexing.c:146
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Error escribiendo «%s».\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:244
+#: src/fs/gnunet-service-fs_indexing.c:243
 #, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Se produjo un fallo al eliminar el bloque defectuoso: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:297
+#: src/fs/gnunet-service-fs_indexing.c:296
 msgid "# index blocks removed: original file inaccessible"
 msgstr "# bloques de índice eliminados: fichero original inaccesible"
 
-#: src/fs/gnunet-service-fs_indexing.c:311
+#: src/fs/gnunet-service-fs_indexing.c:310
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 "No se pudo acceder al fichero indexado «%s» (%s) en el desplazamiento %llu: "
 "%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:315
+#: src/fs/gnunet-service-fs_indexing.c:314
 msgid "not indexed"
 msgstr "no indexado"
 
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:328
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "El fichero indexado «%s» ha cambiado en el desplazamiento %llu\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:435
+#: src/fs/gnunet-service-fs_indexing.c:434
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3803,33 +3803,52 @@ msgstr "# Mensajes «GAP PUT» recibidos"
 msgid "time required, content pushing disabled"
 msgstr "se requiere tiempo, publicación de contenido deshabilitada"
 
-#: src/fs/gnunet-unindex.c:93
+#: src/fs/gnunet-unindex.c:94
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr "Desindexado en %llu/%llu (quedan %s)\n"
 
-#: src/fs/gnunet-unindex.c:102
+#: src/fs/gnunet-unindex.c:103
 #, c-format
 msgid "Error unindexing: %s.\n"
 msgstr "Error desindexando: %s.\n"
 
-#: src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-unindex.c:109
 msgid "Unindexing done.\n"
 msgstr "Desindexado finalizado.\n"
 
-#: src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-unindex.c:142
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr "Se debe especificar uno y solo un fichero para desindexar.\n"
 
-#: src/fs/gnunet-unindex.c:161
+#: src/fs/gnunet-unindex.c:162
 msgid "Could not start unindex operation.\n"
 msgstr "No se pudo empezar la operación de desindexado.\n"
 
-#: src/fs/gnunet-unindex.c:194
+#: src/fs/gnunet-unindex.c:195
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr "Desindexa un fichero previamente indexado con «gnunet-publish»."
 
+#: src/fs/meta_data.c:1063 src/fs/meta_data.c:1116 src/fs/meta_data.c:1131
+msgid "metadata length"
+msgstr ""
+
+#: src/fs/meta_data.c:1074
+#, fuzzy, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
+msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)"
+
+#: src/fs/meta_data.c:1091
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Se produjo un fallo al serializar metadatos"
+
+#: src/fs/meta_data.c:1126
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Se produjo un fallo al serializar metadatos"
+
 #: src/gns/gns_tld_api.c:293
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
@@ -3856,46 +3875,46 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:298
+#: src/gns/gnunet-dns2gns.c:296
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 "¡Se produjo un fallo al empaquetar una respuesta DNS en un paquete UDP!\n"
 
-#: src/gns/gnunet-dns2gns.c:379
+#: src/gns/gnunet-dns2gns.c:377
 #, fuzzy
 msgid "Failed to parse DNS response!\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/gns/gnunet-dns2gns.c:453
+#: src/gns/gnunet-dns2gns.c:451
 #, fuzzy, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr "El ATS devolvió resultados para %u direcciones\n"
 
-#: src/gns/gnunet-dns2gns.c:656
+#: src/gns/gnunet-dns2gns.c:654
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "No se puede procesar la petición DNS de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:672
+#: src/gns/gnunet-dns2gns.c:670
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:680
+#: src/gns/gnunet-dns2gns.c:678
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Recibida petición DNS no soportada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:841
+#: src/gns/gnunet-dns2gns.c:839
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:1001
+#: src/gns/gnunet-dns2gns.c:999
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "IP del resolvedor recursivo DNS a usar (requerido)"
 
-#: src/gns/gnunet-dns2gns.c:1018
+#: src/gns/gnunet-dns2gns.c:1016
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
@@ -4032,173 +4051,173 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-gns.c:257
+#: src/gns/gnunet-gns.c:256
 #, fuzzy, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/gns/gnunet-gns.c:267 src/util/dnsparser.c:253
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 "Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: "
 "%s\n"
 
-#: src/gns/gnunet-gns.c:281
+#: src/gns/gnunet-gns.c:280
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:305
+#: src/gns/gnunet-gns.c:304
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:340
+#: src/gns/gnunet-gns.c:339
 msgid "Lookup a record for the given name"
 msgstr "Buscar el registro para el nombre dado"
 
-#: src/gns/gnunet-gns.c:346
+#: src/gns/gnunet-gns.c:345
 msgid "Specify the type of the record to lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:352
+#: src/gns/gnunet-gns.c:351
 #, fuzzy
 msgid "Specify a timeout for the lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:356
+#: src/gns/gnunet-gns.c:355
 msgid "No unneeded output"
 msgstr "Sin salida innecesaria"
 
-#: src/gns/gnunet-gns.c:361
+#: src/gns/gnunet-gns.c:360
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:375
+#: src/gns/gnunet-gns.c:374
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/gns/gnunet-service-gns.c:519
+#: src/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "Tipo requerido\n"
 
-#: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1346
+#: src/gns/gnunet-service-gns.c:554
+#: src/zonemaster/gnunet-service-zonemaster.c:1345
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/gns/gnunet-service-gns.c:574
-#: src/zonemaster/gnunet-service-zonemaster.c:1385
+#: src/gns/gnunet-service-gns.c:573
+#: src/zonemaster/gnunet-service-zonemaster.c:1384
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:279
+#: src/gns/gnunet-service-gns_interceptor.c:278
 #, fuzzy
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:380
+#: src/gns/gnunet-service-gns_interceptor.c:379
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio GNS!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:672
+#: src/gns/gnunet-service-gns_resolver.c:669
 #, fuzzy, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:684
+#: src/gns/gnunet-service-gns_resolver.c:681
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:690
+#: src/gns/gnunet-service-gns_resolver.c:687
 #, fuzzy, c-format
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:903
+#: src/gns/gnunet-service-gns_resolver.c:900
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1094
+#: src/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1870
+#: src/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1885
+#: src/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1918
+#: src/gns/gnunet-service-gns_resolver.c:1915
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2320
+#: src/gns/gnunet-service-gns_resolver.c:2317
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2325
+#: src/gns/gnunet-service-gns_resolver.c:2322
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2348
+#: src/gns/gnunet-service-gns_resolver.c:2345
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2515
+#: src/gns/gnunet-service-gns_resolver.c:2512
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2663
+#: src/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:138
+#: src/gns/plugin_gnsrecord_gns.c:137
 msgid "This is a memento of an older block for internal maintenance."
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:177
+#: src/gns/plugin_gnsrecord_gns.c:176
 #, fuzzy, c-format
 msgid "Unable to parse zone key record `%s'\n"
 msgstr "No se pudo procesar el registro MX «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:191
+#: src/gns/plugin_gnsrecord_gns.c:190
 msgid "Record type does not match parsed record type\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:214
+#: src/gns/plugin_gnsrecord_gns.c:213
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:231
+#: src/gns/plugin_gnsrecord_gns.c:230
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:255
+#: src/gns/plugin_gnsrecord_gns.c:254
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:287
+#: src/gns/plugin_gnsrecord_gns.c:286
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
@@ -4208,121 +4227,121 @@ msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
 msgid "Gns REST API initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/gnsrecord/gnsrecord_misc.c:53
+#: src/gnsrecord/gnsrecord_misc.c:51
 msgid "Label is NULL which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:58
+#: src/gnsrecord/gnsrecord_misc.c:56
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:481
+#: src/gnsrecord/gnsrecord_misc.c:479
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:489
+#: src/gnsrecord/gnsrecord_misc.c:487
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:499
+#: src/gnsrecord/gnsrecord_misc.c:497
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:515
+#: src/gnsrecord/gnsrecord_misc.c:513
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:526
+#: src/gnsrecord/gnsrecord_misc.c:524
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:548
+#: src/gnsrecord/gnsrecord_misc.c:546
 msgid "Mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:367
+#: src/gnsrecord/plugin_gnsrecord_dns.c:366
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "No se pudo procesar la dirección IPv4 «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:385
+#: src/gnsrecord/plugin_gnsrecord_dns.c:384
 #, fuzzy, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:406
+#: src/gnsrecord/plugin_gnsrecord_dns.c:405
 #, fuzzy, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:480
+#: src/gnsrecord/plugin_gnsrecord_dns.c:479
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:516
+#: src/gnsrecord/plugin_gnsrecord_dns.c:515
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:533
+#: src/gnsrecord/plugin_gnsrecord_dns.c:532
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:553
+#: src/gnsrecord/plugin_gnsrecord_dns.c:552
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:573
+#: src/gnsrecord/plugin_gnsrecord_dns.c:572
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "No se pudo procesar el registro MX «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:585
+#: src/gnsrecord/plugin_gnsrecord_dns.c:584
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:608
+#: src/gnsrecord/plugin_gnsrecord_dns.c:607
 #, fuzzy, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:621
+#: src/gnsrecord/plugin_gnsrecord_dns.c:620
 #, fuzzy, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:640
+#: src/gnsrecord/plugin_gnsrecord_dns.c:639
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "No se pudo procesar dirección IPv4 «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:660
-#: src/gnsrecord/plugin_gnsrecord_dns.c:674
+#: src/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/gnsrecord/plugin_gnsrecord_dns.c:673
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:693
+#: src/gnsrecord/plugin_gnsrecord_dns.c:692
 #, fuzzy, c-format
 msgid "Unable to parse CAA record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
@@ -4825,66 +4844,66 @@ msgstr "No se pudo procesar el registro SOA «%s»\n"
 msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/my/my.c:196 src/my/my.c:215
+#: src/my/my.c:197 src/my/my.c:216
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
 
-#: src/mysql/mysql.c:190
+#: src/mysql/mysql.c:191
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Intentando usar el fichero «%s» para la configuración de MySQL.\n"
 
-#: src/mysql/mysql.c:198
+#: src/mysql/mysql.c:199
 #, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "No se pudo acceder al fichero «%s»: %s\n"
 
-#: src/namecache/gnunet-namecache.c:106
+#: src/namecache/gnunet-namecache.c:105
 #, fuzzy, c-format
 msgid "No records found for `%s'"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/namecache/gnunet-namecache.c:119 src/namestore/gnunet-namestore.c:888
+#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:887
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
 
-#: src/namecache/gnunet-namecache.c:175
+#: src/namecache/gnunet-namecache.c:174
 #, fuzzy, c-format
 msgid "You must specify which zone should be accessed\n"
 msgstr "Se debe especificar un apodo\n"
 
-#: src/namecache/gnunet-namecache.c:182
+#: src/namecache/gnunet-namecache.c:181
 #, fuzzy, c-format
 msgid "Invalid public key for zone `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namecache/gnunet-namecache.c:188
+#: src/namecache/gnunet-namecache.c:187
 #, fuzzy, c-format
 msgid "You must specify a name\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:2020
+#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2019
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
-#: src/namecache/gnunet-namecache.c:221
+#: src/namecache/gnunet-namecache.c:220
 #, fuzzy
 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:2102
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2101
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
-#: src/namecache/namecache_api.c:285
+#: src/namecache/namecache_api.c:283
 #, fuzzy
 msgid "Namecache failed to cache block"
 msgstr "El almacén de nombres no pudo añadir el registro"
 
 # Miguel: ¿Conectar y conexión?
-#: src/namecache/namecache_api.c:373
+#: src/namecache/namecache_api.c:371
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Error al comunicar con el servicio ARM.\n"
@@ -4924,7 +4943,7 @@ msgid "Failed to setup database at `%s'\n"
 msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 
 #: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1951
+#: src/namestore/gnunet-namestore.c:1950
 #, fuzzy, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr "Argumentos superfluos (ignorados).\n"
@@ -5100,254 +5119,254 @@ msgid "Failed to connect to IDENTITY\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
 #: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2087
+#: src/namestore/gnunet-namestore.c:2086
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
 
-#: src/namestore/gnunet-namestore.c:412
+#: src/namestore/gnunet-namestore.c:411
 #, 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:420
+#: src/namestore/gnunet-namestore.c:419
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Comando desconocido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:428 src/namestore/gnunet-namestore.c:443
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:435
+#: src/namestore/gnunet-namestore.c:434
 #, fuzzy, c-format
 msgid "Error parsing expiration time %s.\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/namestore/gnunet-namestore.c:465
+#: src/namestore/gnunet-namestore.c:464
 #, 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:667
+#: src/namestore/gnunet-namestore.c:666
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr "No se pudo añadir el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:685 src/namestore/gnunet-namestore.c:701
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1137
+#: src/namestore/gnunet-namestore.c:1136
 #, 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:1258
+#: src/namestore/gnunet-namestore.c:1257
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1301
+#: src/namestore/gnunet-namestore.c:1300
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1326
+#: src/namestore/gnunet-namestore.c:1325
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1355
+#: src/namestore/gnunet-namestore.c:1354
 #, c-format
 msgid "No options given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/namestore/gnunet-namestore.c:1369
+#: src/namestore/gnunet-namestore.c:1368
 #, c-format
 msgid "Recordlines only work with option `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1378 src/namestore/gnunet-namestore.c:1430
-#: src/namestore/gnunet-namestore.c:1440 src/namestore/gnunet-namestore.c:1450
-#: src/namestore/gnunet-namestore.c:1479 src/namestore/gnunet-namestore.c:1500
-#: src/namestore/gnunet-namestore.c:1527 src/namestore/gnunet-namestore.c:1537
-#: src/namestore/gnunet-namestore.c:1570 src/namestore/gnunet-namestore.c:1595
-#: src/namestore/gnunet-namestore.c:1629 src/namestore/gnunet-namestore.c:1663
-#: src/namestore/gnunet-namestore.c:1686
+#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
+#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
+#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
+#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
+#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
+#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
+#: src/namestore/gnunet-namestore.c:1685
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1380
+#: src/namestore/gnunet-namestore.c:1379
 #, fuzzy
 msgid "name"
 msgstr "sin nombre"
 
-#: src/namestore/gnunet-namestore.c:1409
+#: src/namestore/gnunet-namestore.c:1408
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1432 src/namestore/gnunet-namestore.c:1442
-#: src/namestore/gnunet-namestore.c:1452 src/namestore/gnunet-namestore.c:1481
-#: src/namestore/gnunet-namestore.c:1502 src/namestore/gnunet-namestore.c:1688
+#: src/namestore/gnunet-namestore.c:1431 src/namestore/gnunet-namestore.c:1441
+#: src/namestore/gnunet-namestore.c:1451 src/namestore/gnunet-namestore.c:1480
+#: src/namestore/gnunet-namestore.c:1501 src/namestore/gnunet-namestore.c:1687
 msgid "add"
 msgstr "añadir"
 
-#: src/namestore/gnunet-namestore.c:1460
+#: src/namestore/gnunet-namestore.c:1459
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1470
+#: src/namestore/gnunet-namestore.c:1469
 #, c-format
 msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1490
+#: src/namestore/gnunet-namestore.c:1489
 #, c-format
 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:1509 src/namestore/gnunet-namestore.c:1695
+#: src/namestore/gnunet-namestore.c:1508 src/namestore/gnunet-namestore.c:1694
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1529 src/namestore/gnunet-namestore.c:1539
+#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
 msgid "del"
 msgstr "borrar"
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1571
 msgid "purge-zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1596
 msgid "list"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1631
+#: src/namestore/gnunet-namestore.c:1630
 msgid "reverse-pkey"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1641
+#: src/namestore/gnunet-namestore.c:1640
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1665
+#: src/namestore/gnunet-namestore.c:1664
 msgid "uri"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1678
+#: src/namestore/gnunet-namestore.c:1677
 #: 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:1966
+#: src/namestore/gnunet-namestore.c:1965
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/namestore/gnunet-namestore.c:1985
+#: src/namestore/gnunet-namestore.c:1984
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:1988
+#: src/namestore/gnunet-namestore.c:1987
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:1992
+#: src/namestore/gnunet-namestore.c:1991
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:1996
+#: src/namestore/gnunet-namestore.c:1995
 msgid "read commands from stdin"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2003
+#: src/namestore/gnunet-namestore.c:2002
 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:2009
+#: src/namestore/gnunet-namestore.c:2008
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/namestore/gnunet-namestore.c:2014
+#: src/namestore/gnunet-namestore.c:2013
 #, 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:2024
+#: src/namestore/gnunet-namestore.c:2023
 #, fuzzy
 msgid "Output in recordline format"
 msgstr "salida en formato de gnuplot"
 
-#: src/namestore/gnunet-namestore.c:2030
+#: src/namestore/gnunet-namestore.c:2029
 #, fuzzy
 msgid "determine our name for the given KEY"
 msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:2036
+#: src/namestore/gnunet-namestore.c:2035
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:2041
+#: src/namestore/gnunet-namestore.c:2040
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:2047
+#: src/namestore/gnunet-namestore.c:2046
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:2051
+#: src/namestore/gnunet-namestore.c:2050
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:2055
+#: src/namestore/gnunet-namestore.c:2054
 #, fuzzy
 msgid "omit private records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:2060
+#: src/namestore/gnunet-namestore.c:2059
 msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2065
+#: src/namestore/gnunet-namestore.c:2064
 msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2070
+#: src/namestore/gnunet-namestore.c:2069
 msgid ""
 "show private key for orphaned records for recovery using `gnunet-identity -C "
 "-P <key>'. Use in combination with --display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2075
+#: src/namestore/gnunet-namestore.c:2074
 msgid "delete all records in specified zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2081
+#: src/namestore/gnunet-namestore.c:2080
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1837
+#: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1843
+#: src/namestore/gnunet-zoneimport.c:1841
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
@@ -5708,7 +5727,7 @@ msgid "Show network size estimates from NSE service."
 msgstr "# Estimaciones del tamaño de red recibidas"
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:242
+#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5908,59 +5927,59 @@ 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/pt/gnunet-daemon-pt.c:418
+#: src/pt/gnunet-daemon-pt.c:416
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Se produjo un fallo al empaquetar la petición DNS.  Omitiendo.\n"
 
-#: src/pt/gnunet-daemon-pt.c:424
+#: src/pt/gnunet-daemon-pt.c:422
 msgid "# DNS requests mapped to VPN"
 msgstr "# Peticiones DNS asociadas a la VPN"
 
-#: src/pt/gnunet-daemon-pt.c:478
+#: src/pt/gnunet-daemon-pt.c:476
 msgid "# DNS records modified"
 msgstr "# Registros DNS modificados"
 
-#: src/pt/gnunet-daemon-pt.c:673
+#: src/pt/gnunet-daemon-pt.c:671
 msgid "# DNS replies intercepted"
 msgstr "# Respuestas DNS interceptadas"
 
-#: src/pt/gnunet-daemon-pt.c:680
+#: src/pt/gnunet-daemon-pt.c:678
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/pt/gnunet-daemon-pt.c:718
+#: src/pt/gnunet-daemon-pt.c:716
 msgid "# DNS requests dropped (timeout)"
 msgstr "# Peticiones DNS omitidas (expiradas)"
 
-#: src/pt/gnunet-daemon-pt.c:773
+#: src/pt/gnunet-daemon-pt.c:771
 msgid "# DNS requests intercepted"
 msgstr "# Peticiones DNS interceptadas"
 
-#: src/pt/gnunet-daemon-pt.c:779
+#: src/pt/gnunet-daemon-pt.c:777
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# Peticiones DNS omitidas (túnel mesh DNS caído)"
 
-#: src/pt/gnunet-daemon-pt.c:788
+#: src/pt/gnunet-daemon-pt.c:786
 msgid "# DNS requests dropped (malformed)"
 msgstr "# Peticiones DNS omitidas (mal formadas)"
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:881
 msgid "# DNS replies received"
 msgstr "# Respuestas DNS recibidas"
 
-#: src/pt/gnunet-daemon-pt.c:900
+#: src/pt/gnunet-daemon-pt.c:898
 msgid "# DNS replies dropped (too late?)"
 msgstr "# Respuestas DNS (¿demasiado tarde?)"
 
-#: src/pt/gnunet-daemon-pt.c:1227 src/pt/gnunet-daemon-pt.c:1236
-#: src/pt/gnunet-daemon-pt.c:1252 src/pt/gnunet-daemon-pt.c:1261
-#: src/pt/gnunet-daemon-pt.c:1270
+#: 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 "Se produjo un fallo al conectar con el servicio %s.  Saliendo.\n"
 
-#: src/pt/gnunet-daemon-pt.c:1316
+#: src/pt/gnunet-daemon-pt.c:1314
 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"
@@ -6089,7 +6108,7 @@ msgstr ""
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:3096
+#: src/reclaim/plugin_rest_openid_connect.c:3095
 #, fuzzy
 msgid "OpenID Connect REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -6099,7 +6118,7 @@ msgstr "Conexión fallida\n"
 msgid "Identity Provider REST API initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/reclaim/reclaim_api.c:545
+#: src/reclaim/reclaim_api.c:544
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
@@ -6121,7 +6140,7 @@ 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:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:631
+#: src/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
@@ -6129,7 +6148,7 @@ msgstr ""
 "Saliendo.\n"
 
 #: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:639
+#: src/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Las políticas de directorio especificadas no existen. Saliendo.\n"
@@ -6176,16 +6195,16 @@ msgstr "nombre del fichero para escribir las estadísticas"
 msgid "Profiler for regex"
 msgstr "Perfilador para expresiones regulares."
 
-#: src/regex/gnunet-regex-simulation-profiler.c:700
+#: src/regex/gnunet-regex-simulation-profiler.c:701
 msgid "name of the table to write DFAs"
 msgstr "nombre de la tabla para escribir los DFA"
 
 # WTF???
-#: src/regex/gnunet-regex-simulation-profiler.c:706
+#: src/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr "longitud de la máxima compresión de rutas"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:720
+#: src/regex/gnunet-regex-simulation-profiler.c:721
 msgid "Profiler for regex library"
 msgstr "Analizador de rendimiento para la biblioteca de expresiones regulares"
 
@@ -6498,7 +6517,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
 #: src/setu/gnunet-service-setu.c:5389
 #, fuzzy
 msgid "Could not connect to CADET service\n"
@@ -6571,12 +6590,12 @@ msgstr ""
 msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr "«%s» falló al resolver el método «%s» con error: %s\n"
 
-#: src/statistics/gnunet-service-statistics.c:319
+#: src/statistics/gnunet-service-statistics.c:314
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Escritos %llu bytes de estadísticas a «%s»\n"
 
-#: src/statistics/gnunet-service-statistics.c:984
+#: src/statistics/gnunet-service-statistics.c:979
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Cargando %llu bytes de estadísticas de «%s»\n"
@@ -6759,7 +6778,7 @@ msgid ""
 msgstr ""
 
 #: 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
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:319
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
@@ -6774,37 +6793,37 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1153
+#: src/testbed/gnunet-service-testbed_peers.c:1154
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# elementos almacenados"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1156
+#: src/testbed/gnunet-service-testbed_peers.c:1157
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "'%s' comenzando\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1159
+#: src/testbed/gnunet-service-testbed_peers.c:1160
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1162
+#: src/testbed/gnunet-service-testbed_peers.c:1163
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "'%s' comenzando\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1166
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1172
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
@@ -6812,23 +6831,23 @@ msgstr ""
 # Miguel: ¿Debería cambiar las siglas de ARM?
 # De momento las he mantenido con una traducción en
 # otro mensaje.
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1175
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "El servicio «%s» es desconocido para el ARM.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1178
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
 # Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»?
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1181
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "Petición ignorada porque el ARM se está apagando.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1182
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, fuzzy, c-format
 msgid "%.s Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
@@ -8220,17 +8239,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:1400
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1401
 #, 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:1412
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1413
 #, 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:1419
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1420
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
@@ -8244,7 +8263,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:837
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:838
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr "Familia de direcciones %d desconocida\n"
@@ -8254,23 +8273,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:950
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:951
 #, 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:991
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:992
 #, 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:1480
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1481
 #, 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:1504
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1505
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8287,46 +8306,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:1750
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1751
 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:1755
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1756
 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:1760
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1761
 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:1641
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1219
+#: src/util/service.c:1642
 #, 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:1643
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1644
 msgid "No such user"
 msgstr "No existe tal usuario"
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1658
 #, 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:2000
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2001
 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:2076
-#: src/util/service.c:2088
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2077
+#: src/util/service.c:2089
 #, 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:2098
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2099
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
@@ -8340,146 +8359,127 @@ msgstr "No se pudo acceder al fichero de configuración «%s»\n"
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:228 src/util/bio.c:236
+#: src/util/bio.c:223 src/util/bio.c:231
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "Error leyendo «%s»: %s"
 
-#: src/util/bio.c:238
+#: src/util/bio.c:233
 msgid "End of file"
 msgstr "Fin del fichero"
 
-#: src/util/bio.c:267
+#: src/util/bio.c:262
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "Error decodificando clave %u\n"
 
-#: src/util/bio.c:269
+#: src/util/bio.c:264
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:309
+#: src/util/bio.c:304
 #, fuzzy, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr "Parámetro no válido «%s» en la línea de comandos\n"
 
-#: src/util/bio.c:336 src/util/bio.c:840
+#: src/util/bio.c:331 src/util/bio.c:781
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:342
+#: src/util/bio.c:337
 #, fuzzy, c-format
 msgid "%s (while reading `%s')"
 msgstr "Error decodificando clave %u\n"
 
-#: src/util/bio.c:347
+#: src/util/bio.c:342
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr "Se produjo un error leyendo la cadena «%s»"
 
-#: src/util/bio.c:360
+#: src/util/bio.c:355
 #, fuzzy, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr "La cadena «%s» es mayor de lo permitido (%u > %u)"
 
-#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
-msgid "metadata length"
-msgstr ""
-
-#: src/util/bio.c:411
-#, fuzzy, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
-msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)"
-
-#: src/util/bio.c:427
-#, fuzzy, c-format
-msgid "Failed to deserialize metadata `%s'"
-msgstr "Se produjo un fallo al serializar metadatos"
-
-#: src/util/bio.c:669
+#: src/util/bio.c:610
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:731 src/util/bio.c:752
+#: src/util/bio.c:672 src/util/bio.c:693
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "Error decodificando clave %u\n"
 
-#: src/util/bio.c:733
+#: src/util/bio.c:674
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:817
+#: src/util/bio.c:758
 #, fuzzy, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/util/bio.c:877
-#, fuzzy, c-format
-msgid "Failed to serialize metadata `%s'"
-msgstr "Se produjo un fallo al serializar metadatos"
-
-#: src/util/client.c:750 src/util/client.c:941
+#: src/util/client.c:751 src/util/client.c:942
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1096
+#: src/util/client.c:1097
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr "Se necesita un nombre de máquina no vacío para el servicio «%s».\n"
 
-#: src/util/common_logging.c:648 src/util/common_logging.c:687
+#: src/util/common_logging.c:647 src/util/common_logging.c:686
 #, c-format
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:911
+#: src/util/common_logging.c:910
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Mensaje `%.*s» repetido %u veces en el último %s\n"
 
-#: src/util/common_logging.c:1104
+#: src/util/common_logging.c:1103
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1105
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1107
 msgid "MESSAGE"
 msgstr "MENSAJE"
 
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1109
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1111
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1113
 msgid "NONE"
 msgstr "NINGUNO"
 
-#: src/util/common_logging.c:1115
+#: src/util/common_logging.c:1114
 msgid "INVALID"
 msgstr "NO VÁLIDO"
 
-#: src/util/common_logging.c:1360
+#: src/util/common_logging.c:1359
 msgid "unknown address"
 msgstr "dirección desconocida"
 
-#: src/util/common_logging.c:1405
+#: src/util/common_logging.c:1404
 msgid "invalid address"
 msgstr "dirección no válida"
 
-#: src/util/common_logging.c:1417
+#: src/util/common_logging.c:1416
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "¡La configuración no especifica la opción «%s» en la sección «%s»!\n"
 
-#: src/util/common_logging.c:1432
+#: src/util/common_logging.c:1431
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8487,52 +8487,52 @@ msgstr ""
 "La configuración especifica un valor no válido en la opción «%s» de la "
 "sección «%s»: %s\n"
 
-#: src/util/configuration.c:790
+#: src/util/configuration.c:786
 #, c-format
 msgid "Illegal directive in line %u (parsing restricted section %s)\n"
 msgstr ""
 
-#: src/util/configuration.c:800
+#: src/util/configuration.c:796
 #, c-format
 msgid "Bad directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:853
+#: src/util/configuration.c:849
 #, c-format
 msgid "Bad inline-secret directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:875
+#: src/util/configuration.c:871
 #, c-format
 msgid "Unknown or malformed directive '%s' in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:905
+#: src/util/configuration.c:901
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u (option without section)\n"
 msgstr "Error de sintaxis en la línea %u mientras se deserializaba\n"
 
-#: src/util/configuration.c:949
+#: src/util/configuration.c:945
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Error de sintaxis en la línea %u mientras se deserializaba\n"
 
-#: src/util/configuration.c:1049
+#: src/util/configuration.c:1045
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Error decodificando clave %u\n"
 
-#: src/util/configuration.c:1062
+#: src/util/configuration.c:1058
 #, fuzzy, c-format
 msgid "Failed to parse configuration file `%s'\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/util/configuration.c:1695
+#: src/util/configuration.c:1691
 #, fuzzy
 msgid "Not a valid relative time specification"
 msgstr "Tiempo de expiración no válido para la operación «%s»\n"
 
-#: src/util/configuration.c:1765
+#: src/util/configuration.c:1761
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8541,44 +8541,44 @@ msgstr ""
 "El valor de configuración «%s» para «%s» de la sección «%s» no está dentro "
 "de las opciones legales\n"
 
-#: src/util/configuration.c:1860
+#: src/util/configuration.c:1856
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1892
+#: src/util/configuration.c:1888
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/util/configuration.c:1958
+#: src/util/configuration.c:1954
 #, 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
+#: src/util/configuration_helper.c:134
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:147
+#: src/util/configuration_helper.c:148
 #, fuzzy, c-format
 msgid "%s, %s or %s argument is required\n"
 msgstr "el parámetro --section es necesario\n"
 
-#: src/util/configuration_helper.c:218
+#: src/util/configuration_helper.c:219
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr "el parámetro --option es necesario para establecer un valor\n"
 
-#: src/util/configuration_helper.c:262
+#: src/util/configuration_helper.c:263
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8597,7 +8597,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:281
+#: src/util/crypto_ecc_setup.c:282
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "No se pudo acceder a la clave de máquina.\n"
@@ -8607,123 +8607,123 @@ 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:907
+#: src/util/crypto_rsa.c:908
 #, 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:1207
+#: src/util/crypto_rsa.c:1208
 #, 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"
 
-#: src/util/disk.c:843
+#: src/util/disk.c:842
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/dnsparser.c:909
+#: src/util/dnsparser.c:910
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 "Se produjo un fallo al convertir el nombre en UTF-8 «%s» al formato DNS "
 "IDNA: %s\n"
 
-#: src/util/dnsstub.c:227
+#: src/util/dnsstub.c:228
 #, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "No se pudo asociar con ningún puerto: %s\n"
 
-#: src/util/dnsstub.c:370
+#: src/util/dnsstub.c:371
 #, fuzzy, c-format
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)"
 
-#: src/util/dnsstub.c:503
+#: src/util/dnsstub.c:504
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:509
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Petición DNS enviada a %s\n"
 
-#: src/util/getopt.c:565
+#: src/util/getopt.c:566
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción «%s» es ambigua\n"
 
-#: src/util/getopt.c:590
+#: src/util/getopt.c:591
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: la opción «--%s» no permite un parámetro\n"
 
-#: src/util/getopt.c:596
+#: src/util/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: la opción «%c%s» no permite un parámetro\n"
 
-#: src/util/getopt.c:616 src/util/getopt.c:797
+#: src/util/getopt.c:617 src/util/getopt.c:798
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción «%s» requiere un parámetro\n"
 
-#: src/util/getopt.c:647
+#: src/util/getopt.c:648
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción no reconocida «--%s»\n"
 
-#: src/util/getopt.c:653
+#: src/util/getopt.c:654
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción no reconocida «%c%s»\n"
 
-#: src/util/getopt.c:680
+#: src/util/getopt.c:681
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción ilegal -- %c\n"
 
-#: src/util/getopt.c:682
+#: src/util/getopt.c:683
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción no válida -- %c\n"
 
-#: src/util/getopt.c:711 src/util/getopt.c:847
+#: src/util/getopt.c:712 src/util/getopt.c:848
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción requiere un parámetro -- %c\n"
 
-#: src/util/getopt.c:761
+#: src/util/getopt.c:762
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción «-W %s» es ambigua\n"
 
-#: src/util/getopt.c:781
+#: src/util/getopt.c:782
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: la opción «-W %s» no permite un parámetro\n"
 
-#: src/util/getopt.c:970
+#: src/util/getopt.c:971
 #, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Use %s para obtener una lista de opciones.\n"
 
-#: src/util/getopt.c:983
+#: src/util/getopt.c:984
 #, fuzzy, c-format
 msgid "Option `%s' can't be used with other options.\n"
 msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n"
 
-#: src/util/getopt.c:995
+#: src/util/getopt.c:996
 #, fuzzy, c-format
 msgid "Missing mandatory option `%s'.\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/util/getopt_helpers.c:63
+#: src/util/getopt_helpers.c:64
 msgid "print the version number"
 msgstr "imprime el número de versión"
 
-#: src/util/getopt_helpers.c:110
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8731,139 +8731,139 @@ msgstr ""
 "Los parámetros obligatorios para las opciones largas también lo son para sus "
 "versiones cortas.\n"
 
-#: src/util/getopt_helpers.c:197
+#: src/util/getopt_helpers.c:198
 msgid "print this help"
 msgstr "imprime esta ayuda"
 
-#: src/util/getopt_helpers.c:262
+#: src/util/getopt_helpers.c:263
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:378
+#: src/util/getopt_helpers.c:379
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:445
+#: src/util/getopt_helpers.c:446
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:462
+#: src/util/getopt_helpers.c:463
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "crear ficheros de configuración únicos"
 
-#: src/util/getopt_helpers.c:498 src/util/getopt_helpers.c:812
-#: src/util/getopt_helpers.c:868
+#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
+#: src/util/getopt_helpers.c:869
 #, 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:570
+#: src/util/getopt_helpers.c:571
 #, 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:577
+#: src/util/getopt_helpers.c:578
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:595
+#: src/util/getopt_helpers.c:596
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:597
+#: src/util/getopt_helpers.c:598
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:631
+#: src/util/getopt_helpers.c:632
 #, 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:685
+#: src/util/getopt_helpers.c:686
 #, 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:742
+#: src/util/getopt_helpers.c:743
 #, 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:749
+#: src/util/getopt_helpers.c:750
 #, c-format
 msgid "The maximum precision allowed for timestamps is seconds.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:805
+#: src/util/getopt_helpers.c:806
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:875
+#: src/util/getopt_helpers.c:876
 #, 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:953
+#: src/util/getopt_helpers.c:954
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-base32.c:46
+#: src/util/gnunet-base32.c:47
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/util/gnunet-config.c:153
+#: src/util/gnunet-config.c:154
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/util/gnunet-config.c:159
+#: src/util/gnunet-config.c:160
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:164
+#: src/util/gnunet-config.c:165
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:170
+#: src/util/gnunet-config.c:171
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:176
+#: src/util/gnunet-config.c:177
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:192
 msgid "Manipulate GNUnet configuration files"
 msgstr "Manipular ficheros de configuración de GNUnet"
 
-#: src/util/gnunet-crypto-tvg.c:1527
+#: src/util/gnunet-crypto-tvg.c:1528
 msgid "verify a test vector from stdin"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:94
+#: src/util/gnunet-ecc.c:95
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Se produjo un fallo al abrir «%s»: %s\n"
 
-#: src/util/gnunet-ecc.c:128
+#: src/util/gnunet-ecc.c:129
 #, fuzzy, c-format
 msgid "Generating %u keys like %s, please wait"
 msgstr "Generando %u claves, por favor, espere"
 
-#: src/util/gnunet-ecc.c:136
+#: src/util/gnunet-ecc.c:137
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr "Generando %u claves, por favor, espere"
 
-#: src/util/gnunet-ecc.c:177
+#: src/util/gnunet-ecc.c:178
 #, c-format
 msgid ""
 "\n"
@@ -8872,328 +8872,328 @@ msgstr ""
 "\n"
 "Se produjo un fallo al escribir en «%s»: %s\n"
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:185
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "¡Finalizado!\n"
 
-#: src/util/gnunet-ecc.c:186
+#: src/util/gnunet-ecc.c:187
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:303
+#: src/util/gnunet-ecc.c:304
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "El fichero de máquinas %s no fue encontrado\n"
 
-#: src/util/gnunet-ecc.c:313
+#: src/util/gnunet-ecc.c:314
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "El archivo de amigos «%s» está vacío.\n"
 
-#: src/util/gnunet-ecc.c:333
+#: src/util/gnunet-ecc.c:334
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "¡No se puede leer el fichero de claves de máquina!\n"
 
-#: src/util/gnunet-ecc.c:387
+#: src/util/gnunet-ecc.c:388
 msgid "No hostkey file specified on command line\n"
 msgstr "No se ha especificado la clave de máquina en la línea de comandos\n"
 
-#: src/util/gnunet-ecc.c:451
+#: src/util/gnunet-ecc.c:452
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:457
+#: src/util/gnunet-ecc.c:458
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:463
+#: src/util/gnunet-ecc.c:464
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr "crea «COUNT» pares de claves pública-privada (para pruebas)"
 
-#: src/util/gnunet-ecc.c:468
+#: src/util/gnunet-ecc.c:469
 msgid "print the public key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:473
+#: src/util/gnunet-ecc.c:474
 #, fuzzy
 msgid "print the private key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:478
+#: src/util/gnunet-ecc.c:479
 #, fuzzy
 msgid "print the public key in HEX format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:484
+#: src/util/gnunet-ecc.c:485
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:498
+#: src/util/gnunet-ecc.c:499
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
-#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
+#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, 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
+#: src/util/gnunet-qr.c:134
 #, fuzzy, c-format
 msgid "Added URI %s\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/util/gnunet-qr.c:160
+#: src/util/gnunet-qr.c:161
 #, 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:170
+#: src/util/gnunet-qr.c:171
 #, 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:181
+#: src/util/gnunet-qr.c:182
 #, 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:217
+#: src/util/gnunet-qr.c:218
 #, 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
+#: src/util/gnunet-qr.c:247
 #, 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
+#: src/util/gnunet-qr.c:261
 #, fuzzy
 msgid "Capturing...\n"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
 msgid "No captured images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
 #, c-format
 msgid "Got %d images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
 #, 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
+#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
 #, 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
+#: src/util/gnunet-qr.c:546
 #, fuzzy
 msgid "No data found\n"
 msgstr "«upnpc» no encontrado\n"
 
-#: src/util/gnunet-qr.c:561
+#: src/util/gnunet-qr.c:562
 msgid "Dispatching the URI\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:572
+#: src/util/gnunet-qr.c:573
 msgid "use the video device DEVICE (defaults to /dev/video0)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:579
+#: src/util/gnunet-qr.c:580
 msgid "read from the PNG-encoded file FILE"
 msgstr ""
 
-#: src/util/gnunet-qr.c:590
+#: src/util/gnunet-qr.c:591
 msgid "Scan a QR code and import the URI read"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:168
+#: src/util/gnunet-resolver.c:169
 msgid "perform a reverse lookup"
 msgstr "realizar una búsqueda inversa"
 
-#: src/util/gnunet-resolver.c:182
+#: src/util/gnunet-resolver.c:183
 #, fuzzy
 msgid "Use built-in GNUnet stub resolver"
 msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
 
-#: src/util/gnunet-scrypt.c:214
+#: 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:280
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:286
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:292
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:312
+#: src/util/gnunet-scrypt.c:313
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
-#: src/util/gnunet-service-resolver.c:1287
+#: src/util/gnunet-service-resolver.c:1288
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:88
+#: src/util/gnunet-uri.c:89
 #, c-format
 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
+#: src/util/gnunet-uri.c:95
 #, 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
+#: src/util/gnunet-uri.c:102
 #, 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
+#: src/util/gnunet-uri.c:109
 #, 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
+#: src/util/gnunet-uri.c:179
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
 
-#: src/util/gnunet_error_codes.c:59
+#: src/util/gnunet_error_codes.c:60
 msgid "No error (success)."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:65
+#: src/util/gnunet_error_codes.c:66
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "Error desconocido"
 
 # Miguel: ¿Conectar y conexión?
-#: src/util/gnunet_error_codes.c:71
+#: src/util/gnunet_error_codes.c:72
 #, fuzzy
 msgid "Communication with service failed."
 msgstr "Error al comunicar con el servicio ARM.\n"
 
-#: src/util/gnunet_error_codes.c:77
+#: src/util/gnunet_error_codes.c:78
 #, fuzzy
 msgid "Ego not found."
 msgstr "Contenido no encontrado"
 
-#: src/util/gnunet_error_codes.c:83
+#: src/util/gnunet_error_codes.c:84
 msgid "Identifier already in use for another ego."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:89
+#: src/util/gnunet_error_codes.c:90
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:95
+#: src/util/gnunet_error_codes.c:96
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "Error desconocido"
 
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr "# sesiones wlan creadas"
 
-#: src/util/gnunet_error_codes.c:107
+#: src/util/gnunet_error_codes.c:108
 #, fuzzy
 msgid "Zone not found."
 msgstr "Contenido no encontrado"
 
-#: src/util/gnunet_error_codes.c:113
+#: src/util/gnunet_error_codes.c:114
 #, fuzzy
 msgid "Record not found."
 msgstr "«upnpc» no encontrado\n"
 
-#: src/util/gnunet_error_codes.c:125
+#: src/util/gnunet_error_codes.c:126
 #, fuzzy
 msgid "Zone does not contain any records."
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/util/gnunet_error_codes.c:131
+#: src/util/gnunet_error_codes.c:132
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/util/gnunet_error_codes.c:137
+#: src/util/gnunet_error_codes.c:138
 #, fuzzy
 msgid "No records given."
 msgstr "No se han proporcionado opciones\n"
 
-#: src/util/gnunet_error_codes.c:143
+#: src/util/gnunet_error_codes.c:144
 msgid "Record data invalid."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:149
+#: src/util/gnunet_error_codes.c:150
 #, fuzzy
 msgid "No label given."
 msgstr "No se han proporcionado opciones\n"
 
-#: src/util/gnunet_error_codes.c:155
+#: src/util/gnunet_error_codes.c:156
 #, fuzzy
 msgid "No results given."
 msgstr "No se han proporcionado opciones\n"
 
-#: src/util/gnunet_error_codes.c:161
+#: src/util/gnunet_error_codes.c:162
 #, fuzzy
 msgid "Record already exists."
 msgstr "El registro ya existía en el almacén de nombres"
 
-#: src/util/gnunet_error_codes.c:167
+#: src/util/gnunet_error_codes.c:168
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:173
+#: src/util/gnunet_error_codes.c:174
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:179
+#: src/util/gnunet_error_codes.c:180
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/util/gnunet_error_codes.c:185
+#: src/util/gnunet_error_codes.c:186
 msgid "Label invalid or malformed."
 msgstr ""
 
-#: src/util/helper.c:306
+#: src/util/helper.c:305
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Error leyendo de «%s»: %s\n"
 
-#: src/util/helper.c:358
+#: src/util/helper.c:357
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
 
-#: src/util/helper.c:573
+#: src/util/helper.c:572
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Error escribiendo a «%s»: %s\n"
@@ -9211,7 +9211,7 @@ msgstr ""
 "¡Error lógico interno fatal, el proceso está colgado en «%s» (abortar con "
 "CTRL-C)!\n"
 
-#: src/util/os_installation.c:415
+#: src/util/os_installation.c:416
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -9220,51 +9220,51 @@ msgstr ""
 "No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
 "de entorno «%s».\n"
 
-#: src/util/os_installation.c:786
+#: src/util/os_installation.c:787
 #, 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:819
+#: src/util/os_installation.c:820
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/util/plugin.c:86
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
 
-#: src/util/plugin.c:157
+#: src/util/plugin.c:158
 #, 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:214
+#: src/util/plugin.c:215
 #, 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:370
+#: src/util/plugin.c:371
 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:286
+#: src/util/program.c:287
 #, 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:298
+#: src/util/program.c:299
 #, 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:313
+#: src/util/program.c:314
 #, 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:328
+#: src/util/program.c:329
 #, fuzzy
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
@@ -9274,13 +9274,13 @@ msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/resolver_api.c:220
+#: src/util/resolver_api.c:221
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:242
+#: src/util/resolver_api.c:243
 #, fuzzy, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
@@ -9289,12 +9289,12 @@ msgstr ""
 "¡Se debe especificar «%s» o una dirección numérica IP para «%s» de «%s» en "
 "la configuración!\n"
 
-#: src/util/resolver_api.c:887
+#: src/util/resolver_api.c:888
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Expiración de plazo intentando resolver el nombre de máquina «%s».\n"
 
-#: src/util/resolver_api.c:900
+#: src/util/resolver_api.c:901
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n"
@@ -9302,19 +9302,19 @@ msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n"
 # Miguel: He traducido "default" por "predeterminado", la locución
 # "por defecto" no tiene sentido en sitios como este y he tratado
 # de ser consistente.
-#: src/util/resolver_api.c:1085
+#: src/util/resolver_api.c:1086
 #, fuzzy
 msgid "Resolver not configured correctly.\n"
 msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n"
 
-#: src/util/resolver_api.c:1174 src/util/resolver_api.c:1197
-#: src/util/resolver_api.c:1211
+#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
+#: src/util/resolver_api.c:1212
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
 "No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n"
 
-#: src/util/service.c:653
+#: src/util/service.c:654
 #, fuzzy, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9323,292 +9323,292 @@ 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:1572
+#: src/util/service.c:1573
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/socks.c:635
+#: src/util/socks.c:636
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:652
+#: src/util/socks.c:653
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:395
+#: src/util/strings.c:394
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n"
 
-#: src/util/strings.c:514
+#: src/util/strings.c:513
 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:1050
+#: src/util/strings.c:1049
 msgid "IPv6 address did not start with `['\n"
 msgstr "La dirección IPv6 no empezaba con «[»\n"
 
-#: src/util/strings.c:1058
+#: src/util/strings.c:1057
 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:1065
+#: src/util/strings.c:1064
 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:1073
+#: src/util/strings.c:1072
 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:1082
+#: src/util/strings.c:1081
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
 
-#: src/util/strings.c:1264 src/util/strings.c:1275
+#: src/util/strings.c:1263 src/util/strings.c:1274
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1284
+#: src/util/strings.c:1283
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/util/strings.c:1355 src/util/strings.c:1384 src/util/strings.c:1431
-#: src/util/strings.c:1451
+#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
+#: src/util/strings.c:1450
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: «%s»\n"
 
-#: src/util/strings.c:1409
+#: src/util/strings.c:1408
 #, 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:1460
+#: src/util/strings.c:1459
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/util/strings.c:1502
+#: src/util/strings.c:1501
 #, 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:1552
+#: src/util/strings.c:1551
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato «%s» erroneo para máscara de red\n"
 
-#: src/util/strings.c:1583
+#: src/util/strings.c:1582
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato «%s» erroneo para red\n"
 
-#: src/util/time.c:900 src/util/time.c:928
+#: src/util/time.c:901 src/util/time.c:929
 #, 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:936
+#: src/util/time.c:937
 #, 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
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
 #, fuzzy
 msgid "# Active channels"
 msgstr "# Túneles activos"
 
-#: src/vpn/gnunet-service-vpn.c:583
+#: src/vpn/gnunet-service-vpn.c:582
 #, fuzzy
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr "# Bytes omitidos en la cola mesh (desbordamiento)"
 
-#: src/vpn/gnunet-service-vpn.c:736
+#: src/vpn/gnunet-service-vpn.c:735
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "# Paquetes ICMP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:1112
+#: src/vpn/gnunet-service-vpn.c:1111
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# Paquetes UDP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:1262
+#: src/vpn/gnunet-service-vpn.c:1261
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# Paquetes TCP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:1461
+#: src/vpn/gnunet-service-vpn.c:1460
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# Túneles mesh creados"
 
-#: src/vpn/gnunet-service-vpn.c:1685
+#: src/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr "Protocolo %u no soportado, omitiendo\n"
 
-#: src/vpn/gnunet-service-vpn.c:1821
+#: src/vpn/gnunet-service-vpn.c:1820
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# Paquetes ICMP omitidos (tipo no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:2019
+#: src/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:2045
+#: src/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:2282
+#: src/vpn/gnunet-service-vpn.c:2281
 msgid "# Packets received from TUN interface"
 msgstr "# Paquetes recibidos de la interfaz TUN"
 
-#: src/vpn/gnunet-service-vpn.c:2316 src/vpn/gnunet-service-vpn.c:2348
+#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr "Paquete recibido para el destino «%s» no mapeado (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:2355
+#: src/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr "Recibido paquete IPv4 con opciones (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:2371
+#: src/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr "Recibido paquete de protocolo %d desconocido desde TUN (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:2411
+#: src/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr "No se encontraron direcciones IPv4 libres en el rango de la VPN\n"
 
-#: src/vpn/gnunet-service-vpn.c:2463
+#: src/vpn/gnunet-service-vpn.c:2462
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "No se encontraron direcciones IPv6 libres en el rango de la VPN\n"
 
-#: src/vpn/gnunet-service-vpn.c:2497 src/vpn/gnunet-service-vpn.c:2705
+#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
 msgid "# Active destinations"
 msgstr "# Destinos activos"
 
-#: src/vpn/gnunet-service-vpn.c:2750
+#: src/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n"
 
-#: src/vpn/gnunet-service-vpn.c:3008
+#: src/vpn/gnunet-service-vpn.c:3007
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3036
+#: src/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3046
+#: src/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 "El soporte de IPv6 se deshabilita porque este sistema no soporta IPv6\n"
 
-#: src/vpn/gnunet-service-vpn.c:3062
+#: src/vpn/gnunet-service-vpn.c:3061
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3079
+#: src/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 "El soporte de IPv4 se deshabilita porque este sistema no soporta IPv4\n"
 
-#: src/vpn/gnunet-vpn.c:143
+#: src/vpn/gnunet-vpn.c:142
 msgid "Error creating tunnel\n"
 msgstr "Error creando el túnel\n"
 
-#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:226
+#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "La opción «%s» no tiene sentido con la opción «%s».\n"
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:202
 #, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "Las opción «%s» o «%s» es necesaria.\n"
 
-#: src/vpn/gnunet-vpn.c:217
+#: src/vpn/gnunet-vpn.c:216
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Las opción «%s» o «%s» es necesaria cuando se usa la opción «%s».\n"
 
-#: src/vpn/gnunet-vpn.c:240
+#: src/vpn/gnunet-vpn.c:239
 #, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "«%s» no es un identificador de par válido\n"
 
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:258
 #, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:295
 msgid "request that result should be an IPv4 address"
 msgstr "petición cuyo resultado debe ser una dirección IPv4"
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:301
 msgid "request that result should be an IPv6 address"
 msgstr "petición cuyo resultado debe ser una dirección IPv6"
 
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:308
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr "¿cuánto tiempo debe ser válido el mapeado para túneles nuevos?"
 
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:315
 msgid "destination IP for the tunnel"
 msgstr "IP de destino para el túnel"
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:322
 msgid "peer offering the service we would like to access"
 msgstr "par que ofrece el servicio al que nos gustaría acceder"
 
-#: src/vpn/gnunet-vpn.c:330
+#: src/vpn/gnunet-vpn.c:329
 msgid "name of the service we would like to access"
 msgstr "nombre del servicio al que nos gustaría acceder"
 
-#: src/vpn/gnunet-vpn.c:335
+#: src/vpn/gnunet-vpn.c:334
 msgid "service is offered via TCP"
 msgstr "el servicio es ofrecido vía TCP"
 
-#: src/vpn/gnunet-vpn.c:340
+#: src/vpn/gnunet-vpn.c:339
 msgid "service is offered via UDP"
 msgstr "el servicio es ofrecido vía UDP"
 
-#: src/vpn/gnunet-vpn.c:354
+#: src/vpn/gnunet-vpn.c:353
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/zonemaster/gnunet-service-zonemaster.c:502
+#: src/zonemaster/gnunet-service-zonemaster.c:501
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1333
+#: src/zonemaster/gnunet-service-zonemaster.c:1332
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
diff --git a/po/fr.po b/po/fr.po
index 9db77048a..aee4d781b 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: 2022-12-04 14:58+0900\n"
+"POT-Creation-Date: 2022-12-05 17:21+0900\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"
@@ -29,9 +29,9 @@ msgstr ""
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1958
+#: src/namestore/gnunet-namestore.c:1957
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr ""
@@ -143,7 +143,7 @@ msgstr ""
 msgid "GNUnet abd resolver tool"
 msgstr ""
 
-#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr ""
@@ -163,15 +163,15 @@ msgstr ""
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1133
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1136
 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:1137
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1138
 msgid "Unknown request status"
 msgstr ""
 
@@ -382,28 +382,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:1094
-#: src/util/service.c:1100
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1095
+#: src/util/service.c:1101
 #, 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:530
-#: src/util/service.c:1133
+#: src/transport/tcp_service_legacy.c:634 src/util/client.c:531
+#: src/util/service.c:1134
 #, 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:535
-#: src/util/service.c:1137
+#: src/transport/tcp_service_legacy.c:638 src/util/client.c:536
+#: src/util/service.c:1138
 #, 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
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1158
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -411,7 +411,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:1175
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1176
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -419,7 +419,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:1206
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1207
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
@@ -427,7 +427,7 @@ 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
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1226
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
@@ -1096,7 +1096,7 @@ msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:664
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1500,10 +1500,10 @@ msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:128
 #: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_mysql.c:890
+#: src/datastore/plugin_datastore_mysql.c:891
 #: 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/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:82 src/my/my.c:94
+#: src/mysql/mysql.c:47 src/mysql/mysql.c:65
 #: src/namecache/plugin_namecache_sqlite.c:54
 #: src/namestore/plugin_namestore_sqlite.c:56
 #: src/peerstore/plugin_peerstore_sqlite.c:54
@@ -1511,7 +1511,7 @@ msgstr ""
 #: 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
+#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
@@ -1806,23 +1806,23 @@ msgstr ""
 msgid "Heap database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:371
-#: src/datastore/plugin_datastore_mysql.c:423
-#: src/datastore/plugin_datastore_mysql.c:1071
+#: src/datastore/plugin_datastore_mysql.c:372
+#: src/datastore/plugin_datastore_mysql.c:424
+#: src/datastore/plugin_datastore_mysql.c:1072
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:410
+#: src/datastore/plugin_datastore_mysql.c:411
 #: src/datastore/plugin_datastore_sqlite.c:675
 msgid "Data too large"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:847
+#: src/datastore/plugin_datastore_mysql.c:848
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1179
+#: src/datastore/plugin_datastore_mysql.c:1180
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -1952,7 +1952,7 @@ msgstr ""
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:359
+#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
 #: src/nse/gnunet-nse-profiler.c:894
 msgid "be verbose (print progress information)"
 msgstr ""
@@ -2042,268 +2042,268 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:371 src/dns/gnunet-dns-monitor.c:376
+#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:388
+#: src/dns/gnunet-dns-monitor.c:387
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:241
+#: src/dns/gnunet-dns-redirector.c:240
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:246
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:260
+#: src/dns/gnunet-dns-redirector.c:259
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:466
+#: src/dns/gnunet-service-dns.c:463
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:620
+#: src/dns/gnunet-service-dns.c:617
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:756
+#: src/dns/gnunet-service-dns.c:753
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:832
+#: src/dns/gnunet-service-dns.c:829
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:951
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:973
+#: src/dns/gnunet-service-dns.c:970
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:984
+#: src/dns/gnunet-service-dns.c:981
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:996
+#: src/dns/gnunet-service-dns.c:993
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:999
+#: src/dns/gnunet-service-dns.c:996
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069
+#: src/dns/gnunet-service-dns.c:1066
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
+#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1128
+#: src/dns/gnunet-service-dns.c:1125
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:971
+#: src/exit/gnunet-daemon-exit.c:968
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1077
+#: src/exit/gnunet-daemon-exit.c:1074
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1371
+#: src/exit/gnunet-daemon-exit.c:1368
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
+#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
+#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
+#: src/exit/gnunet-daemon-exit.c:2283
 msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1507
+#: src/exit/gnunet-daemon-exit.c:1504
 msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1619
+#: src/exit/gnunet-daemon-exit.c:1616
 msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1661
+#: src/exit/gnunet-daemon-exit.c:1658
 msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1752
+#: src/exit/gnunet-daemon-exit.c:1749
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1840
+#: src/exit/gnunet-daemon-exit.c:1837
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1879
+#: src/exit/gnunet-daemon-exit.c:1876
 msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2020
+#: src/exit/gnunet-daemon-exit.c:2017
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
+#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
+#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
+#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
+#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2290
+#: src/exit/gnunet-daemon-exit.c:2287
 msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2349 src/vpn/gnunet-service-vpn.c:995
-#: src/vpn/gnunet-service-vpn.c:2122
+#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
+#: src/vpn/gnunet-service-vpn.c:2121
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
+#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2498 src/exit/gnunet-daemon-exit.c:3199
+#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
 msgid "# Inbound CADET channels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2619
+#: src/exit/gnunet-daemon-exit.c:2616
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2639
+#: src/exit/gnunet-daemon-exit.c:2636
 msgid "# Messages transmitted via cadet channels"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2831
+#: src/exit/gnunet-daemon-exit.c:2828
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2840
+#: src/exit/gnunet-daemon-exit.c:2837
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2916
+#: src/exit/gnunet-daemon-exit.c:2913
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2990
+#: src/exit/gnunet-daemon-exit.c:2987
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3039
+#: src/exit/gnunet-daemon-exit.c:3036
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3054
+#: src/exit/gnunet-daemon-exit.c:3051
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3081
+#: src/exit/gnunet-daemon-exit.c:3078
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3112
+#: src/exit/gnunet-daemon-exit.c:3109
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3164
+#: src/exit/gnunet-daemon-exit.c:3161
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3173
+#: src/exit/gnunet-daemon-exit.c:3170
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
+#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
+#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3451
+#: src/exit/gnunet-daemon-exit.c:3448
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
+#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3495
+#: src/exit/gnunet-daemon-exit.c:3492
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3640
+#: src/exit/gnunet-daemon-exit.c:3637
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3649
+#: src/exit/gnunet-daemon-exit.c:3646
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3657
+#: src/exit/gnunet-daemon-exit.c:3654
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3661
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3835
+#: src/exit/gnunet-daemon-exit.c:3832
 msgid "Must be a number"
 msgstr "Doit être un nombre"
 
-#: src/exit/gnunet-daemon-exit.c:3951
+#: src/exit/gnunet-daemon-exit.c:3948
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4117
+#: src/exit/gnunet-daemon-exit.c:4114
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2324,163 +2324,163 @@ msgstr ""
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:240
+#: src/fragmentation/fragmentation.c:239
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:245
+#: src/fragmentation/fragmentation.c:244
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:278
+#: src/fragmentation/fragmentation.c:277
 msgid "# fragments wrap arounds"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:325
+#: src/fragmentation/fragmentation.c:324
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:331
+#: src/fragmentation/fragmentation.c:330
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:459
+#: src/fragmentation/fragmentation.c:458
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:466
+#: src/fragmentation/fragmentation.c:465
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:490
+#: src/fragmentation/fragmentation.c:489
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:481
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:492
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:499
+#: src/fs/fs_api.c:500
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1156
+#: src/fs/fs_api.c:1157
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1707
+#: src/fs/fs_api.c:1708
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1722
+#: src/fs/fs_api.c:1723
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2451
+#: src/fs/fs_api.c:2452
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2462
+#: src/fs/fs_api.c:2463
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
+#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2628
+#: src/fs/fs_api.c:2629
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
+#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2846
+#: src/fs/fs_api.c:2847
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3107
+#: src/fs/fs_api.c:3108
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:215
+#: src/fs/fs_directory.c:216
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:332
+#: src/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:346
+#: src/fs/fs_download.c:347
 #, c-format
 msgid ""
 "Failed to access full directory contents of `%s' for recursive download\n"
 msgstr ""
 
-#: src/fs/fs_download.c:528 src/fs/fs_download.c:541
+#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr ""
 
-#: src/fs/fs_download.c:960
+#: src/fs/fs_download.c:961
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1044
+#: src/fs/fs_download.c:1045
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1066
+#: src/fs/fs_download.c:1067
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1089
+#: src/fs/fs_download.c:1090
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1100
+#: src/fs/fs_download.c:1101
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1110
+#: src/fs/fs_download.c:1111
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1218
+#: src/fs/fs_download.c:1219
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1889
+#: src/fs/fs_download.c:1890
 msgid "Invalid URI"
 msgstr "URI invalide"
 
@@ -2491,101 +2491,101 @@ msgid ""
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:190
+#: src/fs/fs_list_indexed.c:191
 #, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr ""
 
-#: src/fs/fs_misc.c:128
+#: src/fs/fs_misc.c:129
 #, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:202
+#: src/fs/fs_namespace.c:203
 #, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:233
+#: src/fs/fs_namespace.c:234
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:330
+#: src/fs/fs_namespace.c:331
 #, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:457
+#: src/fs/fs_namespace.c:458
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:128 src/fs/fs_publish.c:438
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:731
+#: src/fs/fs_publish.c:732
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/fs/fs_publish.c: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
+#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:790
+#: src/fs/fs_publish.c:791
 msgid "error on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:836
+#: src/fs/fs_publish.c:837
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:857
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:888
+#: src/fs/fs_publish.c:889
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:915
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1003 src/fs/fs_publish.c:1040
+#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1107
+#: src/fs/fs_publish.c:1108
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1115
+#: src/fs/fs_publish.c:1116
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1156
+#: src/fs/fs_publish.c:1157
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1396
+#: src/fs/fs_publish.c:1397
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "pa_stream_new() échoué : %s\n"
 
-#: src/fs/fs_publish.c:1488
+#: src/fs/fs_publish.c:1489
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:212
+#: src/fs/fs_publish_ksk.c:213
 msgid "Could not connect to datastore."
 msgstr ""
 
@@ -2593,145 +2593,145 @@ msgstr ""
 msgid "Internal error."
 msgstr "Erreur interne."
 
-#: src/fs/fs_search.c:829 src/fs/fs_search.c:900
+#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
 #, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_search.c:993
+#: src/fs/fs_search.c:994
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:64
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:68
+#: src/fs/fs_unindex.c:69
 msgid "Failed to read file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:275
+#: src/fs/fs_unindex.c:276
 msgid "Error communicating with `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:326
+#: src/fs/fs_unindex.c:327
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:389
+#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
 msgid "Failed to get KSKs from directory scan."
 msgstr ""
 
-#: src/fs/fs_unindex.c:385
+#: src/fs/fs_unindex.c:386
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:446
+#: src/fs/fs_unindex.c:447
 #, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:592 src/fs/fs_unindex.c:656
+#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:670
 msgid "Failed to open file for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:708
+#: src/fs/fs_unindex.c:709
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:231
+#: src/fs/fs_uri.c:232
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:290
+#: src/fs/fs_uri.c:291
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:308
+#: src/fs/fs_uri.c:309
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:315
+#: src/fs/fs_uri.c:316
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:382
+#: src/fs/fs_uri.c:383
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:423
+#: src/fs/fs_uri.c:424
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:440
+#: src/fs/fs_uri.c:441
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:517
+#: src/fs/fs_uri.c:518
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:534
+#: src/fs/fs_uri.c:535
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:561
+#: src/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:567
+#: src/fs/fs_uri.c:568
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:574
+#: src/fs/fs_uri.c:575
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:592
+#: src/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:612
+#: src/fs/fs_uri.c:613
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:645
+#: src/fs/fs_uri.c:646
 #, fuzzy
 msgid "invalid argument"
 msgstr "Argument invalide « %s »\n"
 
-#: src/fs/fs_uri.c:665
+#: src/fs/fs_uri.c:666
 msgid "Unrecognized URI type"
 msgstr "Type d’URI non reconnu"
 
-#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1093
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2767,7 +2767,7 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:896
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
@@ -2775,15 +2775,15 @@ msgstr ""
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:946
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:959
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2791,127 +2791,127 @@ msgstr ""
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:667
+#: src/fs/gnunet-daemon-fsprofiler.c:668
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:54
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:105
+#: src/fs/gnunet-directory.c:106
 #, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:108
+#: src/fs/gnunet-directory.c:109
 #, c-format
 msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-directory.c:146
 msgid "You must specify a filename to inspect.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:159
+#: src/fs/gnunet-directory.c:160
 #, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:169
+#: src/fs/gnunet-directory.c:170
 #, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:200
+#: src/fs/gnunet-directory.c:201
 msgid "Display contents of a GNUnet directory"
 msgstr ""
 
-#: src/fs/gnunet-download.c:130
+#: src/fs/gnunet-download.c:131
 #, c-format
 msgid "Starting download `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:142
+#: src/fs/gnunet-download.c:143
 msgid "<unknown time>"
 msgstr ""
 
-#: src/fs/gnunet-download.c:154
+#: src/fs/gnunet-download.c:155
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:188
+#: src/fs/gnunet-download.c:189
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:206 src/fs/gnunet-publish.c:299
-#: src/fs/gnunet-search.c:543 src/fs/gnunet-unindex.c:117
+#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
+#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:234
 msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:715
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:716
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:247
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:254
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:271 src/fs/gnunet-publish.c:869
-#: src/fs/gnunet-unindex.c:154
+#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-unindex.c:155
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:318
+#: src/fs/gnunet-download.c:319
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:325
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:330 src/fs/gnunet-search.c:745
+#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:335
+#: src/fs/gnunet-download.c:336
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:342
+#: src/fs/gnunet-download.c:343
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:349
+#: src/fs/gnunet-download.c:350
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:354
+#: src/fs/gnunet-download.c:355
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:373
+#: src/fs/gnunet-download.c:374
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2933,288 +2933,288 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:164
+#: src/fs/gnunet-fs.c:165
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:179
+#: src/fs/gnunet-fs.c:180
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:234
+#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:246
+#: src/fs/gnunet-publish.c:247
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:254
+#: src/fs/gnunet-publish.c:255
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr "Publication de « %s » terminée.\n"
 
-#: src/fs/gnunet-publish.c:258
+#: src/fs/gnunet-publish.c:259
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr "L’URI est « %s ».\n"
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:265
 #, fuzzy, c-format
 msgid "Namespace URI is `%s'.\n"
 msgstr "L’URI est « %s ».\n"
 
-#: src/fs/gnunet-publish.c:279
+#: src/fs/gnunet-publish.c:280
 msgid "Starting cleanup after abort\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-publish.c:287
 msgid "Cleanup after abort completed.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:291
+#: src/fs/gnunet-publish.c:292
 msgid "Cleanup after abort failed.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:425
+#: src/fs/gnunet-publish.c:426
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:428
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:582
+#: src/fs/gnunet-publish.c:583
 msgid "Could not publish\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:611
+#: src/fs/gnunet-publish.c:612
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:644
+#: src/fs/gnunet-publish.c:645
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:647
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-publish.c:653
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:659
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:664
+#: src/fs/gnunet-publish.c:665
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:670
+#: src/fs/gnunet-publish.c:671
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:678
+#: src/fs/gnunet-publish.c:679
 msgid "Error scanning directory.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:706
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:737
+#: src/fs/gnunet-publish.c:738
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:755
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:810
+#: src/fs/gnunet-publish.c:811
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:817
+#: src/fs/gnunet-publish.c:818
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:823
+#: src/fs/gnunet-publish.c:824
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:832 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:208
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:853
+#: src/fs/gnunet-publish.c:845 src/fs/gnunet-publish.c:854
 #: 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:906
+#: src/fs/gnunet-publish.c:907
 msgid "enable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:921
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:927
+#: src/fs/gnunet-publish.c:928
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:932
+#: src/fs/gnunet-publish.c:933
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-publish.c:940
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:952
+#: src/fs/gnunet-publish.c:953
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:964
+#: src/fs/gnunet-publish.c:965
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:971
+#: src/fs/gnunet-publish.c:972
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:979
+#: src/fs/gnunet-publish.c:980
 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:997
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:443
+#: src/fs/gnunet-search.c:446
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:532
+#: src/fs/gnunet-search.c:535
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:592
+#: src/fs/gnunet-search.c:595
 #, c-format
 msgid "Conflicting options --bookmark-only and --silent.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:599
+#: src/fs/gnunet-search.c:602
 #, c-format
 msgid "Conflicting options --bookmark-only and --output.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:605
+#: src/fs/gnunet-search.c:608
 #, c-format
 msgid "An output file is mandatory for silent mode.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:626
+#: src/fs/gnunet-search.c:629
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:634
+#: src/fs/gnunet-search.c:637
 msgid ""
 "Invalid URI. Valid URIs for searching are keyword query URIs\n"
 "(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
 "\").\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:659
+#: src/fs/gnunet-search.c:662
 #, c-format
 msgid "Could not initialize the `%s` subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:673
+#: src/fs/gnunet-search.c:676
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:699
+#: src/fs/gnunet-search.c:702
 msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:705
+#: src/fs/gnunet-search.c:708
 msgid "do not search, print only the URI that points to this search"
 msgstr ""
 
-#: src/fs/gnunet-search.c:712
+#: src/fs/gnunet-search.c:715
 msgid ""
 "write search results for directories according to FORMAT; accepted "
 "placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
 "printf when omitted or to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:722
+#: src/fs/gnunet-search.c:725
 msgid ""
 "write search results according to FORMAT; accepted placeholders are: %a, %f, "
 "%j, %l, %m, %n, %s; defaults to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:730
+#: src/fs/gnunet-search.c:733
 msgid ""
 "when the %a or %j placeholders appear in --printf or --dir-printf, list each "
 "metadata property according to FORMAT; accepted placeholders are: %i, %l, "
 "%n, %p"
 msgstr ""
 
-#: src/fs/gnunet-search.c:739
+#: src/fs/gnunet-search.c:742
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:751
+#: src/fs/gnunet-search.c:754
 msgid ""
 "create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
 "search --output=commons"
 msgstr ""
 
-#: src/fs/gnunet-search.c:758
+#: src/fs/gnunet-search.c:761
 msgid "silent mode (requires the --output argument)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:764
+#: src/fs/gnunet-search.c:767
 msgid ""
 "automatically terminate search after DELAY; the value given must be a number "
 "followed by a space and a time unit, for example \"500 ms\"; without a unit "
@@ -3222,51 +3222,51 @@ msgid ""
 "to wait for CTRL-C"
 msgstr ""
 
-#: src/fs/gnunet-search.c:773
+#: src/fs/gnunet-search.c:776
 #, c-format
 msgid ""
 "be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
 "arguments - ignored when these are provided by the user)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:786
+#: src/fs/gnunet-search.c:789
 msgid "Search for files that have been published on GNUnet\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:371 src/fs/gnunet-service-fs.c:878
+#: src/fs/gnunet-service-fs.c:370 src/fs/gnunet-service-fs.c:877
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:430
+#: src/fs/gnunet-service-fs.c:429
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:596
+#: src/fs/gnunet-service-fs.c:595
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:648 src/fs/gnunet-service-fs_cp.c:558
+#: src/fs/gnunet-service-fs.c:647 src/fs/gnunet-service-fs_cp.c:558
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:831
+#: src/fs/gnunet-service-fs.c:830
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:871
+#: src/fs/gnunet-service-fs.c:870
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1041
+#: src/fs/gnunet-service-fs.c:1040
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1288
+#: src/fs/gnunet-service-fs.c:1287
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1322 src/hostlist/gnunet-daemon-hostlist.c:343
+#: src/fs/gnunet-service-fs.c:1321 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3359,41 +3359,41 @@ msgstr ""
 msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:188
+#: src/fs/gnunet-service-fs_indexing.c:129
+#: src/fs/gnunet-service-fs_indexing.c:187
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:147
+#: src/fs/gnunet-service-fs_indexing.c:146
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:244
+#: src/fs/gnunet-service-fs_indexing.c:243
 #, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:297
+#: src/fs/gnunet-service-fs_indexing.c:296
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:311
+#: src/fs/gnunet-service-fs_indexing.c:310
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:315
+#: src/fs/gnunet-service-fs_indexing.c:314
 msgid "not indexed"
 msgstr "non indexé"
 
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:328
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:435
+#: src/fs/gnunet-service-fs_indexing.c:434
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3523,33 +3523,52 @@ msgstr ""
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:93
+#: src/fs/gnunet-unindex.c:94
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:102
+#: src/fs/gnunet-unindex.c:103
 #, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-unindex.c:109
 msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-unindex.c:142
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:161
+#: src/fs/gnunet-unindex.c:162
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:194
+#: src/fs/gnunet-unindex.c:195
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
+#: src/fs/meta_data.c:1063 src/fs/meta_data.c:1116 src/fs/meta_data.c:1131
+msgid "metadata length"
+msgstr ""
+
+#: src/fs/meta_data.c:1074
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
+msgstr ""
+
+#: src/fs/meta_data.c:1091
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/fs/meta_data.c:1126
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Échec du démarrage de %s\n"
+
 #: src/gns/gns_tld_api.c:293
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
@@ -3575,44 +3594,44 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:298
+#: src/gns/gnunet-dns2gns.c:296
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:379
+#: src/gns/gnunet-dns2gns.c:377
 #, fuzzy
 msgid "Failed to parse DNS response!\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:453
+#: src/gns/gnunet-dns2gns.c:451
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:656
+#: src/gns/gnunet-dns2gns.c:654
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:672
+#: src/gns/gnunet-dns2gns.c:670
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:680
+#: src/gns/gnunet-dns2gns.c:678
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:841
+#: src/gns/gnunet-dns2gns.c:839
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1001
+#: src/gns/gnunet-dns2gns.c:999
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1018
+#: src/gns/gnunet-dns2gns.c:1016
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3747,162 +3766,162 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:257
+#: src/gns/gnunet-gns.c:256
 #, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:267 src/util/dnsparser.c:253
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:281
+#: src/gns/gnunet-gns.c:280
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:305
+#: src/gns/gnunet-gns.c:304
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:340
+#: src/gns/gnunet-gns.c:339
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:346
+#: src/gns/gnunet-gns.c:345
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:352
+#: src/gns/gnunet-gns.c:351
 msgid "Specify a timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:356
+#: src/gns/gnunet-gns.c:355
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:361
+#: src/gns/gnunet-gns.c:360
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:375
+#: src/gns/gnunet-gns.c:374
 msgid "GNUnet GNS resolver tool"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:519
+#: src/gns/gnunet-service-gns.c:518
 msgid "Properly base32-encoded public key required"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1346
+#: src/gns/gnunet-service-gns.c:554
+#: src/zonemaster/gnunet-service-zonemaster.c:1345
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:574
-#: src/zonemaster/gnunet-service-zonemaster.c:1385
+#: src/gns/gnunet-service-gns.c:573
+#: src/zonemaster/gnunet-service-zonemaster.c:1384
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:279
+#: src/gns/gnunet-service-gns_interceptor.c:278
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:380
+#: src/gns/gnunet-service-gns_interceptor.c:379
 msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:672
+#: src/gns/gnunet-service-gns_resolver.c:669
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:684
+#: src/gns/gnunet-service-gns_resolver.c:681
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:690
+#: src/gns/gnunet-service-gns_resolver.c:687
 #, c-format
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:903
+#: src/gns/gnunet-service-gns_resolver.c:900
 msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1094
+#: src/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1870
+#: src/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1885
+#: src/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1918
+#: src/gns/gnunet-service-gns_resolver.c:1915
 #, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2320
+#: src/gns/gnunet-service-gns_resolver.c:2317
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2325
+#: src/gns/gnunet-service-gns_resolver.c:2322
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2348
+#: src/gns/gnunet-service-gns_resolver.c:2345
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2515
+#: src/gns/gnunet-service-gns_resolver.c:2512
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2663
+#: src/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:138
+#: src/gns/plugin_gnsrecord_gns.c:137
 msgid "This is a memento of an older block for internal maintenance."
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:177
+#: src/gns/plugin_gnsrecord_gns.c:176
 #, c-format
 msgid "Unable to parse zone key record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:191
+#: src/gns/plugin_gnsrecord_gns.c:190
 msgid "Record type does not match parsed record type\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:214
+#: src/gns/plugin_gnsrecord_gns.c:213
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:231
+#: src/gns/plugin_gnsrecord_gns.c:230
 #, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:255
+#: src/gns/plugin_gnsrecord_gns.c:254
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:287
+#: src/gns/plugin_gnsrecord_gns.c:286
 #, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr ""
@@ -3911,109 +3930,109 @@ msgstr ""
 msgid "Gns REST API initialized\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:53
+#: src/gnsrecord/gnsrecord_misc.c:51
 msgid "Label is NULL which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:58
+#: src/gnsrecord/gnsrecord_misc.c:56
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:481
+#: src/gnsrecord/gnsrecord_misc.c:479
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:489
+#: src/gnsrecord/gnsrecord_misc.c:487
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:499
+#: src/gnsrecord/gnsrecord_misc.c:497
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:515
+#: src/gnsrecord/gnsrecord_misc.c:513
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:526
+#: src/gnsrecord/gnsrecord_misc.c:524
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:548
+#: src/gnsrecord/gnsrecord_misc.c:546
 msgid "Mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:367
+#: src/gnsrecord/plugin_gnsrecord_dns.c:366
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:385
+#: src/gnsrecord/plugin_gnsrecord_dns.c:384
 #, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:406
+#: src/gnsrecord/plugin_gnsrecord_dns.c:405
 #, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:480
+#: src/gnsrecord/plugin_gnsrecord_dns.c:479
 #, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:516
+#: src/gnsrecord/plugin_gnsrecord_dns.c:515
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:533
+#: src/gnsrecord/plugin_gnsrecord_dns.c:532
 #, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:553
+#: src/gnsrecord/plugin_gnsrecord_dns.c:552
 #, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:573
+#: src/gnsrecord/plugin_gnsrecord_dns.c:572
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:585
+#: src/gnsrecord/plugin_gnsrecord_dns.c:584
 #, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:608
+#: src/gnsrecord/plugin_gnsrecord_dns.c:607
 #, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:621
+#: src/gnsrecord/plugin_gnsrecord_dns.c:620
 #, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:640
+#: src/gnsrecord/plugin_gnsrecord_dns.c:639
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:660
-#: src/gnsrecord/plugin_gnsrecord_dns.c:674
+#: src/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/gnsrecord/plugin_gnsrecord_dns.c:673
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:693
+#: src/gnsrecord/plugin_gnsrecord_dns.c:692
 #, c-format
 msgid "Unable to parse CAA record string `%s'\n"
 msgstr ""
@@ -4478,63 +4497,63 @@ msgstr ""
 msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
 msgstr ""
 
-#: src/my/my.c:196 src/my/my.c:215
+#: src/my/my.c:197 src/my/my.c:216
 #, c-format
 msgid "%s failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/mysql/mysql.c:190
+#: src/mysql/mysql.c:191
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/mysql/mysql.c:198
+#: src/mysql/mysql.c:199
 #, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:106
+#: src/namecache/gnunet-namecache.c:105
 #, c-format
 msgid "No records found for `%s'"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:119 src/namestore/gnunet-namestore.c:888
+#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:887
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:175
+#: src/namecache/gnunet-namecache.c:174
 #, c-format
 msgid "You must specify which zone should be accessed\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:182
+#: src/namecache/gnunet-namecache.c:181
 #, fuzzy, c-format
 msgid "Invalid public key for zone `%s'\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/namecache/gnunet-namecache.c:188
+#: src/namecache/gnunet-namecache.c:187
 #, c-format
 msgid "You must specify a name\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:2020
+#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2019
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:221
+#: src/namecache/gnunet-namecache.c:220
 msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:2102
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2101
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
-#: src/namecache/namecache_api.c:285
+#: src/namecache/namecache_api.c:283
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:373
+#: src/namecache/namecache_api.c:371
 msgid "Error communicating with namecache service"
 msgstr ""
 
@@ -4572,7 +4591,7 @@ msgid "Failed to setup database at `%s'\n"
 msgstr "Échec du démarrage de %s\n"
 
 #: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1951
+#: src/namestore/gnunet-namestore.c:1950
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
@@ -4739,246 +4758,246 @@ msgid "Failed to connect to IDENTITY\n"
 msgstr "Échec du démarrage de %s\n"
 
 #: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2087
+#: src/namestore/gnunet-namestore.c:2086
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:412
+#: src/namestore/gnunet-namestore.c:411
 #, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:420
+#: src/namestore/gnunet-namestore.c:419
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Commande « %s » inconnue\n"
 
-#: src/namestore/gnunet-namestore.c:428 src/namestore/gnunet-namestore.c:443
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:435
+#: src/namestore/gnunet-namestore.c:434
 #, c-format
 msgid "Error parsing expiration time %s.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:465
+#: src/namestore/gnunet-namestore.c:464
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:667
+#: src/namestore/gnunet-namestore.c:666
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:685 src/namestore/gnunet-namestore.c:701
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/namestore/gnunet-namestore.c:1137
+#: src/namestore/gnunet-namestore.c:1136
 #, 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:1258
+#: src/namestore/gnunet-namestore.c:1257
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1301
+#: src/namestore/gnunet-namestore.c:1300
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1326
+#: src/namestore/gnunet-namestore.c:1325
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1355
+#: src/namestore/gnunet-namestore.c:1354
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1369
+#: src/namestore/gnunet-namestore.c:1368
 #, c-format
 msgid "Recordlines only work with option `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1378 src/namestore/gnunet-namestore.c:1430
-#: src/namestore/gnunet-namestore.c:1440 src/namestore/gnunet-namestore.c:1450
-#: src/namestore/gnunet-namestore.c:1479 src/namestore/gnunet-namestore.c:1500
-#: src/namestore/gnunet-namestore.c:1527 src/namestore/gnunet-namestore.c:1537
-#: src/namestore/gnunet-namestore.c:1570 src/namestore/gnunet-namestore.c:1595
-#: src/namestore/gnunet-namestore.c:1629 src/namestore/gnunet-namestore.c:1663
-#: src/namestore/gnunet-namestore.c:1686
+#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
+#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
+#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
+#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
+#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
+#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
+#: src/namestore/gnunet-namestore.c:1685
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1380
+#: src/namestore/gnunet-namestore.c:1379
 msgid "name"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1409
+#: src/namestore/gnunet-namestore.c:1408
 #, c-format
 msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1432 src/namestore/gnunet-namestore.c:1442
-#: src/namestore/gnunet-namestore.c:1452 src/namestore/gnunet-namestore.c:1481
-#: src/namestore/gnunet-namestore.c:1502 src/namestore/gnunet-namestore.c:1688
+#: src/namestore/gnunet-namestore.c:1431 src/namestore/gnunet-namestore.c:1441
+#: src/namestore/gnunet-namestore.c:1451 src/namestore/gnunet-namestore.c:1480
+#: src/namestore/gnunet-namestore.c:1501 src/namestore/gnunet-namestore.c:1687
 msgid "add"
 msgstr "ajouter"
 
-#: src/namestore/gnunet-namestore.c:1460
+#: src/namestore/gnunet-namestore.c:1459
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1470
+#: src/namestore/gnunet-namestore.c:1469
 #, c-format
 msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1490
+#: src/namestore/gnunet-namestore.c:1489
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1509 src/namestore/gnunet-namestore.c:1695
+#: src/namestore/gnunet-namestore.c:1508 src/namestore/gnunet-namestore.c:1694
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1529 src/namestore/gnunet-namestore.c:1539
+#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
 msgid "del"
 msgstr "supprimer"
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1571
 msgid "purge-zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1596
 msgid "list"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1631
+#: src/namestore/gnunet-namestore.c:1630
 msgid "reverse-pkey"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1641
+#: src/namestore/gnunet-namestore.c:1640
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1665
+#: src/namestore/gnunet-namestore.c:1664
 msgid "uri"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1678
+#: src/namestore/gnunet-namestore.c:1677
 #: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI invalide « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:1966
+#: src/namestore/gnunet-namestore.c:1965
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1985
+#: src/namestore/gnunet-namestore.c:1984
 msgid "add record"
 msgstr "ajouter un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1988
+#: src/namestore/gnunet-namestore.c:1987
 msgid "delete record"
 msgstr "suprimer un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1992
+#: src/namestore/gnunet-namestore.c:1991
 msgid "display records"
 msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore.c:1996
+#: src/namestore/gnunet-namestore.c:1995
 msgid "read commands from stdin"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2003
+#: src/namestore/gnunet-namestore.c:2002
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2009
+#: src/namestore/gnunet-namestore.c:2008
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2014
+#: src/namestore/gnunet-namestore.c:2013
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2024
+#: src/namestore/gnunet-namestore.c:2023
 msgid "Output in recordline format"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2030
+#: src/namestore/gnunet-namestore.c:2029
 msgid "determine our name for the given KEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2036
+#: src/namestore/gnunet-namestore.c:2035
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2041
+#: src/namestore/gnunet-namestore.c:2040
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2047
+#: src/namestore/gnunet-namestore.c:2046
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2051
+#: src/namestore/gnunet-namestore.c:2050
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2055
+#: src/namestore/gnunet-namestore.c:2054
 #, fuzzy
 msgid "omit private records"
 msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore.c:2060
+#: src/namestore/gnunet-namestore.c:2059
 msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2065
+#: src/namestore/gnunet-namestore.c:2064
 msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2070
+#: src/namestore/gnunet-namestore.c:2069
 msgid ""
 "show private key for orphaned records for recovery using `gnunet-identity -C "
 "-P <key>'. Use in combination with --display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2075
+#: src/namestore/gnunet-namestore.c:2074
 msgid "delete all records in specified zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2081
+#: src/namestore/gnunet-namestore.c:2080
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1837
+#: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1843
+#: src/namestore/gnunet-zoneimport.c:1841
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
@@ -5309,7 +5328,7 @@ msgid "Show network size estimates from NSE service."
 msgstr ""
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:242
+#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5501,58 +5520,58 @@ msgstr ""
 msgid "Unable to create indices: %s.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:418
+#: src/pt/gnunet-daemon-pt.c:416
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:424
+#: src/pt/gnunet-daemon-pt.c:422
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:478
+#: src/pt/gnunet-daemon-pt.c:476
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:673
+#: src/pt/gnunet-daemon-pt.c:671
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:680
+#: src/pt/gnunet-daemon-pt.c:678
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:718
+#: src/pt/gnunet-daemon-pt.c:716
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:773
+#: src/pt/gnunet-daemon-pt.c:771
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:779
+#: src/pt/gnunet-daemon-pt.c:777
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:788
+#: src/pt/gnunet-daemon-pt.c:786
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:881
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:900
+#: src/pt/gnunet-daemon-pt.c:898
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1227 src/pt/gnunet-daemon-pt.c:1236
-#: src/pt/gnunet-daemon-pt.c:1252 src/pt/gnunet-daemon-pt.c:1261
-#: src/pt/gnunet-daemon-pt.c:1270
+#: 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:1316
+#: src/pt/gnunet-daemon-pt.c:1314
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -5679,7 +5698,7 @@ msgstr ""
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:3096
+#: src/reclaim/plugin_rest_openid_connect.c:3095
 msgid "OpenID Connect REST API initialized\n"
 msgstr ""
 
@@ -5687,7 +5706,7 @@ msgstr ""
 msgid "Identity Provider REST API initialized\n"
 msgstr ""
 
-#: src/reclaim/reclaim_api.c:545
+#: src/reclaim/reclaim_api.c:544
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Échec du démarrage de %s\n"
@@ -5706,13 +5725,13 @@ msgid "No configuration file given. Exiting\n"
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:631
+#: src/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:639
+#: src/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
@@ -5754,15 +5773,15 @@ msgstr ""
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:700
+#: src/regex/gnunet-regex-simulation-profiler.c:701
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:706
+#: src/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:720
+#: src/regex/gnunet-regex-simulation-profiler.c:721
 msgid "Profiler for regex library"
 msgstr ""
 
@@ -6053,7 +6072,7 @@ msgstr "threshold"
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
 #: src/setu/gnunet-service-setu.c:5389
 msgid "Could not connect to CADET service\n"
 msgstr ""
@@ -6122,12 +6141,12 @@ msgstr ""
 msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:319
+#: src/statistics/gnunet-service-statistics.c:314
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:984
+#: src/statistics/gnunet-service-statistics.c:979
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
@@ -6307,7 +6326,7 @@ msgid ""
 msgstr ""
 
 #: 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
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:319
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6322,57 +6341,57 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1153
+#: src/testbed/gnunet-service-testbed_peers.c:1154
 #, c-format
 msgid "%s is stopped"
 msgstr "%s est arrêté"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1156
+#: src/testbed/gnunet-service-testbed_peers.c:1157
 #, c-format
 msgid "%s is starting"
 msgstr "%s est en cours de démarrage"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1159
+#: src/testbed/gnunet-service-testbed_peers.c:1160
 #, c-format
 msgid "%s is stopping"
 msgstr "%s est en cours d'arrêt"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1162
+#: src/testbed/gnunet-service-testbed_peers.c:1163
 #, c-format
 msgid "%s is starting already"
 msgstr "%s est déjà en cours de démarrage"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1166
 #, c-format
 msgid "%s is stopping already"
 msgstr "%s est déjà arrêté"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is started already"
 msgstr "%s est déjà démarré"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1172
 #, c-format
 msgid "%s is stopped already"
 msgstr "%s est déjà arrêté"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1178
 #, c-format
 msgid "%s service failed to start"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1181
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1182
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, c-format
 msgid "%.s Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
@@ -7624,17 +7643,17 @@ msgstr ""
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1400
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1401
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1412
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1413
 #, 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:1419
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1420
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
@@ -7646,7 +7665,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:838
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7656,23 +7675,23 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:950
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:951
 #, 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:991
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:992
 #, 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:1480
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1481
 #, 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:1504
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1505
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -7687,45 +7706,45 @@ msgstr ""
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1750
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1751
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1756
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1761
 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
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1219
+#: src/util/service.c:1642
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1643
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1644
 msgid "No such user"
 msgstr "Aucun utilisateur trouvé"
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1658
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2000
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2001
 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
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2077
+#: src/util/service.c:2089
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2098
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2099
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
@@ -7738,240 +7757,221 @@ msgstr ""
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:228 src/util/bio.c:236
+#: src/util/bio.c:223 src/util/bio.c:231
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/bio.c:238
+#: src/util/bio.c:233
 msgid "End of file"
 msgstr "Fin de fichier"
 
-#: src/util/bio.c:267
+#: src/util/bio.c:262
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/bio.c:269
+#: src/util/bio.c:264
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:309
+#: src/util/bio.c:304
 #, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr ""
 
-#: src/util/bio.c:336 src/util/bio.c:840
+#: src/util/bio.c:331 src/util/bio.c:781
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:342
+#: src/util/bio.c:337
 #, c-format
 msgid "%s (while reading `%s')"
 msgstr ""
 
-#: src/util/bio.c:347
+#: src/util/bio.c:342
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:360
+#: src/util/bio.c:355
 #, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
-msgid "metadata length"
-msgstr ""
-
-#: src/util/bio.c:411
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
-msgstr ""
-
-#: src/util/bio.c:427
-#, fuzzy, c-format
-msgid "Failed to deserialize metadata `%s'"
-msgstr "Résolution de « %s » échouée\n"
-
-#: src/util/bio.c:669
+#: src/util/bio.c:610
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:731 src/util/bio.c:752
+#: src/util/bio.c:672 src/util/bio.c:693
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/bio.c:733
+#: src/util/bio.c:674
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:817
+#: src/util/bio.c:758
 #, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr ""
 
-#: src/util/bio.c:877
-#, fuzzy, c-format
-msgid "Failed to serialize metadata `%s'"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/util/client.c:750 src/util/client.c:941
+#: src/util/client.c:751 src/util/client.c:942
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1096
+#: src/util/client.c:1097
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:648 src/util/common_logging.c:687
+#: src/util/common_logging.c:647 src/util/common_logging.c:686
 #, c-format
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:911
+#: src/util/common_logging.c:910
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1104
+#: src/util/common_logging.c:1103
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1105
 msgid "WARNING"
 msgstr "AVERTISSEMENT"
 
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1107
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1109
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1111
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1113
 msgid "NONE"
 msgstr "AUCUN"
 
-#: src/util/common_logging.c:1115
+#: src/util/common_logging.c:1114
 msgid "INVALID"
 msgstr "INVALIDE"
 
-#: src/util/common_logging.c:1360
+#: src/util/common_logging.c:1359
 msgid "unknown address"
 msgstr "adresse inconnue"
 
-#: src/util/common_logging.c:1405
+#: src/util/common_logging.c:1404
 msgid "invalid address"
 msgstr "adresse invalide"
 
-#: src/util/common_logging.c:1417
+#: src/util/common_logging.c:1416
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1432
+#: src/util/common_logging.c:1431
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr ""
 
-#: src/util/configuration.c:790
+#: src/util/configuration.c:786
 #, c-format
 msgid "Illegal directive in line %u (parsing restricted section %s)\n"
 msgstr ""
 
-#: src/util/configuration.c:800
+#: src/util/configuration.c:796
 #, c-format
 msgid "Bad directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:853
+#: src/util/configuration.c:849
 #, c-format
 msgid "Bad inline-secret directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:875
+#: src/util/configuration.c:871
 #, c-format
 msgid "Unknown or malformed directive '%s' in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:905
+#: src/util/configuration.c:901
 #, c-format
 msgid "Syntax error while deserializing in line %u (option without section)\n"
 msgstr ""
 
-#: src/util/configuration.c:949
+#: src/util/configuration.c:945
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:1049
+#: src/util/configuration.c:1045
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/configuration.c:1062
+#: src/util/configuration.c:1058
 #, fuzzy, c-format
 msgid "Failed to parse configuration file `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/util/configuration.c:1695
+#: src/util/configuration.c:1691
 msgid "Not a valid relative time specification"
 msgstr ""
 
-#: src/util/configuration.c:1765
+#: src/util/configuration.c:1761
 #, 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
+#: src/util/configuration.c:1856
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1892
+#: src/util/configuration.c:1888
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1958
+#: src/util/configuration.c:1954
 #, 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
+#: src/util/configuration_helper.c:134
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:147
+#: src/util/configuration_helper.c:148
 #, c-format
 msgid "%s, %s or %s argument is required\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:218
+#: src/util/configuration_helper.c:219
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:262
+#: src/util/configuration_helper.c:263
 #, c-format
 msgid "failed to load configuration defaults"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -7988,7 +7988,7 @@ msgstr ""
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:281
+#: src/util/crypto_ecc_setup.c:282
 msgid "Could not load peer's private key\n"
 msgstr ""
 
@@ -7997,265 +7997,265 @@ msgstr ""
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:907
+#: src/util/crypto_rsa.c:908
 #, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1207
+#: src/util/crypto_rsa.c:1208
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:843
+#: src/util/disk.c:842
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/dnsparser.c:909
+#: src/util/dnsparser.c:910
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 
-#: src/util/dnsstub.c:227
+#: src/util/dnsstub.c:228
 #, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr ""
 
-#: src/util/dnsstub.c:370
+#: src/util/dnsstub.c:371
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr ""
 
-#: src/util/dnsstub.c:503
+#: src/util/dnsstub.c:504
 #, 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:508
+#: src/util/dnsstub.c:509
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr ""
 
-#: src/util/getopt.c:565
+#: src/util/getopt.c:566
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: src/util/getopt.c:590
+#: src/util/getopt.c:591
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:596
+#: src/util/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:616 src/util/getopt.c:797
+#: src/util/getopt.c:617 src/util/getopt.c:798
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:647
+#: src/util/getopt.c:648
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: src/util/getopt.c:653
+#: src/util/getopt.c:654
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: src/util/getopt.c:680
+#: src/util/getopt.c:681
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:682
+#: src/util/getopt.c:683
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:711 src/util/getopt.c:847
+#: src/util/getopt.c:712 src/util/getopt.c:848
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:761
+#: src/util/getopt.c:762
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: src/util/getopt.c:781
+#: src/util/getopt.c:782
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:970
+#: src/util/getopt.c:971
 #, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr ""
 
-#: src/util/getopt.c:983
+#: src/util/getopt.c:984
 #, c-format
 msgid "Option `%s' can't be used with other options.\n"
 msgstr ""
 
-#: src/util/getopt.c:995
+#: src/util/getopt.c:996
 #, c-format
 msgid "Missing mandatory option `%s'.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:63
+#: src/util/getopt_helpers.c:64
 msgid "print the version number"
 msgstr ""
 
-#: src/util/getopt_helpers.c:110
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:197
+#: src/util/getopt_helpers.c:198
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:262
+#: src/util/getopt_helpers.c:263
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:378
+#: src/util/getopt_helpers.c:379
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:445
+#: src/util/getopt_helpers.c:446
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:462
+#: src/util/getopt_helpers.c:463
 msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:498 src/util/getopt_helpers.c:812
-#: src/util/getopt_helpers.c:868
+#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
+#: src/util/getopt_helpers.c:869
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:570
+#: src/util/getopt_helpers.c:571
 #, c-format
 msgid ""
 "You must pass a relative time (optionally with sign) to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:577
+#: src/util/getopt_helpers.c:578
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:595
+#: src/util/getopt_helpers.c:596
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:597
+#: src/util/getopt_helpers.c:598
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:631
+#: src/util/getopt_helpers.c:632
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:685
+#: src/util/getopt_helpers.c:686
 #, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:742
+#: src/util/getopt_helpers.c:743
 #, c-format
 msgid "You must pass a timestamp to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:749
+#: src/util/getopt_helpers.c:750
 #, c-format
 msgid "The maximum precision allowed for timestamps is seconds.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:805
+#: src/util/getopt_helpers.c:806
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:875
+#: src/util/getopt_helpers.c:876
 #, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:953
+#: src/util/getopt_helpers.c:954
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-base32.c:46
+#: src/util/gnunet-base32.c:47
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/util/gnunet-config.c:153
+#: src/util/gnunet-config.c:154
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/util/gnunet-config.c:159
+#: src/util/gnunet-config.c:160
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:164
+#: src/util/gnunet-config.c:165
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:170
+#: src/util/gnunet-config.c:171
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:176
+#: src/util/gnunet-config.c:177
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:192
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
-#: src/util/gnunet-crypto-tvg.c:1527
+#: src/util/gnunet-crypto-tvg.c:1528
 msgid "verify a test vector from stdin"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:94
+#: src/util/gnunet-ecc.c:95
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:128
+#: src/util/gnunet-ecc.c:129
 #, c-format
 msgid "Generating %u keys like %s, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:136
+#: src/util/gnunet-ecc.c:137
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:177
+#: src/util/gnunet-ecc.c:178
 #, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:185
 #, c-format
 msgid ""
 "\n"
@@ -8264,309 +8264,309 @@ msgstr ""
 "\n"
 "Terminé !\n"
 
-#: src/util/gnunet-ecc.c:186
+#: src/util/gnunet-ecc.c:187
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:303
+#: src/util/gnunet-ecc.c:304
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:313
+#: src/util/gnunet-ecc.c:314
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:333
+#: src/util/gnunet-ecc.c:334
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:387
+#: src/util/gnunet-ecc.c:388
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:451
+#: src/util/gnunet-ecc.c:452
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:457
+#: src/util/gnunet-ecc.c:458
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:463
+#: src/util/gnunet-ecc.c:464
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:468
+#: src/util/gnunet-ecc.c:469
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:473
+#: src/util/gnunet-ecc.c:474
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:478
+#: src/util/gnunet-ecc.c:479
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:484
+#: src/util/gnunet-ecc.c:485
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:498
+#: src/util/gnunet-ecc.c:499
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
+#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/util/gnunet-qr.c:133
+#: src/util/gnunet-qr.c:134
 #, fuzzy, c-format
 msgid "Added URI %s\n"
 msgstr "URI invalide « %s »\n"
 
-#: src/util/gnunet-qr.c:160
+#: src/util/gnunet-qr.c:161
 #, c-format
 msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:170
+#: src/util/gnunet-qr.c:171
 #, c-format
 msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:181
+#: src/util/gnunet-qr.c:182
 #, c-format
 msgid "No known handler for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:217
+#: src/util/gnunet-qr.c:218
 #, c-format
 msgid "Unable to start child process `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:246
+#: src/util/gnunet-qr.c:247
 #, 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
+#: src/util/gnunet-qr.c:261
 #, fuzzy
 msgid "Capturing...\n"
 msgstr "En cous de démarrage %s…\n"
 
-#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
 msgid "No captured images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
 #, c-format
 msgid "Got %d images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
 #, c-format
 msgid "Found %s: \"%s\"\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:364 src/util/gnunet-qr.c:366
+#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
 #, c-format
 msgid "%s is not a PNG file\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:545
+#: src/util/gnunet-qr.c:546
 #, fuzzy
 msgid "No data found\n"
 msgstr "upnpc introuvable\n"
 
-#: src/util/gnunet-qr.c:561
+#: src/util/gnunet-qr.c:562
 msgid "Dispatching the URI\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:572
+#: src/util/gnunet-qr.c:573
 msgid "use the video device DEVICE (defaults to /dev/video0)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:579
+#: src/util/gnunet-qr.c:580
 msgid "read from the PNG-encoded file FILE"
 msgstr ""
 
-#: src/util/gnunet-qr.c:590
+#: src/util/gnunet-qr.c:591
 msgid "Scan a QR code and import the URI read"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:168
+#: src/util/gnunet-resolver.c:169
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:182
+#: src/util/gnunet-resolver.c:183
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:214
+#: src/util/gnunet-scrypt.c:215
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:280
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:286
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:292
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:312
+#: src/util/gnunet-scrypt.c:313
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:1287
+#: src/util/gnunet-service-resolver.c:1288
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:88
+#: src/util/gnunet-uri.c:89
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:94
+#: src/util/gnunet-uri.c:95
 #, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:101
+#: src/util/gnunet-uri.c:102
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:108
+#: src/util/gnunet-uri.c:109
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:178
+#: src/util/gnunet-uri.c:179
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:59
+#: src/util/gnunet_error_codes.c:60
 msgid "No error (success)."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:65
+#: src/util/gnunet_error_codes.c:66
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "%.s Code d'erreur inconnu"
 
-#: src/util/gnunet_error_codes.c:71
+#: src/util/gnunet_error_codes.c:72
 msgid "Communication with service failed."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:77
+#: src/util/gnunet_error_codes.c:78
 #, fuzzy
 msgid "Ego not found."
 msgstr "upnpc introuvable\n"
 
-#: src/util/gnunet_error_codes.c:83
+#: src/util/gnunet_error_codes.c:84
 msgid "Identifier already in use for another ego."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:89
+#: src/util/gnunet_error_codes.c:90
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:95
+#: src/util/gnunet_error_codes.c:96
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "%.s Code d'erreur inconnu"
 
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr "# Session TCP active"
 
-#: src/util/gnunet_error_codes.c:107
+#: src/util/gnunet_error_codes.c:108
 #, fuzzy
 msgid "Zone not found."
 msgstr "upnpc introuvable\n"
 
-#: src/util/gnunet_error_codes.c:113
+#: src/util/gnunet_error_codes.c:114
 #, fuzzy
 msgid "Record not found."
 msgstr "upnpc introuvable\n"
 
-#: src/util/gnunet_error_codes.c:125
+#: src/util/gnunet_error_codes.c:126
 msgid "Zone does not contain any records."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:131
+#: src/util/gnunet_error_codes.c:132
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "Échec du démarrage de %s\n"
 
-#: src/util/gnunet_error_codes.c:137
+#: src/util/gnunet_error_codes.c:138
 msgid "No records given."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:143
+#: src/util/gnunet_error_codes.c:144
 msgid "Record data invalid."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:149
+#: src/util/gnunet_error_codes.c:150
 msgid "No label given."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:155
+#: src/util/gnunet_error_codes.c:156
 #, fuzzy
 msgid "No results given."
 msgstr "# résultats introuvables"
 
-#: src/util/gnunet_error_codes.c:161
+#: src/util/gnunet_error_codes.c:162
 msgid "Record already exists."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:167
+#: src/util/gnunet_error_codes.c:168
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:173
+#: src/util/gnunet_error_codes.c:174
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:179
+#: src/util/gnunet_error_codes.c:180
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "Échec du démarrage de %s\n"
 
-#: src/util/gnunet_error_codes.c:185
+#: src/util/gnunet_error_codes.c:186
 msgid "Label invalid or malformed."
 msgstr ""
 
-#: src/util/helper.c:306
+#: src/util/helper.c:305
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr ""
 
-#: src/util/helper.c:358
+#: src/util/helper.c:357
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:573
+#: src/util/helper.c:572
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
@@ -8582,58 +8582,58 @@ msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:415
+#: src/util/os_installation.c:416
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:786
+#: src/util/os_installation.c:787
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:819
+#: src/util/os_installation.c:820
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/util/plugin.c:86
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/plugin.c:157
+#: src/util/plugin.c:158
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:214
+#: src/util/plugin.c:215
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:370
+#: src/util/plugin.c:371
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/program.c:286
+#: src/util/program.c:287
 #, c-format
 msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr ""
 
-#: src/util/program.c:298
+#: src/util/program.c:299
 #, c-format
 msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr ""
 
-#: src/util/program.c:313
+#: src/util/program.c:314
 #, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr ""
 
-#: src/util/program.c:328
+#: src/util/program.c:329
 msgid "Malformed configuration. Exiting ...\n"
 msgstr ""
 
@@ -8642,312 +8642,312 @@ msgstr ""
 msgid "Bad mask: %d\n"
 msgstr "Masque érroné : %d\n"
 
-#: src/util/resolver_api.c:220
+#: src/util/resolver_api.c:221
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:242
+#: src/util/resolver_api.c:243
 #, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
 "resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:887
+#: src/util/resolver_api.c:888
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:900
+#: src/util/resolver_api.c:901
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1085
+#: src/util/resolver_api.c:1086
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1174 src/util/resolver_api.c:1197
-#: src/util/resolver_api.c:1211
+#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
+#: src/util/resolver_api.c:1212
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/util/service.c:653
+#: src/util/service.c:654
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1572
+#: src/util/service.c:1573
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/socks.c:635
+#: src/util/socks.c:636
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:652
+#: src/util/socks.c:653
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:395
+#: src/util/strings.c:394
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:514
+#: src/util/strings.c:513
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:1050
+#: src/util/strings.c:1049
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1058
+#: src/util/strings.c:1057
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1065
+#: src/util/strings.c:1064
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1073
+#: src/util/strings.c:1072
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1082
+#: src/util/strings.c:1081
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1264 src/util/strings.c:1275
+#: src/util/strings.c:1263 src/util/strings.c:1274
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1284
+#: src/util/strings.c:1283
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1355 src/util/strings.c:1384 src/util/strings.c:1431
-#: src/util/strings.c:1451
+#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
+#: src/util/strings.c:1450
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1409
+#: src/util/strings.c:1408
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1460
+#: src/util/strings.c:1459
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/strings.c:1502
+#: src/util/strings.c:1501
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1552
+#: src/util/strings.c:1551
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1583
+#: src/util/strings.c:1582
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/util/time.c:900 src/util/time.c:928
+#: src/util/time.c:901 src/util/time.c:929
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:936
+#: src/util/time.c:937
 #, 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
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
 msgid "# Active channels"
 msgstr "# Canaux actifs"
 
-#: src/vpn/gnunet-service-vpn.c:583
+#: src/vpn/gnunet-service-vpn.c:582
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:736
+#: src/vpn/gnunet-service-vpn.c:735
 msgid "# ICMP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1112
+#: src/vpn/gnunet-service-vpn.c:1111
 msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1262
+#: src/vpn/gnunet-service-vpn.c:1261
 msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1461
+#: src/vpn/gnunet-service-vpn.c:1460
 msgid "# Cadet channels created"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1685
+#: src/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1821
+#: src/vpn/gnunet-service-vpn.c:1820
 msgid "# Packets dropped (channel not yet online)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2019
+#: src/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2045
+#: src/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2282
+#: src/vpn/gnunet-service-vpn.c:2281
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2316 src/vpn/gnunet-service-vpn.c:2348
+#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2355
+#: src/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2371
+#: src/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2411
+#: src/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2463
+#: src/vpn/gnunet-service-vpn.c:2462
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2497 src/vpn/gnunet-service-vpn.c:2705
+#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2750
+#: src/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3008
+#: src/vpn/gnunet-service-vpn.c:3007
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3036
+#: src/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3046
+#: src/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3062
+#: src/vpn/gnunet-service-vpn.c:3061
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3079
+#: src/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:143
+#: src/vpn/gnunet-vpn.c:142
 msgid "Error creating tunnel\n"
 msgstr "Erreur de création du tunnel\n"
 
-#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:226
+#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:202
 #, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:217
+#: src/vpn/gnunet-vpn.c:216
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:240
+#: src/vpn/gnunet-vpn.c:239
 #, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:258
 #, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:295
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:301
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:308
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:315
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:322
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:330
+#: src/vpn/gnunet-vpn.c:329
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:335
+#: src/vpn/gnunet-vpn.c:334
 msgid "service is offered via TCP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:340
+#: src/vpn/gnunet-vpn.c:339
 msgid "service is offered via UDP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:354
+#: src/vpn/gnunet-vpn.c:353
 msgid "Setup tunnels via VPN."
 msgstr "Configurer des tunnels via VPN."
 
-#: src/zonemaster/gnunet-service-zonemaster.c:502
+#: src/zonemaster/gnunet-service-zonemaster.c:501
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1333
+#: src/zonemaster/gnunet-service-zonemaster.c:1332
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index feb2b22c7..21ccaf89e 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: 2022-12-04 14:58+0900\n"
+"POT-Creation-Date: 2022-12-05 17:21+0900\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"
@@ -32,9 +32,9 @@ msgstr ""
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1958
+#: src/namestore/gnunet-namestore.c:1957
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr ""
@@ -146,7 +146,7 @@ msgstr ""
 msgid "GNUnet abd resolver tool"
 msgstr ""
 
-#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr ""
@@ -166,15 +166,15 @@ msgstr ""
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1133
 msgid "Message was sent successfully"
 msgstr "Messaggio inviato con successo"
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1136
 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:1137
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1138
 msgid "Unknown request status"
 msgstr ""
 
@@ -382,28 +382,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:1094
-#: src/util/service.c:1100
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1095
+#: src/util/service.c:1101
 #, 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:530
-#: src/util/service.c:1133
+#: src/transport/tcp_service_legacy.c:634 src/util/client.c:531
+#: src/util/service.c:1134
 #, 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:535
-#: src/util/service.c:1137
+#: src/transport/tcp_service_legacy.c:638 src/util/client.c:536
+#: src/util/service.c:1138
 #, 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
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1158
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -411,7 +411,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:1175
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1176
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -419,7 +419,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:1206
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1207
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr ""
@@ -427,7 +427,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:1225
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1226
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
@@ -1097,7 +1097,7 @@ msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:664
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1506,10 +1506,10 @@ msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:128
 #: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_mysql.c:890
+#: src/datastore/plugin_datastore_mysql.c:891
 #: 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/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:82 src/my/my.c:94
+#: src/mysql/mysql.c:47 src/mysql/mysql.c:65
 #: src/namecache/plugin_namecache_sqlite.c:54
 #: src/namestore/plugin_namestore_sqlite.c:56
 #: src/peerstore/plugin_peerstore_sqlite.c:54
@@ -1517,7 +1517,7 @@ msgstr ""
 #: 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
+#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
@@ -1814,23 +1814,23 @@ msgstr ""
 msgid "Heap database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:371
-#: src/datastore/plugin_datastore_mysql.c:423
-#: src/datastore/plugin_datastore_mysql.c:1071
+#: src/datastore/plugin_datastore_mysql.c:372
+#: src/datastore/plugin_datastore_mysql.c:424
+#: src/datastore/plugin_datastore_mysql.c:1072
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:410
+#: src/datastore/plugin_datastore_mysql.c:411
 #: src/datastore/plugin_datastore_sqlite.c:675
 msgid "Data too large"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:847
+#: src/datastore/plugin_datastore_mysql.c:848
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1179
+#: src/datastore/plugin_datastore_mysql.c:1180
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -1956,7 +1956,7 @@ msgstr ""
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:359
+#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
 #: src/nse/gnunet-nse-profiler.c:894
 msgid "be verbose (print progress information)"
 msgstr ""
@@ -2045,278 +2045,278 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:371 src/dns/gnunet-dns-monitor.c:376
+#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:388
+#: src/dns/gnunet-dns-monitor.c:387
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:241
+#: src/dns/gnunet-dns-redirector.c:240
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:246
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:260
+#: src/dns/gnunet-dns-redirector.c:259
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:466
+#: src/dns/gnunet-service-dns.c:463
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:620
+#: src/dns/gnunet-service-dns.c:617
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:756
+#: src/dns/gnunet-service-dns.c:753
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:832
+#: src/dns/gnunet-service-dns.c:829
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:951
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:973
+#: src/dns/gnunet-service-dns.c:970
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:984
+#: src/dns/gnunet-service-dns.c:981
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:996
+#: src/dns/gnunet-service-dns.c:993
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:999
+#: src/dns/gnunet-service-dns.c:996
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069
+#: src/dns/gnunet-service-dns.c:1066
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
+#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1128
+#: src/dns/gnunet-service-dns.c:1125
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:971
+#: src/exit/gnunet-daemon-exit.c:968
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1077
+#: src/exit/gnunet-daemon-exit.c:1074
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1371
+#: src/exit/gnunet-daemon-exit.c:1368
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
+#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
+#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
+#: src/exit/gnunet-daemon-exit.c:2283
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# byte ricevuti via SMTP"
 
-#: src/exit/gnunet-daemon-exit.c:1507
+#: src/exit/gnunet-daemon-exit.c:1504
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/exit/gnunet-daemon-exit.c:1619
+#: src/exit/gnunet-daemon-exit.c:1616
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/exit/gnunet-daemon-exit.c:1661
+#: src/exit/gnunet-daemon-exit.c:1658
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# connessioni attive"
 
-#: src/exit/gnunet-daemon-exit.c:1752
+#: src/exit/gnunet-daemon-exit.c:1749
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# connessioni attive"
 
-#: src/exit/gnunet-daemon-exit.c:1840
+#: src/exit/gnunet-daemon-exit.c:1837
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1879
+#: src/exit/gnunet-daemon-exit.c:1876
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/exit/gnunet-daemon-exit.c:2020
+#: src/exit/gnunet-daemon-exit.c:2017
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# messaggi PONG ricevuti"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
+#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
+#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
+#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
+#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2290
+#: src/exit/gnunet-daemon-exit.c:2287
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/exit/gnunet-daemon-exit.c:2349 src/vpn/gnunet-service-vpn.c:995
-#: src/vpn/gnunet-service-vpn.c:2122
+#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
+#: src/vpn/gnunet-service-vpn.c:2121
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
+#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2498 src/exit/gnunet-daemon-exit.c:3199
+#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# messaggi PONG decrittati"
 
-#: src/exit/gnunet-daemon-exit.c:2619
+#: src/exit/gnunet-daemon-exit.c:2616
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2639
+#: src/exit/gnunet-daemon-exit.c:2636
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# Messaggi PING trasmessi"
 
-#: src/exit/gnunet-daemon-exit.c:2831
+#: src/exit/gnunet-daemon-exit.c:2828
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2840
+#: src/exit/gnunet-daemon-exit.c:2837
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2916
+#: src/exit/gnunet-daemon-exit.c:2913
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2990
+#: src/exit/gnunet-daemon-exit.c:2987
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3039
+#: src/exit/gnunet-daemon-exit.c:3036
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3054
+#: src/exit/gnunet-daemon-exit.c:3051
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3081
+#: src/exit/gnunet-daemon-exit.c:3078
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3112
+#: src/exit/gnunet-daemon-exit.c:3109
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3164
+#: src/exit/gnunet-daemon-exit.c:3161
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3173
+#: src/exit/gnunet-daemon-exit.c:3170
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
+#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
+#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3451
+#: src/exit/gnunet-daemon-exit.c:3448
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
+#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3495
+#: src/exit/gnunet-daemon-exit.c:3492
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3640
+#: src/exit/gnunet-daemon-exit.c:3637
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3649
+#: src/exit/gnunet-daemon-exit.c:3646
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3657
+#: src/exit/gnunet-daemon-exit.c:3654
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3661
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3835
+#: src/exit/gnunet-daemon-exit.c:3832
 msgid "Must be a number"
 msgstr "Deve essere un numero"
 
-#: src/exit/gnunet-daemon-exit.c:3951
+#: src/exit/gnunet-daemon-exit.c:3948
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4117
+#: src/exit/gnunet-daemon-exit.c:4114
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2337,163 +2337,163 @@ msgstr ""
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:240
+#: src/fragmentation/fragmentation.c:239
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:245
+#: src/fragmentation/fragmentation.c:244
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:278
+#: src/fragmentation/fragmentation.c:277
 msgid "# fragments wrap arounds"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:325
+#: src/fragmentation/fragmentation.c:324
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:331
+#: src/fragmentation/fragmentation.c:330
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:459
+#: src/fragmentation/fragmentation.c:458
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:466
+#: src/fragmentation/fragmentation.c:465
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:490
+#: src/fragmentation/fragmentation.c:489
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:481
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:492
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:499
+#: src/fs/fs_api.c:500
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1156
+#: src/fs/fs_api.c:1157
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1707
+#: src/fs/fs_api.c:1708
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1722
+#: src/fs/fs_api.c:1723
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2451
+#: src/fs/fs_api.c:2452
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2462
+#: src/fs/fs_api.c:2463
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
+#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2628
+#: src/fs/fs_api.c:2629
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
+#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2846
+#: src/fs/fs_api.c:2847
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3107
+#: src/fs/fs_api.c:3108
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:215
+#: src/fs/fs_directory.c:216
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:332
+#: src/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:346
+#: src/fs/fs_download.c:347
 #, c-format
 msgid ""
 "Failed to access full directory contents of `%s' for recursive download\n"
 msgstr ""
 
-#: src/fs/fs_download.c:528 src/fs/fs_download.c:541
+#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr ""
 
-#: src/fs/fs_download.c:960
+#: src/fs/fs_download.c:961
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1044
+#: src/fs/fs_download.c:1045
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1066
+#: src/fs/fs_download.c:1067
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1089
+#: src/fs/fs_download.c:1090
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1100
+#: src/fs/fs_download.c:1101
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1110
+#: src/fs/fs_download.c:1111
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1218
+#: src/fs/fs_download.c:1219
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1889
+#: src/fs/fs_download.c:1890
 msgid "Invalid URI"
 msgstr ""
 
@@ -2504,102 +2504,102 @@ msgid ""
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:190
+#: src/fs/fs_list_indexed.c:191
 #, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr ""
 
-#: src/fs/fs_misc.c:128
+#: src/fs/fs_misc.c:129
 #, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:202
+#: src/fs/fs_namespace.c:203
 #, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:233
+#: src/fs/fs_namespace.c:234
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:330
+#: src/fs/fs_namespace.c:331
 #, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:457
+#: src/fs/fs_namespace.c:458
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:128 src/fs/fs_publish.c:438
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:731
+#: src/fs/fs_publish.c:732
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.\n"
 msgstr "Connessione stabilita con `%s'\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
+#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:790
+#: src/fs/fs_publish.c:791
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "Impossibile avviare il servizio.\n"
 
-#: src/fs/fs_publish.c:836
+#: src/fs/fs_publish.c:837
 msgid "failed to compute hash"
 msgstr "impossibile calcolare l'hash"
 
-#: src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:857
 msgid "filename too long"
 msgstr "nome file troppo lungo"
 
-#: src/fs/fs_publish.c:888
+#: src/fs/fs_publish.c:889
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:915
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1003 src/fs/fs_publish.c:1040
+#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1107
+#: src/fs/fs_publish.c:1108
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1115
+#: src/fs/fs_publish.c:1116
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1156
+#: src/fs/fs_publish.c:1157
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1396
+#: src/fs/fs_publish.c:1397
 #, c-format
 msgid "Datastore failure: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1488
+#: src/fs/fs_publish.c:1489
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:212
+#: src/fs/fs_publish_ksk.c:213
 msgid "Could not connect to datastore."
 msgstr ""
 
@@ -2607,144 +2607,144 @@ msgstr ""
 msgid "Internal error."
 msgstr "Errore interno."
 
-#: src/fs/fs_search.c:829 src/fs/fs_search.c:900
+#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
 #, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_search.c:993
+#: src/fs/fs_search.c:994
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:64
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:68
+#: src/fs/fs_unindex.c:69
 msgid "Failed to read file"
 msgstr "Impossibile leggere il file"
 
-#: src/fs/fs_unindex.c:275
+#: src/fs/fs_unindex.c:276
 msgid "Error communicating with `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:326
+#: src/fs/fs_unindex.c:327
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:389
+#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
 msgid "Failed to get KSKs from directory scan."
 msgstr ""
 
-#: src/fs/fs_unindex.c:385
+#: src/fs/fs_unindex.c:386
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:446
+#: src/fs/fs_unindex.c:447
 #, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:592 src/fs/fs_unindex.c:656
+#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:670
 msgid "Failed to open file for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:708
+#: src/fs/fs_unindex.c:709
 msgid "Failed to compute hash of file."
 msgstr "Impossibile calcolare l'hash del file."
 
-#: src/fs/fs_uri.c:231
+#: src/fs/fs_uri.c:232
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:290
+#: src/fs/fs_uri.c:291
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:308
+#: src/fs/fs_uri.c:309
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:315
+#: src/fs/fs_uri.c:316
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:382
+#: src/fs/fs_uri.c:383
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:423
+#: src/fs/fs_uri.c:424
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:440
+#: src/fs/fs_uri.c:441
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:517
+#: src/fs/fs_uri.c:518
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:534
+#: src/fs/fs_uri.c:535
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:561
+#: src/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:567
+#: src/fs/fs_uri.c:568
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:574
+#: src/fs/fs_uri.c:575
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:592
+#: src/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:612
+#: src/fs/fs_uri.c:613
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:645
+#: src/fs/fs_uri.c:646
 msgid "invalid argument"
 msgstr "argomento non valido"
 
-#: src/fs/fs_uri.c:665
+#: src/fs/fs_uri.c:666
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1093
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2780,7 +2780,7 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:896
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
@@ -2788,15 +2788,15 @@ msgstr ""
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:946
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:959
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2804,127 +2804,127 @@ msgstr ""
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:667
+#: src/fs/gnunet-daemon-fsprofiler.c:668
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:54
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:105
+#: src/fs/gnunet-directory.c:106
 #, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:108
+#: src/fs/gnunet-directory.c:109
 #, c-format
 msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-directory.c:146
 msgid "You must specify a filename to inspect.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:159
+#: src/fs/gnunet-directory.c:160
 #, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:169
+#: src/fs/gnunet-directory.c:170
 #, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:200
+#: src/fs/gnunet-directory.c:201
 msgid "Display contents of a GNUnet directory"
 msgstr ""
 
-#: src/fs/gnunet-download.c:130
+#: src/fs/gnunet-download.c:131
 #, c-format
 msgid "Starting download `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:142
+#: src/fs/gnunet-download.c:143
 msgid "<unknown time>"
 msgstr ""
 
-#: src/fs/gnunet-download.c:154
+#: src/fs/gnunet-download.c:155
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:188
+#: src/fs/gnunet-download.c:189
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:206 src/fs/gnunet-publish.c:299
-#: src/fs/gnunet-search.c:543 src/fs/gnunet-unindex.c:117
+#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
+#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:234
 msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:715
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:716
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:247
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:254
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:271 src/fs/gnunet-publish.c:869
-#: src/fs/gnunet-unindex.c:154
+#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-unindex.c:155
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:318
+#: src/fs/gnunet-download.c:319
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:325
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:330 src/fs/gnunet-search.c:745
+#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:335
+#: src/fs/gnunet-download.c:336
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:342
+#: src/fs/gnunet-download.c:343
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:349
+#: src/fs/gnunet-download.c:350
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:354
+#: src/fs/gnunet-download.c:355
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:373
+#: src/fs/gnunet-download.c:374
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2946,293 +2946,293 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:164
+#: src/fs/gnunet-fs.c:165
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:179
+#: src/fs/gnunet-fs.c:180
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:234
+#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:246
+#: src/fs/gnunet-publish.c:247
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:254
+#: src/fs/gnunet-publish.c:255
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:258
+#: src/fs/gnunet-publish.c:259
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr ""
 "L'URI è `%s'.\n"
 "\n"
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:265
 #, fuzzy, c-format
 msgid "Namespace URI is `%s'.\n"
 msgstr ""
 "L'URI è `%s'.\n"
 "\n"
 
-#: src/fs/gnunet-publish.c:279
+#: src/fs/gnunet-publish.c:280
 msgid "Starting cleanup after abort\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-publish.c:287
 msgid "Cleanup after abort completed.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:291
+#: src/fs/gnunet-publish.c:292
 msgid "Cleanup after abort failed.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:425
+#: src/fs/gnunet-publish.c:426
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:428
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:582
+#: src/fs/gnunet-publish.c:583
 msgid "Could not publish\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:611
+#: src/fs/gnunet-publish.c:612
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:644
+#: src/fs/gnunet-publish.c:645
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:647
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-publish.c:653
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:659
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:664
+#: src/fs/gnunet-publish.c:665
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:670
+#: src/fs/gnunet-publish.c:671
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:678
+#: src/fs/gnunet-publish.c:679
 #, fuzzy
 msgid "Error scanning directory.\n"
 msgstr "Errore interno."
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:706
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:737
+#: src/fs/gnunet-publish.c:738
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:755
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:810
+#: src/fs/gnunet-publish.c:811
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:817
+#: src/fs/gnunet-publish.c:818
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:823
+#: src/fs/gnunet-publish.c:824
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:832 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:208
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:853
+#: src/fs/gnunet-publish.c:845 src/fs/gnunet-publish.c:854
 #: 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:906
+#: src/fs/gnunet-publish.c:907
 msgid "enable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:921
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:927
+#: src/fs/gnunet-publish.c:928
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:932
+#: src/fs/gnunet-publish.c:933
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-publish.c:940
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:952
+#: src/fs/gnunet-publish.c:953
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:964
+#: src/fs/gnunet-publish.c:965
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:971
+#: src/fs/gnunet-publish.c:972
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:979
+#: src/fs/gnunet-publish.c:980
 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:997
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:443
+#: src/fs/gnunet-search.c:446
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:532
+#: src/fs/gnunet-search.c:535
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:592
+#: src/fs/gnunet-search.c:595
 #, c-format
 msgid "Conflicting options --bookmark-only and --silent.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:599
+#: src/fs/gnunet-search.c:602
 #, c-format
 msgid "Conflicting options --bookmark-only and --output.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:605
+#: src/fs/gnunet-search.c:608
 #, c-format
 msgid "An output file is mandatory for silent mode.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:626
+#: src/fs/gnunet-search.c:629
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:634
+#: src/fs/gnunet-search.c:637
 msgid ""
 "Invalid URI. Valid URIs for searching are keyword query URIs\n"
 "(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
 "\").\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:659
+#: src/fs/gnunet-search.c:662
 #, c-format
 msgid "Could not initialize the `%s` subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:673
+#: src/fs/gnunet-search.c:676
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:699
+#: src/fs/gnunet-search.c:702
 msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:705
+#: src/fs/gnunet-search.c:708
 msgid "do not search, print only the URI that points to this search"
 msgstr ""
 
-#: src/fs/gnunet-search.c:712
+#: src/fs/gnunet-search.c:715
 msgid ""
 "write search results for directories according to FORMAT; accepted "
 "placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
 "printf when omitted or to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:722
+#: src/fs/gnunet-search.c:725
 msgid ""
 "write search results according to FORMAT; accepted placeholders are: %a, %f, "
 "%j, %l, %m, %n, %s; defaults to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:730
+#: src/fs/gnunet-search.c:733
 msgid ""
 "when the %a or %j placeholders appear in --printf or --dir-printf, list each "
 "metadata property according to FORMAT; accepted placeholders are: %i, %l, "
 "%n, %p"
 msgstr ""
 
-#: src/fs/gnunet-search.c:739
+#: src/fs/gnunet-search.c:742
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:751
+#: src/fs/gnunet-search.c:754
 msgid ""
 "create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
 "search --output=commons"
 msgstr ""
 
-#: src/fs/gnunet-search.c:758
+#: src/fs/gnunet-search.c:761
 msgid "silent mode (requires the --output argument)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:764
+#: src/fs/gnunet-search.c:767
 msgid ""
 "automatically terminate search after DELAY; the value given must be a number "
 "followed by a space and a time unit, for example \"500 ms\"; without a unit "
@@ -3240,51 +3240,51 @@ msgid ""
 "to wait for CTRL-C"
 msgstr ""
 
-#: src/fs/gnunet-search.c:773
+#: src/fs/gnunet-search.c:776
 #, c-format
 msgid ""
 "be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
 "arguments - ignored when these are provided by the user)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:786
+#: src/fs/gnunet-search.c:789
 msgid "Search for files that have been published on GNUnet\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:371 src/fs/gnunet-service-fs.c:878
+#: src/fs/gnunet-service-fs.c:370 src/fs/gnunet-service-fs.c:877
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:430
+#: src/fs/gnunet-service-fs.c:429
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:596
+#: src/fs/gnunet-service-fs.c:595
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:648 src/fs/gnunet-service-fs_cp.c:558
+#: src/fs/gnunet-service-fs.c:647 src/fs/gnunet-service-fs_cp.c:558
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:831
+#: src/fs/gnunet-service-fs.c:830
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:871
+#: src/fs/gnunet-service-fs.c:870
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1041
+#: src/fs/gnunet-service-fs.c:1040
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1288
+#: src/fs/gnunet-service-fs.c:1287
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1322 src/hostlist/gnunet-daemon-hostlist.c:343
+#: src/fs/gnunet-service-fs.c:1321 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3381,41 +3381,41 @@ msgstr ""
 msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:188
+#: src/fs/gnunet-service-fs_indexing.c:129
+#: src/fs/gnunet-service-fs_indexing.c:187
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:147
+#: src/fs/gnunet-service-fs_indexing.c:146
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Errore durante la scrittura di `%s'.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:244
+#: src/fs/gnunet-service-fs_indexing.c:243
 #, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:297
+#: src/fs/gnunet-service-fs_indexing.c:296
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:311
+#: src/fs/gnunet-service-fs_indexing.c:310
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:315
+#: src/fs/gnunet-service-fs_indexing.c:314
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:328
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:435
+#: src/fs/gnunet-service-fs_indexing.c:434
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3545,33 +3545,52 @@ msgstr ""
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:93
+#: src/fs/gnunet-unindex.c:94
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:102
+#: src/fs/gnunet-unindex.c:103
 #, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-unindex.c:109
 msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-unindex.c:142
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:161
+#: src/fs/gnunet-unindex.c:162
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:194
+#: src/fs/gnunet-unindex.c:195
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
+#: src/fs/meta_data.c:1063 src/fs/meta_data.c:1116 src/fs/meta_data.c:1131
+msgid "metadata length"
+msgstr ""
+
+#: src/fs/meta_data.c:1074
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
+msgstr ""
+
+#: src/fs/meta_data.c:1091
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/fs/meta_data.c:1126
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
 #: src/gns/gns_tld_api.c:293
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
@@ -3598,44 +3617,44 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:298
+#: src/gns/gnunet-dns2gns.c:296
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:379
+#: src/gns/gnunet-dns2gns.c:377
 #, fuzzy
 msgid "Failed to parse DNS response!\n"
 msgstr "Generazione statistiche fallita\n"
 
-#: src/gns/gnunet-dns2gns.c:453
+#: src/gns/gnunet-dns2gns.c:451
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:656
+#: src/gns/gnunet-dns2gns.c:654
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:672
+#: src/gns/gnunet-dns2gns.c:670
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:680
+#: src/gns/gnunet-dns2gns.c:678
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:841
+#: src/gns/gnunet-dns2gns.c:839
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1001
+#: src/gns/gnunet-dns2gns.c:999
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1018
+#: src/gns/gnunet-dns2gns.c:1016
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3770,163 +3789,163 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:257
+#: src/gns/gnunet-gns.c:256
 #, fuzzy, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/gns/gnunet-gns.c:267 src/util/dnsparser.c:253
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:281
+#: src/gns/gnunet-gns.c:280
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:305
+#: src/gns/gnunet-gns.c:304
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:340
+#: src/gns/gnunet-gns.c:339
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:346
+#: src/gns/gnunet-gns.c:345
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:352
+#: src/gns/gnunet-gns.c:351
 msgid "Specify a timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:356
+#: src/gns/gnunet-gns.c:355
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:361
+#: src/gns/gnunet-gns.c:360
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:375
+#: src/gns/gnunet-gns.c:374
 msgid "GNUnet GNS resolver tool"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:519
+#: src/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1346
+#: src/gns/gnunet-service-gns.c:554
+#: src/zonemaster/gnunet-service-zonemaster.c:1345
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:574
-#: src/zonemaster/gnunet-service-zonemaster.c:1385
+#: src/gns/gnunet-service-gns.c:573
+#: src/zonemaster/gnunet-service-zonemaster.c:1384
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:279
+#: src/gns/gnunet-service-gns_interceptor.c:278
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:380
+#: src/gns/gnunet-service-gns_interceptor.c:379
 msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:672
+#: src/gns/gnunet-service-gns_resolver.c:669
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:684
+#: src/gns/gnunet-service-gns_resolver.c:681
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:690
+#: src/gns/gnunet-service-gns_resolver.c:687
 #, c-format
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:903
+#: src/gns/gnunet-service-gns_resolver.c:900
 msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1094
+#: src/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1870
+#: src/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1885
+#: src/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1918
+#: src/gns/gnunet-service-gns_resolver.c:1915
 #, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2320
+#: src/gns/gnunet-service-gns_resolver.c:2317
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2325
+#: src/gns/gnunet-service-gns_resolver.c:2322
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2348
+#: src/gns/gnunet-service-gns_resolver.c:2345
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2515
+#: src/gns/gnunet-service-gns_resolver.c:2512
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2663
+#: src/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:138
+#: src/gns/plugin_gnsrecord_gns.c:137
 msgid "This is a memento of an older block for internal maintenance."
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:177
+#: src/gns/plugin_gnsrecord_gns.c:176
 #, fuzzy, c-format
 msgid "Unable to parse zone key record `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:191
+#: src/gns/plugin_gnsrecord_gns.c:190
 msgid "Record type does not match parsed record type\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:214
+#: src/gns/plugin_gnsrecord_gns.c:213
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:231
+#: src/gns/plugin_gnsrecord_gns.c:230
 #, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:255
+#: src/gns/plugin_gnsrecord_gns.c:254
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:287
+#: src/gns/plugin_gnsrecord_gns.c:286
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
@@ -3935,109 +3954,109 @@ msgstr "Impossibile avviare il servizio ' %s'\n"
 msgid "Gns REST API initialized\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:53
+#: src/gnsrecord/gnsrecord_misc.c:51
 msgid "Label is NULL which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:58
+#: src/gnsrecord/gnsrecord_misc.c:56
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:481
+#: src/gnsrecord/gnsrecord_misc.c:479
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:489
+#: src/gnsrecord/gnsrecord_misc.c:487
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:499
+#: src/gnsrecord/gnsrecord_misc.c:497
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:515
+#: src/gnsrecord/gnsrecord_misc.c:513
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:526
+#: src/gnsrecord/gnsrecord_misc.c:524
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:548
+#: src/gnsrecord/gnsrecord_misc.c:546
 msgid "Mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:367
+#: src/gnsrecord/plugin_gnsrecord_dns.c:366
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:385
+#: src/gnsrecord/plugin_gnsrecord_dns.c:384
 #, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:406
+#: src/gnsrecord/plugin_gnsrecord_dns.c:405
 #, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:480
+#: src/gnsrecord/plugin_gnsrecord_dns.c:479
 #, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:516
+#: src/gnsrecord/plugin_gnsrecord_dns.c:515
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:533
+#: src/gnsrecord/plugin_gnsrecord_dns.c:532
 #, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:553
+#: src/gnsrecord/plugin_gnsrecord_dns.c:552
 #, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:573
+#: src/gnsrecord/plugin_gnsrecord_dns.c:572
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:585
+#: src/gnsrecord/plugin_gnsrecord_dns.c:584
 #, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:608
+#: src/gnsrecord/plugin_gnsrecord_dns.c:607
 #, fuzzy, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:621
+#: src/gnsrecord/plugin_gnsrecord_dns.c:620
 #, fuzzy, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:640
+#: src/gnsrecord/plugin_gnsrecord_dns.c:639
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:660
-#: src/gnsrecord/plugin_gnsrecord_dns.c:674
+#: src/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/gnsrecord/plugin_gnsrecord_dns.c:673
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:693
+#: src/gnsrecord/plugin_gnsrecord_dns.c:692
 #, fuzzy, c-format
 msgid "Unable to parse CAA record string `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
@@ -4503,63 +4522,63 @@ msgstr "Impossibile avviare il servizio ' %s'\n"
 msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/my/my.c:196 src/my/my.c:215
+#: src/my/my.c:197 src/my/my.c:216
 #, c-format
 msgid "%s failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/mysql/mysql.c:190
+#: src/mysql/mysql.c:191
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/mysql/mysql.c:198
+#: src/mysql/mysql.c:199
 #, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:106
+#: src/namecache/gnunet-namecache.c:105
 #, c-format
 msgid "No records found for `%s'"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:119 src/namestore/gnunet-namestore.c:888
+#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:887
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:175
+#: src/namecache/gnunet-namecache.c:174
 #, c-format
 msgid "You must specify which zone should be accessed\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:182
+#: src/namecache/gnunet-namecache.c:181
 #, fuzzy, c-format
 msgid "Invalid public key for zone `%s'\n"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/namecache/gnunet-namecache.c:188
+#: src/namecache/gnunet-namecache.c:187
 #, c-format
 msgid "You must specify a name\n"
 msgstr "È necessario specificare un nome\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:2020
+#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2019
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:221
+#: src/namecache/gnunet-namecache.c:220
 msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:2102
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2101
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
-#: src/namecache/namecache_api.c:285
+#: src/namecache/namecache_api.c:283
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:373
+#: src/namecache/namecache_api.c:371
 msgid "Error communicating with namecache service"
 msgstr ""
 
@@ -4597,7 +4616,7 @@ msgid "Failed to setup database at `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
 #: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1951
+#: src/namestore/gnunet-namestore.c:1950
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
@@ -4765,245 +4784,245 @@ msgid "Failed to connect to IDENTITY\n"
 msgstr "Impossibile avviare il servizio.\n"
 
 #: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2087
+#: src/namestore/gnunet-namestore.c:2086
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:412
+#: src/namestore/gnunet-namestore.c:411
 #, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:420
+#: src/namestore/gnunet-namestore.c:419
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/namestore/gnunet-namestore.c:428 src/namestore/gnunet-namestore.c:443
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:435
+#: src/namestore/gnunet-namestore.c:434
 #, c-format
 msgid "Error parsing expiration time %s.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:465
+#: src/namestore/gnunet-namestore.c:464
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Indirizzo IPv6 non valido: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:667
+#: src/namestore/gnunet-namestore.c:666
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:685 src/namestore/gnunet-namestore.c:701
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr "Impossibile leggere il file"
 
-#: src/namestore/gnunet-namestore.c:1137
+#: src/namestore/gnunet-namestore.c:1136
 #, 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:1258
+#: src/namestore/gnunet-namestore.c:1257
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1301
+#: src/namestore/gnunet-namestore.c:1300
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1326
+#: src/namestore/gnunet-namestore.c:1325
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1355
+#: src/namestore/gnunet-namestore.c:1354
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1369
+#: src/namestore/gnunet-namestore.c:1368
 #, c-format
 msgid "Recordlines only work with option `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1378 src/namestore/gnunet-namestore.c:1430
-#: src/namestore/gnunet-namestore.c:1440 src/namestore/gnunet-namestore.c:1450
-#: src/namestore/gnunet-namestore.c:1479 src/namestore/gnunet-namestore.c:1500
-#: src/namestore/gnunet-namestore.c:1527 src/namestore/gnunet-namestore.c:1537
-#: src/namestore/gnunet-namestore.c:1570 src/namestore/gnunet-namestore.c:1595
-#: src/namestore/gnunet-namestore.c:1629 src/namestore/gnunet-namestore.c:1663
-#: src/namestore/gnunet-namestore.c:1686
+#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
+#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
+#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
+#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
+#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
+#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
+#: src/namestore/gnunet-namestore.c:1685
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1380
+#: src/namestore/gnunet-namestore.c:1379
 msgid "name"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1409
+#: src/namestore/gnunet-namestore.c:1408
 #, c-format
 msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1432 src/namestore/gnunet-namestore.c:1442
-#: src/namestore/gnunet-namestore.c:1452 src/namestore/gnunet-namestore.c:1481
-#: src/namestore/gnunet-namestore.c:1502 src/namestore/gnunet-namestore.c:1688
+#: src/namestore/gnunet-namestore.c:1431 src/namestore/gnunet-namestore.c:1441
+#: src/namestore/gnunet-namestore.c:1451 src/namestore/gnunet-namestore.c:1480
+#: src/namestore/gnunet-namestore.c:1501 src/namestore/gnunet-namestore.c:1687
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1460
+#: src/namestore/gnunet-namestore.c:1459
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1470
+#: src/namestore/gnunet-namestore.c:1469
 #, c-format
 msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1490
+#: src/namestore/gnunet-namestore.c:1489
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1509 src/namestore/gnunet-namestore.c:1695
+#: src/namestore/gnunet-namestore.c:1508 src/namestore/gnunet-namestore.c:1694
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1529 src/namestore/gnunet-namestore.c:1539
+#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1571
 msgid "purge-zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1596
 msgid "list"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1631
+#: src/namestore/gnunet-namestore.c:1630
 msgid "reverse-pkey"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1641
+#: src/namestore/gnunet-namestore.c:1640
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1665
+#: src/namestore/gnunet-namestore.c:1664
 msgid "uri"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1678
+#: src/namestore/gnunet-namestore.c:1677
 #: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1966
+#: src/namestore/gnunet-namestore.c:1965
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1985
+#: src/namestore/gnunet-namestore.c:1984
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1988
+#: src/namestore/gnunet-namestore.c:1987
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1992
+#: src/namestore/gnunet-namestore.c:1991
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1996
+#: src/namestore/gnunet-namestore.c:1995
 msgid "read commands from stdin"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2003
+#: src/namestore/gnunet-namestore.c:2002
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2009
+#: src/namestore/gnunet-namestore.c:2008
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2014
+#: src/namestore/gnunet-namestore.c:2013
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2024
+#: src/namestore/gnunet-namestore.c:2023
 msgid "Output in recordline format"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2030
+#: src/namestore/gnunet-namestore.c:2029
 msgid "determine our name for the given KEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2036
+#: src/namestore/gnunet-namestore.c:2035
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2041
+#: src/namestore/gnunet-namestore.c:2040
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2047
+#: src/namestore/gnunet-namestore.c:2046
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2051
+#: src/namestore/gnunet-namestore.c:2050
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2055
+#: src/namestore/gnunet-namestore.c:2054
 msgid "omit private records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2060
+#: src/namestore/gnunet-namestore.c:2059
 msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2065
+#: src/namestore/gnunet-namestore.c:2064
 msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2070
+#: src/namestore/gnunet-namestore.c:2069
 msgid ""
 "show private key for orphaned records for recovery using `gnunet-identity -C "
 "-P <key>'. Use in combination with --display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2075
+#: src/namestore/gnunet-namestore.c:2074
 msgid "delete all records in specified zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2081
+#: src/namestore/gnunet-namestore.c:2080
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1837
+#: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1843
+#: src/namestore/gnunet-zoneimport.c:1841
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
@@ -5335,7 +5354,7 @@ msgid "Show network size estimates from NSE service."
 msgstr ""
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:242
+#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5527,58 +5546,58 @@ msgstr ""
 msgid "Unable to create indices: %s.\n"
 msgstr "Generazione statistiche fallita\n"
 
-#: src/pt/gnunet-daemon-pt.c:418
+#: src/pt/gnunet-daemon-pt.c:416
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:424
+#: src/pt/gnunet-daemon-pt.c:422
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:478
+#: src/pt/gnunet-daemon-pt.c:476
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:673
+#: src/pt/gnunet-daemon-pt.c:671
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:680
+#: src/pt/gnunet-daemon-pt.c:678
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:718
+#: src/pt/gnunet-daemon-pt.c:716
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:773
+#: src/pt/gnunet-daemon-pt.c:771
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:779
+#: src/pt/gnunet-daemon-pt.c:777
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:788
+#: src/pt/gnunet-daemon-pt.c:786
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:881
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:900
+#: src/pt/gnunet-daemon-pt.c:898
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1227 src/pt/gnunet-daemon-pt.c:1236
-#: src/pt/gnunet-daemon-pt.c:1252 src/pt/gnunet-daemon-pt.c:1261
-#: src/pt/gnunet-daemon-pt.c:1270
+#: 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:1316
+#: src/pt/gnunet-daemon-pt.c:1314
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -5705,7 +5724,7 @@ msgstr ""
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:3096
+#: src/reclaim/plugin_rest_openid_connect.c:3095
 msgid "OpenID Connect REST API initialized\n"
 msgstr ""
 
@@ -5713,7 +5732,7 @@ msgstr ""
 msgid "Identity Provider REST API initialized\n"
 msgstr ""
 
-#: src/reclaim/reclaim_api.c:545
+#: src/reclaim/reclaim_api.c:544
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Impossibile avviare il servizio.\n"
@@ -5732,13 +5751,13 @@ msgid "No configuration file given. Exiting\n"
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:631
+#: src/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:639
+#: src/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
@@ -5780,15 +5799,15 @@ msgstr ""
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:700
+#: src/regex/gnunet-regex-simulation-profiler.c:701
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:706
+#: src/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:720
+#: src/regex/gnunet-regex-simulation-profiler.c:721
 msgid "Profiler for regex library"
 msgstr ""
 
@@ -6080,7 +6099,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
 #: src/setu/gnunet-service-setu.c:5389
 #, fuzzy
 msgid "Could not connect to CADET service\n"
@@ -6150,12 +6169,12 @@ msgstr ""
 msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/statistics/gnunet-service-statistics.c:319
+#: src/statistics/gnunet-service-statistics.c:314
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:984
+#: src/statistics/gnunet-service-statistics.c:979
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
@@ -6336,7 +6355,7 @@ msgid ""
 msgstr ""
 
 #: 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
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:319
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6351,57 +6370,57 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1153
+#: src/testbed/gnunet-service-testbed_peers.c:1154
 #, c-format
 msgid "%s is stopped"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1156
+#: src/testbed/gnunet-service-testbed_peers.c:1157
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1159
+#: src/testbed/gnunet-service-testbed_peers.c:1160
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1162
+#: src/testbed/gnunet-service-testbed_peers.c:1163
 #, c-format
 msgid "%s is starting already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1166
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1172
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1178
 #, c-format
 msgid "%s service failed to start"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1181
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1182
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -7675,17 +7694,17 @@ msgstr ""
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1400
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1401
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1412
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1413
 #, 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:1419
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1420
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
@@ -7697,7 +7716,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:838
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7707,23 +7726,23 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:950
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:951
 #, 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:991
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:992
 #, 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:1480
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1481
 #, 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:1504
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1505
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -7738,45 +7757,45 @@ msgstr ""
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1750
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1751
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1756
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1761
 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
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1219
+#: src/util/service.c:1642
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1643
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1644
 msgid "No such user"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1658
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2000
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2001
 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
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2077
+#: src/util/service.c:2089
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2098
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2099
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
@@ -7789,240 +7808,221 @@ msgstr ""
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:228 src/util/bio.c:236
+#: src/util/bio.c:223 src/util/bio.c:231
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "Errore di lettura da '%s': %s\n"
 
-#: src/util/bio.c:238
+#: src/util/bio.c:233
 msgid "End of file"
 msgstr "Fine del file"
 
-#: src/util/bio.c:267
+#: src/util/bio.c:262
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "Errore di lettura del file `%s'\n"
 
-#: src/util/bio.c:269
+#: src/util/bio.c:264
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:309
+#: src/util/bio.c:304
 #, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr ""
 
-#: src/util/bio.c:336 src/util/bio.c:840
+#: src/util/bio.c:331 src/util/bio.c:781
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:342
+#: src/util/bio.c:337
 #, fuzzy, c-format
 msgid "%s (while reading `%s')"
 msgstr "Errore di lettura del file `%s'\n"
 
-#: src/util/bio.c:347
+#: src/util/bio.c:342
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:360
+#: src/util/bio.c:355
 #, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
-msgid "metadata length"
-msgstr ""
-
-#: src/util/bio.c:411
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
-msgstr ""
-
-#: src/util/bio.c:427
-#, fuzzy, c-format
-msgid "Failed to deserialize metadata `%s'"
-msgstr "Impossibile avviare il servizio ' %s'\n"
-
-#: src/util/bio.c:669
+#: src/util/bio.c:610
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:731 src/util/bio.c:752
+#: src/util/bio.c:672 src/util/bio.c:693
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "Errore di lettura del file `%s'\n"
 
-#: src/util/bio.c:733
+#: src/util/bio.c:674
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:817
+#: src/util/bio.c:758
 #, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr ""
 
-#: src/util/bio.c:877
-#, fuzzy, c-format
-msgid "Failed to serialize metadata `%s'"
-msgstr "Impossibile avviare il servizio ' %s'\n"
-
-#: src/util/client.c:750 src/util/client.c:941
+#: src/util/client.c:751 src/util/client.c:942
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1096
+#: src/util/client.c:1097
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:648 src/util/common_logging.c:687
+#: src/util/common_logging.c:647 src/util/common_logging.c:686
 #, c-format
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:911
+#: src/util/common_logging.c:910
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1104
+#: src/util/common_logging.c:1103
 msgid "ERROR"
 msgstr "ERRORE"
 
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1105
 msgid "WARNING"
 msgstr "ATTENZIONE"
 
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1107
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1109
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1111
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1113
 msgid "NONE"
 msgstr "NESSUNA"
 
-#: src/util/common_logging.c:1115
+#: src/util/common_logging.c:1114
 msgid "INVALID"
 msgstr "NON VALIDO"
 
-#: src/util/common_logging.c:1360
+#: src/util/common_logging.c:1359
 msgid "unknown address"
 msgstr "indirizzo sconosciuto"
 
-#: src/util/common_logging.c:1405
+#: src/util/common_logging.c:1404
 msgid "invalid address"
 msgstr "indirizzo non valido"
 
-#: src/util/common_logging.c:1417
+#: src/util/common_logging.c:1416
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1432
+#: src/util/common_logging.c:1431
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr ""
 
-#: src/util/configuration.c:790
+#: src/util/configuration.c:786
 #, c-format
 msgid "Illegal directive in line %u (parsing restricted section %s)\n"
 msgstr ""
 
-#: src/util/configuration.c:800
+#: src/util/configuration.c:796
 #, c-format
 msgid "Bad directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:853
+#: src/util/configuration.c:849
 #, c-format
 msgid "Bad inline-secret directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:875
+#: src/util/configuration.c:871
 #, c-format
 msgid "Unknown or malformed directive '%s' in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:905
+#: src/util/configuration.c:901
 #, c-format
 msgid "Syntax error while deserializing in line %u (option without section)\n"
 msgstr ""
 
-#: src/util/configuration.c:949
+#: src/util/configuration.c:945
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:1049
+#: src/util/configuration.c:1045
 #, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Errore di lettura del file `%s'\n"
 
-#: src/util/configuration.c:1062
+#: src/util/configuration.c:1058
 #, fuzzy, c-format
 msgid "Failed to parse configuration file `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/configuration.c:1695
+#: src/util/configuration.c:1691
 msgid "Not a valid relative time specification"
 msgstr ""
 
-#: src/util/configuration.c:1765
+#: src/util/configuration.c:1761
 #, 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
+#: src/util/configuration.c:1856
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1892
+#: src/util/configuration.c:1888
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1958
+#: src/util/configuration.c:1954
 #, 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
+#: src/util/configuration_helper.c:134
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:147
+#: src/util/configuration_helper.c:148
 #, c-format
 msgid "%s, %s or %s argument is required\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:218
+#: src/util/configuration_helper.c:219
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:262
+#: src/util/configuration_helper.c:263
 #, c-format
 msgid "failed to load configuration defaults"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8039,7 +8039,7 @@ msgstr ""
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:281
+#: src/util/crypto_ecc_setup.c:282
 msgid "Could not load peer's private key\n"
 msgstr ""
 
@@ -8048,265 +8048,265 @@ msgstr ""
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:907
+#: src/util/crypto_rsa.c:908
 #, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1207
+#: src/util/crypto_rsa.c:1208
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:843
+#: src/util/disk.c:842
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/dnsparser.c:909
+#: src/util/dnsparser.c:910
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 
-#: src/util/dnsstub.c:227
+#: src/util/dnsstub.c:228
 #, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr ""
 
-#: src/util/dnsstub.c:370
+#: src/util/dnsstub.c:371
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr ""
 
-#: src/util/dnsstub.c:503
+#: src/util/dnsstub.c:504
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "Generazione statistiche fallita\n"
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:509
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr ""
 
-#: src/util/getopt.c:565
+#: src/util/getopt.c:566
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: src/util/getopt.c:590
+#: src/util/getopt.c:591
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:596
+#: src/util/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:616 src/util/getopt.c:797
+#: src/util/getopt.c:617 src/util/getopt.c:798
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:647
+#: src/util/getopt.c:648
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: src/util/getopt.c:653
+#: src/util/getopt.c:654
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: src/util/getopt.c:680
+#: src/util/getopt.c:681
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:682
+#: src/util/getopt.c:683
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:711 src/util/getopt.c:847
+#: src/util/getopt.c:712 src/util/getopt.c:848
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:761
+#: src/util/getopt.c:762
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: src/util/getopt.c:781
+#: src/util/getopt.c:782
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:970
+#: src/util/getopt.c:971
 #, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr ""
 
-#: src/util/getopt.c:983
+#: src/util/getopt.c:984
 #, c-format
 msgid "Option `%s' can't be used with other options.\n"
 msgstr ""
 
-#: src/util/getopt.c:995
+#: src/util/getopt.c:996
 #, c-format
 msgid "Missing mandatory option `%s'.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:63
+#: src/util/getopt_helpers.c:64
 msgid "print the version number"
 msgstr ""
 
-#: src/util/getopt_helpers.c:110
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:197
+#: src/util/getopt_helpers.c:198
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:262
+#: src/util/getopt_helpers.c:263
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:378
+#: src/util/getopt_helpers.c:379
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:445
+#: src/util/getopt_helpers.c:446
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:462
+#: src/util/getopt_helpers.c:463
 msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:498 src/util/getopt_helpers.c:812
-#: src/util/getopt_helpers.c:868
+#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
+#: src/util/getopt_helpers.c:869
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:570
+#: src/util/getopt_helpers.c:571
 #, c-format
 msgid ""
 "You must pass a relative time (optionally with sign) to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:577
+#: src/util/getopt_helpers.c:578
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:595
+#: src/util/getopt_helpers.c:596
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:597
+#: src/util/getopt_helpers.c:598
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:631
+#: src/util/getopt_helpers.c:632
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:685
+#: src/util/getopt_helpers.c:686
 #, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:742
+#: src/util/getopt_helpers.c:743
 #, c-format
 msgid "You must pass a timestamp to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:749
+#: src/util/getopt_helpers.c:750
 #, c-format
 msgid "The maximum precision allowed for timestamps is seconds.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:805
+#: src/util/getopt_helpers.c:806
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:875
+#: src/util/getopt_helpers.c:876
 #, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:953
+#: src/util/getopt_helpers.c:954
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-base32.c:46
+#: src/util/gnunet-base32.c:47
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/util/gnunet-config.c:153
+#: src/util/gnunet-config.c:154
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/util/gnunet-config.c:159
+#: src/util/gnunet-config.c:160
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:164
+#: src/util/gnunet-config.c:165
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:170
+#: src/util/gnunet-config.c:171
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:176
+#: src/util/gnunet-config.c:177
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:192
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
-#: src/util/gnunet-crypto-tvg.c:1527
+#: src/util/gnunet-crypto-tvg.c:1528
 msgid "verify a test vector from stdin"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:94
+#: src/util/gnunet-ecc.c:95
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:128
+#: src/util/gnunet-ecc.c:129
 #, c-format
 msgid "Generating %u keys like %s, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:136
+#: src/util/gnunet-ecc.c:137
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:177
+#: src/util/gnunet-ecc.c:178
 #, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:185
 #, c-format
 msgid ""
 "\n"
@@ -8315,308 +8315,308 @@ msgstr ""
 "\n"
 "Completato!\n"
 
-#: src/util/gnunet-ecc.c:186
+#: src/util/gnunet-ecc.c:187
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:303
+#: src/util/gnunet-ecc.c:304
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:313
+#: src/util/gnunet-ecc.c:314
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:333
+#: src/util/gnunet-ecc.c:334
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:387
+#: src/util/gnunet-ecc.c:388
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:451
+#: src/util/gnunet-ecc.c:452
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:457
+#: src/util/gnunet-ecc.c:458
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:463
+#: src/util/gnunet-ecc.c:464
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:468
+#: src/util/gnunet-ecc.c:469
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:473
+#: src/util/gnunet-ecc.c:474
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:478
+#: src/util/gnunet-ecc.c:479
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:484
+#: src/util/gnunet-ecc.c:485
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:498
+#: src/util/gnunet-ecc.c:499
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
+#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
 msgstr "Impossibile leggere il file"
 
-#: src/util/gnunet-qr.c:133
+#: src/util/gnunet-qr.c:134
 #, c-format
 msgid "Added URI %s\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:160
+#: src/util/gnunet-qr.c:161
 #, c-format
 msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:170
+#: src/util/gnunet-qr.c:171
 #, c-format
 msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:181
+#: src/util/gnunet-qr.c:182
 #, c-format
 msgid "No known handler for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:217
+#: src/util/gnunet-qr.c:218
 #, fuzzy, c-format
 msgid "Unable to start child process `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/gnunet-qr.c:246
+#: src/util/gnunet-qr.c:247
 #, fuzzy, c-format
 msgid "Failed to open device: `%s': %d\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/gnunet-qr.c:260
+#: src/util/gnunet-qr.c:261
 #, fuzzy
 msgid "Capturing...\n"
 msgstr "Avvio di %s in corso...\n"
 
-#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
 msgid "No captured images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
 #, c-format
 msgid "Got %d images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
 #, c-format
 msgid "Found %s: \"%s\"\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:364 src/util/gnunet-qr.c:366
+#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
 #, 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
+#: src/util/gnunet-qr.c:546
 #, fuzzy
 msgid "No data found\n"
 msgstr "upnpc non trovato\n"
 
-#: src/util/gnunet-qr.c:561
+#: src/util/gnunet-qr.c:562
 msgid "Dispatching the URI\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:572
+#: src/util/gnunet-qr.c:573
 msgid "use the video device DEVICE (defaults to /dev/video0)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:579
+#: src/util/gnunet-qr.c:580
 msgid "read from the PNG-encoded file FILE"
 msgstr ""
 
-#: src/util/gnunet-qr.c:590
+#: src/util/gnunet-qr.c:591
 msgid "Scan a QR code and import the URI read"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:168
+#: src/util/gnunet-resolver.c:169
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:182
+#: src/util/gnunet-resolver.c:183
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:214
+#: src/util/gnunet-scrypt.c:215
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:280
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:286
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:292
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:312
+#: src/util/gnunet-scrypt.c:313
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:1287
+#: src/util/gnunet-service-resolver.c:1288
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:88
+#: src/util/gnunet-uri.c:89
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:94
+#: src/util/gnunet-uri.c:95
 #, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:101
+#: src/util/gnunet-uri.c:102
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:108
+#: src/util/gnunet-uri.c:109
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:178
+#: src/util/gnunet-uri.c:179
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:59
+#: src/util/gnunet_error_codes.c:60
 msgid "No error (success)."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:65
+#: src/util/gnunet_error_codes.c:66
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/util/gnunet_error_codes.c:71
+#: src/util/gnunet_error_codes.c:72
 msgid "Communication with service failed."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:77
+#: src/util/gnunet_error_codes.c:78
 #, fuzzy
 msgid "Ego not found."
 msgstr "Contenuto non trovato"
 
-#: src/util/gnunet_error_codes.c:83
+#: src/util/gnunet_error_codes.c:84
 msgid "Identifier already in use for another ego."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:89
+#: src/util/gnunet_error_codes.c:90
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:95
+#: src/util/gnunet_error_codes.c:96
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr "# connessioni attive"
 
-#: src/util/gnunet_error_codes.c:107
+#: src/util/gnunet_error_codes.c:108
 #, fuzzy
 msgid "Zone not found."
 msgstr "Contenuto non trovato"
 
-#: src/util/gnunet_error_codes.c:113
+#: src/util/gnunet_error_codes.c:114
 #, fuzzy
 msgid "Record not found."
 msgstr "upnpc non trovato\n"
 
-#: src/util/gnunet_error_codes.c:125
+#: src/util/gnunet_error_codes.c:126
 msgid "Zone does not contain any records."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:131
+#: src/util/gnunet_error_codes.c:132
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "Impossibile avviare il servizio.\n"
 
-#: src/util/gnunet_error_codes.c:137
+#: src/util/gnunet_error_codes.c:138
 msgid "No records given."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:143
+#: src/util/gnunet_error_codes.c:144
 msgid "Record data invalid."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:149
+#: src/util/gnunet_error_codes.c:150
 msgid "No label given."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:155
+#: src/util/gnunet_error_codes.c:156
 msgid "No results given."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:161
+#: src/util/gnunet_error_codes.c:162
 msgid "Record already exists."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:167
+#: src/util/gnunet_error_codes.c:168
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:173
+#: src/util/gnunet_error_codes.c:174
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:179
+#: src/util/gnunet_error_codes.c:180
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "Impossibile avviare il servizio.\n"
 
-#: src/util/gnunet_error_codes.c:185
+#: src/util/gnunet_error_codes.c:186
 msgid "Label invalid or malformed."
 msgstr ""
 
-#: src/util/helper.c:306
+#: src/util/helper.c:305
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Errore di lettura da '%s': %s\n"
 
-#: src/util/helper.c:358
+#: src/util/helper.c:357
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:573
+#: src/util/helper.c:572
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
@@ -8632,58 +8632,58 @@ msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:415
+#: src/util/os_installation.c:416
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:786
+#: src/util/os_installation.c:787
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:819
+#: src/util/os_installation.c:820
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/util/plugin.c:86
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/plugin.c:157
+#: src/util/plugin.c:158
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:214
+#: src/util/plugin.c:215
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:370
+#: src/util/plugin.c:371
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/program.c:286
+#: src/util/program.c:287
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/program.c:298
+#: src/util/program.c:299
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/program.c:313
+#: src/util/program.c:314
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/program.c:328
+#: src/util/program.c:329
 #, fuzzy
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
@@ -8693,316 +8693,316 @@ msgstr "Impossibile avviare il servizio ' %s'\n"
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/resolver_api.c:220
+#: src/util/resolver_api.c:221
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:242
+#: src/util/resolver_api.c:243
 #, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
 "resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:887
+#: src/util/resolver_api.c:888
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:900
+#: src/util/resolver_api.c:901
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1085
+#: src/util/resolver_api.c:1086
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1174 src/util/resolver_api.c:1197
-#: src/util/resolver_api.c:1211
+#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
+#: src/util/resolver_api.c:1212
 #, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
 
-#: src/util/service.c:653
+#: src/util/service.c:654
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1572
+#: src/util/service.c:1573
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/socks.c:635
+#: src/util/socks.c:636
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:652
+#: src/util/socks.c:653
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:395
+#: src/util/strings.c:394
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:514
+#: src/util/strings.c:513
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:1050
+#: src/util/strings.c:1049
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1058
+#: src/util/strings.c:1057
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1065
+#: src/util/strings.c:1064
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1073
+#: src/util/strings.c:1072
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1082
+#: src/util/strings.c:1081
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1264 src/util/strings.c:1275
+#: src/util/strings.c:1263 src/util/strings.c:1274
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1284
+#: src/util/strings.c:1283
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1355 src/util/strings.c:1384 src/util/strings.c:1431
-#: src/util/strings.c:1451
+#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
+#: src/util/strings.c:1450
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1409
+#: src/util/strings.c:1408
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1460
+#: src/util/strings.c:1459
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1502
+#: src/util/strings.c:1501
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1552
+#: src/util/strings.c:1551
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1583
+#: src/util/strings.c:1582
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/util/time.c:900 src/util/time.c:928
+#: src/util/time.c:901 src/util/time.c:929
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:936
+#: src/util/time.c:937
 #, 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
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
 msgid "# Active channels"
 msgstr "# Canali attivi"
 
-#: src/vpn/gnunet-service-vpn.c:583
+#: src/vpn/gnunet-service-vpn.c:582
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:736
+#: src/vpn/gnunet-service-vpn.c:735
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/vpn/gnunet-service-vpn.c:1112
+#: src/vpn/gnunet-service-vpn.c:1111
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/vpn/gnunet-service-vpn.c:1262
+#: src/vpn/gnunet-service-vpn.c:1261
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/vpn/gnunet-service-vpn.c:1461
+#: src/vpn/gnunet-service-vpn.c:1460
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# messaggi PONG decrittati"
 
-#: src/vpn/gnunet-service-vpn.c:1685
+#: src/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1821
+#: src/vpn/gnunet-service-vpn.c:1820
 msgid "# Packets dropped (channel not yet online)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2019
+#: src/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2045
+#: src/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2282
+#: src/vpn/gnunet-service-vpn.c:2281
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2316 src/vpn/gnunet-service-vpn.c:2348
+#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2355
+#: src/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2371
+#: src/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2411
+#: src/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2463
+#: src/vpn/gnunet-service-vpn.c:2462
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2497 src/vpn/gnunet-service-vpn.c:2705
+#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
 msgid "# Active destinations"
 msgstr "# Destinazioni attive"
 
-#: src/vpn/gnunet-service-vpn.c:2750
+#: src/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3008
+#: src/vpn/gnunet-service-vpn.c:3007
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3036
+#: src/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3046
+#: src/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3062
+#: src/vpn/gnunet-service-vpn.c:3061
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3079
+#: src/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:143
+#: src/vpn/gnunet-vpn.c:142
 msgid "Error creating tunnel\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:226
+#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:202
 #, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:217
+#: src/vpn/gnunet-vpn.c:216
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:240
+#: src/vpn/gnunet-vpn.c:239
 #, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:258
 #, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:295
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:301
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:308
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:315
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:322
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:330
+#: src/vpn/gnunet-vpn.c:329
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:335
+#: src/vpn/gnunet-vpn.c:334
 msgid "service is offered via TCP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:340
+#: src/vpn/gnunet-vpn.c:339
 msgid "service is offered via UDP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:354
+#: src/vpn/gnunet-vpn.c:353
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:502
+#: src/zonemaster/gnunet-service-zonemaster.c:501
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1333
+#: src/zonemaster/gnunet-service-zonemaster.c:1332
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 08f483322..060975342 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: 2022-12-04 14:58+0900\n"
+"POT-Creation-Date: 2022-12-05 17:21+0900\n"
 "PO-Revision-Date: 2020-10-23 18:39+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -30,9 +30,9 @@ msgstr "Его „%s“ није познат услузи идентитета\
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "Јавни кључ „%s“ није добро оформљен\n"
 
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1958
+#: src/namestore/gnunet-namestore.c:1957
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Нисам успео да се повежем са смештајем назива\n"
@@ -147,7 +147,7 @@ msgstr ""
 msgid "GNUnet abd resolver tool"
 msgstr "Алат ГНУнет ГНС решавача"
 
-#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Нисам успео да се повежем са ГНС-ом\n"
@@ -167,15 +167,15 @@ msgstr "Нисам успео да уклоним датотеку подеша�
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Нисам успео да уклоним матични директоријум услуге „%s“\n"
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1133
 msgid "Message was sent successfully"
 msgstr "Порука је успешно послата"
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1136
 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:1137
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1138
 msgid "Unknown request status"
 msgstr "Стање захтева је непознато"
 
@@ -391,28 +391,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:1094
-#: src/util/service.c:1100
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1095
+#: src/util/service.c:1101
 #, 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:530
-#: src/util/service.c:1133
+#: src/transport/tcp_service_legacy.c:634 src/util/client.c:531
+#: src/util/service.c:1134
 #, 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:535
-#: src/util/service.c:1137
+#: src/transport/tcp_service_legacy.c:638 src/util/client.c:536
+#: src/util/service.c:1138
 #, 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:1157
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1158
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -422,7 +422,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:1175
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1176
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -431,7 +431,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:1206
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1207
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Нисам успео да решим „%s“: %s\n"
@@ -439,7 +439,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:1225
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1226
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Нисам успео да нађем %s адресу за „%s“.\n"
@@ -1148,7 +1148,7 @@ msgid "Enables having a conversation with other GNUnet users."
 msgstr "Укључује могућност конверзације са другим ГНУнет корисницима."
 
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:664
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr "Грешка читања са СТНДУЛАЗА: %d %s\n"
@@ -1568,10 +1568,10 @@ msgstr "Остава података скупине ради\n"
 
 #: src/datacache/plugin_datacache_sqlite.c:128
 #: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_mysql.c:890
+#: src/datastore/plugin_datastore_mysql.c:891
 #: 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/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:82 src/my/my.c:94
+#: src/mysql/mysql.c:47 src/mysql/mysql.c:65
 #: src/namecache/plugin_namecache_sqlite.c:54
 #: src/namestore/plugin_namestore_sqlite.c:56
 #: src/peerstore/plugin_peerstore_sqlite.c:54
@@ -1579,7 +1579,7 @@ msgstr "Остава података скупине ради\n"
 #: 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
+#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "„%s“ није успело на %s:%d са грешком: %s\n"
@@ -1884,24 +1884,24 @@ msgstr "Нисам успео да покренем блумфилтер.\n"
 msgid "Heap database running\n"
 msgstr "База података скупине ради\n"
 
-#: src/datastore/plugin_datastore_mysql.c:371
-#: src/datastore/plugin_datastore_mysql.c:423
-#: src/datastore/plugin_datastore_mysql.c:1071
+#: src/datastore/plugin_datastore_mysql.c:372
+#: src/datastore/plugin_datastore_mysql.c:424
+#: src/datastore/plugin_datastore_mysql.c:1072
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:410
+#: src/datastore/plugin_datastore_mysql.c:411
 #: src/datastore/plugin_datastore_sqlite.c:675
 #, fuzzy
 msgid "Data too large"
 msgstr "Вредност је превелика.\n"
 
-#: src/datastore/plugin_datastore_mysql.c:847
+#: src/datastore/plugin_datastore_mysql.c:848
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "„%s“ за „%s“ није успело на %s:%d са грешком: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1179
+#: src/datastore/plugin_datastore_mysql.c:1180
 msgid "Mysql database running\n"
 msgstr "База података Мајскула ради\n"
 
@@ -2036,7 +2036,7 @@ msgstr ""
 msgid "how long should the monitor command run"
 msgstr "колико дуго треба да ради наредба праћења"
 
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:359
+#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
 #: src/nse/gnunet-nse-profiler.c:894
 msgid "be verbose (print progress information)"
 msgstr "бива опширан (исписује податке напредовања)"
@@ -2128,243 +2128,243 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "Мери квалитет и учинковитост НСЕ услуге."
 
-#: src/dns/gnunet-dns-monitor.c:371 src/dns/gnunet-dns-monitor.c:376
+#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr "само надгледа ДНС упите"
 
-#: src/dns/gnunet-dns-monitor.c:388
+#: src/dns/gnunet-dns-monitor.c:387
 msgid "Monitor DNS queries."
 msgstr "Надгледа ДНС упите."
 
-#: src/dns/gnunet-dns-redirector.c:241
+#: src/dns/gnunet-dns-redirector.c:240
 msgid "set A records"
 msgstr "поставља A записе"
 
-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:246
 msgid "set AAAA records"
 msgstr "поставља AAAA записе"
 
-#: src/dns/gnunet-dns-redirector.c:260
+#: src/dns/gnunet-dns-redirector.c:259
 msgid "Change DNS replies to point elsewhere."
 msgstr "Мења ДНС одговоре да показују негде другде."
 
-#: src/dns/gnunet-service-dns.c:466
+#: src/dns/gnunet-service-dns.c:463
 msgid "# DNS requests answered via TUN interface"
 msgstr "# на ДНС захтеве је одговорено путем ТУН сучеља"
 
-#: src/dns/gnunet-service-dns.c:620
+#: src/dns/gnunet-service-dns.c:617
 msgid "# DNS exit failed (failed to open socket)"
 msgstr "# ДНС излаз није успео (нисам успео да отворим прикључницу)"
 
-#: src/dns/gnunet-service-dns.c:756
+#: src/dns/gnunet-service-dns.c:753
 msgid "# External DNS response discarded (no matching request)"
 msgstr "# Спољни ДНС одговор је одбачен (нема одговарајућег захтева)"
 
-#: src/dns/gnunet-service-dns.c:832
+#: src/dns/gnunet-service-dns.c:829
 msgid "# Client response discarded (no matching request)"
 msgstr "# Одговор клијента је одбачен (нема одговарајућег захтева)"
 
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:951
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr "Примих лош ИПв4-УДП пакет на ТУН сучељу.\n"
 
-#: src/dns/gnunet-service-dns.c:973
+#: src/dns/gnunet-service-dns.c:970
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr "Примих лош ИПв6-УДП пакет на ТУН сучељу.\n"
 
-#: src/dns/gnunet-service-dns.c:984
+#: src/dns/gnunet-service-dns.c:981
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr "Добих не-ИП пакет са %u бајта и протокол %u са ТУН-а\n"
 
-#: src/dns/gnunet-service-dns.c:996
+#: src/dns/gnunet-service-dns.c:993
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:999
+#: src/dns/gnunet-service-dns.c:996
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr "# Не-ДНС УДП пакет је примљен путем ТУН сучеља"
 
-#: src/dns/gnunet-service-dns.c:1069
+#: src/dns/gnunet-service-dns.c:1066
 msgid "# DNS requests received via TUN interface"
 msgstr "# ДНС захтеви су примљени путем ТУН сучеља"
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
+#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "потребна је исправна ИПв4 или ИПв6 адреса\n"
 
-#: src/dns/gnunet-service-dns.c:1128
+#: src/dns/gnunet-service-dns.c:1125
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:971
+#: src/exit/gnunet-daemon-exit.c:968
 msgid "# TCP packets sent via TUN"
 msgstr "# ТЦП пакети су послати путем ТУН-а"
 
-#: src/exit/gnunet-daemon-exit.c:1077
+#: src/exit/gnunet-daemon-exit.c:1074
 msgid "# ICMP packets sent via TUN"
 msgstr "# ICMP пакети су послати путем TUN-а"
 
-#: src/exit/gnunet-daemon-exit.c:1371
+#: src/exit/gnunet-daemon-exit.c:1368
 msgid "# UDP packets sent via TUN"
 msgstr "# UDP пакети су послати путем TUN-а"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
+#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
+#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
+#: src/exit/gnunet-daemon-exit.c:2283
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# Бајтови су примљени од TUN-а"
 
-#: src/exit/gnunet-daemon-exit.c:1507
+#: src/exit/gnunet-daemon-exit.c:1504
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Захтеви УДП ИП-излаза су примљени путем меша"
 
-#: src/exit/gnunet-daemon-exit.c:1619
+#: src/exit/gnunet-daemon-exit.c:1616
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# Захтеви УДП услуге су примљени путем меша"
 
-#: src/exit/gnunet-daemon-exit.c:1661
+#: src/exit/gnunet-daemon-exit.c:1658
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# Захтеви стварања ТЦП услуге су примљени путем меша"
 
-#: src/exit/gnunet-daemon-exit.c:1752
+#: src/exit/gnunet-daemon-exit.c:1749
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Захтеви стварања ТЦП ИП-излаза су примљени путем меша"
 
-#: src/exit/gnunet-daemon-exit.c:1840
+#: src/exit/gnunet-daemon-exit.c:1837
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# TCP DATA захтеви су одбачени (нема сесије)"
 
-#: src/exit/gnunet-daemon-exit.c:1879
+#: src/exit/gnunet-daemon-exit.c:1876
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# Захтеви ТЦП података су примљени путем меша"
 
-#: src/exit/gnunet-daemon-exit.c:2020
+#: src/exit/gnunet-daemon-exit.c:2017
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Захтеви ИЦМП ИП-излаза су примљени путем меша"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
+#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
+#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr "# ICMPv4 пакети су одбачени (врста није дозвољена)"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
+#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
+#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr "# ICMPv6 пакети су одбачени (врста није дозвољена)"
 
-#: src/exit/gnunet-daemon-exit.c:2290
+#: src/exit/gnunet-daemon-exit.c:2287
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# Захтеви ИЦМП услуге су примљени путем меша"
 
-#: src/exit/gnunet-daemon-exit.c:2349 src/vpn/gnunet-service-vpn.c:995
-#: src/vpn/gnunet-service-vpn.c:2122
+#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
+#: src/vpn/gnunet-service-vpn.c:2121
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr "# ICMPv4 пакети су одбачени (немогуће PT за v6)"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
+#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr "# ICMPv6 пакети су одбачени (немогуће PT за v4)"
 
-#: src/exit/gnunet-daemon-exit.c:2498 src/exit/gnunet-daemon-exit.c:3199
+#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# Долазни МЕШ канали су створени"
 
-#: src/exit/gnunet-daemon-exit.c:2619
+#: src/exit/gnunet-daemon-exit.c:2616
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr "Добих двоструке записе услуге за `%s:%u'\n"
 
-#: src/exit/gnunet-daemon-exit.c:2639
+#: src/exit/gnunet-daemon-exit.c:2636
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# Бајтови су пренесени путем меш канала"
 
-#: src/exit/gnunet-daemon-exit.c:2831
+#: src/exit/gnunet-daemon-exit.c:2828
 msgid "# ICMP packets dropped (not allowed)"
 msgstr "# ICMP пакет је одбачен (није дозвољен)"
 
-#: src/exit/gnunet-daemon-exit.c:2840
+#: src/exit/gnunet-daemon-exit.c:2837
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr "ICMP Пакет је одбачен, нема одговарајуће податке о вези\n"
 
-#: src/exit/gnunet-daemon-exit.c:2916
+#: src/exit/gnunet-daemon-exit.c:2913
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr "UDP Пакет је одбачен, нема одговарајуће податке о вези\n"
 
-#: src/exit/gnunet-daemon-exit.c:2990
+#: src/exit/gnunet-daemon-exit.c:2987
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr "TCP Пакет је одбачен, нема одговарајуће податке о вези\n"
 
-#: src/exit/gnunet-daemon-exit.c:3039
+#: src/exit/gnunet-daemon-exit.c:3036
 msgid "# Packets received from TUN"
 msgstr "# Пакети су примљени од TUN-а"
 
-#: src/exit/gnunet-daemon-exit.c:3054
+#: src/exit/gnunet-daemon-exit.c:3051
 msgid "# Bytes received from TUN"
 msgstr "# Бајтови су примљени од TUN-а"
 
-#: src/exit/gnunet-daemon-exit.c:3081
+#: src/exit/gnunet-daemon-exit.c:3078
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "Опције IPv4 пакета су примљене.  Занемарено.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3112
+#: src/exit/gnunet-daemon-exit.c:3109
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 "IPv4 пакет са неподржаним следећим заглављем %u је примљен.  Занемарено.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3164
+#: src/exit/gnunet-daemon-exit.c:3161
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 "IPv6 пакет са неподржаним следећим заглављем %d је примљен.  Занемарено.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3173
+#: src/exit/gnunet-daemon-exit.c:3170
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr "Пакет са непознатог протокола %u је примљен.  Занемарено.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
+#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Опција „%s“ за домен „%s“ није форматирана исправна!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
+#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr "„%s“ није исправан број прикључника (за домен „%s“)!"
 
-#: src/exit/gnunet-daemon-exit.c:3451
+#: src/exit/gnunet-daemon-exit.c:3448
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr "Није нађена ниједна адрееса за назив домаћина „%s“ услуге „%s“!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
+#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr "Услуга „%s“ је подешена за IPv4, али IPv4 је искључено!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3495
+#: src/exit/gnunet-daemon-exit.c:3492
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr "Није нађена ниједна ИП адрееса за назив домаћина „%s“ услуге „%s“!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3640
+#: src/exit/gnunet-daemon-exit.c:3637
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2372,7 +2372,7 @@ msgstr ""
 "Овај систем не подржава IPv4, искључиће IPv4 функције упркос томе што су "
 "укључене у подешавањима\n"
 
-#: src/exit/gnunet-daemon-exit.c:3649
+#: src/exit/gnunet-daemon-exit.c:3646
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2380,7 +2380,7 @@ msgstr ""
 "Овај систем не подржава IPv6, искључиће IPv6 функције упркос томе што су "
 "укључене у подешавањима\n"
 
-#: src/exit/gnunet-daemon-exit.c:3657
+#: src/exit/gnunet-daemon-exit.c:3654
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2388,7 +2388,7 @@ msgstr ""
 "Не могу да укључим ИПв4 излаз али искључујем ИПв4 на ТУН сучељу, користићу "
 "„ENABLE_IPv4=ДА“\n"
 
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3661
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2396,20 +2396,20 @@ msgstr ""
 "Не могу да укључим ИПв6 излаз али искључујем ИПв6 на ТУН сучељу, користићу "
 "„ENABLE_IPv6=ДА“\n"
 
-#: src/exit/gnunet-daemon-exit.c:3835
+#: src/exit/gnunet-daemon-exit.c:3832
 msgid "Must be a number"
 msgstr "Мора бити број"
 
-#: src/exit/gnunet-daemon-exit.c:3951
+#: src/exit/gnunet-daemon-exit.c:3948
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
 msgid "No useful service enabled.  Exiting.\n"
 msgstr "Ниједна корисна услуга није укључена.  Излазим.\n"
 
-#: src/exit/gnunet-daemon-exit.c:4117
+#: src/exit/gnunet-daemon-exit.c:4114
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr "Демон за покретање за обезбеђивање чвора ИП излаза за ВПН"
 
@@ -2430,112 +2430,112 @@ msgstr "# двоструки делићи су примљени"
 msgid "# messages defragmented"
 msgstr "# делићи порука су уједињени"
 
-#: src/fragmentation/fragmentation.c:240
+#: src/fragmentation/fragmentation.c:239
 msgid "# fragments transmitted"
 msgstr "# делићи су пренесени"
 
-#: src/fragmentation/fragmentation.c:245
+#: src/fragmentation/fragmentation.c:244
 msgid "# fragments retransmitted"
 msgstr "# делићи су поново пренесени"
 
-#: src/fragmentation/fragmentation.c:278
+#: src/fragmentation/fragmentation.c:277
 msgid "# fragments wrap arounds"
 msgstr "# делићи се преламају около"
 
-#: src/fragmentation/fragmentation.c:325
+#: src/fragmentation/fragmentation.c:324
 msgid "# messages fragmented"
 msgstr "# поруке су расцепкане"
 
-#: src/fragmentation/fragmentation.c:331
+#: src/fragmentation/fragmentation.c:330
 msgid "# total size of fragmented messages"
 msgstr "# укупна величина расцепканих порука"
 
-#: src/fragmentation/fragmentation.c:459
+#: src/fragmentation/fragmentation.c:458
 msgid "# fragment acknowledgements received"
 msgstr "# потврде делића су примљене"
 
-#: src/fragmentation/fragmentation.c:466
+#: src/fragmentation/fragmentation.c:465
 msgid "# bits removed from fragmentation ACKs"
 msgstr "# битови су уклоњени из АЦК-ова расцепканости"
 
-#: src/fragmentation/fragmentation.c:490
+#: src/fragmentation/fragmentation.c:489
 msgid "# fragmentation transmissions completed"
 msgstr "# преноси расцепканости су завршени"
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:481
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Не могу да отворим датотеку „%s“: %s"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:492
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Не могу да читам датотеку „%s“: %s"
 
-#: src/fs/fs_api.c:499
+#: src/fs/fs_api.c:500
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr "Кратко читање читајући из датотеке „%s“!"
 
-#: src/fs/fs_api.c:1156
+#: src/fs/fs_api.c:1157
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Нисам успео да наставим са подацима објављивања „%s“: %s\n"
 
-#: src/fs/fs_api.c:1707
+#: src/fs/fs_api.c:1708
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr "Неуспех приликом настављања са радњом објављивања „%s“: %s\n"
 
-#: src/fs/fs_api.c:1722
+#: src/fs/fs_api.c:1723
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Нисам успео да наставим са радњом објављивања „%s“: %s\n"
 
-#: src/fs/fs_api.c:2451
+#: src/fs/fs_api.c:2452
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 "Неуспех приликом настављања са радњом поништавања индексирања „%s“: %s\n"
 
-#: src/fs/fs_api.c:2462
+#: src/fs/fs_api.c:2463
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Нисам успео да наставим са радњом поништавања индексирања „%s“: %s\n"
 
-#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
+#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Нисам успео да наставим са садржаним преузимањем „%s“: %s\n"
 
-#: src/fs/fs_api.c:2628
+#: src/fs/fs_api.c:2629
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Нисам успео да наставим са садржаном претрагом „%s“: %s\n"
 
-#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
+#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr "Неуспех приликом настављања са радњом претраге „%s“: %s\n"
 
-#: src/fs/fs_api.c:2846
+#: src/fs/fs_api.c:2847
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 "Нисам успео да наставим са садржаним преузимањем „%s“: не могу да отворим "
 "датотеку „%s“\n"
 
-#: src/fs/fs_api.c:3107
+#: src/fs/fs_api.c:3108
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 "Не могу да наставим са покренутом претрагом, наставићу као са паузираном "
 "претрагом\n"
 
-#: src/fs/fs_directory.c:215
+#: src/fs/fs_directory.c:216
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "МАГИЈА не одговара.  Ово није директоријум ГНУнет-а.\n"
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
@@ -2543,27 +2543,27 @@ msgstr ""
 "Дубинска преузимања директоријума већих од 4 GB нису подржана на 32-битним "
 "системима\n"
 
-#: src/fs/fs_download.c:332
+#: src/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr "Директоријум је превелик за простор адресу система\n"
 
-#: src/fs/fs_download.c:346
+#: src/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directory contents of `%s' for recursive download\n"
 msgstr "Нисам успео да направим директоријум за дубинско преузимање „%s“\n"
 
-#: src/fs/fs_download.c:528 src/fs/fs_download.c:541
+#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Нисам успео да отворим датотеку „%s“ за писање"
 
-#: src/fs/fs_download.c:960
+#: src/fs/fs_download.c:961
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Нисам успео да направим директоријум за дубинско преузимање „%s“\n"
 
-#: src/fs/fs_download.c:1044
+#: src/fs/fs_download.c:1045
 #, fuzzy, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
@@ -2572,31 +2572,31 @@ msgstr ""
 "Унутрашња грешка или лажна путања преузимања (очекивах %u бајта на дубини %u "
 "и померају %llu/%llu, добих %u бајта)"
 
-#: src/fs/fs_download.c:1066
+#: src/fs/fs_download.c:1067
 msgid "internal error decrypting content"
 msgstr "унутрашња грешка дешифровања садржаја"
 
-#: src/fs/fs_download.c:1089
+#: src/fs/fs_download.c:1090
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Преузимање није успело: не могу да отворим датотеку „%s“: %s"
 
-#: src/fs/fs_download.c:1100
+#: src/fs/fs_download.c:1101
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Нисам успео да пређем на померај %llu у датотеци „%s“: %s"
 
-#: src/fs/fs_download.c:1110
+#: src/fs/fs_download.c:1111
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 "Нисам успео да запишем блок од %u бајта на померају %llu у датотеци „%s“: %s"
 
-#: src/fs/fs_download.c:1218
+#: src/fs/fs_download.c:1219
 msgid "internal error decoding tree"
 msgstr "унутрашња грешка декодирања стабла"
 
-#: src/fs/fs_download.c:1889
+#: src/fs/fs_download.c:1890
 msgid "Invalid URI"
 msgstr "Неисправан УРИ"
 
@@ -2609,102 +2609,102 @@ msgstr ""
 "Непозната врста метаподатака у опцији метаподатака „%s“.  Користим уместо "
 "тога користим врсту метаподатака `unknown'.\n"
 
-#: src/fs/fs_list_indexed.c:190
+#: src/fs/fs_list_indexed.c:191
 #, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Нисам успео да се не повежем са „%s“ услугом.\n"
 
-#: src/fs/fs_misc.c:128
+#: src/fs/fs_misc.c:129
 #, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "Нисам успео да нађем миме врсту „%s“ на списку проширења.\n"
 
-#: src/fs/fs_namespace.c:202
+#: src/fs/fs_namespace.c:203
 #, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Нисам успео да отворим „%s“ ради уписа: %s\n"
 
-#: src/fs/fs_namespace.c:233
+#: src/fs/fs_namespace.c:234
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Нисам успео да пишем „%s“: %s\n"
 
-#: src/fs/fs_namespace.c:330
+#: src/fs/fs_namespace.c:331
 #, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Нисам успео да прочитам „%s“: %s\n"
 
-#: src/fs/fs_namespace.c:457
+#: src/fs/fs_namespace.c:458
 msgid "Failed to connect to datastore."
 msgstr "Нисам успео да се повежем са смештајем података."
 
-#: src/fs/fs_publish.c:128 src/fs/fs_publish.c:438
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
 #, c-format
 msgid "Publishing failed: %s"
 msgstr "Објављивање није успело: %s"
 
-#: src/fs/fs_publish.c:731
+#: src/fs/fs_publish.c:732
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.\n"
 msgstr "Не могу да отворим датотеку кључа домаћина „%s“: %s\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
+#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Не могу да индексирам датотеку „%s“: %s.  Покушаћу да је уметнем.\n"
 
-#: src/fs/fs_publish.c:790
+#: src/fs/fs_publish.c:791
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "истекло је време на захтев почетка индекса за „fs“ услугу"
 
-#: src/fs/fs_publish.c:836
+#: src/fs/fs_publish.c:837
 msgid "failed to compute hash"
 msgstr "нисам успео да прорачунам хеш"
 
-#: src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:857
 msgid "filename too long"
 msgstr "назив датотеке је предуг"
 
-#: src/fs/fs_publish.c:888
+#: src/fs/fs_publish.c:889
 msgid "could not connect to `fs' service"
 msgstr "не могу да се повежем са „fs“ услугом"
 
-#: src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:915
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Нисам успео да добавим одреднике датотеке за „%s“\n"
 
-#: src/fs/fs_publish.c:1003 src/fs/fs_publish.c:1040
+#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1107
+#: src/fs/fs_publish.c:1108
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "Дубински утовар није успео на „%s“: %s"
 
-#: src/fs/fs_publish.c:1115
+#: src/fs/fs_publish.c:1116
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Дубински утовар није успео: %s"
 
-#: src/fs/fs_publish.c:1156
+#: src/fs/fs_publish.c:1157
 msgid "needs to be an actual file"
 msgstr "треба да буде актуелна датотека"
 
-#: src/fs/fs_publish.c:1396
+#: src/fs/fs_publish.c:1397
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "# Неуспеси „СТАВИ“ смештаја података"
 
-#: src/fs/fs_publish.c:1488
+#: src/fs/fs_publish.c:1489
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Резервишем простор за %u уноса и %llu бајта за објављивање\n"
 
-#: src/fs/fs_publish_ksk.c:212
+#: src/fs/fs_publish_ksk.c:213
 msgid "Could not connect to datastore."
 msgstr "Не могу да се повежем са смештајем података."
 
@@ -2712,160 +2712,160 @@ msgstr "Не могу да се повежем са смештајем пода�
 msgid "Internal error."
 msgstr "Унутрашња грешка."
 
-#: src/fs/fs_search.c:829 src/fs/fs_search.c:900
+#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
 #, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Нисам успео да обрадим УРИ „%s“: %s\n"
 
-#: src/fs/fs_search.c:993
+#: src/fs/fs_search.c:994
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr "Добих резултат са непознатом врстом блока „%d“, занемарујем"
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:64
 msgid "Failed to find given position in file"
 msgstr "Нисам успео да нађем дати положај у датотеци"
 
-#: src/fs/fs_unindex.c:68
+#: src/fs/fs_unindex.c:69
 msgid "Failed to read file"
 msgstr "Нисам успео да прочитам датотеку"
 
-#: src/fs/fs_unindex.c:275
+#: src/fs/fs_unindex.c:276
 #, fuzzy
 msgid "Error communicating with `fs' service."
 msgstr "Грешка у комуникацији са услугом ПОДАЦИ_ПАРЊАКА: %s\n"
 
-#: src/fs/fs_unindex.c:326
+#: src/fs/fs_unindex.c:327
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Нисам успео да се повежем на ФС услугу зарад поништавања индексирања."
 
-#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:389
+#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
 msgid "Failed to get KSKs from directory scan."
 msgstr "Нисам успео да добавим KSKs из скенирања директоријума."
 
-#: src/fs/fs_unindex.c:385
+#: src/fs/fs_unindex.c:386
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "Унутрашња грешка скенирања „%s“.\n"
 
-#: src/fs/fs_unindex.c:446
+#: src/fs/fs_unindex.c:447
 #, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Нисам успео да уклоним „UBlock“: %s\n"
 
-#: src/fs/fs_unindex.c:592 src/fs/fs_unindex.c:656
+#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
 msgid "Failed to connect to `datastore' service."
 msgstr "Нисам успео да се повежем са „datastore“ услугом."
 
-#: src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:670
 msgid "Failed to open file for unindexing."
 msgstr "Нисам успео да отворим датотеку за поништавање индексирања."
 
-#: src/fs/fs_unindex.c:708
+#: src/fs/fs_unindex.c:709
 msgid "Failed to compute hash of file."
 msgstr "Нисам успео да израчунам хеш датотеке."
 
-#: src/fs/fs_uri.c:231
+#: src/fs/fs_uri.c:232
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "„%“ мора бити праћено HEX бројем"
 
-#: src/fs/fs_uri.c:290
+#: src/fs/fs_uri.c:291
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Лоша KSK УРИ (не сме почињати или завршавати се са знаком +)"
 
-#: src/fs/fs_uri.c:308
+#: src/fs/fs_uri.c:309
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "Лоша KSK УРИ (не сме почињати или завршавати се са знаком +)"
 
-#: src/fs/fs_uri.c:315
+#: src/fs/fs_uri.c:316
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Лоша KSK УРИ (не сме почињати или завршавати се са знаком +)"
 
-#: src/fs/fs_uri.c:382
+#: src/fs/fs_uri.c:383
 #, fuzzy
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr "Лоша SKS УРИ"
 
-#: src/fs/fs_uri.c:423
+#: src/fs/fs_uri.c:424
 #, fuzzy
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr "Лоша CHK УРИ"
 
-#: src/fs/fs_uri.c:440
+#: src/fs/fs_uri.c:441
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:517
+#: src/fs/fs_uri.c:518
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax)"
 msgstr "LOC УРИ је лоше"
 
-#: src/fs/fs_uri.c:534
+#: src/fs/fs_uri.c:535
 #, fuzzy
 msgid "LOC URI malformed (no CHK)"
 msgstr "LOC УРИ је лоше"
 
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 #, fuzzy
 msgid "LOC URI malformed (missing LOC)"
 msgstr "LOC УРИ је лоше"
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr "LOC УРИ је лоше (не могу да декодирам јавни кључ)"
 
-#: src/fs/fs_uri.c:561
+#: src/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr "LOC УРИ је лоше (не могу да декодирам јавни кључ)"
 
-#: src/fs/fs_uri.c:567
+#: src/fs/fs_uri.c:568
 #, fuzzy
 msgid "LOC URI malformed (could not find signature)"
 msgstr "SKS УРИ је лоше (не могу да нашем потпис)"
 
-#: src/fs/fs_uri.c:574
+#: src/fs/fs_uri.c:575
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr "SKS УРИ је лоше (не могу да нашем потпис)"
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 #, fuzzy
 msgid "LOC URI malformed (could not decode signature)"
 msgstr "SKS УРИ је лоше (не могу да декодирам потпис)"
 
-#: src/fs/fs_uri.c:592
+#: src/fs/fs_uri.c:593
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr "SKS УРИ је лоше (не могу да обрадим време истека)"
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:599
 #, fuzzy
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr "SKS УРИ је лоше (не могу да обрадим време истека)"
 
-#: src/fs/fs_uri.c:612
+#: src/fs/fs_uri.c:613
 #, fuzzy
 msgid "LOC URI malformed (signature failed validation)"
 msgstr "SKS УРИ је лоше (потврђивање потписа није успело)"
 
-#: src/fs/fs_uri.c:645
+#: src/fs/fs_uri.c:646
 #, fuzzy
 msgid "invalid argument"
 msgstr "Неисправан аргумент „%s“\n"
 
-#: src/fs/fs_uri.c:665
+#: src/fs/fs_uri.c:666
 msgid "Unrecognized URI type"
 msgstr "Непозната УРИ врста"
 
-#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr "Нису наведене речи кључа!\n"
 
-#: src/fs/fs_uri.c:1093
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Број двоструких квота које нису уравнотежене!\n"
 
@@ -2903,7 +2903,7 @@ msgstr ""
 "Морате навести један и само један назив директоријума за самостално "
 "објављивање.\n"
 
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:896
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "поставља жељени НИВО анонимности пошиљаоца"
 
@@ -2911,15 +2911,15 @@ msgstr "поставља жељени НИВО анонимности пошиљ
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr "искључује додавање времена стварања метаподацима утоварене датотеке"
 
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
 msgid "do not use libextractor to add keywords or metadata"
 msgstr "не користи „libextractor“ за додавање кључних речи или метаподатака"
 
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:946
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
 msgid "specify the priority of the content"
 msgstr "наводи приоритет садржаја"
 
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:959
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
 msgid "set the desired replication LEVEL"
 msgstr "поставља жељени НИВО одоговарања"
 
@@ -2927,53 +2927,53 @@ msgstr "поставља жељени НИВО одоговарања"
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Самостално објављује датотеке из директоријума на ГНУнет-у"
 
-#: src/fs/gnunet-daemon-fsprofiler.c:667
+#: src/fs/gnunet-daemon-fsprofiler.c:668
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr "Демон за коришћење дељења датотеке за мерење њене учинковитости."
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:54
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr "\t<изворна датотека угнеждена у %u бајта метаподатака>\n"
 
-#: src/fs/gnunet-directory.c:105
+#: src/fs/gnunet-directory.c:106
 #, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr "Метаподаци директоријума „%s“:\n"
 
-#: src/fs/gnunet-directory.c:108
+#: src/fs/gnunet-directory.c:109
 #, c-format
 msgid "Directory `%s' contents:\n"
 msgstr "Садржај директоријума „%s“:\n"
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-directory.c:146
 msgid "You must specify a filename to inspect.\n"
 msgstr "Морате навести назив датотеке за преглед.\n"
 
-#: src/fs/gnunet-directory.c:159
+#: src/fs/gnunet-directory.c:160
 #, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr "Нисам успео да прочитам директоријум „%s“\n"
 
-#: src/fs/gnunet-directory.c:169
+#: src/fs/gnunet-directory.c:170
 #, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "„%s“ није ГНУнет директоријум\n"
 
-#: src/fs/gnunet-directory.c:200
+#: src/fs/gnunet-directory.c:201
 msgid "Display contents of a GNUnet directory"
 msgstr "Приказује садржај ГНУнет директоријума"
 
-#: src/fs/gnunet-download.c:130
+#: src/fs/gnunet-download.c:131
 #, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Покрећем преузимање „%s“.\n"
 
-#: src/fs/gnunet-download.c:142
+#: src/fs/gnunet-download.c:143
 msgid "<unknown time>"
 msgstr "<непознато време>"
 
-#: src/fs/gnunet-download.c:154
+#: src/fs/gnunet-download.c:155
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
@@ -2982,74 +2982,74 @@ msgstr ""
 "Преузимам „%s“ при %llu/%llu (преостаје %s, %s/сек). Блоку је требало %s за "
 "преузимање\n"
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Грешка преузимања: %s.\n"
 
-#: src/fs/gnunet-download.c:188
+#: src/fs/gnunet-download.c:189
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Преузимање „%s“ је готово (%s/сек).\n"
 
-#: src/fs/gnunet-download.c:206 src/fs/gnunet-publish.c:299
-#: src/fs/gnunet-search.c:543 src/fs/gnunet-unindex.c:117
+#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
+#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Неочекивано стање: %d\n"
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:234
 msgid "You need to specify a URI argument.\n"
 msgstr "Треба да наведете УРИ аргумент.\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:715
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:716
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Нисам успео да обрадим УРИ: %s\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:247
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr "Подржани су само CHK или LOC УРИ.\n"
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:254
 msgid "Target filename must be specified.\n"
 msgstr "Назив циљне датотеке мора бити наведен.\n"
 
-#: src/fs/gnunet-download.c:271 src/fs/gnunet-publish.c:869
-#: src/fs/gnunet-unindex.c:154
+#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-unindex.c:155
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Не могу да покренем „%s“ субсистем.\n"
 
-#: src/fs/gnunet-download.c:318
+#: src/fs/gnunet-download.c:319
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "поставља жељени НИВО анонимности примаоца"
 
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:325
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "брише недовршена преузимања (када се прекине са КТРЛ-Ц)"
 
-#: src/fs/gnunet-download.c:330 src/fs/gnunet-search.c:745
+#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
 msgid "only search the local peer (no P2P network search)"
 msgstr "тражи само локалног парњака (без претраге П2П мреже)"
 
-#: src/fs/gnunet-download.c:335
+#: src/fs/gnunet-download.c:336
 msgid "write the file to FILENAME"
 msgstr "уписује датотеку у НАЗИВ_ДАТОТЕКЕ"
 
-#: src/fs/gnunet-download.c:342
+#: src/fs/gnunet-download.c:343
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr "поставља највећи број паралелних преузимања који је дозвољен"
 
-#: src/fs/gnunet-download.c:349
+#: src/fs/gnunet-download.c:350
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr "поставља највећи број паралелних захтева за блокове који је дозвољен"
 
-#: src/fs/gnunet-download.c:354
+#: src/fs/gnunet-download.c:355
 msgid "download a GNUnet directory recursively"
 msgstr "преузима ГНУнет директоријум дубински"
 
-#: src/fs/gnunet-download.c:373
+#: src/fs/gnunet-download.c:374
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -3073,116 +3073,116 @@ msgstr "самостално окончава експеримент након
 msgid "run a testbed to measure file-sharing performance"
 msgstr "покреће пробно место за мерење учинковитости дељења датотека"
 
-#: src/fs/gnunet-fs.c:164
+#: src/fs/gnunet-fs.c:165
 msgid "print a list of all indexed files"
 msgstr "исписује списак свих индексираних датотека"
 
-#: src/fs/gnunet-fs.c:179
+#: src/fs/gnunet-fs.c:180
 msgid "Special file-sharing operations"
 msgstr "Посебне радње дељења датотека"
 
-#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:234
+#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr "Објављујем „%s“ при %llu/%llu (преостаје %s)\n"
 
-#: src/fs/gnunet-publish.c:246
+#: src/fs/gnunet-publish.c:247
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Грешка објављивања: %s.\n"
 
-#: src/fs/gnunet-publish.c:254
+#: src/fs/gnunet-publish.c:255
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr "Објављивање „%s“ је готово.\n"
 
-#: src/fs/gnunet-publish.c:258
+#: src/fs/gnunet-publish.c:259
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr "УРИ је „%s“.\n"
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:265
 #, fuzzy, c-format
 msgid "Namespace URI is `%s'.\n"
 msgstr "УРИ је „%s“.\n"
 
-#: src/fs/gnunet-publish.c:279
+#: src/fs/gnunet-publish.c:280
 #, fuzzy
 msgid "Starting cleanup after abort\n"
 msgstr "Чисти након обављеног прекидања.\n"
 
-#: src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-publish.c:287
 #, fuzzy
 msgid "Cleanup after abort completed.\n"
 msgstr "Чисти након обављеног прекидања.\n"
 
-#: src/fs/gnunet-publish.c:291
+#: src/fs/gnunet-publish.c:292
 #, fuzzy
 msgid "Cleanup after abort failed.\n"
 msgstr "Чисти након обављеног прекидања.\n"
 
-#: src/fs/gnunet-publish.c:425
+#: src/fs/gnunet-publish.c:426
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Мета подаци за датотеку „%s“ (%s)\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:428
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Кључне речи за датотеку „%s“ (%s)\n"
 
-#: src/fs/gnunet-publish.c:582
+#: src/fs/gnunet-publish.c:583
 msgid "Could not publish\n"
 msgstr "Не могу да објавим\n"
 
-#: src/fs/gnunet-publish.c:611
+#: src/fs/gnunet-publish.c:612
 msgid "Could not start publishing.\n"
 msgstr "Не могу да покренем објављивање.\n"
 
-#: src/fs/gnunet-publish.c:644
+#: src/fs/gnunet-publish.c:645
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Скенирам директоријум „%s“.\n"
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:647
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Скенирам датотеку „%s“.\n"
 
-#: src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-publish.c:653
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr "Било је проблема обраде датотеке „%s“, прескачем је.\n"
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:659
 msgid "Preprocessing complete.\n"
 msgstr "Предодбрада је завршена.\n"
 
-#: src/fs/gnunet-publish.c:664
+#: src/fs/gnunet-publish.c:665
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Извлачење мета података из датотеке „%s“ је завршено.\n"
 
-#: src/fs/gnunet-publish.c:670
+#: src/fs/gnunet-publish.c:671
 msgid "Meta data extraction has finished.\n"
 msgstr "Извлачење мета података је завршено.\n"
 
-#: src/fs/gnunet-publish.c:678
+#: src/fs/gnunet-publish.c:679
 #, fuzzy
 msgid "Error scanning directory.\n"
 msgstr "Унутрашња грешка скенирања директоријума.\n"
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:706
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Изабрани псеудоним „%s“ је непознат\n"
 
-#: src/fs/gnunet-publish.c:737
+#: src/fs/gnunet-publish.c:738
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Нисам успео да приступим „%s“: %s\n"
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:755
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
@@ -3190,38 +3190,38 @@ msgstr ""
 "Нисам успео да покренем скенер мета директоријума.  Да ли је инсталиран "
 "„gnunet-helper-publish-fs“?\n"
 
-#: src/fs/gnunet-publish.c:810
+#: src/fs/gnunet-publish.c:811
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "Не могу да извучем метаподатке из УРИ-ја!\n"
 
-#: src/fs/gnunet-publish.c:817
+#: src/fs/gnunet-publish.c:818
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Морате навести један и само један назив датотеке за уметање.\n"
 
-#: src/fs/gnunet-publish.c:823
+#: src/fs/gnunet-publish.c:824
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "НЕ можете навести УРИ и назив датотеке.\n"
 
-#: src/fs/gnunet-publish.c:832 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:208
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Опција „%s“ се захтева приликом коришћења опције „%s“.\n"
 
-#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:853
+#: src/fs/gnunet-publish.c:845 src/fs/gnunet-publish.c:854
 #: 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 "Опција „%s“ нема смисла без опције „%s“.\n"
 
-#: src/fs/gnunet-publish.c:906
+#: src/fs/gnunet-publish.c:907
 #, fuzzy
 msgid "enable adding the creation time to the metadata of the uploaded file"
 msgstr "искључује додавање времена стварања метаподацима утоварене датотеке"
 
-#: src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3229,7 +3229,7 @@ msgstr ""
 "исписује списак извучених кључних речи које ће се користити, али не обавља "
 "утовар"
 
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:921
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3237,11 +3237,11 @@ msgstr ""
 "додаје додатну кључну реч за датотеку највишег нивоа или директоријум (ова "
 "опција се може навести више пута)"
 
-#: src/fs/gnunet-publish.c:927
+#: src/fs/gnunet-publish.c:928
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "поставља мета-податке за дату ВРСТУ за дату ВРЕДНОСТ"
 
-#: src/fs/gnunet-publish.c:932
+#: src/fs/gnunet-publish.c:933
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3249,7 +3249,7 @@ msgstr ""
 "не индексира, обавља пуно уметање (смешта читаву датотеку у шифрованом "
 "облику у ГНУнет базу података)"
 
-#: src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-publish.c:940
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3257,12 +3257,12 @@ msgstr ""
 "наводи ИБ ажурираног издања које ће бити објављено у будућности (само за "
 "уметања називног простора)"
 
-#: src/fs/gnunet-publish.c:952
+#: src/fs/gnunet-publish.c:953
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "објављује датотеке под псеудонимом НАЗИВ (ставља датотеку у називни простор)"
 
-#: src/fs/gnunet-publish.c:964
+#: src/fs/gnunet-publish.c:965
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
@@ -3270,13 +3270,13 @@ msgstr ""
 "само опонаша процес али не чини никакво актуелно објављивање (корисно за "
 "прорачун УРИ-ја)"
 
-#: src/fs/gnunet-publish.c:971
+#: src/fs/gnunet-publish.c:972
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "поставља ИБ овог издања објављивања (само за уметања називног простора)"
 
-#: src/fs/gnunet-publish.c:979
+#: src/fs/gnunet-publish.c:980
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3284,99 +3284,99 @@ msgstr ""
 "УРИ који ће бити објављен (може се користити уместо прослеђивања датотеке за "
 "додавање кључних речи датотеци са одговарајућим УРИ-јем)"
 
-#: src/fs/gnunet-publish.c:997
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr "Објављује датотеку или директоријум на ГНУнет-у"
 
-#: src/fs/gnunet-search.c:443
+#: src/fs/gnunet-search.c:446
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr "Нисам успео да пишем директоријум са резултатима претраге за „%s“\n"
 
-#: src/fs/gnunet-search.c:532
+#: src/fs/gnunet-search.c:535
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr "Грешка претраге: %s.\n"
 
-#: src/fs/gnunet-search.c:592
+#: src/fs/gnunet-search.c:595
 #, c-format
 msgid "Conflicting options --bookmark-only and --silent.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:599
+#: src/fs/gnunet-search.c:602
 #, c-format
 msgid "Conflicting options --bookmark-only and --output.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:605
+#: src/fs/gnunet-search.c:608
 #, c-format
 msgid "An output file is mandatory for silent mode.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:626
+#: src/fs/gnunet-search.c:629
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Не могу да створим УРИ кључне речи из аргумената.\n"
 
-#: src/fs/gnunet-search.c:634
+#: src/fs/gnunet-search.c:637
 msgid ""
 "Invalid URI. Valid URIs for searching are keyword query URIs\n"
 "(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
 "\").\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:659
+#: src/fs/gnunet-search.c:662
 #, fuzzy, c-format
 msgid "Could not initialize the `%s` subsystem.\n"
 msgstr "Не могу да покренем „%s“ субсистем.\n"
 
-#: src/fs/gnunet-search.c:673
+#: src/fs/gnunet-search.c:676
 msgid "Could not start searching.\n"
 msgstr "Не могу да покренем претрагу.\n"
 
-#: src/fs/gnunet-search.c:699
+#: src/fs/gnunet-search.c:702
 #, fuzzy
 msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
 msgstr "поставља жељени НИВО анонимности примаоца"
 
-#: src/fs/gnunet-search.c:705
+#: src/fs/gnunet-search.c:708
 msgid "do not search, print only the URI that points to this search"
 msgstr ""
 
-#: src/fs/gnunet-search.c:712
+#: src/fs/gnunet-search.c:715
 msgid ""
 "write search results for directories according to FORMAT; accepted "
 "placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
 "printf when omitted or to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:722
+#: src/fs/gnunet-search.c:725
 msgid ""
 "write search results according to FORMAT; accepted placeholders are: %a, %f, "
 "%j, %l, %m, %n, %s; defaults to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:730
+#: src/fs/gnunet-search.c:733
 msgid ""
 "when the %a or %j placeholders appear in --printf or --dir-printf, list each "
 "metadata property according to FORMAT; accepted placeholders are: %i, %l, "
 "%n, %p"
 msgstr ""
 
-#: src/fs/gnunet-search.c:739
+#: src/fs/gnunet-search.c:742
 msgid "automatically terminate search after VALUE results are found"
 msgstr "самостално окончава претрагу након што су пронађени резултати ВРЕДНОСТ"
 
-#: src/fs/gnunet-search.c:751
+#: src/fs/gnunet-search.c:754
 msgid ""
 "create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
 "search --output=commons"
 msgstr ""
 
-#: src/fs/gnunet-search.c:758
+#: src/fs/gnunet-search.c:761
 msgid "silent mode (requires the --output argument)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:764
+#: src/fs/gnunet-search.c:767
 msgid ""
 "automatically terminate search after DELAY; the value given must be a number "
 "followed by a space and a time unit, for example \"500 ms\"; without a unit "
@@ -3384,56 +3384,56 @@ msgid ""
 "to wait for CTRL-C"
 msgstr ""
 
-#: src/fs/gnunet-search.c:773
+#: src/fs/gnunet-search.c:776
 #, c-format
 msgid ""
 "be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
 "arguments - ignored when these are provided by the user)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:786
+#: src/fs/gnunet-search.c:789
 #, fuzzy
 msgid "Search for files that have been published on GNUnet\n"
 msgstr "Претражује ГНУнет за датотекама које су објављене на ГНУнет-у"
 
-#: src/fs/gnunet-service-fs.c:371 src/fs/gnunet-service-fs.c:878
+#: src/fs/gnunet-service-fs.c:370 src/fs/gnunet-service-fs.c:877
 msgid "# client searches active"
 msgstr "# претраге клијента су активне"
 
-#: src/fs/gnunet-service-fs.c:430
+#: src/fs/gnunet-service-fs.c:429
 msgid "# replies received for local clients"
 msgstr "# одговори су примљени за локалне клијенте"
 
-#: src/fs/gnunet-service-fs.c:596
+#: src/fs/gnunet-service-fs.c:595
 msgid "# running average P2P latency (ms)"
 msgstr "# радно просечно П2П кашњење (ms)"
 
-#: src/fs/gnunet-service-fs.c:648 src/fs/gnunet-service-fs_cp.c:558
+#: src/fs/gnunet-service-fs.c:647 src/fs/gnunet-service-fs_cp.c:558
 msgid "# Loopback routes suppressed"
 msgstr "# Руте петље су потиснуте"
 
-#: src/fs/gnunet-service-fs.c:831
+#: src/fs/gnunet-service-fs.c:830
 msgid "# client searches received"
 msgstr "# претраге клијента су примљене"
 
-#: src/fs/gnunet-service-fs.c:871
+#: src/fs/gnunet-service-fs.c:870
 msgid "# client searches updated (merged content seen list)"
 msgstr "# претраге клијента су освежене (стопљени садржај виђеног списка)"
 
-#: src/fs/gnunet-service-fs.c:1041
+#: src/fs/gnunet-service-fs.c:1040
 #, fuzzy, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 "Неодговарајући хеш приликом покушаја индексирања датотеке „%s“ која има хеш "
 "„%s“\n"
 
-#: src/fs/gnunet-service-fs.c:1288
+#: src/fs/gnunet-service-fs.c:1287
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Услузи језгра недостаје поставка подешавања КЉУЧА_ДОМАЋИНА.  Излазим.\n"
 
-#: src/fs/gnunet-service-fs.c:1322 src/hostlist/gnunet-daemon-hostlist.c:343
+#: src/fs/gnunet-service-fs.c:1321 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3533,42 +3533,42 @@ msgstr "# поруке П2П упита су примљене и обрађен�
 msgid "# migration stop messages sent"
 msgstr "# поруке зауставља миграције су послате"
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:188
+#: src/fs/gnunet-service-fs_indexing.c:129
+#: src/fs/gnunet-service-fs_indexing.c:187
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Не могу да отворим „%s“.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:147
+#: src/fs/gnunet-service-fs_indexing.c:146
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Грешка писања „%s“.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:244
+#: src/fs/gnunet-service-fs_indexing.c:243
 #, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Нисам успео да обришем лажни блок: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:297
+#: src/fs/gnunet-service-fs_indexing.c:296
 msgid "# index blocks removed: original file inaccessible"
 msgstr "# блокови индекси су уклоњени: изворна датотека је неприступачна"
 
-#: src/fs/gnunet-service-fs_indexing.c:311
+#: src/fs/gnunet-service-fs_indexing.c:310
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 "Не могу да приступим индексираној датотеци „%s“ (%s) на померају %llu: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:315
+#: src/fs/gnunet-service-fs_indexing.c:314
 msgid "not indexed"
 msgstr "није индексирано"
 
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:328
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Индексирана датотека „%s“ је измењена на померају %llu\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:435
+#: src/fs/gnunet-service-fs_indexing.c:434
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3701,37 +3701,56 @@ msgstr "# поруке ЈАЗ СТАВИ су примљене"
 msgid "time required, content pushing disabled"
 msgstr "време је затражено, гурање садржаја је искључено"
 
-#: src/fs/gnunet-unindex.c:93
+#: src/fs/gnunet-unindex.c:94
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr "Поништавам индексирање при %llu/%llu (преостаје %s)\n"
 
-#: src/fs/gnunet-unindex.c:102
+#: src/fs/gnunet-unindex.c:103
 #, c-format
 msgid "Error unindexing: %s.\n"
 msgstr "Грешка поништавања индексирања: %s.\n"
 
-#: src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-unindex.c:109
 msgid "Unindexing done.\n"
 msgstr "Поништавање индексирања је готово.\n"
 
-#: src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-unindex.c:142
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 "Морате навести један и само један назив датотеке за поништавање "
 "индексирања.\n"
 
-#: src/fs/gnunet-unindex.c:161
+#: src/fs/gnunet-unindex.c:162
 msgid "Could not start unindex operation.\n"
 msgstr "Не могу да започнем радњу поништавања индексирања.\n"
 
-#: src/fs/gnunet-unindex.c:194
+#: src/fs/gnunet-unindex.c:195
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 "Поништава индексирање датотеке која је претходно била индексирана са „gnunet-"
 "publish“."
 
+#: src/fs/meta_data.c:1063 src/fs/meta_data.c:1116 src/fs/meta_data.c:1131
+msgid "metadata length"
+msgstr ""
+
+#: src/fs/meta_data.c:1074
+#, fuzzy, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
+msgstr "Серијализовани метаподаци „%s“ су већи од дозвољеног (%u>%u)"
+
+#: src/fs/meta_data.c:1091
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Нисам успео да серијализујем НС запис са вредношћу „%s“\n"
+
+#: src/fs/meta_data.c:1126
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Нисам успео да серијализујем НС запис са вредношћу „%s“\n"
+
 #: src/gns/gns_tld_api.c:293
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
@@ -3759,44 +3778,44 @@ msgstr "Покрећем ХТТП сервер на прикључнику ПР�
 msgid "GNUnet HTTP server to create business cards"
 msgstr "ГНУнет ХТТП сервер за стварање бизнис картица"
 
-#: src/gns/gnunet-dns2gns.c:298
+#: src/gns/gnunet-dns2gns.c:296
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Нисам успео да упакујем ДНС одговор у УДП пакет!\n"
 
-#: src/gns/gnunet-dns2gns.c:379
+#: src/gns/gnunet-dns2gns.c:377
 #, fuzzy
 msgid "Failed to parse DNS response!\n"
 msgstr "Нисам успео да обрадим ДНС одговор\n"
 
-#: src/gns/gnunet-dns2gns.c:453
+#: src/gns/gnunet-dns2gns.c:451
 #, fuzzy, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr "АТС је вратио резултате за %u адресе\n"
 
-#: src/gns/gnunet-dns2gns.c:656
+#: src/gns/gnunet-dns2gns.c:654
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "Не могу да обрадим ДНС захтев од „%s“\n"
 
-#: src/gns/gnunet-dns2gns.c:672
+#: src/gns/gnunet-dns2gns.c:670
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Примих лош ДНС захтев од „%s“\n"
 
-#: src/gns/gnunet-dns2gns.c:680
+#: src/gns/gnunet-dns2gns.c:678
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Примих неподржан ДНС захтев од „%s“\n"
 
-#: src/gns/gnunet-dns2gns.c:841
+#: src/gns/gnunet-dns2gns.c:839
 msgid "No DNS server specified!\n"
 msgstr "Није наведен ДНС сервер!\n"
 
-#: src/gns/gnunet-dns2gns.c:1001
+#: src/gns/gnunet-dns2gns.c:999
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "ИП дубинског ДНС решавача за коришћење (потребно)"
 
-#: src/gns/gnunet-dns2gns.c:1018
+#: src/gns/gnunet-dns2gns.c:1016
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Посредник ДНС-до-ГНС ГНУнет-а (ДНС сервер)"
 
@@ -3932,164 +3951,164 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr "ГНУнет ГНС посредник"
 
-#: src/gns/gnunet-gns.c:257
+#: src/gns/gnunet-gns.c:256
 #, fuzzy, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "„%s“ није исправна ИП адреса.\n"
 
-#: src/gns/gnunet-gns.c:267 src/util/dnsparser.c:253
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Нисам успео да претворим ДНС ИДНА „%s“ у УТФ-8: %s\n"
 
-#: src/gns/gnunet-gns.c:281
+#: src/gns/gnunet-gns.c:280
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:305
+#: src/gns/gnunet-gns.c:304
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:340
+#: src/gns/gnunet-gns.c:339
 msgid "Lookup a record for the given name"
 msgstr "Претражује запис за датим називом"
 
-#: src/gns/gnunet-gns.c:346
+#: src/gns/gnunet-gns.c:345
 msgid "Specify the type of the record to lookup"
 msgstr "Наводи врсту записа за претраживање"
 
-#: src/gns/gnunet-gns.c:352
+#: src/gns/gnunet-gns.c:351
 #, fuzzy
 msgid "Specify a timeout for the lookup"
 msgstr "Наводи време истека за претраживање"
 
-#: src/gns/gnunet-gns.c:356
+#: src/gns/gnunet-gns.c:355
 msgid "No unneeded output"
 msgstr "Нема непотребног излаза"
 
-#: src/gns/gnunet-gns.c:361
+#: src/gns/gnunet-gns.c:360
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:375
+#: src/gns/gnunet-gns.c:374
 msgid "GNUnet GNS resolver tool"
 msgstr "Алат ГНУнет ГНС решавача"
 
-#: src/gns/gnunet-service-gns.c:519
+#: src/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "исправан јавни кључ се захтева"
 
-#: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1346
+#: src/gns/gnunet-service-gns.c:554
+#: src/zonemaster/gnunet-service-zonemaster.c:1345
 msgid "Failed to connect to the namecache!\n"
 msgstr "Нисам успео да се повежем са оставом назива!\n"
 
-#: src/gns/gnunet-service-gns.c:574
-#: src/zonemaster/gnunet-service-zonemaster.c:1385
+#: src/gns/gnunet-service-gns.c:573
+#: src/zonemaster/gnunet-service-zonemaster.c:1384
 msgid "Could not connect to DHT!\n"
 msgstr "Не могу да се повежем на ДХТ!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:279
+#: src/gns/gnunet-service-gns_interceptor.c:278
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "Грешка претварања ГНС одговора у ДНС одговор!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:380
+#: src/gns/gnunet-service-gns_interceptor.c:379
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Нисам успео да се повежем са ДНС услугом!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:672
+#: src/gns/gnunet-service-gns_resolver.c:669
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:684
+#: src/gns/gnunet-service-gns_resolver.c:681
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:690
+#: src/gns/gnunet-service-gns_resolver.c:687
 #, c-format
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:903
+#: src/gns/gnunet-service-gns_resolver.c:900
 msgid "Failed to parse DNS response\n"
 msgstr "Нисам успео да обрадим ДНС одговор\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1094
+#: src/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr "Прескачем запис неподржане врсте %d\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1870
+#: src/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1885
+#: src/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr "ГНС претраживање је резултирало ДНС називом који је предуг („%s“)\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1918
+#: src/gns/gnunet-service-gns_resolver.c:1915
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "Дубачење ГНС претраге није успело (нисам нашао запис изасланства)\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2320
+#: src/gns/gnunet-service-gns_resolver.c:2317
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2325
+#: src/gns/gnunet-service-gns_resolver.c:2322
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr "Дубачење ГНС претраге није успело (нисам нашао запис изасланства)\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2348
+#: src/gns/gnunet-service-gns_resolver.c:2345
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Нисам успео да сместим у оставу ГНС резолуцију: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2515
+#: src/gns/gnunet-service-gns_resolver.c:2512
 #, fuzzy, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr "АТС је вратио резултате за %u адресе\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2663
+#: src/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr "Зона %s је опозвана, резолуција није успела\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:138
+#: src/gns/plugin_gnsrecord_gns.c:137
 msgid "This is a memento of an older block for internal maintenance."
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:177
+#: src/gns/plugin_gnsrecord_gns.c:176
 #, fuzzy, c-format
 msgid "Unable to parse zone key record `%s'\n"
 msgstr "Не могу да обрадим „MX“ запис „%s“\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:191
+#: src/gns/plugin_gnsrecord_gns.c:190
 msgid "Record type does not match parsed record type\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:214
+#: src/gns/plugin_gnsrecord_gns.c:213
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Не могу да обрадим „GNS2DNS“ запис „%s“\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:231
+#: src/gns/plugin_gnsrecord_gns.c:230
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
 msgstr "Нисам успео да серијализујем ГНС2ДНС запис са вредношћу „%s“\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:255
+#: src/gns/plugin_gnsrecord_gns.c:254
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Не могу да обрадим ниску ВПН записа „%s“\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:287
+#: src/gns/plugin_gnsrecord_gns.c:286
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Не могу да обрадим ниску ВПН записа „%s“\n"
@@ -4099,110 +4118,110 @@ msgstr "Не могу да обрадим ниску ВПН записа „%s�
 msgid "Gns REST API initialized\n"
 msgstr "Меш је покренут\n"
 
-#: src/gnsrecord/gnsrecord_misc.c:53
+#: src/gnsrecord/gnsrecord_misc.c:51
 msgid "Label is NULL which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:58
+#: src/gnsrecord/gnsrecord_misc.c:56
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:481
+#: src/gnsrecord/gnsrecord_misc.c:479
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:489
+#: src/gnsrecord/gnsrecord_misc.c:487
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:499
+#: src/gnsrecord/gnsrecord_misc.c:497
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:515
+#: src/gnsrecord/gnsrecord_misc.c:513
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:526
+#: src/gnsrecord/gnsrecord_misc.c:524
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:548
+#: src/gnsrecord/gnsrecord_misc.c:546
 msgid "Mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:367
+#: src/gnsrecord/plugin_gnsrecord_dns.c:366
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Не могу да обрадим ИПв4 адресу „%s“\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:385
+#: src/gnsrecord/plugin_gnsrecord_dns.c:384
 #, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr "Нисам успео да серијализујем НС запис са вредношћу „%s“\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:406
+#: src/gnsrecord/plugin_gnsrecord_dns.c:405
 #, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "Нисам успео да серијализујем ЦНАЗИВ запис са вредношћу „%s“\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:480
+#: src/gnsrecord/plugin_gnsrecord_dns.c:479
 #, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr "Нисам успео да серијализујем УВЕР запис са %u бајта\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:516
+#: src/gnsrecord/plugin_gnsrecord_dns.c:515
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Не могу да обрадим „SOA“ запис „%s“\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:533
+#: src/gnsrecord/plugin_gnsrecord_dns.c:532
 #, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr ""
 "Нисам успео да серијализујем СОА запис са називом „%s“ и р-називом „%s“\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:553
+#: src/gnsrecord/plugin_gnsrecord_dns.c:552
 #, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "Нисам успео да серијализујем ПТР запис са вредношћу „%s“\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:573
+#: src/gnsrecord/plugin_gnsrecord_dns.c:572
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Не могу да обрадим „MX“ запис „%s“\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:585
+#: src/gnsrecord/plugin_gnsrecord_dns.c:584
 #, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "Нисам успео да серијализујем МИкс запис са називом домаћина „%s“\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:608
+#: src/gnsrecord/plugin_gnsrecord_dns.c:607
 #, fuzzy, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr "Не могу да обрадим „SOA“ запис „%s“\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:621
+#: src/gnsrecord/plugin_gnsrecord_dns.c:620
 #, fuzzy, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr "Нисам успео да серијализујем НС запис са вредношћу „%s“\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:640
+#: src/gnsrecord/plugin_gnsrecord_dns.c:639
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Не могу да обрадим ИПв6 адресу „%s“\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:660
-#: src/gnsrecord/plugin_gnsrecord_dns.c:674
+#: src/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/gnsrecord/plugin_gnsrecord_dns.c:673
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Не могу да обрадим ниску ТЛСА записа „%s“\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:693
+#: src/gnsrecord/plugin_gnsrecord_dns.c:692
 #, fuzzy, c-format
 msgid "Unable to parse CAA record string `%s'\n"
 msgstr "Не могу да обрадим ниску ТЛСА записа „%s“\n"
@@ -4687,64 +4706,64 @@ msgstr "Не могу да обрадим „SOA“ запис „%s“\n"
 msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
 msgstr "Не могу да обрадим „SOA“ запис „%s“\n"
 
-#: src/my/my.c:196 src/my/my.c:215
+#: src/my/my.c:197 src/my/my.c:216
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
 msgstr "„%s“ није успело на %s:%d са грешком: %s\n"
 
-#: src/mysql/mysql.c:190
+#: src/mysql/mysql.c:191
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Покушавам да користим датотеку „%s“ за МајСКуЛ подешавање.\n"
 
-#: src/mysql/mysql.c:198
+#: src/mysql/mysql.c:199
 #, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "Не могу да приступим датотеци „%s“: %s\n"
 
-#: src/namecache/gnunet-namecache.c:106
+#: src/namecache/gnunet-namecache.c:105
 #, c-format
 msgid "No records found for `%s'"
 msgstr "Нисам нашао записе за „%s“"
 
-#: src/namecache/gnunet-namecache.c:119 src/namestore/gnunet-namestore.c:888
+#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:887
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr "\tОштећен или неподржан запис врсте %u\n"
 
-#: src/namecache/gnunet-namecache.c:175
+#: src/namecache/gnunet-namecache.c:174
 #, c-format
 msgid "You must specify which zone should be accessed\n"
 msgstr "Морате навести којој зони се треба приступити\n"
 
-#: src/namecache/gnunet-namecache.c:182
+#: src/namecache/gnunet-namecache.c:181
 #, fuzzy, c-format
 msgid "Invalid public key for zone `%s'\n"
 msgstr "Неисправан јавни кључ за обратну претрагу „%s“\n"
 
-#: src/namecache/gnunet-namecache.c:188
+#: src/namecache/gnunet-namecache.c:187
 #, c-format
 msgid "You must specify a name\n"
 msgstr "Морате навести назив\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:2020
+#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2019
 msgid "name of the record to add/delete/display"
 msgstr "назив записа за додавање/брисање/приказ"
 
-#: src/namecache/gnunet-namecache.c:221
+#: src/namecache/gnunet-namecache.c:220
 #, fuzzy
 msgid "specifies the public key of the zone to look in"
 msgstr "наводи јавни кључ зоне за претраживање"
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:2102
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2101
 msgid "GNUnet zone manipulation tool"
 msgstr "Алат манипуслисања ГНУнет зоном"
 
-#: src/namecache/namecache_api.c:285
+#: src/namecache/namecache_api.c:283
 msgid "Namecache failed to cache block"
 msgstr "Остава назива није успела да смести у оставу блок"
 
-#: src/namecache/namecache_api.c:373
+#: src/namecache/namecache_api.c:371
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Грешка у комуникацији са услугом ПОДАЦИ_ПАРЊАКА: %s\n"
@@ -4783,7 +4802,7 @@ msgid "Failed to setup database at `%s'\n"
 msgstr "Нисам успео да покренем „%s“ на „%s“\n"
 
 #: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1951
+#: src/namestore/gnunet-namestore.c:1950
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
@@ -4956,248 +4975,248 @@ msgid "Failed to connect to IDENTITY\n"
 msgstr "Нисам успео да се повежем са ГНС-ом\n"
 
 #: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2087
+#: src/namestore/gnunet-namestore.c:2086
 msgid "name of the ego controlling the zone"
 msgstr "назив егоа који контролише зону"
 
-#: src/namestore/gnunet-namestore.c:412
+#: src/namestore/gnunet-namestore.c:411
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Недостаје функција „%s“ у прикључку преноса за „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:420
+#: src/namestore/gnunet-namestore.c:419
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Непозната наредба „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:428 src/namestore/gnunet-namestore.c:443
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:435
+#: src/namestore/gnunet-namestore.c:434
 #, fuzzy, c-format
 msgid "Error parsing expiration time %s.\n"
 msgstr "Грешка прорачуна уније скупа опозивања са %s\n"
 
-#: src/namestore/gnunet-namestore.c:465
+#: src/namestore/gnunet-namestore.c:464
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Неисправан формат за ИП: „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:667
+#: src/namestore/gnunet-namestore.c:666
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr "Додавање записа није успело: %s\n"
 
-#: src/namestore/gnunet-namestore.c:685 src/namestore/gnunet-namestore.c:701
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr "Брисање записа није успело%s%s\n"
 
-#: src/namestore/gnunet-namestore.c:1137
+#: src/namestore/gnunet-namestore.c:1136
 #, 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:1258
+#: src/namestore/gnunet-namestore.c:1257
 #, fuzzy, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr "Нема позива који би могао бити отказан управо сада.\n"
 
-#: src/namestore/gnunet-namestore.c:1301
+#: src/namestore/gnunet-namestore.c:1300
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1326
+#: src/namestore/gnunet-namestore.c:1325
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1355
+#: src/namestore/gnunet-namestore.c:1354
 #, c-format
 msgid "No options given\n"
 msgstr "Нису дате опције\n"
 
-#: src/namestore/gnunet-namestore.c:1369
+#: src/namestore/gnunet-namestore.c:1368
 #, c-format
 msgid "Recordlines only work with option `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1378 src/namestore/gnunet-namestore.c:1430
-#: src/namestore/gnunet-namestore.c:1440 src/namestore/gnunet-namestore.c:1450
-#: src/namestore/gnunet-namestore.c:1479 src/namestore/gnunet-namestore.c:1500
-#: src/namestore/gnunet-namestore.c:1527 src/namestore/gnunet-namestore.c:1537
-#: src/namestore/gnunet-namestore.c:1570 src/namestore/gnunet-namestore.c:1595
-#: src/namestore/gnunet-namestore.c:1629 src/namestore/gnunet-namestore.c:1663
-#: src/namestore/gnunet-namestore.c:1686
+#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
+#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
+#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
+#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
+#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
+#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
+#: src/namestore/gnunet-namestore.c:1685
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Недостаје опција „%s“ за радњу „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1380
+#: src/namestore/gnunet-namestore.c:1379
 msgid "name"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1409
+#: src/namestore/gnunet-namestore.c:1408
 #, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Неисправан надимак „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1432 src/namestore/gnunet-namestore.c:1442
-#: src/namestore/gnunet-namestore.c:1452 src/namestore/gnunet-namestore.c:1481
-#: src/namestore/gnunet-namestore.c:1502 src/namestore/gnunet-namestore.c:1688
+#: src/namestore/gnunet-namestore.c:1431 src/namestore/gnunet-namestore.c:1441
+#: src/namestore/gnunet-namestore.c:1451 src/namestore/gnunet-namestore.c:1480
+#: src/namestore/gnunet-namestore.c:1501 src/namestore/gnunet-namestore.c:1687
 msgid "add"
 msgstr "додај"
 
-#: src/namestore/gnunet-namestore.c:1460
+#: src/namestore/gnunet-namestore.c:1459
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Неподржана врста „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1470
+#: src/namestore/gnunet-namestore.c:1469
 #, c-format
 msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1490
+#: src/namestore/gnunet-namestore.c:1489
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "Вредност „%s“ је неисправна за врсту записа „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1509 src/namestore/gnunet-namestore.c:1695
+#: src/namestore/gnunet-namestore.c:1508 src/namestore/gnunet-namestore.c:1694
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Неисправан формат времена „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1529 src/namestore/gnunet-namestore.c:1539
+#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
 msgid "del"
 msgstr "обриши"
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1571
 msgid "purge-zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1596
 msgid "list"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1631
+#: src/namestore/gnunet-namestore.c:1630
 msgid "reverse-pkey"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1641
+#: src/namestore/gnunet-namestore.c:1640
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Неисправан јавни кључ за обратну претрагу „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1665
+#: src/namestore/gnunet-namestore.c:1664
 msgid "uri"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1678
+#: src/namestore/gnunet-namestore.c:1677
 #: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Неисправан УРИ „%s“\n"
 
-#: src/namestore/gnunet-namestore.c:1966
+#: src/namestore/gnunet-namestore.c:1965
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Не могу да се повежем са услугом идентитета\n"
 
-#: src/namestore/gnunet-namestore.c:1985
+#: src/namestore/gnunet-namestore.c:1984
 msgid "add record"
 msgstr "додаје запис"
 
-#: src/namestore/gnunet-namestore.c:1988
+#: src/namestore/gnunet-namestore.c:1987
 msgid "delete record"
 msgstr "брише запис"
 
-#: src/namestore/gnunet-namestore.c:1992
+#: src/namestore/gnunet-namestore.c:1991
 msgid "display records"
 msgstr "приказује записе"
 
-#: src/namestore/gnunet-namestore.c:1996
+#: src/namestore/gnunet-namestore.c:1995
 msgid "read commands from stdin"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2003
+#: src/namestore/gnunet-namestore.c:2002
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr "време истека записа за коришћење (само за додавање), „never“ је могуће"
 
-#: src/namestore/gnunet-namestore.c:2009
+#: src/namestore/gnunet-namestore.c:2008
 msgid "set the desired nick name for the zone"
 msgstr "поставља жељени назив надимка за зону"
 
-#: src/namestore/gnunet-namestore.c:2014
+#: src/namestore/gnunet-namestore.c:2013
 msgid "monitor changes in the namestore"
 msgstr "прати измене у смештају назива"
 
-#: src/namestore/gnunet-namestore.c:2024
+#: src/namestore/gnunet-namestore.c:2023
 msgid "Output in recordline format"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2030
+#: src/namestore/gnunet-namestore.c:2029
 #, fuzzy
 msgid "determine our name for the given KEY"
 msgstr "одређује наш назив за дати „PKEY“"
 
-#: src/namestore/gnunet-namestore.c:2036
+#: src/namestore/gnunet-namestore.c:2035
 msgid "type of the record to add/delete/display"
 msgstr "врста записа за додавање/брисање/приказ"
 
-#: src/namestore/gnunet-namestore.c:2041
+#: src/namestore/gnunet-namestore.c:2040
 msgid "URI to import into our zone"
 msgstr "УРИ за увоз у нашу зону"
 
-#: src/namestore/gnunet-namestore.c:2047
+#: src/namestore/gnunet-namestore.c:2046
 msgid "value of the record to add/delete"
 msgstr "вредност записа за додавање/брисање"
 
-#: src/namestore/gnunet-namestore.c:2051
+#: src/namestore/gnunet-namestore.c:2050
 msgid "create or list public record"
 msgstr "ствара или исписује јавни запис"
 
-#: src/namestore/gnunet-namestore.c:2055
+#: src/namestore/gnunet-namestore.c:2054
 #, fuzzy
 msgid "omit private records"
 msgstr "приказује записе"
 
-#: src/namestore/gnunet-namestore.c:2060
+#: src/namestore/gnunet-namestore.c:2059
 msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2065
+#: src/namestore/gnunet-namestore.c:2064
 msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2070
+#: src/namestore/gnunet-namestore.c:2069
 msgid ""
 "show private key for orphaned records for recovery using `gnunet-identity -C "
 "-P <key>'. Use in combination with --display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2075
+#: src/namestore/gnunet-namestore.c:2074
 msgid "delete all records in specified zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2081
+#: src/namestore/gnunet-namestore.c:2080
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 "прави сеновити запис (важи само ако су сви остали записи исте врсте истекли"
 
-#: src/namestore/gnunet-zoneimport.c:1837
+#: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1843
+#: src/namestore/gnunet-zoneimport.c:1841
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
@@ -5548,7 +5567,7 @@ msgid "Show network size estimates from NSE service."
 msgstr "Показује процене величине мреже из НСЕ услуге."
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:242
+#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr "Вредност је превелика.\n"
 
@@ -5747,59 +5766,59 @@ msgstr ""
 msgid "Unable to create indices: %s.\n"
 msgstr "Нисам успео да направим индексе\n"
 
-#: src/pt/gnunet-daemon-pt.c:418
+#: src/pt/gnunet-daemon-pt.c:416
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Нисам успео да упакујем ДНС захтев.  Одбацујем.\n"
 
-#: src/pt/gnunet-daemon-pt.c:424
+#: src/pt/gnunet-daemon-pt.c:422
 msgid "# DNS requests mapped to VPN"
 msgstr "# ДНС захтеви су мапирани у ВПН"
 
-#: src/pt/gnunet-daemon-pt.c:478
+#: src/pt/gnunet-daemon-pt.c:476
 msgid "# DNS records modified"
 msgstr "# ДНС записи су измењени"
 
-#: src/pt/gnunet-daemon-pt.c:673
+#: src/pt/gnunet-daemon-pt.c:671
 msgid "# DNS replies intercepted"
 msgstr "# ДНС одговори су пресретени"
 
-#: src/pt/gnunet-daemon-pt.c:680
+#: src/pt/gnunet-daemon-pt.c:678
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Нисам успео да обрадим ДНС захтев.  Одбацујем.\n"
 
-#: src/pt/gnunet-daemon-pt.c:718
+#: src/pt/gnunet-daemon-pt.c:716
 msgid "# DNS requests dropped (timeout)"
 msgstr "# ДНС захтеви су одбачени (истекло је време)"
 
-#: src/pt/gnunet-daemon-pt.c:773
+#: src/pt/gnunet-daemon-pt.c:771
 msgid "# DNS requests intercepted"
 msgstr "# ДНС захтеви су пресретени"
 
-#: src/pt/gnunet-daemon-pt.c:779
+#: src/pt/gnunet-daemon-pt.c:777
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# ДНС захтеви су одбачени (ДНС меш канал је пао)"
 
-#: src/pt/gnunet-daemon-pt.c:788
+#: src/pt/gnunet-daemon-pt.c:786
 msgid "# DNS requests dropped (malformed)"
 msgstr "# ДНС захтеви су одбачени (лоши су)"
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:881
 msgid "# DNS replies received"
 msgstr "# ДНС одговори су примљени"
 
-#: src/pt/gnunet-daemon-pt.c:900
+#: src/pt/gnunet-daemon-pt.c:898
 msgid "# DNS replies dropped (too late?)"
 msgstr "# ДНС одговори су одбачени (прекасно је?)"
 
-#: src/pt/gnunet-daemon-pt.c:1227 src/pt/gnunet-daemon-pt.c:1236
-#: src/pt/gnunet-daemon-pt.c:1252 src/pt/gnunet-daemon-pt.c:1261
-#: src/pt/gnunet-daemon-pt.c:1270
+#: 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 "Нисам успео да се повежем са „%s“ услугом.  Излазим.\n"
 
-#: src/pt/gnunet-daemon-pt.c:1316
+#: src/pt/gnunet-daemon-pt.c:1314
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr "Демон за покретање за обављање превода ИП протокола у ГНУнет"
 
@@ -5926,7 +5945,7 @@ msgstr ""
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:3096
+#: src/reclaim/plugin_rest_openid_connect.c:3095
 msgid "OpenID Connect REST API initialized\n"
 msgstr ""
 
@@ -5934,7 +5953,7 @@ msgstr ""
 msgid "Identity Provider REST API initialized\n"
 msgstr ""
 
-#: src/reclaim/reclaim_api.c:545
+#: src/reclaim/reclaim_api.c:544
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Смештај назива није успео да смести запис\n"
@@ -5954,13 +5973,13 @@ msgid "No configuration file given. Exiting\n"
 msgstr "Није дата датотека подешавања. Излазим\n"
 
 #: src/regex/gnunet-regex-profiler.c:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:631
+#: src/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr "На линији наредби није наведен директоријум политике. Излазим.\n"
 
 #: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:639
+#: src/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Наведени директоријум политике не постоји. Излазим.\n"
@@ -6002,15 +6021,15 @@ msgstr "назив датотеке са називима домаћина"
 msgid "Profiler for regex"
 msgstr "Профилатор за регуларни израз"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:700
+#: src/regex/gnunet-regex-simulation-profiler.c:701
 msgid "name of the table to write DFAs"
 msgstr "назив табеле за уписивање ДФА-са"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:706
+#: src/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr "највећа дужина сажимања путање"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:720
+#: src/regex/gnunet-regex-simulation-profiler.c:721
 msgid "Profiler for regex library"
 msgstr "Профилатор за библиотеку регуларног израза"
 
@@ -6321,7 +6340,7 @@ msgstr "осетљивост"
 msgid "also profile decryption"
 msgstr "такође опис профила"
 
-#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
 #: src/setu/gnunet-service-setu.c:5389
 #, fuzzy
 msgid "Could not connect to CADET service\n"
@@ -6393,12 +6412,12 @@ msgstr ""
 msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr "„%s“ није успело да реши метод '%s' са грешком: %s\n"
 
-#: src/statistics/gnunet-service-statistics.c:319
+#: src/statistics/gnunet-service-statistics.c:314
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Записујем %llu бајта статистике у „%s“\n"
 
-#: src/statistics/gnunet-service-statistics.c:984
+#: src/statistics/gnunet-service-statistics.c:979
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Учитавам %llu бајта статистике из „%s“\n"
@@ -6603,7 +6622,7 @@ msgstr ""
 "места"
 
 #: 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
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:319
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "Нетачан формат датотеке кључа домаћина: %s\n"
@@ -6620,57 +6639,57 @@ msgstr ""
 "Не могу да отворим „%s“ за писање статистике учитавања.  Не записујем у "
 "дневник статистику учитавања\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1153
+#: src/testbed/gnunet-service-testbed_peers.c:1154
 #, c-format
 msgid "%s is stopped"
 msgstr "„%s“ је заустављен"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1156
+#: src/testbed/gnunet-service-testbed_peers.c:1157
 #, c-format
 msgid "%s is starting"
 msgstr "„%s“ се покреће"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1159
+#: src/testbed/gnunet-service-testbed_peers.c:1160
 #, c-format
 msgid "%s is stopping"
 msgstr "„%s“ се зауставља"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1162
+#: src/testbed/gnunet-service-testbed_peers.c:1163
 #, c-format
 msgid "%s is starting already"
 msgstr "„%s“ се већ покреће"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1166
 #, c-format
 msgid "%s is stopping already"
 msgstr "„%s“ се већ зауставља"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is started already"
 msgstr "„%s“ је већ покренут"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1172
 #, c-format
 msgid "%s is stopped already"
 msgstr "„%s“ је већ заустављен"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr "„%s“ услуга није позната АУР-у"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1178
 #, c-format
 msgid "%s service failed to start"
 msgstr "„%s“ услуга није успела да се покрене"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1181
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "„%s“ услуга се не може покренути јер се АУР гаси"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1182
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, c-format
 msgid "%.s Unknown result code."
 msgstr "%.s Непознат код резултата."
@@ -8023,17 +8042,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:1400
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1401
 #, 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:1412
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1413
 #, 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:1419
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1420
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "„%s“ није успело за „%s“: адреса је већ у употреби\n"
@@ -8047,7 +8066,7 @@ msgstr ""
 "Обрађивачки код за поруку врсте %u није позвао „GNUNET_SERVER_receive_done“ "
 "након „%s“\n"
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:838
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr "Непозната породица адресе „%d“\n"
@@ -8057,23 +8076,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:950
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:951
 #, 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:991
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:992
 #, 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:1480
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1481
 #, 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:1504
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1505
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8090,45 +8109,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:1750
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1751
 msgid "Service process failed to initialize\n"
 msgstr "Процес услуге није успео да се покрене\n"
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1756
 msgid "Service process could not initialize server function\n"
 msgstr "Процес услуге не може да покрене функцију сервера\n"
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1761
 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:1641
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1219
+#: src/util/service.c:1642
 #, 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:1643
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1644
 msgid "No such user"
 msgstr "Нема таквог корисника"
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1658
 #, 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:2000
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2001
 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
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2077
+#: src/util/service.c:2089
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2098
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2099
 msgid "Malformed configuration, exit ...\n"
 msgstr "Лоше подешавање, излазим ...\n"
 
@@ -8141,197 +8160,178 @@ msgstr "Не могу да приступим датотеци подешава�
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:228 src/util/bio.c:236
+#: src/util/bio.c:223 src/util/bio.c:231
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "Грешка при читању „%s“: %s"
 
-#: src/util/bio.c:238
+#: src/util/bio.c:233
 msgid "End of file"
 msgstr "Крај датотеке"
 
-#: src/util/bio.c:267
+#: src/util/bio.c:262
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "Грешка при читању „%s“: %s"
 
-#: src/util/bio.c:269
+#: src/util/bio.c:264
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:309
+#: src/util/bio.c:304
 #, fuzzy, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr "Неисправан аргумент линије наредби „%s“\n"
 
-#: src/util/bio.c:336 src/util/bio.c:840
+#: src/util/bio.c:331 src/util/bio.c:781
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:342
+#: src/util/bio.c:337
 #, c-format
 msgid "%s (while reading `%s')"
 msgstr ""
 
-#: src/util/bio.c:347
+#: src/util/bio.c:342
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr "Грешка читања дужине ниске „%s“"
 
-#: src/util/bio.c:360
+#: src/util/bio.c:355
 #, fuzzy, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr "Ниска „%s“ је дужа од дозвољеног (%u > %u)"
 
-#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
-msgid "metadata length"
-msgstr ""
-
-#: src/util/bio.c:411
-#, fuzzy, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
-msgstr "Серијализовани метаподаци „%s“ су већи од дозвољеног (%u>%u)"
-
-#: src/util/bio.c:427
-#, fuzzy, c-format
-msgid "Failed to deserialize metadata `%s'"
-msgstr "Нисам успео да серијализујем НС запис са вредношћу „%s“\n"
-
-#: src/util/bio.c:669
+#: src/util/bio.c:610
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:731 src/util/bio.c:752
+#: src/util/bio.c:672 src/util/bio.c:693
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "Грешка писања „HELLO“-а у датотеку „%s“: %s\n"
 
-#: src/util/bio.c:733
+#: src/util/bio.c:674
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:817
+#: src/util/bio.c:758
 #, fuzzy, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr "Неисправан формат времена „%s“\n"
 
-#: src/util/bio.c:877
-#, fuzzy, c-format
-msgid "Failed to serialize metadata `%s'"
-msgstr "Нисам успео да серијализујем НС запис са вредношћу „%s“\n"
-
-#: src/util/client.c:750 src/util/client.c:941
+#: src/util/client.c:751 src/util/client.c:942
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1096
+#: src/util/client.c:1097
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr "Потребан је не-празан назив домаћина за услугу „%s“.\n"
 
-#: src/util/common_logging.c:648 src/util/common_logging.c:687
+#: src/util/common_logging.c:647 src/util/common_logging.c:686
 #, c-format
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:911
+#: src/util/common_logging.c:910
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Порука „%.*s“ је поновљена %u пута у прошлости %s\n"
 
-#: src/util/common_logging.c:1104
+#: src/util/common_logging.c:1103
 msgid "ERROR"
 msgstr "ГРЕШКА"
 
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1105
 msgid "WARNING"
 msgstr "УПОЗОРЕЊЕ"
 
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1107
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1109
 msgid "INFO"
 msgstr "ПОДАЦИ"
 
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1111
 msgid "DEBUG"
 msgstr "ПРОЧИШЋАВАЊЕ"
 
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1113
 msgid "NONE"
 msgstr "НИШТА"
 
-#: src/util/common_logging.c:1115
+#: src/util/common_logging.c:1114
 msgid "INVALID"
 msgstr "НЕИСПРАВНО"
 
-#: src/util/common_logging.c:1360
+#: src/util/common_logging.c:1359
 msgid "unknown address"
 msgstr "непозната адреса"
 
-#: src/util/common_logging.c:1405
+#: src/util/common_logging.c:1404
 msgid "invalid address"
 msgstr "неисправна адреса"
 
-#: src/util/common_logging.c:1417
+#: src/util/common_logging.c:1416
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Подешавање није успело да наведе опцију „%s“ у одељку „%s“!\n"
 
-#: src/util/common_logging.c:1432
+#: src/util/common_logging.c:1431
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr ""
 "Подешавање наводи неисправну вредност за опцију „%s“ у одељку „%s“: %s\n"
 
-#: src/util/configuration.c:790
+#: src/util/configuration.c:786
 #, c-format
 msgid "Illegal directive in line %u (parsing restricted section %s)\n"
 msgstr ""
 
-#: src/util/configuration.c:800
+#: src/util/configuration.c:796
 #, c-format
 msgid "Bad directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:853
+#: src/util/configuration.c:849
 #, c-format
 msgid "Bad inline-secret directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:875
+#: src/util/configuration.c:871
 #, c-format
 msgid "Unknown or malformed directive '%s' in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:905
+#: src/util/configuration.c:901
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u (option without section)\n"
 msgstr "Грешка синтаксе приликом десеријализације у реду %u\n"
 
-#: src/util/configuration.c:949
+#: src/util/configuration.c:945
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Грешка синтаксе приликом десеријализације у реду %u\n"
 
-#: src/util/configuration.c:1049
+#: src/util/configuration.c:1045
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Грешка отварања датотеке „%s“: %s\n"
 
-#: src/util/configuration.c:1062
+#: src/util/configuration.c:1058
 #, fuzzy, c-format
 msgid "Failed to parse configuration file `%s'\n"
 msgstr "Нисам успео да уклоним датотеку подешавања „%s“\n"
 
-#: src/util/configuration.c:1695
+#: src/util/configuration.c:1691
 msgid "Not a valid relative time specification"
 msgstr ""
 
-#: src/util/configuration.c:1765
+#: src/util/configuration.c:1761
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8340,17 +8340,17 @@ msgstr ""
 "Вредност подешавања '%s' за '%s' у одељку '%s' није ус купу исправних "
 "избора\n"
 
-#: src/util/configuration.c:1860
+#: src/util/configuration.c:1856
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr "Сумња се на дубинско ширење, прекидам $-ширење за термин „%s“\n"
 
-#: src/util/configuration.c:1892
+#: src/util/configuration.c:1888
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Недостаје затварење „%s“ у опцији „%s“\n"
 
-#: src/util/configuration.c:1958
+#: src/util/configuration.c:1954
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8359,27 +8359,27 @@ msgstr ""
 "Нисам успео да раширим „%s“ у „%s“ јер нисам нашао у [ПУТАЊАМА] нити је "
 "дефинисано као променљива окружења\n"
 
-#: src/util/configuration_helper.c:133
+#: src/util/configuration_helper.c:134
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:147
+#: src/util/configuration_helper.c:148
 #, fuzzy, c-format
 msgid "%s, %s or %s argument is required\n"
 msgstr "аргумент „--section“ је потребан\n"
 
-#: src/util/configuration_helper.c:218
+#: src/util/configuration_helper.c:219
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr "аргумент „--option“ је потребан за постављање вредности\n"
 
-#: src/util/configuration_helper.c:262
+#: src/util/configuration_helper.c:263
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "Нисам успео да учитам подешавање за „%s“\n"
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8398,7 +8398,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:281
+#: src/util/crypto_ecc_setup.c:282
 msgid "Could not load peer's private key\n"
 msgstr "Не могу да учитам лични кључ парњака\n"
 
@@ -8407,260 +8407,260 @@ msgstr "Не могу да учитам лични кључ парњака\n"
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "„libgcrypt“ није очекиваног издања (издање %s је потребно).\n"
 
-#: src/util/crypto_rsa.c:907
+#: src/util/crypto_rsa.c:908
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "„EdDSA“ потписивање није успело на %s:%d: %s\n"
 
-#: src/util/crypto_rsa.c:1207
+#: src/util/crypto_rsa.c:1208
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Провера „ECDSA“ потписа није успела на %s:%d: %s\n"
 
-#: src/util/disk.c:843
+#: src/util/disk.c:842
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Очекивах да „%s“ буде директоријум!\n"
 
-#: src/util/dnsparser.c:909
+#: src/util/dnsparser.c:910
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Нисам успео да претворим УТФ-8 назив „%s“ у ДНС ИДНА формат: %s\n"
 
-#: src/util/dnsstub.c:227
+#: src/util/dnsstub.c:228
 #, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "Не могу да се вежем ни за један прикључник: %s\n"
 
-#: src/util/dnsstub.c:370
+#: src/util/dnsstub.c:371
 #, fuzzy, c-format
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr "Примих ДНС одговор који је премали (%u бајта)"
 
-#: src/util/dnsstub.c:503
+#: src/util/dnsstub.c:504
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "Нисам успео да пошаљем ДНС захтев за %s\n"
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:509
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Послао сам ДНС захтев за %s\n"
 
-#: src/util/getopt.c:565
+#: src/util/getopt.c:566
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: опција „%s“ је нејасна\n"
 
-#: src/util/getopt.c:590
+#: src/util/getopt.c:591
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: опција „--%s“ не дозвољава аргумент\n"
 
-#: src/util/getopt.c:596
+#: src/util/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: опција „%c%s“ не дозвољава аргумент\n"
 
-#: src/util/getopt.c:616 src/util/getopt.c:797
+#: src/util/getopt.c:617 src/util/getopt.c:798
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: опција „%s“ захтева аргумент\n"
 
-#: src/util/getopt.c:647
+#: src/util/getopt.c:648
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: непрепозната опција „--%s“\n"
 
-#: src/util/getopt.c:653
+#: src/util/getopt.c:654
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: непрепозната опција „%c%s“\n"
 
-#: src/util/getopt.c:680
+#: src/util/getopt.c:681
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: недозвољена опција —— %c\n"
 
-#: src/util/getopt.c:682
+#: src/util/getopt.c:683
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: неисправна опција —— %c\n"
 
-#: src/util/getopt.c:711 src/util/getopt.c:847
+#: src/util/getopt.c:712 src/util/getopt.c:848
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: опција захтева аргумент —— %c\n"
 
-#: src/util/getopt.c:761
+#: src/util/getopt.c:762
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: опција „-W %s“ је нејасна\n"
 
-#: src/util/getopt.c:781
+#: src/util/getopt.c:782
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
 
-#: src/util/getopt.c:970
+#: src/util/getopt.c:971
 #, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Употребите „%s“ да добавите списак опција.\n"
 
-#: src/util/getopt.c:983
+#: src/util/getopt.c:984
 #, fuzzy, c-format
 msgid "Option `%s' can't be used with other options.\n"
 msgstr "Опција „%s“ нема смисла без опције „%s“.\n"
 
-#: src/util/getopt.c:995
+#: src/util/getopt.c:996
 #, fuzzy, c-format
 msgid "Missing mandatory option `%s'.\n"
 msgstr "Недостаје опција „%s“ за радњу „%s“\n"
 
-#: src/util/getopt_helpers.c:63
+#: src/util/getopt_helpers.c:64
 msgid "print the version number"
 msgstr ""
 
-#: src/util/getopt_helpers.c:110
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 "Аргументи обавезни за дуге опције су такође обавезни за кратке опције.\n"
 
-#: src/util/getopt_helpers.c:197
+#: src/util/getopt_helpers.c:198
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:262
+#: src/util/getopt_helpers.c:263
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:378
+#: src/util/getopt_helpers.c:379
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:445
+#: src/util/getopt_helpers.c:446
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:462
+#: src/util/getopt_helpers.c:463
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "ствара јединствене датотеке подешавања"
 
-#: src/util/getopt_helpers.c:498 src/util/getopt_helpers.c:812
-#: src/util/getopt_helpers.c:868
+#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
+#: src/util/getopt_helpers.c:869
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Морате да проследите број опцији „%s“.\n"
 
-#: src/util/getopt_helpers.c:570
+#: src/util/getopt_helpers.c:571
 #, 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:577
+#: src/util/getopt_helpers.c:578
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:595
+#: src/util/getopt_helpers.c:596
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:597
+#: src/util/getopt_helpers.c:598
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:631
+#: src/util/getopt_helpers.c:632
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Морате да проследите релативно време опцији „%s“.\n"
 
-#: src/util/getopt_helpers.c:685
+#: src/util/getopt_helpers.c:686
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "Морате да проследите релативно време опцији „%s“.\n"
 
-#: src/util/getopt_helpers.c:742
+#: src/util/getopt_helpers.c:743
 #, fuzzy, c-format
 msgid "You must pass a timestamp to the `%s' option.\n"
 msgstr "Морате да проследите број опцији „%s“.\n"
 
-#: src/util/getopt_helpers.c:749
+#: src/util/getopt_helpers.c:750
 #, c-format
 msgid "The maximum precision allowed for timestamps is seconds.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:805
+#: src/util/getopt_helpers.c:806
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:875
+#: src/util/getopt_helpers.c:876
 #, fuzzy, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr "Морате да проследите број опцији „%s“.\n"
 
-#: src/util/getopt_helpers.c:953
+#: src/util/getopt_helpers.c:954
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-base32.c:46
+#: src/util/gnunet-base32.c:47
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/util/gnunet-config.c:153
+#: src/util/gnunet-config.c:154
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/util/gnunet-config.c:159
+#: src/util/gnunet-config.c:160
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:164
+#: src/util/gnunet-config.c:165
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:170
+#: src/util/gnunet-config.c:171
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:176
+#: src/util/gnunet-config.c:177
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:192
 msgid "Manipulate GNUnet configuration files"
 msgstr "Управља ГНУнет датотекама подешавања"
 
-#: src/util/gnunet-crypto-tvg.c:1527
+#: src/util/gnunet-crypto-tvg.c:1528
 msgid "verify a test vector from stdin"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:94
+#: src/util/gnunet-ecc.c:95
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Нисам успео да отворим „%s“: %s\n"
 
-#: src/util/gnunet-ecc.c:128
+#: src/util/gnunet-ecc.c:129
 #, fuzzy, c-format
 msgid "Generating %u keys like %s, please wait"
 msgstr "Стварам %u кључа, сачекајте"
 
-#: src/util/gnunet-ecc.c:136
+#: src/util/gnunet-ecc.c:137
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr "Стварам %u кључа, сачекајте"
 
-#: src/util/gnunet-ecc.c:177
+#: src/util/gnunet-ecc.c:178
 #, c-format
 msgid ""
 "\n"
@@ -8669,7 +8669,7 @@ msgstr ""
 "\n"
 "Нисам успео да пишем у „%s“: %s\n"
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:185
 #, c-format
 msgid ""
 "\n"
@@ -8678,7 +8678,7 @@ msgstr ""
 "\n"
 "Завршено!\n"
 
-#: src/util/gnunet-ecc.c:186
+#: src/util/gnunet-ecc.c:187
 #, c-format
 msgid ""
 "\n"
@@ -8687,310 +8687,310 @@ msgstr ""
 "\n"
 "Грешка, %u кључа нису створена\n"
 
-#: src/util/gnunet-ecc.c:303
+#: src/util/gnunet-ecc.c:304
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "Нисам нашао датотеку кључа домаћина „%s“\n"
 
-#: src/util/gnunet-ecc.c:313
+#: src/util/gnunet-ecc.c:314
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "Датотека кључа домаћина „%s“ је празна\n"
 
-#: src/util/gnunet-ecc.c:333
+#: src/util/gnunet-ecc.c:334
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "Не могу да прочитам датотеку кључа домаћина: %s\n"
 
-#: src/util/gnunet-ecc.c:387
+#: src/util/gnunet-ecc.c:388
 msgid "No hostkey file specified on command line\n"
 msgstr "Није наведена датотека кључа домаћина на линији наредби\n"
 
-#: src/util/gnunet-ecc.c:451
+#: src/util/gnunet-ecc.c:452
 msgid "list keys included in a file (for testing)"
 msgstr "исписује кључеве укључене у датотеци (за тестирање)"
 
-#: src/util/gnunet-ecc.c:457
+#: src/util/gnunet-ecc.c:458
 msgid "number of keys to list included in a file (for testing)"
 msgstr "број кључева за испис укључених у датотеци (за тестирање)"
 
-#: src/util/gnunet-ecc.c:463
+#: src/util/gnunet-ecc.c:464
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr "ствара БРОЈ пара јавног-личног кључа (за тестирање)"
 
-#: src/util/gnunet-ecc.c:468
+#: src/util/gnunet-ecc.c:469
 msgid "print the public key in ASCII format"
 msgstr "исписује јавни кључ у АСКРИ формату"
 
-#: src/util/gnunet-ecc.c:473
+#: src/util/gnunet-ecc.c:474
 #, fuzzy
 msgid "print the private key in ASCII format"
 msgstr "исписује јавни кључ у АСКРИ формату"
 
-#: src/util/gnunet-ecc.c:478
+#: src/util/gnunet-ecc.c:479
 #, fuzzy
 msgid "print the public key in HEX format"
 msgstr "исписује јавни кључ у АСКРИ формату"
 
-#: src/util/gnunet-ecc.c:484
+#: src/util/gnunet-ecc.c:485
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr "исписује примере ЕЦЦ операција (користи се за тестирање сагласности)"
 
-#: src/util/gnunet-ecc.c:498
+#: src/util/gnunet-ecc.c:499
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Управља ГНУнет датотекама личног ЕЦЦ кључа"
 
-#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
+#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
 msgstr "Нисам успео да обрадим УРИ: %s\n"
 
-#: src/util/gnunet-qr.c:133
+#: src/util/gnunet-qr.c:134
 #, fuzzy, c-format
 msgid "Added URI %s\n"
 msgstr "Неисправан УРИ „%s“\n"
 
-#: src/util/gnunet-qr.c:160
+#: src/util/gnunet-qr.c:161
 #, fuzzy, c-format
 msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr "Неисправна путања: не почиње са „%s“\n"
 
-#: src/util/gnunet-qr.c:170
+#: src/util/gnunet-qr.c:171
 #, fuzzy, c-format
 msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr "Неисправна путања: није успело навођење подсистема\n"
 
-#: src/util/gnunet-qr.c:181
+#: src/util/gnunet-qr.c:182
 #, fuzzy, c-format
 msgid "No known handler for subsystem `%s'\n"
 msgstr "Није познат руковалац за подсистем „%s“\n"
 
-#: src/util/gnunet-qr.c:217
+#: src/util/gnunet-qr.c:218
 #, fuzzy, c-format
 msgid "Unable to start child process `%s'\n"
 msgstr "Не могу да обрадим ИПв4 адресу „%s“\n"
 
-#: src/util/gnunet-qr.c:246
+#: src/util/gnunet-qr.c:247
 #, fuzzy, c-format
 msgid "Failed to open device: `%s': %d\n"
 msgstr "Нисам успео да отворим „%s“: %s\n"
 
-#: src/util/gnunet-qr.c:260
+#: src/util/gnunet-qr.c:261
 #, fuzzy
 msgid "Capturing...\n"
 msgstr "Покрећем %s...\n"
 
-#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
 msgid "No captured images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
 #, c-format
 msgid "Got %d images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
 #, c-format
 msgid "Found %s: \"%s\"\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:364 src/util/gnunet-qr.c:366
+#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
 #, fuzzy, c-format
 msgid "%s is not a PNG file\n"
 msgstr "„%s“ није ГНУнет директоријум\n"
 
-#: src/util/gnunet-qr.c:545
+#: src/util/gnunet-qr.c:546
 #, fuzzy
 msgid "No data found\n"
 msgstr "нисам нашао „upnpc“\n"
 
-#: src/util/gnunet-qr.c:561
+#: src/util/gnunet-qr.c:562
 msgid "Dispatching the URI\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:572
+#: src/util/gnunet-qr.c:573
 msgid "use the video device DEVICE (defaults to /dev/video0)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:579
+#: src/util/gnunet-qr.c:580
 msgid "read from the PNG-encoded file FILE"
 msgstr ""
 
-#: src/util/gnunet-qr.c:590
+#: src/util/gnunet-qr.c:591
 msgid "Scan a QR code and import the URI read"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:168
+#: src/util/gnunet-resolver.c:169
 msgid "perform a reverse lookup"
 msgstr "обавља повратну претрагу"
 
-#: src/util/gnunet-resolver.c:182
+#: src/util/gnunet-resolver.c:183
 #, fuzzy
 msgid "Use built-in GNUnet stub resolver"
 msgstr "Користи уграђеног заменског решавача ГНУнет-а"
 
-#: src/util/gnunet-scrypt.c:214
+#: src/util/gnunet-scrypt.c:215
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Учитавање кључа домаћина из „%s“ није успело.\n"
 
-#: src/util/gnunet-scrypt.c:280
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr "број битова за тражење доказивања о раду"
 
-#: src/util/gnunet-scrypt.c:286
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr "датотека са личним кључем, у супротном користи се основна"
 
-#: src/util/gnunet-scrypt.c:292
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr "датотека са доказом о раду, у супротном користи се основна"
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr "време за чекање између прорачуна"
 
-#: src/util/gnunet-scrypt.c:312
+#: src/util/gnunet-scrypt.c:313
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Управља ГНУнет датотекама доказа о раду"
 
-#: src/util/gnunet-service-resolver.c:1287
+#: src/util/gnunet-service-resolver.c:1288
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:88
+#: src/util/gnunet-uri.c:89
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr "Није наведена путања на линији наредби\n"
 
-#: src/util/gnunet-uri.c:94
+#: src/util/gnunet-uri.c:95
 #, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "Неисправна путања: не почиње са „%s“\n"
 
-#: src/util/gnunet-uri.c:101
+#: src/util/gnunet-uri.c:102
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr "Неисправна путања: није успело навођење подсистема\n"
 
-#: src/util/gnunet-uri.c:108
+#: src/util/gnunet-uri.c:109
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr "Није познат руковалац за подсистем „%s“\n"
 
-#: src/util/gnunet-uri.c:178
+#: src/util/gnunet-uri.c:179
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Обавља основне радње за путање ГНУнет-а"
 
-#: src/util/gnunet_error_codes.c:59
+#: src/util/gnunet_error_codes.c:60
 msgid "No error (success)."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:65
+#: src/util/gnunet_error_codes.c:66
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "%.s Непознат код резултата."
 
-#: src/util/gnunet_error_codes.c:71
+#: src/util/gnunet_error_codes.c:72
 #, fuzzy
 msgid "Communication with service failed."
 msgstr "Грешка у комуникацији са услугом ПОДАЦИ_ПАРЊАКА: %s\n"
 
-#: src/util/gnunet_error_codes.c:77
+#: src/util/gnunet_error_codes.c:78
 #, fuzzy
 msgid "Ego not found."
 msgstr "Нисам нашао садржај"
 
-#: src/util/gnunet_error_codes.c:83
+#: src/util/gnunet_error_codes.c:84
 #, fuzzy
 msgid "Identifier already in use for another ego."
 msgstr "одредник се већ користи за други его"
 
-#: src/util/gnunet_error_codes.c:89
+#: src/util/gnunet_error_codes.c:90
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:95
+#: src/util/gnunet_error_codes.c:96
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "%.s Непознат код резултата."
 
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr "# Бирање парњака није успело"
 
-#: src/util/gnunet_error_codes.c:107
+#: src/util/gnunet_error_codes.c:108
 #, fuzzy
 msgid "Zone not found."
 msgstr "Нисам нашао садржај"
 
-#: src/util/gnunet_error_codes.c:113
+#: src/util/gnunet_error_codes.c:114
 #, fuzzy
 msgid "Record not found."
 msgstr "нисам нашао „upnpc“\n"
 
-#: src/util/gnunet_error_codes.c:125
+#: src/util/gnunet_error_codes.c:126
 msgid "Zone does not contain any records."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:131
+#: src/util/gnunet_error_codes.c:132
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "Смештај назива није успео да смести запис\n"
 
-#: src/util/gnunet_error_codes.c:137
+#: src/util/gnunet_error_codes.c:138
 #, fuzzy
 msgid "No records given."
 msgstr "Није дат парњак!\n"
 
-#: src/util/gnunet_error_codes.c:143
+#: src/util/gnunet_error_codes.c:144
 msgid "Record data invalid."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:149
+#: src/util/gnunet_error_codes.c:150
 #, fuzzy
 msgid "No label given."
 msgstr "Није дат парњак!\n"
 
-#: src/util/gnunet_error_codes.c:155
+#: src/util/gnunet_error_codes.c:156
 #, fuzzy
 msgid "No results given."
 msgstr "Нису дате опције\n"
 
-#: src/util/gnunet_error_codes.c:161
+#: src/util/gnunet_error_codes.c:162
 #, fuzzy
 msgid "Record already exists."
 msgstr "назив мете већ постоји"
 
-#: src/util/gnunet_error_codes.c:167
+#: src/util/gnunet_error_codes.c:168
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:173
+#: src/util/gnunet_error_codes.c:174
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:179
+#: src/util/gnunet_error_codes.c:180
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "Смештај назива није успео да смести запис\n"
 
-#: src/util/gnunet_error_codes.c:185
+#: src/util/gnunet_error_codes.c:186
 msgid "Label invalid or malformed."
 msgstr ""
 
-#: src/util/helper.c:306
+#: src/util/helper.c:305
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Грешка читања из „%s“: %s\n"
 
-#: src/util/helper.c:358
+#: src/util/helper.c:357
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Нисам успео да обрадим долазну поруку са помоћника „%s“\n"
 
-#: src/util/helper.c:573
+#: src/util/helper.c:572
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Грешка писања у „%s“: %s\n"
@@ -9009,7 +9009,7 @@ msgstr ""
 "Кобна унутрашња логичка грешка, процес се заплео у „%s“ (прекините са КТРЛ-"
 "Ц)!\n"
 
-#: src/util/os_installation.c:415
+#: src/util/os_installation.c:416
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -9018,51 +9018,51 @@ msgstr ""
 "Не могу да одредим путању инсталирања за „%s“.  Поставите „%s“ променљиву "
 "окружења.\n"
 
-#: src/util/os_installation.c:786
+#: src/util/os_installation.c:787
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Не могу да нађем извршну „%s“ у ПУТАЊИ!\n"
 
-#: src/util/os_installation.c:819
+#: src/util/os_installation.c:820
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/util/plugin.c:86
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Покретање механизма прикључка није успело: %s!\n"
 
-#: src/util/plugin.c:157
+#: src/util/plugin.c:158
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "„%s“ није успело да реши метод '%s' са грешком: %s\n"
 
-#: src/util/plugin.c:214
+#: src/util/plugin.c:215
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "„%s“ није успело за библиотеку '%s' са грешком: %s\n"
 
-#: src/util/plugin.c:370
+#: src/util/plugin.c:371
 msgid "Could not determine plugin installation path.\n"
 msgstr "Не могу да одредим путању инсталирања прикључка.\n"
 
-#: src/util/program.c:286
+#: src/util/program.c:287
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
 
-#: src/util/program.c:298
+#: src/util/program.c:299
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
 
-#: src/util/program.c:313
+#: src/util/program.c:314
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
 
-#: src/util/program.c:328
+#: src/util/program.c:329
 #, fuzzy
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Лоше подешавање, излазим ...\n"
@@ -9072,13 +9072,13 @@ msgstr "Лоше подешавање, излазим ...\n"
 msgid "Bad mask: %d\n"
 msgstr "Лоша маска: %d\n"
 
-#: src/util/resolver_api.c:220
+#: src/util/resolver_api.c:221
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:242
+#: src/util/resolver_api.c:243
 #, fuzzy, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
@@ -9086,28 +9086,28 @@ msgid ""
 msgstr ""
 "Морате навести „%s“ или бројевну ИП адресу за „%s“ од „%s“ у подешавањима!\n"
 
-#: src/util/resolver_api.c:887
+#: src/util/resolver_api.c:888
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Истекло је време при покушају решавања назива домаћина „%s“.\n"
 
-#: src/util/resolver_api.c:900
+#: src/util/resolver_api.c:901
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "Истекло је време при покушају решавања ИП адресе „%s“.\n"
 
-#: src/util/resolver_api.c:1085
+#: src/util/resolver_api.c:1086
 #, fuzzy
 msgid "Resolver not configured correctly.\n"
 msgstr "Основна услуга „%s“ није подешена исправно!\n"
 
-#: src/util/resolver_api.c:1174 src/util/resolver_api.c:1197
-#: src/util/resolver_api.c:1211
+#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
+#: src/util/resolver_api.c:1212
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Не могу да решим наш „FQDN“ : %s\n"
 
-#: src/util/service.c:653
+#: src/util/service.c:654
 #, fuzzy, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9116,279 +9116,279 @@ msgstr ""
 "Обрађивачки код за поруку врсте %u није позвао „GNUNET_SERVER_receive_done“ "
 "након „%s“\n"
 
-#: src/util/service.c:1572
+#: src/util/service.c:1573
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/socks.c:635
+#: src/util/socks.c:636
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:652
+#: src/util/socks.c:653
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:395
+#: src/util/strings.c:394
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr "Скупови знакова се захтевају где је „%s“–>„%s“\n"
 
-#: src/util/strings.c:514
+#: src/util/strings.c:513
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Нисам успео да раширим „$HOME“: променљива окружења „HOME“ није постављена"
 
-#: src/util/strings.c:1050
+#: src/util/strings.c:1049
 msgid "IPv6 address did not start with `['\n"
 msgstr "ИПв6 адреса не почиње са [\n"
 
-#: src/util/strings.c:1058
+#: src/util/strings.c:1057
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr "ИПв6 адреса садржи : за раздвајање броја прикључника\n"
 
-#: src/util/strings.c:1065
+#: src/util/strings.c:1064
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr "ИПв6 адреса садржи ] пре : за раздвајање броја прикључника\n"
 
-#: src/util/strings.c:1073
+#: src/util/strings.c:1072
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr "ИПв6 адреса садржи исправан број прикључника након последње „:“\n"
 
-#: src/util/strings.c:1082
+#: src/util/strings.c:1081
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Неисправна ИПв6 адреса „%s“: %s\n"
 
-#: src/util/strings.c:1264 src/util/strings.c:1275
+#: src/util/strings.c:1263 src/util/strings.c:1274
 msgid "Port not in range\n"
 msgstr "Прикључник није у опсегу\n"
 
-#: src/util/strings.c:1284
+#: src/util/strings.c:1283
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Лоша политика прикључника „%s“\n"
 
-#: src/util/strings.c:1355 src/util/strings.c:1384 src/util/strings.c:1431
-#: src/util/strings.c:1451
+#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
+#: src/util/strings.c:1450
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Неисправан формат за ИП: „%s“\n"
 
-#: src/util/strings.c:1409
+#: src/util/strings.c:1408
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Неисправна напомена мреже („/%d“ није исправно у ИПв4 ЦИДР-у)."
 
-#: src/util/strings.c:1460
+#: src/util/strings.c:1459
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Неисправан формат: „%s“\n"
 
-#: src/util/strings.c:1502
+#: src/util/strings.c:1501
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Неисправна напомена мреже (не завршава се са „;“: „%s“)\n"
 
-#: src/util/strings.c:1552
+#: src/util/strings.c:1551
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Погрешан формат „%s“ за мрежну маску\n"
 
-#: src/util/strings.c:1583
+#: src/util/strings.c:1582
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Погрешан формат „%s“ за мрежу\n"
 
-#: src/util/time.c:900 src/util/time.c:928
+#: src/util/time.c:901 src/util/time.c:929
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:936
+#: src/util/time.c:937
 #, 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
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
 msgid "# Active channels"
 msgstr "# Активни канали"
 
-#: src/vpn/gnunet-service-vpn.c:583
+#: src/vpn/gnunet-service-vpn.c:582
 #, fuzzy
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr "# Бајтови су одбачени у реду меша (прекорачење)"
 
-#: src/vpn/gnunet-service-vpn.c:736
+#: src/vpn/gnunet-service-vpn.c:735
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "# ИЦМП пакети су примљени од меша"
 
-#: src/vpn/gnunet-service-vpn.c:1112
+#: src/vpn/gnunet-service-vpn.c:1111
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# УДП пакети су примљени од меша"
 
-#: src/vpn/gnunet-service-vpn.c:1262
+#: src/vpn/gnunet-service-vpn.c:1261
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# ТЦП пакети су примљени од меша"
 
-#: src/vpn/gnunet-service-vpn.c:1461
+#: src/vpn/gnunet-service-vpn.c:1460
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# Меш канали су направљени"
 
-#: src/vpn/gnunet-service-vpn.c:1685
+#: src/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr "Протокол %u није подржан, одбацујем\n"
 
-#: src/vpn/gnunet-service-vpn.c:1821
+#: src/vpn/gnunet-service-vpn.c:1820
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# ICMP пакет је одбачен (није дозвољен)"
 
-#: src/vpn/gnunet-service-vpn.c:2019
+#: src/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr "# ICMPv4 пакети су одбачени (нису дозвољени)"
 
-#: src/vpn/gnunet-service-vpn.c:2045
+#: src/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr "# ICMPv6 пакети су одбачени (нису дозвољени)"
 
-#: src/vpn/gnunet-service-vpn.c:2282
+#: src/vpn/gnunet-service-vpn.c:2281
 msgid "# Packets received from TUN interface"
 msgstr "# Пакети су примљени са ТУН сучеља"
 
-#: src/vpn/gnunet-service-vpn.c:2316 src/vpn/gnunet-service-vpn.c:2348
+#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr "Пакет је примљен за одмапирано одредиште „%s“ (одбацујем га)\n"
 
-#: src/vpn/gnunet-service-vpn.c:2355
+#: src/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr "Примљен је ИПв4 пакет са опцијама (одбацујем га)\n"
 
-#: src/vpn/gnunet-service-vpn.c:2371
+#: src/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr "Примљен је пакет непознатог протокола %d са ТУН-а (одбацујем га)\n"
 
-#: src/vpn/gnunet-service-vpn.c:2411
+#: src/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr "Нисам успео да нађем недодељену ИПв4 адресу у опсегу ВПН-а\n"
 
-#: src/vpn/gnunet-service-vpn.c:2463
+#: src/vpn/gnunet-service-vpn.c:2462
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "Нисам успео да нађем недодељену ИПв6 адресу у опсегу ВПН-а\n"
 
-#: src/vpn/gnunet-service-vpn.c:2497 src/vpn/gnunet-service-vpn.c:2705
+#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
 msgid "# Active destinations"
 msgstr "# Активна одредишта"
 
-#: src/vpn/gnunet-service-vpn.c:2750
+#: src/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr "Нисам успео да доделим ИП адресу за ново одредиште\n"
 
-#: src/vpn/gnunet-service-vpn.c:3008
+#: src/vpn/gnunet-service-vpn.c:3007
 msgid "Must specify valid IPv6 address"
 msgstr "Морате навести исправну ИПв6 адресу"
 
-#: src/vpn/gnunet-service-vpn.c:3036
+#: src/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr "Морате навести исправну ИПв6 маску"
 
-#: src/vpn/gnunet-service-vpn.c:3046
+#: src/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr "ИПв6 подршка је искључена јер овај систем не подржава ИПв6\n"
 
-#: src/vpn/gnunet-service-vpn.c:3062
+#: src/vpn/gnunet-service-vpn.c:3061
 msgid "Must specify valid IPv4 address"
 msgstr "Морате навести исправну ИПв4 адресу"
 
-#: src/vpn/gnunet-service-vpn.c:3079
+#: src/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr "Морате навести исправну ИПв4 маску"
 
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr "ИПв4 подршка је искључена јер овај систем не подржава ИПв4\n"
 
-#: src/vpn/gnunet-vpn.c:143
+#: src/vpn/gnunet-vpn.c:142
 msgid "Error creating tunnel\n"
 msgstr "Грешка стварања тунела\n"
 
-#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:226
+#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "Опција „%s“ нема смисла са опцијом „%s“.\n"
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:202
 #, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "Опција „%s“ или „%s“ је потребна.\n"
 
-#: src/vpn/gnunet-vpn.c:217
+#: src/vpn/gnunet-vpn.c:216
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Опција „%s“ или „%s“ се захтева приликом коришћења опције „%s“.\n"
 
-#: src/vpn/gnunet-vpn.c:240
+#: src/vpn/gnunet-vpn.c:239
 #, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "„%s“ није исправан одредник парњака.\n"
 
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:258
 #, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "„%s“ није исправна ИП адреса.\n"
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:295
 msgid "request that result should be an IPv4 address"
 msgstr "захтева да резултат треба да буде ИПв4 адреса"
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:301
 msgid "request that result should be an IPv6 address"
 msgstr "захтева да резултат треба да буде ИПв6 адреса"
 
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:308
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr "колико дуго мапирање треба бити важеће за нове тунеле?"
 
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:315
 msgid "destination IP for the tunnel"
 msgstr "ИП одредишта за тунел"
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:322
 msgid "peer offering the service we would like to access"
 msgstr "парњак који нуди услугу којој желимо да приступимо"
 
-#: src/vpn/gnunet-vpn.c:330
+#: src/vpn/gnunet-vpn.c:329
 msgid "name of the service we would like to access"
 msgstr "назив услуге којој желимо да приступимо"
 
-#: src/vpn/gnunet-vpn.c:335
+#: src/vpn/gnunet-vpn.c:334
 msgid "service is offered via TCP"
 msgstr "услуга се нуди путем ТЦП-а"
 
-#: src/vpn/gnunet-vpn.c:340
+#: src/vpn/gnunet-vpn.c:339
 msgid "service is offered via UDP"
 msgstr "услуга се нуди путем УДП-ом"
 
-#: src/vpn/gnunet-vpn.c:354
+#: src/vpn/gnunet-vpn.c:353
 msgid "Setup tunnels via VPN."
 msgstr "Поставља тунеле путем ВПН-а."
 
-#: src/zonemaster/gnunet-service-zonemaster.c:502
+#: src/zonemaster/gnunet-service-zonemaster.c:501
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Нисам успео да реплицирам блок у остави назива: %s\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1333
+#: src/zonemaster/gnunet-service-zonemaster.c:1332
 msgid "Failed to connect to the namestore!\n"
 msgstr "Нисам успео да се повежем са смештајем назива!\n"
 
diff --git a/po/sv.po b/po/sv.po
index 3978c3772..437672409 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: 2022-12-04 14:58+0900\n"
+"POT-Creation-Date: 2022-12-05 17:21+0900\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"
@@ -28,9 +28,9 @@ msgstr "\"%s\": okänd tjänst: %s\n"
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1958
+#: src/namestore/gnunet-namestore.c:1957
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -147,7 +147,7 @@ msgstr ""
 msgid "GNUnet abd resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -167,16 +167,16 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1133
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1136
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# av anslutna parter"
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1137
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1138
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Okänd operation \"%s\"\n"
@@ -392,28 +392,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:1094
-#: src/util/service.c:1100
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1095
+#: src/util/service.c:1101
 #, 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:530
-#: src/util/service.c:1133
+#: src/transport/tcp_service_legacy.c:634 src/util/client.c:531
+#: src/util/service.c:1134
 #, 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:535
-#: src/util/service.c:1137
+#: src/transport/tcp_service_legacy.c:638 src/util/client.c:536
+#: src/util/service.c:1138
 #, 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:1157
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1158
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -421,7 +421,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:1175
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1176
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -429,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:1206
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1207
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -437,7 +437,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:1225
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1226
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
@@ -1126,7 +1126,7 @@ msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:664
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1576,10 +1576,10 @@ msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:128
 #: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_mysql.c:890
+#: src/datastore/plugin_datastore_mysql.c:891
 #: 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/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:82 src/my/my.c:94
+#: src/mysql/mysql.c:47 src/mysql/mysql.c:65
 #: src/namecache/plugin_namecache_sqlite.c:54
 #: src/namestore/plugin_namestore_sqlite.c:56
 #: src/peerstore/plugin_peerstore_sqlite.c:54
@@ -1587,7 +1587,7 @@ msgstr ""
 #: 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
+#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -1896,24 +1896,24 @@ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 msgid "Heap database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:371
-#: src/datastore/plugin_datastore_mysql.c:423
-#: src/datastore/plugin_datastore_mysql.c:1071
+#: src/datastore/plugin_datastore_mysql.c:372
+#: src/datastore/plugin_datastore_mysql.c:424
+#: src/datastore/plugin_datastore_mysql.c:1072
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:410
+#: src/datastore/plugin_datastore_mysql.c:411
 #: src/datastore/plugin_datastore_sqlite.c:675
 #, fuzzy
 msgid "Data too large"
 msgstr "antal iterationer"
 
-#: src/datastore/plugin_datastore_mysql.c:847
+#: src/datastore/plugin_datastore_mysql.c:848
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1179
+#: src/datastore/plugin_datastore_mysql.c:1180
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -2041,7 +2041,7 @@ msgstr ""
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:359
+#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
 #: src/nse/gnunet-nse-profiler.c:894
 msgid "be verbose (print progress information)"
 msgstr ""
@@ -2132,286 +2132,286 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/dns/gnunet-dns-monitor.c:371 src/dns/gnunet-dns-monitor.c:376
+#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:388
+#: src/dns/gnunet-dns-monitor.c:387
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:241
+#: src/dns/gnunet-dns-redirector.c:240
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:246
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:260
+#: src/dns/gnunet-dns-redirector.c:259
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:466
+#: src/dns/gnunet-service-dns.c:463
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:620
+#: src/dns/gnunet-service-dns.c:617
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:756
+#: src/dns/gnunet-service-dns.c:753
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:832
+#: src/dns/gnunet-service-dns.c:829
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:951
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:973
+#: src/dns/gnunet-service-dns.c:970
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:984
+#: src/dns/gnunet-service-dns.c:981
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:996
+#: src/dns/gnunet-service-dns.c:993
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:999
+#: src/dns/gnunet-service-dns.c:996
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069
+#: src/dns/gnunet-service-dns.c:1066
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
+#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/dns/gnunet-service-dns.c:1128
+#: src/dns/gnunet-service-dns.c:1125
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:971
+#: src/exit/gnunet-daemon-exit.c:968
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1077
+#: src/exit/gnunet-daemon-exit.c:1074
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1371
+#: src/exit/gnunet-daemon-exit.c:1368
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
+#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
+#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
+#: src/exit/gnunet-daemon-exit.c:2283
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1507
+#: src/exit/gnunet-daemon-exit.c:1504
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1619
+#: src/exit/gnunet-daemon-exit.c:1616
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1661
+#: src/exit/gnunet-daemon-exit.c:1658
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1752
+#: src/exit/gnunet-daemon-exit.c:1749
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1840
+#: src/exit/gnunet-daemon-exit.c:1837
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1879
+#: src/exit/gnunet-daemon-exit.c:1876
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2020
+#: src/exit/gnunet-daemon-exit.c:2017
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
+#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
+#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
+#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
+#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2290
+#: src/exit/gnunet-daemon-exit.c:2287
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2349 src/vpn/gnunet-service-vpn.c:995
-#: src/vpn/gnunet-service-vpn.c:2122
+#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
+#: src/vpn/gnunet-service-vpn.c:2121
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
+#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2498 src/exit/gnunet-daemon-exit.c:3199
+#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/exit/gnunet-daemon-exit.c:2619
+#: src/exit/gnunet-daemon-exit.c:2616
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2639
+#: src/exit/gnunet-daemon-exit.c:2636
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# byte skickade av typen %d"
 
-#: src/exit/gnunet-daemon-exit.c:2831
+#: src/exit/gnunet-daemon-exit.c:2828
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2840
+#: src/exit/gnunet-daemon-exit.c:2837
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2916
+#: src/exit/gnunet-daemon-exit.c:2913
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2990
+#: src/exit/gnunet-daemon-exit.c:2987
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3039
+#: src/exit/gnunet-daemon-exit.c:3036
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:3054
+#: src/exit/gnunet-daemon-exit.c:3051
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:3081
+#: src/exit/gnunet-daemon-exit.c:3078
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3112
+#: src/exit/gnunet-daemon-exit.c:3109
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3164
+#: src/exit/gnunet-daemon-exit.c:3161
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3173
+#: src/exit/gnunet-daemon-exit.c:3170
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
+#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
+#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3451
+#: src/exit/gnunet-daemon-exit.c:3448
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
+#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3495
+#: src/exit/gnunet-daemon-exit.c:3492
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3640
+#: src/exit/gnunet-daemon-exit.c:3637
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3649
+#: src/exit/gnunet-daemon-exit.c:3646
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3657
+#: src/exit/gnunet-daemon-exit.c:3654
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3661
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3835
+#: src/exit/gnunet-daemon-exit.c:3832
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3951
+#: src/exit/gnunet-daemon-exit.c:3948
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4117
+#: src/exit/gnunet-daemon-exit.c:4114
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2434,169 +2434,169 @@ msgstr "# byte mottogs via TCP"
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:240
+#: src/fragmentation/fragmentation.c:239
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:245
+#: src/fragmentation/fragmentation.c:244
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:278
+#: src/fragmentation/fragmentation.c:277
 #, fuzzy
 msgid "# fragments wrap arounds"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:325
+#: src/fragmentation/fragmentation.c:324
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:331
+#: src/fragmentation/fragmentation.c:330
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:459
+#: src/fragmentation/fragmentation.c:458
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:466
+#: src/fragmentation/fragmentation.c:465
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:490
+#: src/fragmentation/fragmentation.c:489
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:481
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:492
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:499
+#: src/fs/fs_api.c:500
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1156
+#: src/fs/fs_api.c:1157
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1707
+#: src/fs/fs_api.c:1708
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1722
+#: src/fs/fs_api.c:1723
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2451
+#: src/fs/fs_api.c:2452
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2462
+#: src/fs/fs_api.c:2463
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
+#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2628
+#: src/fs/fs_api.c:2629
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
+#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2846
+#: src/fs/fs_api.c:2847
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3107
+#: src/fs/fs_api.c:3108
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:215
+#: src/fs/fs_directory.c:216
 #, fuzzy
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:332
+#: src/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:346
+#: src/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directory contents of `%s' for recursive download\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_download.c:528 src/fs/fs_download.c:541
+#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:960
+#: src/fs/fs_download.c:961
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_download.c:1044
+#: src/fs/fs_download.c:1045
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1066
+#: src/fs/fs_download.c:1067
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1089
+#: src/fs/fs_download.c:1090
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_download.c:1100
+#: src/fs/fs_download.c:1101
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1110
+#: src/fs/fs_download.c:1111
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1218
+#: src/fs/fs_download.c:1219
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_download.c:1889
+#: src/fs/fs_download.c:1890
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
@@ -2608,108 +2608,108 @@ msgid ""
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:190
+#: src/fs/fs_list_indexed.c:191
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_misc.c:128
+#: src/fs/fs_misc.c:129
 #, fuzzy, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/fs/fs_namespace.c:202
+#: src/fs/fs_namespace.c:203
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_namespace.c:233
+#: src/fs/fs_namespace.c:234
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:330
+#: src/fs/fs_namespace.c:331
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:457
+#: src/fs/fs_namespace.c:458
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:128 src/fs/fs_publish.c:438
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:731
+#: src/fs/fs_publish.c:732
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\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
+#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/fs/fs_publish.c:790
+#: src/fs/fs_publish.c:791
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:836
+#: src/fs/fs_publish.c:837
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:857
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:888
+#: src/fs/fs_publish.c:889
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:915
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_publish.c:1003 src/fs/fs_publish.c:1040
+#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1107
+#: src/fs/fs_publish.c:1108
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_publish.c:1115
+#: src/fs/fs_publish.c:1116
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:1156
+#: src/fs/fs_publish.c:1157
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1396
+#: src/fs/fs_publish.c:1397
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/fs/fs_publish.c:1488
+#: src/fs/fs_publish.c:1489
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:212
+#: src/fs/fs_publish_ksk.c:213
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -2719,155 +2719,155 @@ msgstr "Kunde inte ansluta till gnunetd.\n"
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_search.c:829 src/fs/fs_search.c:900
+#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/fs_search.c:993
+#: src/fs/fs_search.c:994
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:64
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:68
+#: src/fs/fs_unindex.c:69
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:275
+#: src/fs/fs_unindex.c:276
 #, fuzzy
 msgid "Error communicating with `fs' service."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/fs/fs_unindex.c:326
+#: src/fs/fs_unindex.c:327
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:389
+#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_unindex.c:385
+#: src/fs/fs_unindex.c:386
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_unindex.c:446
+#: src/fs/fs_unindex.c:447
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:592 src/fs/fs_unindex.c:656
+#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:670
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:708
+#: src/fs/fs_unindex.c:709
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_uri.c:231
+#: src/fs/fs_uri.c:232
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:290
+#: src/fs/fs_uri.c:291
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:308
+#: src/fs/fs_uri.c:309
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:315
+#: src/fs/fs_uri.c:316
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:382
+#: src/fs/fs_uri.c:383
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:423
+#: src/fs/fs_uri.c:424
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:440
+#: src/fs/fs_uri.c:441
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:517
+#: src/fs/fs_uri.c:518
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:534
+#: src/fs/fs_uri.c:535
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:561
+#: src/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:567
+#: src/fs/fs_uri.c:568
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:574
+#: src/fs/fs_uri.c:575
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:592
+#: src/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:612
+#: src/fs/fs_uri.c:613
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:645
+#: src/fs/fs_uri.c:646
 #, fuzzy
 msgid "invalid argument"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/fs/fs_uri.c:665
+#: src/fs/fs_uri.c:666
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1093
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2905,7 +2905,7 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:896
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
@@ -2913,15 +2913,15 @@ msgstr ""
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:946
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:959
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2929,131 +2929,131 @@ msgstr ""
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:667
+#: src/fs/gnunet-daemon-fsprofiler.c:668
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:54
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:105
+#: src/fs/gnunet-directory.c:106
 #, fuzzy, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr "==> Katalog \"%s\":\n"
 
-#: src/fs/gnunet-directory.c:108
+#: src/fs/gnunet-directory.c:109
 #, fuzzy, c-format
 msgid "Directory `%s' contents:\n"
 msgstr "==> Katalog \"%s\":\n"
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-directory.c:146
 #, fuzzy
 msgid "You must specify a filename to inspect.\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/fs/gnunet-directory.c:159
+#: src/fs/gnunet-directory.c:160
 #, fuzzy, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-directory.c:169
+#: src/fs/gnunet-directory.c:170
 #, fuzzy, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/gnunet-directory.c:200
+#: src/fs/gnunet-directory.c:201
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/gnunet-download.c:130
+#: src/fs/gnunet-download.c:131
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-download.c:142
+#: src/fs/gnunet-download.c:143
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Okänt fel"
 
-#: src/fs/gnunet-download.c:154
+#: src/fs/gnunet-download.c:155
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-download.c:188
+#: src/fs/gnunet-download.c:189
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Uppladdning vägrades!"
 
-#: src/fs/gnunet-download.c:206 src/fs/gnunet-publish.c:299
-#: src/fs/gnunet-search.c:543 src/fs/gnunet-unindex.c:117
+#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
+#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:234
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:715
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:716
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:247
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:254
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:271 src/fs/gnunet-publish.c:869
-#: src/fs/gnunet-unindex.c:154
+#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-unindex.c:155
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-download.c:318
+#: src/fs/gnunet-download.c:319
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:325
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:330 src/fs/gnunet-search.c:745
+#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:335
+#: src/fs/gnunet-download.c:336
 msgid "write the file to FILENAME"
 msgstr "skriv filen till FILNAMN"
 
-#: src/fs/gnunet-download.c:342
+#: src/fs/gnunet-download.c:343
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:349
+#: src/fs/gnunet-download.c:350
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:354
+#: src/fs/gnunet-download.c:355
 msgid "download a GNUnet directory recursively"
 msgstr "hämta en GNUnet-katalog rekursivt"
 
-#: src/fs/gnunet-download.c:373
+#: src/fs/gnunet-download.c:374
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -3075,298 +3075,298 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:164
+#: src/fs/gnunet-fs.c:165
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:179
+#: src/fs/gnunet-fs.c:180
 #, fuzzy
 msgid "Special file-sharing operations"
 msgstr "Visa alla alternativ"
 
-#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:234
+#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:246
+#: src/fs/gnunet-publish.c:247
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-publish.c:254
+#: src/fs/gnunet-publish.c:255
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:258
+#: src/fs/gnunet-publish.c:259
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:265
 #, fuzzy, c-format
 msgid "Namespace URI is `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:279
+#: src/fs/gnunet-publish.c:280
 #, fuzzy
 msgid "Starting cleanup after abort\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-publish.c:287
 #, fuzzy
 msgid "Cleanup after abort completed.\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/fs/gnunet-publish.c:291
+#: src/fs/gnunet-publish.c:292
 #, fuzzy
 msgid "Cleanup after abort failed.\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/fs/gnunet-publish.c:425
+#: src/fs/gnunet-publish.c:426
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:428
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:582
+#: src/fs/gnunet-publish.c:583
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:611
+#: src/fs/gnunet-publish.c:612
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:644
+#: src/fs/gnunet-publish.c:645
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:647
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-publish.c:653
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:659
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Nedstängning klar.\n"
 
-#: src/fs/gnunet-publish.c:664
+#: src/fs/gnunet-publish.c:665
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:670
+#: src/fs/gnunet-publish.c:671
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:678
+#: src/fs/gnunet-publish.c:679
 #, fuzzy
 msgid "Error scanning directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:706
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
 
-#: src/fs/gnunet-publish.c:737
+#: src/fs/gnunet-publish.c:738
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:755
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:810
+#: src/fs/gnunet-publish.c:811
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:817
+#: src/fs/gnunet-publish.c:818
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:823
+#: src/fs/gnunet-publish.c:824
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:832 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:208
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:853
+#: src/fs/gnunet-publish.c:845 src/fs/gnunet-publish.c:854
 #: 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:906
+#: src/fs/gnunet-publish.c:907
 msgid "enable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:921
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:927
+#: src/fs/gnunet-publish.c:928
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:932
+#: src/fs/gnunet-publish.c:933
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-publish.c:940
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:952
+#: src/fs/gnunet-publish.c:953
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:964
+#: src/fs/gnunet-publish.c:965
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:971
+#: src/fs/gnunet-publish.c:972
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:979
+#: src/fs/gnunet-publish.c:980
 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:997
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:443
+#: src/fs/gnunet-search.c:446
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:532
+#: src/fs/gnunet-search.c:535
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/fs/gnunet-search.c:592
+#: src/fs/gnunet-search.c:595
 #, c-format
 msgid "Conflicting options --bookmark-only and --silent.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:599
+#: src/fs/gnunet-search.c:602
 #, c-format
 msgid "Conflicting options --bookmark-only and --output.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:605
+#: src/fs/gnunet-search.c:608
 #, c-format
 msgid "An output file is mandatory for silent mode.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:626
+#: src/fs/gnunet-search.c:629
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:634
+#: src/fs/gnunet-search.c:637
 msgid ""
 "Invalid URI. Valid URIs for searching are keyword query URIs\n"
 "(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
 "\").\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:659
+#: src/fs/gnunet-search.c:662
 #, fuzzy, c-format
 msgid "Could not initialize the `%s` subsystem.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-search.c:673
+#: src/fs/gnunet-search.c:676
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:699
+#: src/fs/gnunet-search.c:702
 msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:705
+#: src/fs/gnunet-search.c:708
 msgid "do not search, print only the URI that points to this search"
 msgstr ""
 
-#: src/fs/gnunet-search.c:712
+#: src/fs/gnunet-search.c:715
 msgid ""
 "write search results for directories according to FORMAT; accepted "
 "placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
 "printf when omitted or to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:722
+#: src/fs/gnunet-search.c:725
 msgid ""
 "write search results according to FORMAT; accepted placeholders are: %a, %f, "
 "%j, %l, %m, %n, %s; defaults to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:730
+#: src/fs/gnunet-search.c:733
 msgid ""
 "when the %a or %j placeholders appear in --printf or --dir-printf, list each "
 "metadata property according to FORMAT; accepted placeholders are: %i, %l, "
 "%n, %p"
 msgstr ""
 
-#: src/fs/gnunet-search.c:739
+#: src/fs/gnunet-search.c:742
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:751
+#: src/fs/gnunet-search.c:754
 msgid ""
 "create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
 "search --output=commons"
 msgstr ""
 
-#: src/fs/gnunet-search.c:758
+#: src/fs/gnunet-search.c:761
 msgid "silent mode (requires the --output argument)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:764
+#: src/fs/gnunet-search.c:767
 msgid ""
 "automatically terminate search after DELAY; the value given must be a number "
 "followed by a space and a time unit, for example \"500 ms\"; without a unit "
@@ -3374,55 +3374,55 @@ msgid ""
 "to wait for CTRL-C"
 msgstr ""
 
-#: src/fs/gnunet-search.c:773
+#: src/fs/gnunet-search.c:776
 #, c-format
 msgid ""
 "be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
 "arguments - ignored when these are provided by the user)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:786
+#: src/fs/gnunet-search.c:789
 msgid "Search for files that have been published on GNUnet\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:371 src/fs/gnunet-service-fs.c:878
+#: src/fs/gnunet-service-fs.c:370 src/fs/gnunet-service-fs.c:877
 #, fuzzy
 msgid "# client searches active"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs.c:430
+#: src/fs/gnunet-service-fs.c:429
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/fs/gnunet-service-fs.c:596
+#: src/fs/gnunet-service-fs.c:595
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:648 src/fs/gnunet-service-fs_cp.c:558
+#: src/fs/gnunet-service-fs.c:647 src/fs/gnunet-service-fs_cp.c:558
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:831
+#: src/fs/gnunet-service-fs.c:830
 #, fuzzy
 msgid "# client searches received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs.c:871
+#: src/fs/gnunet-service-fs.c:870
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1041
+#: src/fs/gnunet-service-fs.c:1040
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1288
+#: src/fs/gnunet-service-fs.c:1287
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/gnunet-service-fs.c:1322 src/hostlist/gnunet-daemon-hostlist.c:343
+#: src/fs/gnunet-service-fs.c:1321 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3525,42 +3525,42 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:188
+#: src/fs/gnunet-service-fs_indexing.c:129
+#: src/fs/gnunet-service-fs_indexing.c:187
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:147
+#: src/fs/gnunet-service-fs_indexing.c:146
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/fs/gnunet-service-fs_indexing.c:244
+#: src/fs/gnunet-service-fs_indexing.c:243
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:297
+#: src/fs/gnunet-service-fs_indexing.c:296
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:311
+#: src/fs/gnunet-service-fs_indexing.c:310
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:315
+#: src/fs/gnunet-service-fs_indexing.c:314
 #, fuzzy
 msgid "not indexed"
 msgstr "Avindexering misslyckades."
 
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:328
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:435
+#: src/fs/gnunet-service-fs_indexing.c:434
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3699,37 +3699,56 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:93
+#: src/fs/gnunet-unindex.c:94
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:102
+#: src/fs/gnunet-unindex.c:103
 #, fuzzy, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 "\n"
 "Fel vid avindexering av fil: %s\n"
 
-#: src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-unindex.c:109
 #, fuzzy
 msgid "Unindexing done.\n"
 msgstr "Avindexera filer."
 
-#: src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-unindex.c:142
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-unindex.c:161
+#: src/fs/gnunet-unindex.c:162
 #, fuzzy
 msgid "Could not start unindex operation.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/fs/gnunet-unindex.c:194
+#: src/fs/gnunet-unindex.c:195
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
+#: src/fs/meta_data.c:1063 src/fs/meta_data.c:1116 src/fs/meta_data.c:1131
+msgid "metadata length"
+msgstr ""
+
+#: src/fs/meta_data.c:1074
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
+msgstr ""
+
+#: src/fs/meta_data.c:1091
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/fs/meta_data.c:1126
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
 #: src/gns/gns_tld_api.c:293
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
@@ -3757,46 +3776,46 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:298
+#: src/gns/gnunet-dns2gns.c:296
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:379
+#: src/gns/gnunet-dns2gns.c:377
 #, fuzzy
 msgid "Failed to parse DNS response!\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:453
+#: src/gns/gnunet-dns2gns.c:451
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:656
+#: src/gns/gnunet-dns2gns.c:654
 #, fuzzy, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:672
+#: src/gns/gnunet-dns2gns.c:670
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/gns/gnunet-dns2gns.c:680
+#: src/gns/gnunet-dns2gns.c:678
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:841
+#: src/gns/gnunet-dns2gns.c:839
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:1001
+#: src/gns/gnunet-dns2gns.c:999
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1018
+#: src/gns/gnunet-dns2gns.c:1016
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3932,170 +3951,170 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:257
+#: src/gns/gnunet-gns.c:256
 #, fuzzy, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/gns/gnunet-gns.c:267 src/util/dnsparser.c:253
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/gns/gnunet-gns.c:281
+#: src/gns/gnunet-gns.c:280
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:305
+#: src/gns/gnunet-gns.c:304
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:340
+#: src/gns/gnunet-gns.c:339
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:346
+#: src/gns/gnunet-gns.c:345
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:352
+#: src/gns/gnunet-gns.c:351
 #, fuzzy
 msgid "Specify a timeout for the lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:356
+#: src/gns/gnunet-gns.c:355
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:361
+#: src/gns/gnunet-gns.c:360
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:375
+#: src/gns/gnunet-gns.c:374
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/gns/gnunet-service-gns.c:519
+#: src/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1346
+#: src/gns/gnunet-service-gns.c:554
+#: src/zonemaster/gnunet-service-zonemaster.c:1345
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:574
-#: src/zonemaster/gnunet-service-zonemaster.c:1385
+#: src/gns/gnunet-service-gns.c:573
+#: src/zonemaster/gnunet-service-zonemaster.c:1384
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:279
+#: src/gns/gnunet-service-gns_interceptor.c:278
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:380
+#: src/gns/gnunet-service-gns_interceptor.c:379
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:672
+#: src/gns/gnunet-service-gns_resolver.c:669
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:684
+#: src/gns/gnunet-service-gns_resolver.c:681
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:690
+#: src/gns/gnunet-service-gns_resolver.c:687
 #, c-format
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:903
+#: src/gns/gnunet-service-gns_resolver.c:900
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1094
+#: src/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1870
+#: src/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1885
+#: src/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1918
+#: src/gns/gnunet-service-gns_resolver.c:1915
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2320
+#: src/gns/gnunet-service-gns_resolver.c:2317
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2325
+#: src/gns/gnunet-service-gns_resolver.c:2322
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2348
+#: src/gns/gnunet-service-gns_resolver.c:2345
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2515
+#: src/gns/gnunet-service-gns_resolver.c:2512
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2663
+#: src/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:138
+#: src/gns/plugin_gnsrecord_gns.c:137
 msgid "This is a memento of an older block for internal maintenance."
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:177
+#: src/gns/plugin_gnsrecord_gns.c:176
 #, fuzzy, c-format
 msgid "Unable to parse zone key record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:191
+#: src/gns/plugin_gnsrecord_gns.c:190
 msgid "Record type does not match parsed record type\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:214
+#: src/gns/plugin_gnsrecord_gns.c:213
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:231
+#: src/gns/plugin_gnsrecord_gns.c:230
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:255
+#: src/gns/plugin_gnsrecord_gns.c:254
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:287
+#: src/gns/plugin_gnsrecord_gns.c:286
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -4105,109 +4124,109 @@ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 msgid "Gns REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/gnsrecord/gnsrecord_misc.c:53
+#: src/gnsrecord/gnsrecord_misc.c:51
 msgid "Label is NULL which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:58
+#: src/gnsrecord/gnsrecord_misc.c:56
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:481
+#: src/gnsrecord/gnsrecord_misc.c:479
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:489
+#: src/gnsrecord/gnsrecord_misc.c:487
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:499
+#: src/gnsrecord/gnsrecord_misc.c:497
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:515
+#: src/gnsrecord/gnsrecord_misc.c:513
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:526
+#: src/gnsrecord/gnsrecord_misc.c:524
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:548
+#: src/gnsrecord/gnsrecord_misc.c:546
 msgid "Mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:367
+#: src/gnsrecord/plugin_gnsrecord_dns.c:366
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:385
+#: src/gnsrecord/plugin_gnsrecord_dns.c:384
 #, fuzzy, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:406
+#: src/gnsrecord/plugin_gnsrecord_dns.c:405
 #, fuzzy, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:480
+#: src/gnsrecord/plugin_gnsrecord_dns.c:479
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:516
+#: src/gnsrecord/plugin_gnsrecord_dns.c:515
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:533
+#: src/gnsrecord/plugin_gnsrecord_dns.c:532
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:553
+#: src/gnsrecord/plugin_gnsrecord_dns.c:552
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:573
+#: src/gnsrecord/plugin_gnsrecord_dns.c:572
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:585
+#: src/gnsrecord/plugin_gnsrecord_dns.c:584
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:608
+#: src/gnsrecord/plugin_gnsrecord_dns.c:607
 #, fuzzy, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:621
+#: src/gnsrecord/plugin_gnsrecord_dns.c:620
 #, fuzzy, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:640
+#: src/gnsrecord/plugin_gnsrecord_dns.c:639
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:660
-#: src/gnsrecord/plugin_gnsrecord_dns.c:674
+#: src/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/gnsrecord/plugin_gnsrecord_dns.c:673
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:693
+#: src/gnsrecord/plugin_gnsrecord_dns.c:692
 #, fuzzy, c-format
 msgid "Unable to parse CAA record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -4683,65 +4702,65 @@ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/my/my.c:196 src/my/my.c:215
+#: src/my/my.c:197 src/my/my.c:216
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/mysql/mysql.c:190
+#: src/mysql/mysql.c:191
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 
-#: src/mysql/mysql.c:198
+#: src/mysql/mysql.c:199
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/namecache/gnunet-namecache.c:106
+#: src/namecache/gnunet-namecache.c:105
 #, fuzzy, c-format
 msgid "No records found for `%s'"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/namecache/gnunet-namecache.c:119 src/namestore/gnunet-namestore.c:888
+#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:887
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:175
+#: src/namecache/gnunet-namecache.c:174
 #, fuzzy, c-format
 msgid "You must specify which zone should be accessed\n"
 msgstr "anger vilken TRANSPORT som ska testas"
 
-#: src/namecache/gnunet-namecache.c:182
+#: src/namecache/gnunet-namecache.c:181
 #, fuzzy, c-format
 msgid "Invalid public key for zone `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namecache/gnunet-namecache.c:188
+#: src/namecache/gnunet-namecache.c:187
 #, fuzzy, c-format
 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:2020
+#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2019
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:221
+#: src/namecache/gnunet-namecache.c:220
 #, fuzzy
 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:2102
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2101
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
 
-#: src/namecache/namecache_api.c:285
+#: src/namecache/namecache_api.c:283
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:373
+#: src/namecache/namecache_api.c:371
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -4780,7 +4799,7 @@ msgid "Failed to setup database at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
 #: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1951
+#: src/namestore/gnunet-namestore.c:1950
 #, fuzzy, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr "Onödiga argument (ignorerade).\n"
@@ -4954,255 +4973,255 @@ msgid "Failed to connect to IDENTITY\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2087
+#: src/namestore/gnunet-namestore.c:2086
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
 
-#: src/namestore/gnunet-namestore.c:412
+#: src/namestore/gnunet-namestore.c:411
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/namestore/gnunet-namestore.c:420
+#: src/namestore/gnunet-namestore.c:419
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:428 src/namestore/gnunet-namestore.c:443
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:435
+#: src/namestore/gnunet-namestore.c:434
 #, fuzzy, c-format
 msgid "Error parsing expiration time %s.\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/namestore/gnunet-namestore.c:465
+#: src/namestore/gnunet-namestore.c:464
 #, 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:667
+#: src/namestore/gnunet-namestore.c:666
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:685 src/namestore/gnunet-namestore.c:701
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1137
+#: src/namestore/gnunet-namestore.c:1136
 #, 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:1258
+#: src/namestore/gnunet-namestore.c:1257
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1301
+#: src/namestore/gnunet-namestore.c:1300
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1326
+#: src/namestore/gnunet-namestore.c:1325
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1355
+#: src/namestore/gnunet-namestore.c:1354
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1369
+#: src/namestore/gnunet-namestore.c:1368
 #, c-format
 msgid "Recordlines only work with option `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1378 src/namestore/gnunet-namestore.c:1430
-#: src/namestore/gnunet-namestore.c:1440 src/namestore/gnunet-namestore.c:1450
-#: src/namestore/gnunet-namestore.c:1479 src/namestore/gnunet-namestore.c:1500
-#: src/namestore/gnunet-namestore.c:1527 src/namestore/gnunet-namestore.c:1537
-#: src/namestore/gnunet-namestore.c:1570 src/namestore/gnunet-namestore.c:1595
-#: src/namestore/gnunet-namestore.c:1629 src/namestore/gnunet-namestore.c:1663
-#: src/namestore/gnunet-namestore.c:1686
+#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
+#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
+#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
+#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
+#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
+#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
+#: src/namestore/gnunet-namestore.c:1685
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:1380
+#: src/namestore/gnunet-namestore.c:1379
 #, fuzzy
 msgid "name"
 msgstr "Visa namn"
 
-#: src/namestore/gnunet-namestore.c:1409
+#: src/namestore/gnunet-namestore.c:1408
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:1432 src/namestore/gnunet-namestore.c:1442
-#: src/namestore/gnunet-namestore.c:1452 src/namestore/gnunet-namestore.c:1481
-#: src/namestore/gnunet-namestore.c:1502 src/namestore/gnunet-namestore.c:1688
+#: src/namestore/gnunet-namestore.c:1431 src/namestore/gnunet-namestore.c:1441
+#: src/namestore/gnunet-namestore.c:1451 src/namestore/gnunet-namestore.c:1480
+#: src/namestore/gnunet-namestore.c:1501 src/namestore/gnunet-namestore.c:1687
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1460
+#: src/namestore/gnunet-namestore.c:1459
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:1470
+#: src/namestore/gnunet-namestore.c:1469
 #, c-format
 msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1490
+#: src/namestore/gnunet-namestore.c:1489
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
 
-#: src/namestore/gnunet-namestore.c:1509 src/namestore/gnunet-namestore.c:1695
+#: src/namestore/gnunet-namestore.c:1508 src/namestore/gnunet-namestore.c:1694
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1529 src/namestore/gnunet-namestore.c:1539
+#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1571
 msgid "purge-zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1596
 msgid "list"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1631
+#: src/namestore/gnunet-namestore.c:1630
 msgid "reverse-pkey"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1641
+#: src/namestore/gnunet-namestore.c:1640
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1665
+#: src/namestore/gnunet-namestore.c:1664
 msgid "uri"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1678
+#: src/namestore/gnunet-namestore.c:1677
 #: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:1966
+#: src/namestore/gnunet-namestore.c:1965
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1985
+#: src/namestore/gnunet-namestore.c:1984
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1988
+#: src/namestore/gnunet-namestore.c:1987
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1992
+#: src/namestore/gnunet-namestore.c:1991
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1996
+#: src/namestore/gnunet-namestore.c:1995
 msgid "read commands from stdin"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2003
+#: src/namestore/gnunet-namestore.c:2002
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2009
+#: src/namestore/gnunet-namestore.c:2008
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:2014
+#: src/namestore/gnunet-namestore.c:2013
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:2024
+#: src/namestore/gnunet-namestore.c:2023
 #, fuzzy
 msgid "Output in recordline format"
 msgstr "utdata i gnuplot-format"
 
-#: src/namestore/gnunet-namestore.c:2030
+#: src/namestore/gnunet-namestore.c:2029
 #, fuzzy
 msgid "determine our name for the given KEY"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:2036
+#: src/namestore/gnunet-namestore.c:2035
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2041
+#: src/namestore/gnunet-namestore.c:2040
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2047
+#: src/namestore/gnunet-namestore.c:2046
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2051
+#: src/namestore/gnunet-namestore.c:2050
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2055
+#: src/namestore/gnunet-namestore.c:2054
 msgid "omit private records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2060
+#: src/namestore/gnunet-namestore.c:2059
 msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2065
+#: src/namestore/gnunet-namestore.c:2064
 msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2070
+#: src/namestore/gnunet-namestore.c:2069
 msgid ""
 "show private key for orphaned records for recovery using `gnunet-identity -C "
 "-P <key>'. Use in combination with --display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2075
+#: src/namestore/gnunet-namestore.c:2074
 msgid "delete all records in specified zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2081
+#: src/namestore/gnunet-namestore.c:2080
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1837
+#: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1843
+#: src/namestore/gnunet-zoneimport.c:1841
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
@@ -5553,7 +5572,7 @@ msgid "Show network size estimates from NSE service."
 msgstr "# byte mottogs via TCP"
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:242
+#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5750,67 +5769,67 @@ msgstr "Fel vid skapandet av användare"
 msgid "Unable to create indices: %s.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/pt/gnunet-daemon-pt.c:418
+#: src/pt/gnunet-daemon-pt.c:416
 #, fuzzy
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/pt/gnunet-daemon-pt.c:424
+#: src/pt/gnunet-daemon-pt.c:422
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:478
+#: src/pt/gnunet-daemon-pt.c:476
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:673
+#: src/pt/gnunet-daemon-pt.c:671
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:680
+#: src/pt/gnunet-daemon-pt.c:678
 #, fuzzy
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/pt/gnunet-daemon-pt.c:718
+#: src/pt/gnunet-daemon-pt.c:716
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/pt/gnunet-daemon-pt.c:773
+#: src/pt/gnunet-daemon-pt.c:771
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:779
+#: src/pt/gnunet-daemon-pt.c:777
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:788
+#: src/pt/gnunet-daemon-pt.c:786
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:881
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:900
+#: src/pt/gnunet-daemon-pt.c:898
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# byte mottagna av typen %d"
 
-#: src/pt/gnunet-daemon-pt.c:1227 src/pt/gnunet-daemon-pt.c:1236
-#: src/pt/gnunet-daemon-pt.c:1252 src/pt/gnunet-daemon-pt.c:1261
-#: src/pt/gnunet-daemon-pt.c:1270
+#: 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
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/pt/gnunet-daemon-pt.c:1316
+#: src/pt/gnunet-daemon-pt.c:1314
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -5938,7 +5957,7 @@ msgstr ""
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:3096
+#: src/reclaim/plugin_rest_openid_connect.c:3095
 #, fuzzy
 msgid "OpenID Connect REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -5948,7 +5967,7 @@ msgstr " Anslutning misslyckades\n"
 msgid "Identity Provider REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/reclaim/reclaim_api.c:545
+#: src/reclaim/reclaim_api.c:544
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Misslyckades att starta samling.\n"
@@ -5968,13 +5987,13 @@ msgid "No configuration file given. Exiting\n"
 msgstr "använd konfigurationsfil FILNAMN"
 
 #: src/regex/gnunet-regex-profiler.c:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:631
+#: src/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:639
+#: src/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
@@ -6020,16 +6039,16 @@ msgstr "Visa värde av alternativet"
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:700
+#: src/regex/gnunet-regex-simulation-profiler.c:701
 #, fuzzy
 msgid "name of the table to write DFAs"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:706
+#: src/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:720
+#: src/regex/gnunet-regex-simulation-profiler.c:721
 msgid "Profiler for regex library"
 msgstr ""
 
@@ -6338,7 +6357,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
 #: src/setu/gnunet-service-setu.c:5389
 #, fuzzy
 msgid "Could not connect to CADET service\n"
@@ -6410,12 +6429,12 @@ msgstr ""
 msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
-#: src/statistics/gnunet-service-statistics.c:319
+#: src/statistics/gnunet-service-statistics.c:314
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-service-statistics.c:984
+#: src/statistics/gnunet-service-statistics.c:979
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
@@ -6598,7 +6617,7 @@ msgid ""
 msgstr ""
 
 #: 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
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:319
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6613,57 +6632,57 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1153
+#: src/testbed/gnunet-service-testbed_peers.c:1154
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# byte krypterade"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1156
+#: src/testbed/gnunet-service-testbed_peers.c:1157
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "\"%s\" startar\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1159
+#: src/testbed/gnunet-service-testbed_peers.c:1160
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1162
+#: src/testbed/gnunet-service-testbed_peers.c:1163
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "\"%s\" startar\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1166
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1172
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1175
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1178
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1181
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1182
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -8011,17 +8030,17 @@ msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1400
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1401
 #, 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:1412
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1413
 #, 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:1419
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1420
 #, 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"
@@ -8033,7 +8052,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:838
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
@@ -8043,23 +8062,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:950
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:951
 #, 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:991
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:992
 #, 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:1480
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1481
 #, 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:1504
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1505
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8074,45 +8093,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:1750
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1751
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1756
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1761
 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
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1219
+#: src/util/service.c:1642
 #, 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:1643
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1644
 msgid "No such user"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1658
 #, 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:2000
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2001
 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
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2077
+#: src/util/service.c:2089
 #, 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:2098
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2099
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -8126,242 +8145,223 @@ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:228 src/util/bio.c:236
+#: src/util/bio.c:223 src/util/bio.c:231
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/bio.c:238
+#: src/util/bio.c:233
 #, fuzzy
 msgid "End of file"
 msgstr "Läs in en konfigurationsfil"
 
-#: src/util/bio.c:267
+#: src/util/bio.c:262
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/util/bio.c:269
+#: src/util/bio.c:264
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:309
+#: src/util/bio.c:304
 #, fuzzy, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/util/bio.c:336 src/util/bio.c:840
+#: src/util/bio.c:331 src/util/bio.c:781
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:342
+#: src/util/bio.c:337
 #, fuzzy, c-format
 msgid "%s (while reading `%s')"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/util/bio.c:347
+#: src/util/bio.c:342
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:360
+#: src/util/bio.c:355
 #, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
-msgid "metadata length"
-msgstr ""
-
-#: src/util/bio.c:411
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
-msgstr ""
-
-#: src/util/bio.c:427
-#, fuzzy, c-format
-msgid "Failed to deserialize metadata `%s'"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/util/bio.c:669
+#: src/util/bio.c:610
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:731 src/util/bio.c:752
+#: src/util/bio.c:672 src/util/bio.c:693
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/util/bio.c:733
+#: src/util/bio.c:674
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:817
+#: src/util/bio.c:758
 #, fuzzy, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/bio.c:877
-#, fuzzy, c-format
-msgid "Failed to serialize metadata `%s'"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/util/client.c:750 src/util/client.c:941
+#: src/util/client.c:751 src/util/client.c:942
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1096
+#: src/util/client.c:1097
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:648 src/util/common_logging.c:687
+#: src/util/common_logging.c:647 src/util/common_logging.c:686
 #, c-format
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:911
+#: src/util/common_logging.c:910
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1104
+#: src/util/common_logging.c:1103
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1105
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1107
 msgid "MESSAGE"
 msgstr "MEDDELANDE"
 
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1109
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1111
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1113
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:1115
+#: src/util/common_logging.c:1114
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1360
+#: src/util/common_logging.c:1359
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1405
+#: src/util/common_logging.c:1404
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1417
+#: src/util/common_logging.c:1416
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/common_logging.c:1432
+#: src/util/common_logging.c:1431
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#: src/util/configuration.c:790
+#: src/util/configuration.c:786
 #, c-format
 msgid "Illegal directive in line %u (parsing restricted section %s)\n"
 msgstr ""
 
-#: src/util/configuration.c:800
+#: src/util/configuration.c:796
 #, c-format
 msgid "Bad directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:853
+#: src/util/configuration.c:849
 #, c-format
 msgid "Bad inline-secret directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:875
+#: src/util/configuration.c:871
 #, c-format
 msgid "Unknown or malformed directive '%s' in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:905
+#: src/util/configuration.c:901
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u (option without section)\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:949
+#: src/util/configuration.c:945
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:1049
+#: src/util/configuration.c:1045
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/util/configuration.c:1062
+#: src/util/configuration.c:1058
 #, fuzzy, c-format
 msgid "Failed to parse configuration file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/configuration.c:1695
+#: src/util/configuration.c:1691
 #, fuzzy
 msgid "Not a valid relative time specification"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/configuration.c:1765
+#: src/util/configuration.c:1761
 #, 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
+#: src/util/configuration.c:1856
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1892
+#: src/util/configuration.c:1888
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/configuration.c:1958
+#: src/util/configuration.c:1954
 #, 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
+#: src/util/configuration_helper.c:134
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:147
+#: src/util/configuration_helper.c:148
 #, fuzzy, c-format
 msgid "%s, %s or %s argument is required\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/util/configuration_helper.c:218
+#: src/util/configuration_helper.c:219
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:262
+#: src/util/configuration_helper.c:263
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8378,7 +8378,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:281
+#: src/util/crypto_ecc_setup.c:282
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
@@ -8388,121 +8388,121 @@ 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:907
+#: src/util/crypto_rsa.c:908
 #, 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:1207
+#: src/util/crypto_rsa.c:1208
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/disk.c:843
+#: src/util/disk.c:842
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/dnsparser.c:909
+#: src/util/dnsparser.c:910
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/dnsstub.c:227
+#: src/util/dnsstub.c:228
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/util/dnsstub.c:370
+#: src/util/dnsstub.c:371
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr ""
 
-#: src/util/dnsstub.c:503
+#: src/util/dnsstub.c:504
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:509
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/util/getopt.c:565
+#: src/util/getopt.c:566
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/util/getopt.c:590
+#: src/util/getopt.c:591
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:596
+#: src/util/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: flagga \"%c%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:616 src/util/getopt.c:797
+#: src/util/getopt.c:617 src/util/getopt.c:798
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: flagga \"%s\" kräver ett argument\n"
 
-#: src/util/getopt.c:647
+#: src/util/getopt.c:648
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: src/util/getopt.c:653
+#: src/util/getopt.c:654
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: src/util/getopt.c:680
+#: src/util/getopt.c:681
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: otillåten flagga -- %c\n"
 
-#: src/util/getopt.c:682
+#: src/util/getopt.c:683
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ogiltig flagga -- %c\n"
 
-#: src/util/getopt.c:711 src/util/getopt.c:847
+#: src/util/getopt.c:712 src/util/getopt.c:848
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: flagga kräver ett argument -- %c\n"
 
-#: src/util/getopt.c:761
+#: src/util/getopt.c:762
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: flagga \"-W %s\" är tvetydig\n"
 
-#: src/util/getopt.c:781
+#: src/util/getopt.c:782
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:970
+#: src/util/getopt.c:971
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Använd --help för att få en lista på flaggor.\n"
 
-#: src/util/getopt.c:983
+#: src/util/getopt.c:984
 #, fuzzy, c-format
 msgid "Option `%s' can't be used with other options.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/util/getopt.c:995
+#: src/util/getopt.c:996
 #, fuzzy, c-format
 msgid "Missing mandatory option `%s'.\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/getopt_helpers.c:63
+#: src/util/getopt_helpers.c:64
 msgid "print the version number"
 msgstr "skriv ut versionsnummer"
 
-#: src/util/getopt_helpers.c:110
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8510,460 +8510,460 @@ msgstr ""
 "Argument som är obligatoriska för långa flaggor är också obligatoriska för "
 "korta flaggor.\n"
 
-#: src/util/getopt_helpers.c:197
+#: src/util/getopt_helpers.c:198
 msgid "print this help"
 msgstr "skriv ut denna hjälp"
 
-#: src/util/getopt_helpers.c:262
+#: src/util/getopt_helpers.c:263
 msgid "be verbose"
 msgstr "var informativ"
 
-#: src/util/getopt_helpers.c:378
+#: src/util/getopt_helpers.c:379
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:445
+#: src/util/getopt_helpers.c:446
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:462
+#: src/util/getopt_helpers.c:463
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/getopt_helpers.c:498 src/util/getopt_helpers.c:812
-#: src/util/getopt_helpers.c:868
+#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
+#: src/util/getopt_helpers.c:869
 #, 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:570
+#: src/util/getopt_helpers.c:571
 #, 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:577
+#: src/util/getopt_helpers.c:578
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:595
+#: src/util/getopt_helpers.c:596
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:597
+#: src/util/getopt_helpers.c:598
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:631
+#: src/util/getopt_helpers.c:632
 #, 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:685
+#: src/util/getopt_helpers.c:686
 #, 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:742
+#: src/util/getopt_helpers.c:743
 #, 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:749
+#: src/util/getopt_helpers.c:750
 #, c-format
 msgid "The maximum precision allowed for timestamps is seconds.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:805
+#: src/util/getopt_helpers.c:806
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:875
+#: src/util/getopt_helpers.c:876
 #, 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:953
+#: src/util/getopt_helpers.c:954
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-base32.c:46
+#: src/util/gnunet-base32.c:47
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/util/gnunet-config.c:153
+#: src/util/gnunet-config.c:154
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/util/gnunet-config.c:159
+#: src/util/gnunet-config.c:160
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:164
+#: src/util/gnunet-config.c:165
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:170
+#: src/util/gnunet-config.c:171
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:176
+#: src/util/gnunet-config.c:177
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:192
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-crypto-tvg.c:1527
+#: src/util/gnunet-crypto-tvg.c:1528
 msgid "verify a test vector from stdin"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:94
+#: src/util/gnunet-ecc.c:95
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/gnunet-ecc.c:128
+#: src/util/gnunet-ecc.c:129
 #, c-format
 msgid "Generating %u keys like %s, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:136
+#: src/util/gnunet-ecc.c:137
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:177
+#: src/util/gnunet-ecc.c:178
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:185
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "Slutför"
 
-#: src/util/gnunet-ecc.c:186
+#: src/util/gnunet-ecc.c:187
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:303
+#: src/util/gnunet-ecc.c:304
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/util/gnunet-ecc.c:313
+#: src/util/gnunet-ecc.c:314
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/util/gnunet-ecc.c:333
+#: src/util/gnunet-ecc.c:334
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/util/gnunet-ecc.c:387
+#: src/util/gnunet-ecc.c:388
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:451
+#: src/util/gnunet-ecc.c:452
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:457
+#: src/util/gnunet-ecc.c:458
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:463
+#: src/util/gnunet-ecc.c:464
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:468
+#: src/util/gnunet-ecc.c:469
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:473
+#: src/util/gnunet-ecc.c:474
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:478
+#: src/util/gnunet-ecc.c:479
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:484
+#: src/util/gnunet-ecc.c:485
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:498
+#: src/util/gnunet-ecc.c:499
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
+#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/util/gnunet-qr.c:133
+#: src/util/gnunet-qr.c:134
 #, fuzzy, c-format
 msgid "Added URI %s\n"
 msgstr "Ogiltiga argument: "
 
-#: src/util/gnunet-qr.c:160
+#: src/util/gnunet-qr.c:161
 #, 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:170
+#: src/util/gnunet-qr.c:171
 #, c-format
 msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:181
+#: src/util/gnunet-qr.c:182
 #, c-format
 msgid "No known handler for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:217
+#: src/util/gnunet-qr.c:218
 #, fuzzy, c-format
 msgid "Unable to start child process `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/gnunet-qr.c:246
+#: src/util/gnunet-qr.c:247
 #, fuzzy, c-format
 msgid "Failed to open device: `%s': %d\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/gnunet-qr.c:260
+#: src/util/gnunet-qr.c:261
 #, fuzzy
 msgid "Capturing...\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
 msgid "No captured images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
 #, c-format
 msgid "Got %d images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
 #, 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
+#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
 #, fuzzy, c-format
 msgid "%s is not a PNG file\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/util/gnunet-qr.c:545
+#: src/util/gnunet-qr.c:546
 #, fuzzy
 msgid "No data found\n"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/util/gnunet-qr.c:561
+#: src/util/gnunet-qr.c:562
 msgid "Dispatching the URI\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:572
+#: src/util/gnunet-qr.c:573
 msgid "use the video device DEVICE (defaults to /dev/video0)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:579
+#: src/util/gnunet-qr.c:580
 msgid "read from the PNG-encoded file FILE"
 msgstr ""
 
-#: src/util/gnunet-qr.c:590
+#: src/util/gnunet-qr.c:591
 msgid "Scan a QR code and import the URI read"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:168
+#: src/util/gnunet-resolver.c:169
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:182
+#: src/util/gnunet-resolver.c:183
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:214
+#: 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:280
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:286
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:292
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:312
+#: 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"
 
-#: src/util/gnunet-service-resolver.c:1287
+#: src/util/gnunet-service-resolver.c:1288
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:88
+#: src/util/gnunet-uri.c:89
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:94
+#: src/util/gnunet-uri.c:95
 #, 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
+#: src/util/gnunet-uri.c:102
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:108
+#: src/util/gnunet-uri.c:109
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:178
+#: src/util/gnunet-uri.c:179
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:59
+#: src/util/gnunet_error_codes.c:60
 msgid "No error (success)."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:65
+#: src/util/gnunet_error_codes.c:66
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "Okänt fel"
 
-#: src/util/gnunet_error_codes.c:71
+#: src/util/gnunet_error_codes.c:72
 #, fuzzy
 msgid "Communication with service failed."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/util/gnunet_error_codes.c:77
+#: src/util/gnunet_error_codes.c:78
 #, fuzzy
 msgid "Ego not found."
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/util/gnunet_error_codes.c:83
+#: src/util/gnunet_error_codes.c:84
 msgid "Identifier already in use for another ego."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:89
+#: src/util/gnunet_error_codes.c:90
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:95
+#: src/util/gnunet_error_codes.c:96
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "Okänt fel"
 
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr "# sessionsnycklar accepterade"
 
-#: src/util/gnunet_error_codes.c:107
+#: src/util/gnunet_error_codes.c:108
 #, fuzzy
 msgid "Zone not found."
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/util/gnunet_error_codes.c:113
+#: src/util/gnunet_error_codes.c:114
 #, fuzzy
 msgid "Record not found."
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/util/gnunet_error_codes.c:125
+#: src/util/gnunet_error_codes.c:126
 msgid "Zone does not contain any records."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:131
+#: src/util/gnunet_error_codes.c:132
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/gnunet_error_codes.c:137
+#: src/util/gnunet_error_codes.c:138
 #, fuzzy
 msgid "No records given."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/util/gnunet_error_codes.c:143
+#: src/util/gnunet_error_codes.c:144
 msgid "Record data invalid."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:149
+#: src/util/gnunet_error_codes.c:150
 msgid "No label given."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:155
+#: src/util/gnunet_error_codes.c:156
 #, fuzzy
 msgid "No results given."
 msgstr "# byte mottogs via TCP"
 
-#: src/util/gnunet_error_codes.c:161
+#: src/util/gnunet_error_codes.c:162
 msgid "Record already exists."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:167
+#: src/util/gnunet_error_codes.c:168
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:173
+#: src/util/gnunet_error_codes.c:174
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:179
+#: src/util/gnunet_error_codes.c:180
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/gnunet_error_codes.c:185
+#: src/util/gnunet_error_codes.c:186
 msgid "Label invalid or malformed."
 msgstr ""
 
-#: src/util/helper.c:306
+#: src/util/helper.c:305
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/helper.c:358
+#: src/util/helper.c:357
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/helper.c:573
+#: src/util/helper.c:572
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
@@ -8979,59 +8979,59 @@ msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:415
+#: src/util/os_installation.c:416
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:786
+#: src/util/os_installation.c:787
 #, 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:819
+#: src/util/os_installation.c:820
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/util/plugin.c:86
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/util/plugin.c:157
+#: src/util/plugin.c:158
 #, 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:214
+#: src/util/plugin.c:215
 #, 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:370
+#: src/util/plugin.c:371
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/util/program.c:286
+#: src/util/program.c:287
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/program.c:298
+#: src/util/program.c:299
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/program.c:313
+#: src/util/program.c:314
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/program.c:328
+#: src/util/program.c:329
 #, fuzzy
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -9041,13 +9041,13 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/resolver_api.c:220
+#: src/util/resolver_api.c:221
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:242
+#: src/util/resolver_api.c:243
 #, fuzzy, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
@@ -9056,313 +9056,313 @@ msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion "
 "\"%s\".\n"
 
-#: src/util/resolver_api.c:887
+#: src/util/resolver_api.c:888
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/resolver_api.c:900
+#: src/util/resolver_api.c:901
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1085
+#: src/util/resolver_api.c:1086
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1174 src/util/resolver_api.c:1197
-#: src/util/resolver_api.c:1211
+#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
+#: src/util/resolver_api.c:1212
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/service.c:653
+#: src/util/service.c:654
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1572
+#: src/util/service.c:1573
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/socks.c:635
+#: src/util/socks.c:636
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:652
+#: src/util/socks.c:653
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:395
+#: src/util/strings.c:394
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:514
+#: src/util/strings.c:513
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:1050
+#: src/util/strings.c:1049
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1058
+#: src/util/strings.c:1057
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1065
+#: src/util/strings.c:1064
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1073
+#: src/util/strings.c:1072
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1082
+#: src/util/strings.c:1081
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/strings.c:1264 src/util/strings.c:1275
+#: src/util/strings.c:1263 src/util/strings.c:1274
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1284
+#: src/util/strings.c:1283
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/strings.c:1355 src/util/strings.c:1384 src/util/strings.c:1431
-#: src/util/strings.c:1451
+#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
+#: src/util/strings.c:1450
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1409
+#: src/util/strings.c:1408
 #, 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:1460
+#: src/util/strings.c:1459
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1502
+#: src/util/strings.c:1501
 #, 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:1552
+#: src/util/strings.c:1551
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/strings.c:1583
+#: src/util/strings.c:1582
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
 
-#: src/util/time.c:900 src/util/time.c:928
+#: src/util/time.c:901 src/util/time.c:929
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:936
+#: src/util/time.c:937
 #, 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
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
 #, fuzzy
 msgid "# Active channels"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:583
+#: src/vpn/gnunet-service-vpn.c:582
 #, fuzzy
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/vpn/gnunet-service-vpn.c:736
+#: src/vpn/gnunet-service-vpn.c:735
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1112
+#: src/vpn/gnunet-service-vpn.c:1111
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1262
+#: src/vpn/gnunet-service-vpn.c:1261
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1461
+#: src/vpn/gnunet-service-vpn.c:1460
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/vpn/gnunet-service-vpn.c:1685
+#: src/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1821
+#: src/vpn/gnunet-service-vpn.c:1820
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/vpn/gnunet-service-vpn.c:2019
+#: src/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2045
+#: src/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2282
+#: src/vpn/gnunet-service-vpn.c:2281
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2316 src/vpn/gnunet-service-vpn.c:2348
+#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2355
+#: src/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2371
+#: src/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2411
+#: src/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2463
+#: src/vpn/gnunet-service-vpn.c:2462
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2497 src/vpn/gnunet-service-vpn.c:2705
+#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:2750
+#: src/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3008
+#: src/vpn/gnunet-service-vpn.c:3007
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3036
+#: src/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3046
+#: src/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3062
+#: src/vpn/gnunet-service-vpn.c:3061
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3079
+#: src/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:143
+#: src/vpn/gnunet-vpn.c:142
 #, fuzzy
 msgid "Error creating tunnel\n"
 msgstr "Klar med skapandet av värdnyckel.\n"
 
-#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:226
+#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:202
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/vpn/gnunet-vpn.c:217
+#: src/vpn/gnunet-vpn.c:216
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/vpn/gnunet-vpn.c:240
+#: src/vpn/gnunet-vpn.c:239
 #, fuzzy, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "\"%s\" är inte en vanlig fil.\n"
 
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:258
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:295
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:301
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:308
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:315
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:322
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:330
+#: src/vpn/gnunet-vpn.c:329
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:335
+#: src/vpn/gnunet-vpn.c:334
 #, fuzzy
 msgid "service is offered via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/vpn/gnunet-vpn.c:340
+#: src/vpn/gnunet-vpn.c:339
 #, fuzzy
 msgid "service is offered via UDP"
 msgstr "# byte mottagna via UDP"
 
-#: src/vpn/gnunet-vpn.c:354
+#: src/vpn/gnunet-vpn.c:353
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:502
+#: src/zonemaster/gnunet-service-zonemaster.c:501
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1333
+#: src/zonemaster/gnunet-service-zonemaster.c:1332
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
diff --git a/po/vi.po b/po/vi.po
index c0a4aeeea..41e736f08 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: 2022-12-04 14:58+0900\n"
+"POT-Creation-Date: 2022-12-05 17:21+0900\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"
@@ -31,9 +31,9 @@ msgstr ""
 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:558 src/abd/gnunet-service-abd.c:1751
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1958
+#: src/namestore/gnunet-namestore.c:1957
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -150,7 +150,7 @@ msgstr ""
 msgid "GNUnet abd resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
 
-#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -170,16 +170,16 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1133
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1136
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1137
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1138
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Không rõ người dùng « %s »\n"
@@ -399,28 +399,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:1094
-#: src/util/service.c:1100
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1095
+#: src/util/service.c:1101
 #, 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:530
-#: src/util/service.c:1133
+#: src/transport/tcp_service_legacy.c:634 src/util/client.c:531
+#: src/util/service.c:1134
 #, 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:535
-#: src/util/service.c:1137
+#: src/transport/tcp_service_legacy.c:638 src/util/client.c:536
+#: src/util/service.c:1138
 #, 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:1157
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1158
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -428,7 +428,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:1175
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1176
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -436,7 +436,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:1206
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1207
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -444,7 +444,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:1225
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1226
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
@@ -1134,7 +1134,7 @@ msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:664
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1585,10 +1585,10 @@ msgstr "kho dữ liệu sqlite"
 
 #: src/datacache/plugin_datacache_sqlite.c:128
 #: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_mysql.c:890
+#: src/datastore/plugin_datastore_mysql.c:891
 #: 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/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:82 src/my/my.c:94
+#: src/mysql/mysql.c:47 src/mysql/mysql.c:65
 #: src/namecache/plugin_namecache_sqlite.c:54
 #: src/namestore/plugin_namestore_sqlite.c:56
 #: src/peerstore/plugin_peerstore_sqlite.c:54
@@ -1596,7 +1596,7 @@ msgstr "kho dữ liệu sqlite"
 #: 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
+#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
 #, c-format
 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"
@@ -1914,24 +1914,24 @@ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 msgid "Heap database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/datastore/plugin_datastore_mysql.c:371
-#: src/datastore/plugin_datastore_mysql.c:423
-#: src/datastore/plugin_datastore_mysql.c:1071
+#: src/datastore/plugin_datastore_mysql.c:372
+#: src/datastore/plugin_datastore_mysql.c:424
+#: src/datastore/plugin_datastore_mysql.c:1072
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:410
+#: src/datastore/plugin_datastore_mysql.c:411
 #: src/datastore/plugin_datastore_sqlite.c:675
 #, fuzzy
 msgid "Data too large"
 msgstr "số lần lặp lại"
 
-#: src/datastore/plugin_datastore_mysql.c:847
+#: src/datastore/plugin_datastore_mysql.c:848
 #, fuzzy, c-format
 msgid "`%s' for `%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/datastore/plugin_datastore_mysql.c:1179
+#: src/datastore/plugin_datastore_mysql.c:1180
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -2062,7 +2062,7 @@ msgstr ""
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:359
+#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
 #: src/nse/gnunet-nse-profiler.c:894
 msgid "be verbose (print progress information)"
 msgstr ""
@@ -2153,286 +2153,286 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/dns/gnunet-dns-monitor.c:371 src/dns/gnunet-dns-monitor.c:376
+#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:388
+#: src/dns/gnunet-dns-monitor.c:387
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:241
+#: src/dns/gnunet-dns-redirector.c:240
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:246
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:260
+#: src/dns/gnunet-dns-redirector.c:259
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:466
+#: src/dns/gnunet-service-dns.c:463
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:620
+#: src/dns/gnunet-service-dns.c:617
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:756
+#: src/dns/gnunet-service-dns.c:753
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:832
+#: src/dns/gnunet-service-dns.c:829
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:951
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:973
+#: src/dns/gnunet-service-dns.c:970
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:984
+#: src/dns/gnunet-service-dns.c:981
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:996
+#: src/dns/gnunet-service-dns.c:993
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:999
+#: src/dns/gnunet-service-dns.c:996
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069
+#: src/dns/gnunet-service-dns.c:1066
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
+#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/dns/gnunet-service-dns.c:1128
+#: src/dns/gnunet-service-dns.c:1125
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:971
+#: src/exit/gnunet-daemon-exit.c:968
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1077
+#: src/exit/gnunet-daemon-exit.c:1074
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1371
+#: src/exit/gnunet-daemon-exit.c:1368
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
+#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
+#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
+#: src/exit/gnunet-daemon-exit.c:2283
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1507
+#: src/exit/gnunet-daemon-exit.c:1504
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1619
+#: src/exit/gnunet-daemon-exit.c:1616
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1661
+#: src/exit/gnunet-daemon-exit.c:1658
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1752
+#: src/exit/gnunet-daemon-exit.c:1749
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1840
+#: src/exit/gnunet-daemon-exit.c:1837
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:1879
+#: src/exit/gnunet-daemon-exit.c:1876
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2020
+#: src/exit/gnunet-daemon-exit.c:2017
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
+#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
+#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
+#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
+#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2290
+#: src/exit/gnunet-daemon-exit.c:2287
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/exit/gnunet-daemon-exit.c:2349 src/vpn/gnunet-service-vpn.c:995
-#: src/vpn/gnunet-service-vpn.c:2122
+#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
+#: src/vpn/gnunet-service-vpn.c:2121
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
+#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2498 src/exit/gnunet-daemon-exit.c:3199
+#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/exit/gnunet-daemon-exit.c:2619
+#: src/exit/gnunet-daemon-exit.c:2616
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2639
+#: src/exit/gnunet-daemon-exit.c:2636
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# các byte được gửi"
 
-#: src/exit/gnunet-daemon-exit.c:2831
+#: src/exit/gnunet-daemon-exit.c:2828
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2840
+#: src/exit/gnunet-daemon-exit.c:2837
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2916
+#: src/exit/gnunet-daemon-exit.c:2913
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2990
+#: src/exit/gnunet-daemon-exit.c:2987
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3039
+#: src/exit/gnunet-daemon-exit.c:3036
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:3054
+#: src/exit/gnunet-daemon-exit.c:3051
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:3081
+#: src/exit/gnunet-daemon-exit.c:3078
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3112
+#: src/exit/gnunet-daemon-exit.c:3109
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3164
+#: src/exit/gnunet-daemon-exit.c:3161
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3173
+#: src/exit/gnunet-daemon-exit.c:3170
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
+#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
+#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3451
+#: src/exit/gnunet-daemon-exit.c:3448
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
+#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3495
+#: src/exit/gnunet-daemon-exit.c:3492
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3640
+#: src/exit/gnunet-daemon-exit.c:3637
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3649
+#: src/exit/gnunet-daemon-exit.c:3646
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3657
+#: src/exit/gnunet-daemon-exit.c:3654
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3661
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3835
+#: src/exit/gnunet-daemon-exit.c:3832
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3951
+#: src/exit/gnunet-daemon-exit.c:3948
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4117
+#: src/exit/gnunet-daemon-exit.c:4114
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2455,170 +2455,170 @@ msgstr "# các kết quả dht được nhận"
 msgid "# messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/fragmentation/fragmentation.c:240
+#: src/fragmentation/fragmentation.c:239
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:245
+#: src/fragmentation/fragmentation.c:244
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:278
+#: src/fragmentation/fragmentation.c:277
 #, fuzzy
 msgid "# fragments wrap arounds"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:325
+#: src/fragmentation/fragmentation.c:324
 msgid "# messages fragmented"
 msgstr "# các thông báo bị tế phân"
 
-#: src/fragmentation/fragmentation.c:331
+#: src/fragmentation/fragmentation.c:330
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:459
+#: src/fragmentation/fragmentation.c:458
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Các quảng cáo đồng đẳng được nhận"
 
-#: src/fragmentation/fragmentation.c:466
+#: src/fragmentation/fragmentation.c:465
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:490
+#: src/fragmentation/fragmentation.c:489
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:481
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:492
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:499
+#: src/fs/fs_api.c:500
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1156
+#: src/fs/fs_api.c:1157
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:1707
+#: src/fs/fs_api.c:1708
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1722
+#: src/fs/fs_api.c:1723
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2451
+#: src/fs/fs_api.c:2452
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2462
+#: src/fs/fs_api.c:2463
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
+#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2628
+#: src/fs/fs_api.c:2629
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
+#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2846
+#: src/fs/fs_api.c:2847
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3107
+#: src/fs/fs_api.c:3108
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:215
+#: src/fs/fs_directory.c:216
 #, fuzzy
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:332
+#: src/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:346
+#: src/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directory contents of `%s' for recursive download\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_download.c:528 src/fs/fs_download.c:541
+#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:960
+#: src/fs/fs_download.c:961
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_download.c:1044
+#: src/fs/fs_download.c:1045
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1066
+#: src/fs/fs_download.c:1067
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1089
+#: src/fs/fs_download.c:1090
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_download.c:1100
+#: src/fs/fs_download.c:1101
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1110
+#: src/fs/fs_download.c:1111
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1218
+#: src/fs/fs_download.c:1219
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_download.c:1889
+#: src/fs/fs_download.c:1890
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -2632,104 +2632,104 @@ msgstr ""
 "Không rõ kiểu siêu dữ liệu trong tùy chọn siêu dữ liệu « %s ». Đang ùng kiểu "
 "siêu dữ liệu « không rõ » (unknown) để thay thế.\n"
 
-#: src/fs/fs_list_indexed.c:190
+#: src/fs/fs_list_indexed.c:191
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_misc.c:128
+#: src/fs/fs_misc.c:129
 #, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:202
+#: src/fs/fs_namespace.c:203
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_namespace.c:233
+#: src/fs/fs_namespace.c:234
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:330
+#: src/fs/fs_namespace.c:331
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:457
+#: src/fs/fs_namespace.c:458
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_publish.c:128 src/fs/fs_publish.c:438
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:731
+#: src/fs/fs_publish.c:732
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.\n"
 msgstr "Không thể mở tập tin « %s »: « %s »"
 
-#: 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
+#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n"
 
-#: src/fs/fs_publish.c:790
+#: src/fs/fs_publish.c:791
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/fs/fs_publish.c:836
+#: src/fs/fs_publish.c:837
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:857
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:888
+#: src/fs/fs_publish.c:889
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:915
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_publish.c:1003 src/fs/fs_publish.c:1040
+#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1107
+#: src/fs/fs_publish.c:1108
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/fs/fs_publish.c:1115
+#: src/fs/fs_publish.c:1116
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:1156
+#: src/fs/fs_publish.c:1157
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1396
+#: src/fs/fs_publish.c:1397
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "Kho dữ liệu đầy.\n"
 
-#: src/fs/fs_publish.c:1488
+#: src/fs/fs_publish.c:1489
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:212
+#: src/fs/fs_publish_ksk.c:213
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
@@ -2739,152 +2739,152 @@ msgstr "« %s »: Không thể kết nối.\n"
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_search.c:829 src/fs/fs_search.c:900
+#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/fs_search.c:993
+#: src/fs/fs_search.c:994
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:64
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:68
+#: src/fs/fs_unindex.c:69
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Lỗi gửi tin nhẳn.\n"
 
-#: src/fs/fs_unindex.c:275
+#: src/fs/fs_unindex.c:276
 #, fuzzy
 msgid "Error communicating with `fs' service."
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/fs/fs_unindex.c:326
+#: src/fs/fs_unindex.c:327
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:389
+#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/fs/fs_unindex.c:385
+#: src/fs/fs_unindex.c:386
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_unindex.c:446
+#: src/fs/fs_unindex.c:447
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_unindex.c:592 src/fs/fs_unindex.c:656
+#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:670
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_unindex.c:708
+#: src/fs/fs_unindex.c:709
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_uri.c:231
+#: src/fs/fs_uri.c:232
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:290
+#: src/fs/fs_uri.c:291
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:308
+#: src/fs/fs_uri.c:309
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:315
+#: src/fs/fs_uri.c:316
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:382
+#: src/fs/fs_uri.c:383
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:423
+#: src/fs/fs_uri.c:424
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:440
+#: src/fs/fs_uri.c:441
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:517
+#: src/fs/fs_uri.c:518
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:534
+#: src/fs/fs_uri.c:535
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:561
+#: src/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:567
+#: src/fs/fs_uri.c:568
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:574
+#: src/fs/fs_uri.c:575
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:592
+#: src/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:612
+#: src/fs/fs_uri.c:613
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:645
+#: src/fs/fs_uri.c:646
 #, fuzzy
 msgid "invalid argument"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/fs_uri.c:665
+#: src/fs/fs_uri.c:666
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1093
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -2920,7 +2920,7 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:896
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
@@ -2928,15 +2928,15 @@ msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người g
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
 
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:946
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
 msgid "specify the priority of the content"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:959
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2945,134 +2945,134 @@ msgstr ""
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Tự động chia sẻ một thư mục."
 
-#: src/fs/gnunet-daemon-fsprofiler.c:667
+#: src/fs/gnunet-daemon-fsprofiler.c:668
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:54
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:105
+#: src/fs/gnunet-directory.c:106
 #, fuzzy, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr "==> Thư mục « %s »:\n"
 
-#: src/fs/gnunet-directory.c:108
+#: src/fs/gnunet-directory.c:109
 #, fuzzy, c-format
 msgid "Directory `%s' contents:\n"
 msgstr "==> Thư mục « %s »:\n"
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-directory.c:146
 #, fuzzy
 msgid "You must specify a filename to inspect.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-directory.c:159
+#: src/fs/gnunet-directory.c:160
 #, fuzzy, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-directory.c:169
+#: src/fs/gnunet-directory.c:170
 #, fuzzy, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/gnunet-directory.c:200
+#: src/fs/gnunet-directory.c:201
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/gnunet-download.c:130
+#: src/fs/gnunet-download.c:131
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-download.c:142
+#: src/fs/gnunet-download.c:143
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Lỗi không rõ"
 
-#: src/fs/gnunet-download.c:154
+#: src/fs/gnunet-download.c:155
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-download.c:188
+#: src/fs/gnunet-download.c:189
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
 
-#: src/fs/gnunet-download.c:206 src/fs/gnunet-publish.c:299
-#: src/fs/gnunet-search.c:543 src/fs/gnunet-unindex.c:117
+#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
+#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:234
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:715
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:716
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:247
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:254
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:271 src/fs/gnunet-publish.c:869
-#: src/fs/gnunet-unindex.c:154
+#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-unindex.c:155
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-download.c:318
+#: src/fs/gnunet-download.c:319
 #, fuzzy
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:325
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
 
-#: src/fs/gnunet-download.c:330 src/fs/gnunet-search.c:745
+#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:335
+#: src/fs/gnunet-download.c:336
 msgid "write the file to FILENAME"
 msgstr "ghi tập tin vào TÊN_TẬP_TIN"
 
-#: src/fs/gnunet-download.c:342
+#: src/fs/gnunet-download.c:343
 #, fuzzy
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
 
-#: src/fs/gnunet-download.c:349
+#: src/fs/gnunet-download.c:350
 #, fuzzy
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
 
-#: src/fs/gnunet-download.c:354
+#: src/fs/gnunet-download.c:355
 msgid "download a GNUnet directory recursively"
 msgstr "tải xuống đệ quy một thư mục GNUnet"
 
-#: src/fs/gnunet-download.c:373
+#: src/fs/gnunet-download.c:374
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -3094,156 +3094,156 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:164
+#: src/fs/gnunet-fs.c:165
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:179
+#: src/fs/gnunet-fs.c:180
 #, fuzzy
 msgid "Special file-sharing operations"
 msgstr "Tùy chọn chia sẻ tập tin"
 
-#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:234
+#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:246
+#: src/fs/gnunet-publish.c:247
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-publish.c:254
+#: src/fs/gnunet-publish.c:255
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:258
+#: src/fs/gnunet-publish.c:259
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:265
 #, fuzzy, c-format
 msgid "Namespace URI is `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/fs/gnunet-publish.c:279
+#: src/fs/gnunet-publish.c:280
 #, fuzzy
 msgid "Starting cleanup after abort\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-publish.c:287
 #, fuzzy
 msgid "Cleanup after abort completed.\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:291
+#: src/fs/gnunet-publish.c:292
 #, fuzzy
 msgid "Cleanup after abort failed.\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:425
+#: src/fs/gnunet-publish.c:426
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:428
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/fs/gnunet-publish.c:582
+#: src/fs/gnunet-publish.c:583
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:611
+#: src/fs/gnunet-publish.c:612
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/fs/gnunet-publish.c:644
+#: src/fs/gnunet-publish.c:645
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:647
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-publish.c:653
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:659
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:664
+#: src/fs/gnunet-publish.c:665
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:670
+#: src/fs/gnunet-publish.c:671
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:678
+#: src/fs/gnunet-publish.c:679
 #, fuzzy
 msgid "Error scanning directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:706
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/fs/gnunet-publish.c:737
+#: src/fs/gnunet-publish.c:738
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:755
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:810
+#: src/fs/gnunet-publish.c:811
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "Không thể trích siêu dữ liệu ra một địa chỉ URI.\n"
 
-#: src/fs/gnunet-publish.c:817
+#: src/fs/gnunet-publish.c:818
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-publish.c:823
+#: src/fs/gnunet-publish.c:824
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-publish.c:832 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:208
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:853
+#: src/fs/gnunet-publish.c:845 src/fs/gnunet-publish.c:854
 #: 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 "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:906
+#: src/fs/gnunet-publish.c:907
 #, fuzzy
 msgid "enable adding the creation time to the metadata of the uploaded file"
 msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
 
-#: src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3251,7 +3251,7 @@ msgstr ""
 "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện "
 "tải lên"
 
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:921
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3259,11 +3259,11 @@ msgstr ""
 "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra "
 "tùy chọn này nhiều lần)"
 
-#: src/fs/gnunet-publish.c:927
+#: src/fs/gnunet-publish.c:928
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
 
-#: src/fs/gnunet-publish.c:932
+#: src/fs/gnunet-publish.c:933
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3271,7 +3271,7 @@ msgstr ""
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-publish.c:940
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3279,12 +3279,12 @@ msgstr ""
 "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ "
 "cho sự chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:952
+#: src/fs/gnunet-publish.c:953
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)"
 
-#: src/fs/gnunet-publish.c:964
+#: src/fs/gnunet-publish.c:965
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -3292,13 +3292,13 @@ msgid ""
 msgstr ""
 "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
 
-#: src/fs/gnunet-publish.c:971
+#: src/fs/gnunet-publish.c:972
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "đặt mã số của phiên bản này của sự công bố (chỉ cho chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:979
+#: src/fs/gnunet-publish.c:980
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3306,101 +3306,101 @@ msgstr ""
 "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm "
 "từ khoá vào tập tin có địa chỉ URI tương ứng)"
 
-#: src/fs/gnunet-publish.c:997
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:443
+#: src/fs/gnunet-search.c:446
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:532
+#: src/fs/gnunet-search.c:535
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-search.c:592
+#: src/fs/gnunet-search.c:595
 #, c-format
 msgid "Conflicting options --bookmark-only and --silent.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:599
+#: src/fs/gnunet-search.c:602
 #, c-format
 msgid "Conflicting options --bookmark-only and --output.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:605
+#: src/fs/gnunet-search.c:608
 #, c-format
 msgid "An output file is mandatory for silent mode.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:626
+#: src/fs/gnunet-search.c:629
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:634
+#: src/fs/gnunet-search.c:637
 msgid ""
 "Invalid URI. Valid URIs for searching are keyword query URIs\n"
 "(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
 "\").\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:659
+#: src/fs/gnunet-search.c:662
 #, fuzzy, c-format
 msgid "Could not initialize the `%s` subsystem.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-search.c:673
+#: src/fs/gnunet-search.c:676
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:699
+#: src/fs/gnunet-search.c:702
 #, fuzzy
 msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-search.c:705
+#: src/fs/gnunet-search.c:708
 msgid "do not search, print only the URI that points to this search"
 msgstr ""
 
-#: src/fs/gnunet-search.c:712
+#: src/fs/gnunet-search.c:715
 msgid ""
 "write search results for directories according to FORMAT; accepted "
 "placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
 "printf when omitted or to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:722
+#: src/fs/gnunet-search.c:725
 msgid ""
 "write search results according to FORMAT; accepted placeholders are: %a, %f, "
 "%j, %l, %m, %n, %s; defaults to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:730
+#: src/fs/gnunet-search.c:733
 msgid ""
 "when the %a or %j placeholders appear in --printf or --dir-printf, list each "
 "metadata property according to FORMAT; accepted placeholders are: %i, %l, "
 "%n, %p"
 msgstr ""
 
-#: src/fs/gnunet-search.c:739
+#: src/fs/gnunet-search.c:742
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:751
+#: src/fs/gnunet-search.c:754
 msgid ""
 "create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
 "search --output=commons"
 msgstr ""
 
-#: src/fs/gnunet-search.c:758
+#: src/fs/gnunet-search.c:761
 msgid "silent mode (requires the --output argument)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:764
+#: src/fs/gnunet-search.c:767
 msgid ""
 "automatically terminate search after DELAY; the value given must be a number "
 "followed by a space and a time unit, for example \"500 ms\"; without a unit "
@@ -3408,57 +3408,57 @@ msgid ""
 "to wait for CTRL-C"
 msgstr ""
 
-#: src/fs/gnunet-search.c:773
+#: src/fs/gnunet-search.c:776
 #, c-format
 msgid ""
 "be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
 "arguments - ignored when these are provided by the user)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:786
+#: src/fs/gnunet-search.c:789
 #, fuzzy
 msgid "Search for files that have been published on GNUnet\n"
 msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chúng ta tải lên"
 
-#: src/fs/gnunet-service-fs.c:371 src/fs/gnunet-service-fs.c:878
+#: src/fs/gnunet-service-fs.c:370 src/fs/gnunet-service-fs.c:877
 #, fuzzy
 msgid "# client searches active"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/fs/gnunet-service-fs.c:430
+#: src/fs/gnunet-service-fs.c:429
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/fs/gnunet-service-fs.c:596
+#: src/fs/gnunet-service-fs.c:595
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:648 src/fs/gnunet-service-fs_cp.c:558
+#: src/fs/gnunet-service-fs.c:647 src/fs/gnunet-service-fs_cp.c:558
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
-#: src/fs/gnunet-service-fs.c:831
+#: src/fs/gnunet-service-fs.c:830
 #, fuzzy
 msgid "# client searches received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/fs/gnunet-service-fs.c:871
+#: src/fs/gnunet-service-fs.c:870
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1041
+#: src/fs/gnunet-service-fs.c:1040
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1288
+#: src/fs/gnunet-service-fs.c:1287
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/fs/gnunet-service-fs.c:1322 src/hostlist/gnunet-daemon-hostlist.c:343
+#: src/fs/gnunet-service-fs.c:1321 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3566,41 +3566,41 @@ msgstr "# các thông báo phát hiện dht được nhận"
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:188
+#: src/fs/gnunet-service-fs_indexing.c:129
+#: src/fs/gnunet-service-fs_indexing.c:187
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:147
+#: src/fs/gnunet-service-fs_indexing.c:146
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/fs/gnunet-service-fs_indexing.c:244
+#: src/fs/gnunet-service-fs_indexing.c:243
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:297
+#: src/fs/gnunet-service-fs_indexing.c:296
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:311
+#: src/fs/gnunet-service-fs_indexing.c:310
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:315
+#: src/fs/gnunet-service-fs_indexing.c:314
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:328
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:435
+#: src/fs/gnunet-service-fs_indexing.c:434
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3743,37 +3743,56 @@ msgstr "# các thông báo PONG đã mật mã được nhận"
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:93
+#: src/fs/gnunet-unindex.c:94
 #, fuzzy, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr "Lỗi bỏ chỉ mục (không đưa ra lý do)."
 
-#: src/fs/gnunet-unindex.c:102
+#: src/fs/gnunet-unindex.c:103
 #, fuzzy, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 "\n"
 "Gặp lỗi khi bỏ chỉ mục tập tin: %s\n"
 
-#: src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-unindex.c:109
 #, fuzzy
 msgid "Unindexing done.\n"
 msgstr "Bỏ chỉ mục tập tin."
 
-#: src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-unindex.c:142
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-unindex.c:161
+#: src/fs/gnunet-unindex.c:162
 #, fuzzy
 msgid "Could not start unindex operation.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/fs/gnunet-unindex.c:194
+#: src/fs/gnunet-unindex.c:195
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
+#: src/fs/meta_data.c:1063 src/fs/meta_data.c:1116 src/fs/meta_data.c:1131
+msgid "metadata length"
+msgstr ""
+
+#: src/fs/meta_data.c:1074
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
+msgstr ""
+
+#: src/fs/meta_data.c:1091
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/fs/meta_data.c:1126
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
 #: src/gns/gns_tld_api.c:293
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
@@ -3801,46 +3820,46 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:298
+#: src/gns/gnunet-dns2gns.c:296
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-dns2gns.c:379
+#: src/gns/gnunet-dns2gns.c:377
 #, fuzzy
 msgid "Failed to parse DNS response!\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-dns2gns.c:453
+#: src/gns/gnunet-dns2gns.c:451
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:656
+#: src/gns/gnunet-dns2gns.c:654
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:672
+#: src/gns/gnunet-dns2gns.c:670
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:680
+#: src/gns/gnunet-dns2gns.c:678
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:841
+#: src/gns/gnunet-dns2gns.c:839
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:1001
+#: src/gns/gnunet-dns2gns.c:999
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1018
+#: src/gns/gnunet-dns2gns.c:1016
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3976,171 +3995,171 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:257
+#: src/gns/gnunet-gns.c:256
 #, fuzzy, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/gns/gnunet-gns.c:267 src/util/dnsparser.c:253
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-gns.c:281
+#: src/gns/gnunet-gns.c:280
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:305
+#: src/gns/gnunet-gns.c:304
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:340
+#: src/gns/gnunet-gns.c:339
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:346
+#: src/gns/gnunet-gns.c:345
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:352
+#: src/gns/gnunet-gns.c:351
 #, fuzzy
 msgid "Specify a timeout for the lookup"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:356
+#: src/gns/gnunet-gns.c:355
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:361
+#: src/gns/gnunet-gns.c:360
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:375
+#: src/gns/gnunet-gns.c:374
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
 
-#: src/gns/gnunet-service-gns.c:519
+#: src/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1346
+#: src/gns/gnunet-service-gns.c:554
+#: src/zonemaster/gnunet-service-zonemaster.c:1345
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/gns/gnunet-service-gns.c:574
-#: src/zonemaster/gnunet-service-zonemaster.c:1385
+#: src/gns/gnunet-service-gns.c:573
+#: src/zonemaster/gnunet-service-zonemaster.c:1384
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:279
+#: src/gns/gnunet-service-gns_interceptor.c:278
 #, fuzzy
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "Gặp lỗi khi chuyển đổi các đối số sang URI.\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:380
+#: src/gns/gnunet-service-gns_interceptor.c:379
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:672
+#: src/gns/gnunet-service-gns_resolver.c:669
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:684
+#: src/gns/gnunet-service-gns_resolver.c:681
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:690
+#: src/gns/gnunet-service-gns_resolver.c:687
 #, c-format
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:903
+#: src/gns/gnunet-service-gns_resolver.c:900
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1094
+#: src/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1870
+#: src/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1885
+#: src/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1918
+#: src/gns/gnunet-service-gns_resolver.c:1915
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2320
+#: src/gns/gnunet-service-gns_resolver.c:2317
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2325
+#: src/gns/gnunet-service-gns_resolver.c:2322
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2348
+#: src/gns/gnunet-service-gns_resolver.c:2345
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2515
+#: src/gns/gnunet-service-gns_resolver.c:2512
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2663
+#: src/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:138
+#: src/gns/plugin_gnsrecord_gns.c:137
 msgid "This is a memento of an older block for internal maintenance."
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:177
+#: src/gns/plugin_gnsrecord_gns.c:176
 #, fuzzy, c-format
 msgid "Unable to parse zone key record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:191
+#: src/gns/plugin_gnsrecord_gns.c:190
 msgid "Record type does not match parsed record type\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:214
+#: src/gns/plugin_gnsrecord_gns.c:213
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:231
+#: src/gns/plugin_gnsrecord_gns.c:230
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:255
+#: src/gns/plugin_gnsrecord_gns.c:254
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:287
+#: src/gns/plugin_gnsrecord_gns.c:286
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -4150,109 +4169,109 @@ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 msgid "Gns REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/gnsrecord/gnsrecord_misc.c:53
+#: src/gnsrecord/gnsrecord_misc.c:51
 msgid "Label is NULL which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:58
+#: src/gnsrecord/gnsrecord_misc.c:56
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:481
+#: src/gnsrecord/gnsrecord_misc.c:479
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:489
+#: src/gnsrecord/gnsrecord_misc.c:487
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:499
+#: src/gnsrecord/gnsrecord_misc.c:497
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:515
+#: src/gnsrecord/gnsrecord_misc.c:513
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:526
+#: src/gnsrecord/gnsrecord_misc.c:524
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:548
+#: src/gnsrecord/gnsrecord_misc.c:546
 msgid "Mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:367
+#: src/gnsrecord/plugin_gnsrecord_dns.c:366
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:385
+#: src/gnsrecord/plugin_gnsrecord_dns.c:384
 #, fuzzy, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:406
+#: src/gnsrecord/plugin_gnsrecord_dns.c:405
 #, fuzzy, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:480
+#: src/gnsrecord/plugin_gnsrecord_dns.c:479
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:516
+#: src/gnsrecord/plugin_gnsrecord_dns.c:515
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:533
+#: src/gnsrecord/plugin_gnsrecord_dns.c:532
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:553
+#: src/gnsrecord/plugin_gnsrecord_dns.c:552
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:573
+#: src/gnsrecord/plugin_gnsrecord_dns.c:572
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:585
+#: src/gnsrecord/plugin_gnsrecord_dns.c:584
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:608
+#: src/gnsrecord/plugin_gnsrecord_dns.c:607
 #, fuzzy, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:621
+#: src/gnsrecord/plugin_gnsrecord_dns.c:620
 #, fuzzy, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:640
+#: src/gnsrecord/plugin_gnsrecord_dns.c:639
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:660
-#: src/gnsrecord/plugin_gnsrecord_dns.c:674
+#: src/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/gnsrecord/plugin_gnsrecord_dns.c:673
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:693
+#: src/gnsrecord/plugin_gnsrecord_dns.c:692
 #, fuzzy, c-format
 msgid "Unable to parse CAA record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -4741,65 +4760,65 @@ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 msgid "Unable to parse MESSENGER_ROOM_DETAILS 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
+#: src/my/my.c:197 src/my/my.c:216
 #, fuzzy, c-format
 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/mysql/mysql.c:190
+#: src/mysql/mysql.c:191
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/mysql/mysql.c:198
+#: src/mysql/mysql.c:199
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/namecache/gnunet-namecache.c:106
+#: src/namecache/gnunet-namecache.c:105
 #, fuzzy, c-format
 msgid "No records found for `%s'"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/namecache/gnunet-namecache.c:119 src/namestore/gnunet-namestore.c:888
+#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:887
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:175
+#: src/namecache/gnunet-namecache.c:174
 #, fuzzy, c-format
 msgid "You must specify which zone should be accessed\n"
 msgstr "chỉ ra TRUYỀN_TẢI nào cần được thử nghiệm"
 
-#: src/namecache/gnunet-namecache.c:182
+#: src/namecache/gnunet-namecache.c:181
 #, fuzzy, c-format
 msgid "Invalid public key for zone `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/namecache/gnunet-namecache.c:188
+#: src/namecache/gnunet-namecache.c:187
 #, fuzzy, c-format
 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:2020
+#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2019
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:221
+#: src/namecache/gnunet-namecache.c:220
 #, fuzzy
 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:2102
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2101
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
 
-#: src/namecache/namecache_api.c:285
+#: src/namecache/namecache_api.c:283
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:373
+#: src/namecache/namecache_api.c:371
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
@@ -4839,7 +4858,7 @@ msgid "Failed to setup database at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
 #: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1951
+#: src/namestore/gnunet-namestore.c:1950
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
@@ -5013,250 +5032,250 @@ msgid "Failed to connect to IDENTITY\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2087
+#: src/namestore/gnunet-namestore.c:2086
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:412
+#: src/namestore/gnunet-namestore.c:411
 #, 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:420
+#: src/namestore/gnunet-namestore.c:419
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/namestore/gnunet-namestore.c:428 src/namestore/gnunet-namestore.c:443
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:435
+#: src/namestore/gnunet-namestore.c:434
 #, fuzzy, c-format
 msgid "Error parsing expiration time %s.\n"
 msgstr "Gặp lỗi khi lưu cấu hình."
 
-#: src/namestore/gnunet-namestore.c:465
+#: src/namestore/gnunet-namestore.c:464
 #, 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:667
+#: src/namestore/gnunet-namestore.c:666
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:685 src/namestore/gnunet-namestore.c:701
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1137
+#: src/namestore/gnunet-namestore.c:1136
 #, 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:1258
+#: src/namestore/gnunet-namestore.c:1257
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1301
+#: src/namestore/gnunet-namestore.c:1300
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1326
+#: src/namestore/gnunet-namestore.c:1325
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1355
+#: src/namestore/gnunet-namestore.c:1354
 #, fuzzy, c-format
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:1369
+#: src/namestore/gnunet-namestore.c:1368
 #, c-format
 msgid "Recordlines only work with option `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1378 src/namestore/gnunet-namestore.c:1430
-#: src/namestore/gnunet-namestore.c:1440 src/namestore/gnunet-namestore.c:1450
-#: src/namestore/gnunet-namestore.c:1479 src/namestore/gnunet-namestore.c:1500
-#: src/namestore/gnunet-namestore.c:1527 src/namestore/gnunet-namestore.c:1537
-#: src/namestore/gnunet-namestore.c:1570 src/namestore/gnunet-namestore.c:1595
-#: src/namestore/gnunet-namestore.c:1629 src/namestore/gnunet-namestore.c:1663
-#: src/namestore/gnunet-namestore.c:1686
+#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
+#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
+#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
+#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
+#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
+#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
+#: src/namestore/gnunet-namestore.c:1685
 #, 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"
 
-#: src/namestore/gnunet-namestore.c:1380
+#: src/namestore/gnunet-namestore.c:1379
 #, fuzzy
 msgid "name"
 msgstr "không-tên"
 
-#: src/namestore/gnunet-namestore.c:1409
+#: src/namestore/gnunet-namestore.c:1408
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore.c:1432 src/namestore/gnunet-namestore.c:1442
-#: src/namestore/gnunet-namestore.c:1452 src/namestore/gnunet-namestore.c:1481
-#: src/namestore/gnunet-namestore.c:1502 src/namestore/gnunet-namestore.c:1688
+#: src/namestore/gnunet-namestore.c:1431 src/namestore/gnunet-namestore.c:1441
+#: src/namestore/gnunet-namestore.c:1451 src/namestore/gnunet-namestore.c:1480
+#: src/namestore/gnunet-namestore.c:1501 src/namestore/gnunet-namestore.c:1687
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1460
+#: src/namestore/gnunet-namestore.c:1459
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/namestore/gnunet-namestore.c:1470
+#: src/namestore/gnunet-namestore.c:1469
 #, c-format
 msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1490
+#: src/namestore/gnunet-namestore.c:1489
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1509 src/namestore/gnunet-namestore.c:1695
+#: src/namestore/gnunet-namestore.c:1508 src/namestore/gnunet-namestore.c:1694
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1529 src/namestore/gnunet-namestore.c:1539
+#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1571
 msgid "purge-zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1596
 msgid "list"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1631
+#: src/namestore/gnunet-namestore.c:1630
 msgid "reverse-pkey"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1641
+#: src/namestore/gnunet-namestore.c:1640
 #, fuzzy, c-format
 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:1665
+#: src/namestore/gnunet-namestore.c:1664
 msgid "uri"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1678
+#: src/namestore/gnunet-namestore.c:1677
 #: 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:1966
+#: src/namestore/gnunet-namestore.c:1965
 #, 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:1985
+#: src/namestore/gnunet-namestore.c:1984
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1988
+#: src/namestore/gnunet-namestore.c:1987
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1992
+#: src/namestore/gnunet-namestore.c:1991
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1996
+#: src/namestore/gnunet-namestore.c:1995
 msgid "read commands from stdin"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2003
+#: src/namestore/gnunet-namestore.c:2002
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2009
+#: src/namestore/gnunet-namestore.c:2008
 #, 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:2014
+#: src/namestore/gnunet-namestore.c:2013
 #, 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:2024
+#: src/namestore/gnunet-namestore.c:2023
 #, fuzzy
 msgid "Output in recordline format"
 msgstr "kết xuất theo định dạng gnuplot"
 
-#: src/namestore/gnunet-namestore.c:2030
+#: src/namestore/gnunet-namestore.c:2029
 #, fuzzy
 msgid "determine our name for the given KEY"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/namestore/gnunet-namestore.c:2036
+#: src/namestore/gnunet-namestore.c:2035
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2041
+#: src/namestore/gnunet-namestore.c:2040
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2047
+#: src/namestore/gnunet-namestore.c:2046
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2051
+#: src/namestore/gnunet-namestore.c:2050
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2055
+#: src/namestore/gnunet-namestore.c:2054
 msgid "omit private records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2060
+#: src/namestore/gnunet-namestore.c:2059
 msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2065
+#: src/namestore/gnunet-namestore.c:2064
 msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2070
+#: src/namestore/gnunet-namestore.c:2069
 msgid ""
 "show private key for orphaned records for recovery using `gnunet-identity -C "
 "-P <key>'. Use in combination with --display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2075
+#: src/namestore/gnunet-namestore.c:2074
 msgid "delete all records in specified zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2081
+#: src/namestore/gnunet-namestore.c:2080
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1837
+#: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1843
+#: src/namestore/gnunet-zoneimport.c:1841
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
@@ -5605,7 +5624,7 @@ 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:1441
-#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:242
+#: src/revocation/gnunet-service-revocation.c:920 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."
@@ -5808,66 +5827,66 @@ 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/pt/gnunet-daemon-pt.c:418
+#: src/pt/gnunet-daemon-pt.c:416
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:424
+#: src/pt/gnunet-daemon-pt.c:422
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/pt/gnunet-daemon-pt.c:478
+#: src/pt/gnunet-daemon-pt.c:476
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:673
+#: src/pt/gnunet-daemon-pt.c:671
 #, fuzzy
 msgid "# DNS replies intercepted"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/pt/gnunet-daemon-pt.c:680
+#: src/pt/gnunet-daemon-pt.c:678
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:718
+#: src/pt/gnunet-daemon-pt.c:716
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/pt/gnunet-daemon-pt.c:773
+#: src/pt/gnunet-daemon-pt.c:771
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/pt/gnunet-daemon-pt.c:779
+#: src/pt/gnunet-daemon-pt.c:777
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/pt/gnunet-daemon-pt.c:788
+#: src/pt/gnunet-daemon-pt.c:786
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:881
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/pt/gnunet-daemon-pt.c:900
+#: src/pt/gnunet-daemon-pt.c:898
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/pt/gnunet-daemon-pt.c:1227 src/pt/gnunet-daemon-pt.c:1236
-#: src/pt/gnunet-daemon-pt.c:1252 src/pt/gnunet-daemon-pt.c:1261
-#: src/pt/gnunet-daemon-pt.c:1270
+#: 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
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/pt/gnunet-daemon-pt.c:1316
+#: src/pt/gnunet-daemon-pt.c:1314
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -5995,7 +6014,7 @@ msgstr ""
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:3096
+#: src/reclaim/plugin_rest_openid_connect.c:3095
 #, fuzzy
 msgid "OpenID Connect REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -6005,7 +6024,7 @@ msgstr "Lỗi sơ khởi lõi.\n"
 msgid "Identity Provider REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/reclaim/reclaim_api.c:545
+#: src/reclaim/reclaim_api.c:544
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
@@ -6025,13 +6044,13 @@ 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:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:631
+#: src/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:639
+#: src/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
@@ -6077,15 +6096,15 @@ msgstr "Lỗi lấy thông kê về truyền tải.\n"
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:700
+#: src/regex/gnunet-regex-simulation-profiler.c:701
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:706
+#: src/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:720
+#: src/regex/gnunet-regex-simulation-profiler.c:721
 msgid "Profiler for regex library"
 msgstr ""
 
@@ -6394,7 +6413,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
 #: src/setu/gnunet-service-setu.c:5389
 #, fuzzy
 msgid "Could not connect to CADET service\n"
@@ -6466,12 +6485,12 @@ msgstr ""
 msgid "Failed to reset sqlite statement 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/statistics/gnunet-service-statistics.c:319
+#: src/statistics/gnunet-service-statistics.c:314
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-service-statistics.c:984
+#: src/statistics/gnunet-service-statistics.c:979
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
@@ -6654,7 +6673,7 @@ msgid ""
 msgstr ""
 
 #: 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
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:319
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6669,57 +6688,57 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1153
+#: src/testbed/gnunet-service-testbed_peers.c:1154
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1156
+#: src/testbed/gnunet-service-testbed_peers.c:1157
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1159
+#: src/testbed/gnunet-service-testbed_peers.c:1160
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1162
+#: src/testbed/gnunet-service-testbed_peers.c:1163
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1166
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1172
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1175
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1178
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1181
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1182
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -8067,17 +8086,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:1400
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1401
 #, 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:1412
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1413
 #, 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:1419
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1420
 #, 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"
@@ -8089,7 +8108,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:838
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
@@ -8099,23 +8118,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:950
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:951
 #, 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:991
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:992
 #, 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:1480
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1481
 #, 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:1504
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1505
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8130,45 +8149,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:1750
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1751
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1756
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1761
 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
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1219
+#: src/util/service.c:1642
 #, 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:1643
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1644
 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:1657
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1658
 #, 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:2000
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2001
 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
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2077
+#: src/util/service.c:2089
 #, 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:2098
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2099
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -8182,199 +8201,180 @@ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:228 src/util/bio.c:236
+#: src/util/bio.c:223 src/util/bio.c:231
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/bio.c:238
+#: src/util/bio.c:233
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:267
+#: src/util/bio.c:262
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/util/bio.c:269
+#: src/util/bio.c:264
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:309
+#: src/util/bio.c:304
 #, fuzzy, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/util/bio.c:336 src/util/bio.c:840
+#: src/util/bio.c:331 src/util/bio.c:781
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:342
+#: src/util/bio.c:337
 #, fuzzy, c-format
 msgid "%s (while reading `%s')"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/util/bio.c:347
+#: src/util/bio.c:342
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:360
+#: src/util/bio.c:355
 #, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
-msgid "metadata length"
-msgstr ""
-
-#: src/util/bio.c:411
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
-msgstr ""
-
-#: src/util/bio.c:427
-#, fuzzy, c-format
-msgid "Failed to deserialize metadata `%s'"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/util/bio.c:669
+#: src/util/bio.c:610
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:731 src/util/bio.c:752
+#: src/util/bio.c:672 src/util/bio.c:693
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/util/bio.c:733
+#: src/util/bio.c:674
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:817
+#: src/util/bio.c:758
 #, fuzzy, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/bio.c:877
-#, fuzzy, c-format
-msgid "Failed to serialize metadata `%s'"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/util/client.c:750 src/util/client.c:941
+#: src/util/client.c:751 src/util/client.c:942
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1096
+#: src/util/client.c:1097
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:648 src/util/common_logging.c:687
+#: src/util/common_logging.c:647 src/util/common_logging.c:686
 #, c-format
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:911
+#: src/util/common_logging.c:910
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
 
-#: src/util/common_logging.c:1104
+#: src/util/common_logging.c:1103
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1105
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1107
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1109
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1111
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1113
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:1115
+#: src/util/common_logging.c:1114
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1360
+#: src/util/common_logging.c:1359
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1405
+#: src/util/common_logging.c:1404
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1417
+#: src/util/common_logging.c:1416
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/util/common_logging.c:1432
+#: src/util/common_logging.c:1431
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/util/configuration.c:790
+#: src/util/configuration.c:786
 #, c-format
 msgid "Illegal directive in line %u (parsing restricted section %s)\n"
 msgstr ""
 
-#: src/util/configuration.c:800
+#: src/util/configuration.c:796
 #, c-format
 msgid "Bad directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:853
+#: src/util/configuration.c:849
 #, c-format
 msgid "Bad inline-secret directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:875
+#: src/util/configuration.c:871
 #, c-format
 msgid "Unknown or malformed directive '%s' in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:905
+#: src/util/configuration.c:901
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u (option without section)\n"
 msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/util/configuration.c:949
+#: src/util/configuration.c:945
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/util/configuration.c:1049
+#: src/util/configuration.c:1045
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/util/configuration.c:1062
+#: src/util/configuration.c:1058
 #, fuzzy, c-format
 msgid "Failed to parse configuration file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/configuration.c:1695
+#: src/util/configuration.c:1691
 #, fuzzy
 msgid "Not a valid relative time specification"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/util/configuration.c:1765
+#: src/util/configuration.c:1761
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8383,44 +8383,44 @@ msgstr ""
 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
 "tập hợp các sự chọn được phép\n"
 
-#: src/util/configuration.c:1860
+#: src/util/configuration.c:1856
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1892
+#: src/util/configuration.c:1888
 #, fuzzy, c-format
 msgid "Missing closing `%s' in 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/configuration.c:1958
+#: src/util/configuration.c:1954
 #, 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
+#: src/util/configuration_helper.c:134
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:147
+#: src/util/configuration_helper.c:148
 #, fuzzy, c-format
 msgid "%s, %s or %s argument is required\n"
 msgstr "đặt tên hiệu cần dùng (cần thiết)"
 
-#: src/util/configuration_helper.c:218
+#: src/util/configuration_helper.c:219
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:262
+#: src/util/configuration_helper.c:263
 #, fuzzy, c-format
 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:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8437,7 +8437,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:281
+#: src/util/crypto_ecc_setup.c:282
 #, 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"
@@ -8447,122 +8447,122 @@ 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:907
+#: src/util/crypto_rsa.c:908
 #, 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:1207
+#: src/util/crypto_rsa.c:1208
 #, 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"
 
-#: src/util/disk.c:843
+#: src/util/disk.c:842
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/util/dnsparser.c:909
+#: src/util/dnsparser.c:910
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/dnsstub.c:227
+#: src/util/dnsstub.c:228
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/util/dnsstub.c:370
+#: src/util/dnsstub.c:371
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr ""
 
-#: src/util/dnsstub.c:503
+#: src/util/dnsstub.c:504
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:509
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/getopt.c:565
+#: src/util/getopt.c:566
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/util/getopt.c:590
+#: src/util/getopt.c:591
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
 
-#: src/util/getopt.c:596
+#: src/util/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
 
-#: src/util/getopt.c:616 src/util/getopt.c:797
+#: src/util/getopt.c:617 src/util/getopt.c:798
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: tùy chọn « %s » cần thiết đối số\n"
 
-#: src/util/getopt.c:647
+#: src/util/getopt.c:648
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: không nhận ra tùy chọn « --%s »\n"
 
-#: src/util/getopt.c:653
+#: src/util/getopt.c:654
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
 
-#: src/util/getopt.c:680
+#: src/util/getopt.c:681
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: tùy chọn không được phép -- %c\n"
 
-#: src/util/getopt.c:682
+#: src/util/getopt.c:683
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: tùy chọn không hợp lệ -- %c\n"
 
-#: src/util/getopt.c:711 src/util/getopt.c:847
+#: src/util/getopt.c:712 src/util/getopt.c:848
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: tùy chọn cần thiết đối số -- %c\n"
 
-#: src/util/getopt.c:761
+#: src/util/getopt.c:762
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
 
-#: src/util/getopt.c:781
+#: src/util/getopt.c:782
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
 
-#: src/util/getopt.c:970
+#: src/util/getopt.c:971
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr ""
 "Hãy sử dụng câu lệnh trợ giúp « --help » để xem danh sách các tùy chọn.\n"
 
-#: src/util/getopt.c:983
+#: src/util/getopt.c:984
 #, fuzzy, c-format
 msgid "Option `%s' can't be used with other options.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/util/getopt.c:995
+#: src/util/getopt.c:996
 #, fuzzy, c-format
 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:63
+#: src/util/getopt_helpers.c:64
 msgid "print the version number"
 msgstr "hiển thị số thứ tự phiên bản"
 
-#: src/util/getopt_helpers.c:110
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8570,462 +8570,462 @@ 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:197
+#: src/util/getopt_helpers.c:198
 msgid "print this help"
 msgstr "hiển thị trợ giúp này"
 
-#: src/util/getopt_helpers.c:262
+#: src/util/getopt_helpers.c:263
 msgid "be verbose"
 msgstr "xuất chi tiết"
 
-#: src/util/getopt_helpers.c:378
+#: src/util/getopt_helpers.c:379
 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:445
+#: src/util/getopt_helpers.c:446
 #, 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:462
+#: src/util/getopt_helpers.c:463
 #, 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:498 src/util/getopt_helpers.c:812
-#: src/util/getopt_helpers.c:868
+#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
+#: src/util/getopt_helpers.c:869
 #, 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:570
+#: src/util/getopt_helpers.c:571
 #, 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:577
+#: src/util/getopt_helpers.c:578
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:595
+#: src/util/getopt_helpers.c:596
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:597
+#: src/util/getopt_helpers.c:598
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:631
+#: src/util/getopt_helpers.c:632
 #, 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:685
+#: src/util/getopt_helpers.c:686
 #, 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:742
+#: src/util/getopt_helpers.c:743
 #, 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:749
+#: src/util/getopt_helpers.c:750
 #, c-format
 msgid "The maximum precision allowed for timestamps is seconds.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:805
+#: src/util/getopt_helpers.c:806
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:875
+#: src/util/getopt_helpers.c:876
 #, 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:953
+#: src/util/getopt_helpers.c:954
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-base32.c:46
+#: src/util/gnunet-base32.c:47
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/util/gnunet-config.c:153
+#: src/util/gnunet-config.c:154
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/util/gnunet-config.c:159
+#: src/util/gnunet-config.c:160
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:164
+#: src/util/gnunet-config.c:165
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:170
+#: src/util/gnunet-config.c:171
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:176
+#: src/util/gnunet-config.c:177
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:192
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/gnunet-crypto-tvg.c:1527
+#: src/util/gnunet-crypto-tvg.c:1528
 msgid "verify a test vector from stdin"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:94
+#: src/util/gnunet-ecc.c:95
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/gnunet-ecc.c:128
+#: src/util/gnunet-ecc.c:129
 #, c-format
 msgid "Generating %u keys like %s, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:136
+#: src/util/gnunet-ecc.c:137
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:177
+#: src/util/gnunet-ecc.c:178
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:185
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:186
+#: src/util/gnunet-ecc.c:187
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:303
+#: src/util/gnunet-ecc.c:304
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/util/gnunet-ecc.c:313
+#: src/util/gnunet-ecc.c:314
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
 
-#: src/util/gnunet-ecc.c:333
+#: src/util/gnunet-ecc.c:334
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/util/gnunet-ecc.c:387
+#: src/util/gnunet-ecc.c:388
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:451
+#: src/util/gnunet-ecc.c:452
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:457
+#: src/util/gnunet-ecc.c:458
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:463
+#: src/util/gnunet-ecc.c:464
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:468
+#: src/util/gnunet-ecc.c:469
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:473
+#: src/util/gnunet-ecc.c:474
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:478
+#: src/util/gnunet-ecc.c:479
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:484
+#: src/util/gnunet-ecc.c:485
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:498
+#: src/util/gnunet-ecc.c:499
 #, fuzzy
 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:129 src/util/gnunet-qr.c:555
+#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/util/gnunet-qr.c:133
+#: src/util/gnunet-qr.c:134
 #, 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
+#: src/util/gnunet-qr.c:161
 #, 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:170
+#: src/util/gnunet-qr.c:171
 #, c-format
 msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:181
+#: src/util/gnunet-qr.c:182
 #, c-format
 msgid "No known handler for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:217
+#: src/util/gnunet-qr.c:218
 #, 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
+#: src/util/gnunet-qr.c:247
 #, 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
+#: src/util/gnunet-qr.c:261
 #, 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
+#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
 msgid "No captured images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
 #, c-format
 msgid "Got %d images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
 #, 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
+#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
 #, 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
+#: src/util/gnunet-qr.c:546
 msgid "No data found\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:561
+#: src/util/gnunet-qr.c:562
 msgid "Dispatching the URI\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:572
+#: src/util/gnunet-qr.c:573
 msgid "use the video device DEVICE (defaults to /dev/video0)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:579
+#: src/util/gnunet-qr.c:580
 msgid "read from the PNG-encoded file FILE"
 msgstr ""
 
-#: src/util/gnunet-qr.c:590
+#: src/util/gnunet-qr.c:591
 msgid "Scan a QR code and import the URI read"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:168
+#: src/util/gnunet-resolver.c:169
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:182
+#: src/util/gnunet-resolver.c:183
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:214
+#: src/util/gnunet-scrypt.c:215
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:280
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:286
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:292
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:312
+#: 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"
 
-#: src/util/gnunet-service-resolver.c:1287
+#: src/util/gnunet-service-resolver.c:1288
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:88
+#: src/util/gnunet-uri.c:89
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:94
+#: src/util/gnunet-uri.c:95
 #, 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
+#: src/util/gnunet-uri.c:102
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:108
+#: src/util/gnunet-uri.c:109
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:178
+#: src/util/gnunet-uri.c:179
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:59
+#: src/util/gnunet_error_codes.c:60
 msgid "No error (success)."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:65
+#: src/util/gnunet_error_codes.c:66
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "Lỗi không rõ.\n"
 
-#: src/util/gnunet_error_codes.c:71
+#: src/util/gnunet_error_codes.c:72
 #, fuzzy
 msgid "Communication with service failed."
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/util/gnunet_error_codes.c:77
+#: src/util/gnunet_error_codes.c:78
 #, fuzzy
 msgid "Ego not found."
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/util/gnunet_error_codes.c:83
+#: src/util/gnunet_error_codes.c:84
 msgid "Identifier already in use for another ego."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:89
+#: src/util/gnunet_error_codes.c:90
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:95
+#: src/util/gnunet_error_codes.c:96
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "Lỗi không rõ.\n"
 
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/util/gnunet_error_codes.c:107
+#: src/util/gnunet_error_codes.c:108
 #, fuzzy
 msgid "Zone not found."
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/util/gnunet_error_codes.c:113
+#: src/util/gnunet_error_codes.c:114
 #, fuzzy
 msgid "Record not found."
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/util/gnunet_error_codes.c:125
+#: src/util/gnunet_error_codes.c:126
 #, fuzzy
 msgid "Zone does not contain any records."
 msgstr "Tập tin « %s » không chứa biệt hiệu.\n"
 
-#: src/util/gnunet_error_codes.c:131
+#: src/util/gnunet_error_codes.c:132
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/util/gnunet_error_codes.c:137
+#: src/util/gnunet_error_codes.c:138
 #, fuzzy
 msgid "No records given."
 msgstr "chưa đưa ra tên"
 
-#: src/util/gnunet_error_codes.c:143
+#: src/util/gnunet_error_codes.c:144
 msgid "Record data invalid."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:149
+#: src/util/gnunet_error_codes.c:150
 #, fuzzy
 msgid "No label given."
 msgstr "chưa đưa ra tên"
 
-#: src/util/gnunet_error_codes.c:155
+#: src/util/gnunet_error_codes.c:156
 #, fuzzy
 msgid "No results given."
 msgstr "chưa đưa ra tên"
 
-#: src/util/gnunet_error_codes.c:161
+#: src/util/gnunet_error_codes.c:162
 msgid "Record already exists."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:167
+#: src/util/gnunet_error_codes.c:168
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:173
+#: src/util/gnunet_error_codes.c:174
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:179
+#: src/util/gnunet_error_codes.c:180
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/util/gnunet_error_codes.c:185
+#: src/util/gnunet_error_codes.c:186
 msgid "Label invalid or malformed."
 msgstr ""
 
-#: src/util/helper.c:306
+#: src/util/helper.c:305
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/helper.c:358
+#: src/util/helper.c:357
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/helper.c:573
+#: src/util/helper.c:572
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
@@ -9041,59 +9041,59 @@ msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:415
+#: src/util/os_installation.c:416
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:786
+#: src/util/os_installation.c:787
 #, 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:819
+#: src/util/os_installation.c:820
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/util/plugin.c:86
+#: src/util/plugin.c:87
 #, c-format
 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:157
+#: src/util/plugin.c:158
 #, 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:214
+#: src/util/plugin.c:215
 #, 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:370
+#: src/util/plugin.c:371
 #, 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:286
+#: src/util/program.c:287
 #, 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:298
+#: src/util/program.c:299
 #, 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:313
+#: src/util/program.c:314
 #, 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:328
+#: src/util/program.c:329
 #, fuzzy
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -9103,327 +9103,327 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/resolver_api.c:220
+#: src/util/resolver_api.c:221
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:242
+#: src/util/resolver_api.c:243
 #, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
 "resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:887
+#: src/util/resolver_api.c:888
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "không quyết định các tên máy"
 
-#: src/util/resolver_api.c:900
+#: src/util/resolver_api.c:901
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/util/resolver_api.c:1085
+#: src/util/resolver_api.c:1086
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1174 src/util/resolver_api.c:1197
-#: src/util/resolver_api.c:1211
+#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
+#: src/util/resolver_api.c:1212
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/service.c:653
+#: src/util/service.c:654
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1572
+#: src/util/service.c:1573
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/socks.c:635
+#: src/util/socks.c:636
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:652
+#: src/util/socks.c:653
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:395
+#: src/util/strings.c:394
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:514
+#: src/util/strings.c:513
 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:1050
+#: src/util/strings.c:1049
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1058
+#: src/util/strings.c:1057
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1065
+#: src/util/strings.c:1064
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1073
+#: src/util/strings.c:1072
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1082
+#: src/util/strings.c:1081
 #, 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:1264 src/util/strings.c:1275
+#: src/util/strings.c:1263 src/util/strings.c:1274
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1284
+#: src/util/strings.c:1283
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/util/strings.c:1355 src/util/strings.c:1384 src/util/strings.c:1431
-#: src/util/strings.c:1451
+#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
+#: src/util/strings.c:1450
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1409
+#: src/util/strings.c:1408
 #, 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:1460
+#: src/util/strings.c:1459
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1502
+#: src/util/strings.c:1501
 #, 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:1552
+#: src/util/strings.c:1551
 #, 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:1583
+#: src/util/strings.c:1582
 #, 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:900 src/util/time.c:928
+#: src/util/time.c:901 src/util/time.c:929
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:936
+#: src/util/time.c:937
 #, 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
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
 #, fuzzy
 msgid "# Active channels"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:583
+#: src/vpn/gnunet-service-vpn.c:582
 #, fuzzy
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/vpn/gnunet-service-vpn.c:736
+#: src/vpn/gnunet-service-vpn.c:735
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:1112
+#: src/vpn/gnunet-service-vpn.c:1111
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:1262
+#: src/vpn/gnunet-service-vpn.c:1261
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:1461
+#: src/vpn/gnunet-service-vpn.c:1460
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/vpn/gnunet-service-vpn.c:1685
+#: src/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1821
+#: src/vpn/gnunet-service-vpn.c:1820
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/vpn/gnunet-service-vpn.c:2019
+#: src/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2045
+#: src/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2282
+#: src/vpn/gnunet-service-vpn.c:2281
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2316 src/vpn/gnunet-service-vpn.c:2348
+#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2355
+#: src/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2371
+#: src/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2411
+#: src/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2463
+#: src/vpn/gnunet-service-vpn.c:2462
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2497 src/vpn/gnunet-service-vpn.c:2705
+#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
 #, fuzzy
 msgid "# Active destinations"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:2750
+#: src/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3008
+#: src/vpn/gnunet-service-vpn.c:3007
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3036
+#: src/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3046
+#: src/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3062
+#: src/vpn/gnunet-service-vpn.c:3061
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3079
+#: src/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:143
+#: src/vpn/gnunet-vpn.c:142
 #, fuzzy
 msgid "Error creating tunnel\n"
 msgstr "Hoàn thành tạo khoá.\n"
 
-#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:226
+#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:202
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/vpn/gnunet-vpn.c:217
+#: src/vpn/gnunet-vpn.c:216
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/vpn/gnunet-vpn.c:240
+#: src/vpn/gnunet-vpn.c:239
 #, fuzzy, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:258
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:295
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:301
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:308
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:315
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:322
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:330
+#: src/vpn/gnunet-vpn.c:329
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:335
+#: src/vpn/gnunet-vpn.c:334
 #, fuzzy
 msgid "service is offered via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/vpn/gnunet-vpn.c:340
+#: src/vpn/gnunet-vpn.c:339
 #, fuzzy
 msgid "service is offered via UDP"
 msgstr "# các byte đã nhận qua UDP"
 
-#: src/vpn/gnunet-vpn.c:354
+#: src/vpn/gnunet-vpn.c:353
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:502
+#: src/zonemaster/gnunet-service-zonemaster.c:501
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1333
+#: src/zonemaster/gnunet-service-zonemaster.c:1332
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ae10f0218..96caabf73 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: 2022-12-04 14:58+0900\n"
+"POT-Creation-Date: 2022-12-05 17:21+0900\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"
@@ -28,9 +28,9 @@ msgstr ""
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
+#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1958
+#: src/namestore/gnunet-namestore.c:1957
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -144,7 +144,7 @@ msgstr ""
 msgid "GNUnet abd resolver tool"
 msgstr "GNUnet 错误日志"
 
-#: src/abd/gnunet-service-abd.c:1746 src/gns/gnunet-gns.c:292
+#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -164,15 +164,15 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1132
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1133
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1135
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1136
 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:1137
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:1138
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
@@ -383,28 +383,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:1094
-#: src/util/service.c:1100
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1095
+#: src/util/service.c:1101
 #, 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:530
-#: src/util/service.c:1133
+#: src/transport/tcp_service_legacy.c:634 src/util/client.c:531
+#: src/util/service.c:1134
 #, 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:535
-#: src/util/service.c:1137
+#: src/transport/tcp_service_legacy.c:638 src/util/client.c:536
+#: src/util/service.c:1138
 #, 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:1157
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1158
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -412,7 +412,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:1175
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1176
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -420,7 +420,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:1206
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1207
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
@@ -428,7 +428,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:1225
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1226
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -1113,7 +1113,7 @@ msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:664
+#: src/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1531,10 +1531,10 @@ msgstr "sqlite 数据仓库"
 
 #: src/datacache/plugin_datacache_sqlite.c:128
 #: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_mysql.c:890
+#: src/datastore/plugin_datastore_mysql.c:891
 #: 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/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:82 src/my/my.c:94
+#: src/mysql/mysql.c:47 src/mysql/mysql.c:65
 #: src/namecache/plugin_namecache_sqlite.c:54
 #: src/namestore/plugin_namestore_sqlite.c:56
 #: src/peerstore/plugin_peerstore_sqlite.c:54
@@ -1542,7 +1542,7 @@ msgstr "sqlite 数据仓库"
 #: 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
+#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
@@ -1841,24 +1841,24 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Heap database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datastore/plugin_datastore_mysql.c:371
-#: src/datastore/plugin_datastore_mysql.c:423
-#: src/datastore/plugin_datastore_mysql.c:1071
+#: src/datastore/plugin_datastore_mysql.c:372
+#: src/datastore/plugin_datastore_mysql.c:424
+#: src/datastore/plugin_datastore_mysql.c:1072
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:410
+#: src/datastore/plugin_datastore_mysql.c:411
 #: src/datastore/plugin_datastore_sqlite.c:675
 #, fuzzy
 msgid "Data too large"
 msgstr "迭代次数"
 
-#: src/datastore/plugin_datastore_mysql.c:847
+#: src/datastore/plugin_datastore_mysql.c:848
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1179
+#: src/datastore/plugin_datastore_mysql.c:1180
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -1987,7 +1987,7 @@ msgstr ""
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:359
+#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
 #: src/nse/gnunet-nse-profiler.c:894
 msgid "be verbose (print progress information)"
 msgstr ""
@@ -2078,275 +2078,275 @@ msgstr ""
 msgid "Measure quality and performance of the DHT service."
 msgstr "无法访问该服务"
 
-#: src/dns/gnunet-dns-monitor.c:371 src/dns/gnunet-dns-monitor.c:376
+#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:388
+#: src/dns/gnunet-dns-monitor.c:387
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:241
+#: src/dns/gnunet-dns-redirector.c:240
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:246
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:260
+#: src/dns/gnunet-dns-redirector.c:259
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:466
+#: src/dns/gnunet-service-dns.c:463
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:620
+#: src/dns/gnunet-service-dns.c:617
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:756
+#: src/dns/gnunet-service-dns.c:753
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:832
+#: src/dns/gnunet-service-dns.c:829
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:951
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:973
+#: src/dns/gnunet-service-dns.c:970
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:984
+#: src/dns/gnunet-service-dns.c:981
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:996
+#: src/dns/gnunet-service-dns.c:993
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:999
+#: src/dns/gnunet-service-dns.c:996
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069
+#: src/dns/gnunet-service-dns.c:1066
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1117 src/exit/gnunet-daemon-exit.c:3707
+#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/dns/gnunet-service-dns.c:1128
+#: src/dns/gnunet-service-dns.c:1125
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:971
+#: src/exit/gnunet-daemon-exit.c:968
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1077
+#: src/exit/gnunet-daemon-exit.c:1074
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1371
+#: src/exit/gnunet-daemon-exit.c:1368
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
+#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
+#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
+#: src/exit/gnunet-daemon-exit.c:2283
 msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1507
+#: src/exit/gnunet-daemon-exit.c:1504
 msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1619
+#: src/exit/gnunet-daemon-exit.c:1616
 msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1661
+#: src/exit/gnunet-daemon-exit.c:1658
 msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1752
+#: src/exit/gnunet-daemon-exit.c:1749
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1840
+#: src/exit/gnunet-daemon-exit.c:1837
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1879
+#: src/exit/gnunet-daemon-exit.c:1876
 msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2020
+#: src/exit/gnunet-daemon-exit.c:2017
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
+#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
+#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
+#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
+#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2290
+#: src/exit/gnunet-daemon-exit.c:2287
 msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2349 src/vpn/gnunet-service-vpn.c:995
-#: src/vpn/gnunet-service-vpn.c:2122
+#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
+#: src/vpn/gnunet-service-vpn.c:2121
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
+#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2498 src/exit/gnunet-daemon-exit.c:3199
+#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:2619
+#: src/exit/gnunet-daemon-exit.c:2616
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2639
+#: src/exit/gnunet-daemon-exit.c:2636
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:2831
+#: src/exit/gnunet-daemon-exit.c:2828
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2840
+#: src/exit/gnunet-daemon-exit.c:2837
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2916
+#: src/exit/gnunet-daemon-exit.c:2913
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2990
+#: src/exit/gnunet-daemon-exit.c:2987
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3039
+#: src/exit/gnunet-daemon-exit.c:3036
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3054
+#: src/exit/gnunet-daemon-exit.c:3051
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3081
+#: src/exit/gnunet-daemon-exit.c:3078
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3112
+#: src/exit/gnunet-daemon-exit.c:3109
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3164
+#: src/exit/gnunet-daemon-exit.c:3161
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3173
+#: src/exit/gnunet-daemon-exit.c:3170
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3376 src/exit/gnunet-daemon-exit.c:3387
+#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/exit/gnunet-daemon-exit.c:3401 src/exit/gnunet-daemon-exit.c:3409
+#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3451
+#: src/exit/gnunet-daemon-exit.c:3448
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3466 src/exit/gnunet-daemon-exit.c:3481
+#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3495
+#: src/exit/gnunet-daemon-exit.c:3492
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3640
+#: src/exit/gnunet-daemon-exit.c:3637
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3649
+#: src/exit/gnunet-daemon-exit.c:3646
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3657
+#: src/exit/gnunet-daemon-exit.c:3654
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3661
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3835
+#: src/exit/gnunet-daemon-exit.c:3832
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3951
+#: src/exit/gnunet-daemon-exit.c:3948
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3963 src/pt/gnunet-daemon-pt.c:1212
+#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4117
+#: src/exit/gnunet-daemon-exit.c:4114
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2367,164 +2367,164 @@ msgstr ""
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:240
+#: src/fragmentation/fragmentation.c:239
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:245
+#: src/fragmentation/fragmentation.c:244
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:278
+#: src/fragmentation/fragmentation.c:277
 msgid "# fragments wrap arounds"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:325
+#: src/fragmentation/fragmentation.c:324
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:331
+#: src/fragmentation/fragmentation.c:330
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:459
+#: src/fragmentation/fragmentation.c:458
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:466
+#: src/fragmentation/fragmentation.c:465
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:490
+#: src/fragmentation/fragmentation.c:489
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:481
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:492
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/fs_api.c:499
+#: src/fs/fs_api.c:500
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1156
+#: src/fs/fs_api.c:1157
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:1707
+#: src/fs/fs_api.c:1708
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1722
+#: src/fs/fs_api.c:1723
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2451
+#: src/fs/fs_api.c:2452
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2462
+#: src/fs/fs_api.c:2463
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
+#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2628
+#: src/fs/fs_api.c:2629
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
+#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2846
+#: src/fs/fs_api.c:2847
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:3107
+#: src/fs/fs_api.c:3108
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:215
+#: src/fs/fs_directory.c:216
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:332
+#: src/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:346
+#: src/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directory contents of `%s' for recursive download\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_download.c:528 src/fs/fs_download.c:541
+#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:960
+#: src/fs/fs_download.c:961
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1044
+#: src/fs/fs_download.c:1045
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1066
+#: src/fs/fs_download.c:1067
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1089
+#: src/fs/fs_download.c:1090
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:1100
+#: src/fs/fs_download.c:1101
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:1110
+#: src/fs/fs_download.c:1111
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_download.c:1218
+#: src/fs/fs_download.c:1219
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_download.c:1889
+#: src/fs/fs_download.c:1890
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
@@ -2536,102 +2536,102 @@ msgid ""
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:190
+#: src/fs/fs_list_indexed.c:191
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_misc.c:128
+#: src/fs/fs_misc.c:129
 #, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:202
+#: src/fs/fs_namespace.c:203
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_namespace.c:233
+#: src/fs/fs_namespace.c:234
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_namespace.c:330
+#: src/fs/fs_namespace.c:331
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_namespace.c:457
+#: src/fs/fs_namespace.c:458
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:128 src/fs/fs_publish.c:438
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:731
+#: src/fs/fs_publish.c:732
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\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
+#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:790
+#: src/fs/fs_publish.c:791
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_publish.c:836
+#: src/fs/fs_publish.c:837
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:857
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:888
+#: src/fs/fs_publish.c:889
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:915
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:1003 src/fs/fs_publish.c:1040
+#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1107
+#: src/fs/fs_publish.c:1108
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1115
+#: src/fs/fs_publish.c:1116
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1156
+#: src/fs/fs_publish.c:1157
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1396
+#: src/fs/fs_publish.c:1397
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/fs/fs_publish.c:1488
+#: src/fs/fs_publish.c:1489
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:212
+#: src/fs/fs_publish_ksk.c:213
 msgid "Could not connect to datastore."
 msgstr ""
 
@@ -2640,150 +2640,150 @@ msgstr ""
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_search.c:829 src/fs/fs_search.c:900
+#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_search.c:993
+#: src/fs/fs_search.c:994
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:64
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:68
+#: src/fs/fs_unindex.c:69
 #, fuzzy
 msgid "Failed to read file"
 msgstr "发送消息失败。\n"
 
-#: src/fs/fs_unindex.c:275
+#: src/fs/fs_unindex.c:276
 #, fuzzy
 msgid "Error communicating with `fs' service."
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/fs/fs_unindex.c:326
+#: src/fs/fs_unindex.c:327
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:389
+#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_unindex.c:385
+#: src/fs/fs_unindex.c:386
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_unindex.c:446
+#: src/fs/fs_unindex.c:447
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_unindex.c:592 src/fs/fs_unindex.c:656
+#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:670
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_unindex.c:708
+#: src/fs/fs_unindex.c:709
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:231
+#: src/fs/fs_uri.c:232
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:290
+#: src/fs/fs_uri.c:291
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:308
+#: src/fs/fs_uri.c:309
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:315
+#: src/fs/fs_uri.c:316
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:382
+#: src/fs/fs_uri.c:383
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:423
+#: src/fs/fs_uri.c:424
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:440
+#: src/fs/fs_uri.c:441
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:517
+#: src/fs/fs_uri.c:518
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:534
+#: src/fs/fs_uri.c:535
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:561
+#: src/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:567
+#: src/fs/fs_uri.c:568
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:574
+#: src/fs/fs_uri.c:575
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:592
+#: src/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:612
+#: src/fs/fs_uri.c:613
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:645
+#: src/fs/fs_uri.c:646
 #, fuzzy
 msgid "invalid argument"
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_uri.c:665
+#: src/fs/fs_uri.c:666
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1060 src/fs/fs_uri.c:1087
+#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1093
+#: src/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2819,7 +2819,7 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:896
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
@@ -2827,15 +2827,15 @@ msgstr ""
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:946
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:959
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2843,131 +2843,131 @@ msgstr ""
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:667
+#: src/fs/gnunet-daemon-fsprofiler.c:668
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:54
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:105
+#: src/fs/gnunet-directory.c:106
 #, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:108
+#: src/fs/gnunet-directory.c:109
 #, c-format
 msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-directory.c:146
 #, fuzzy
 msgid "You must specify a filename to inspect.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-directory.c:159
+#: src/fs/gnunet-directory.c:160
 #, fuzzy, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-directory.c:169
+#: src/fs/gnunet-directory.c:170
 #, fuzzy, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "更改 GNUnet 目录的权限出错"
 
-#: src/fs/gnunet-directory.c:200
+#: src/fs/gnunet-directory.c:201
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "更改 GNUnet 目录的权限出错"
 
-#: src/fs/gnunet-download.c:130
+#: src/fs/gnunet-download.c:131
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-download.c:142
+#: src/fs/gnunet-download.c:143
 #, fuzzy
 msgid "<unknown time>"
 msgstr "未知错误"
 
-#: src/fs/gnunet-download.c:154
+#: src/fs/gnunet-download.c:155
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:188
+#: src/fs/gnunet-download.c:189
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:206 src/fs/gnunet-publish.c:299
-#: src/fs/gnunet-search.c:543 src/fs/gnunet-unindex.c:117
+#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
+#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:234
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:715
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:716
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:247
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:254
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:271 src/fs/gnunet-publish.c:869
-#: src/fs/gnunet-unindex.c:154
+#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-unindex.c:155
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-download.c:318
+#: src/fs/gnunet-download.c:319
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:325
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:330 src/fs/gnunet-search.c:745
+#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:335
+#: src/fs/gnunet-download.c:336
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:342
+#: src/fs/gnunet-download.c:343
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:349
+#: src/fs/gnunet-download.c:350
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:354
+#: src/fs/gnunet-download.c:355
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:373
+#: src/fs/gnunet-download.c:374
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2989,290 +2989,290 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:164
+#: src/fs/gnunet-fs.c:165
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:179
+#: src/fs/gnunet-fs.c:180
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:234
+#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:246
+#: src/fs/gnunet-publish.c:247
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:254
+#: src/fs/gnunet-publish.c:255
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:258
+#: src/fs/gnunet-publish.c:259
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:265
 #, c-format
 msgid "Namespace URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:279
+#: src/fs/gnunet-publish.c:280
 msgid "Starting cleanup after abort\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-publish.c:287
 msgid "Cleanup after abort completed.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:291
+#: src/fs/gnunet-publish.c:292
 msgid "Cleanup after abort failed.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:425
+#: src/fs/gnunet-publish.c:426
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:428
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:582
+#: src/fs/gnunet-publish.c:583
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:611
+#: src/fs/gnunet-publish.c:612
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:644
+#: src/fs/gnunet-publish.c:645
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:647
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-publish.c:653
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:659
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:664
+#: src/fs/gnunet-publish.c:665
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:670
+#: src/fs/gnunet-publish.c:671
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:678
+#: src/fs/gnunet-publish.c:679
 #, fuzzy
 msgid "Error scanning directory.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:706
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:737
+#: src/fs/gnunet-publish.c:738
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:755
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:810
+#: src/fs/gnunet-publish.c:811
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:817
+#: src/fs/gnunet-publish.c:818
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:823
+#: src/fs/gnunet-publish.c:824
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:832 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:208
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:853
+#: src/fs/gnunet-publish.c:845 src/fs/gnunet-publish.c:854
 #: 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:906
+#: src/fs/gnunet-publish.c:907
 msgid "enable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:921
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:927
+#: src/fs/gnunet-publish.c:928
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:932
+#: src/fs/gnunet-publish.c:933
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-publish.c:940
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:952
+#: src/fs/gnunet-publish.c:953
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:964
+#: src/fs/gnunet-publish.c:965
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:971
+#: src/fs/gnunet-publish.c:972
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:979
+#: src/fs/gnunet-publish.c:980
 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:997
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:443
+#: src/fs/gnunet-search.c:446
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:532
+#: src/fs/gnunet-search.c:535
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-search.c:592
+#: src/fs/gnunet-search.c:595
 #, c-format
 msgid "Conflicting options --bookmark-only and --silent.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:599
+#: src/fs/gnunet-search.c:602
 #, c-format
 msgid "Conflicting options --bookmark-only and --output.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:605
+#: src/fs/gnunet-search.c:608
 #, c-format
 msgid "An output file is mandatory for silent mode.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:626
+#: src/fs/gnunet-search.c:629
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:634
+#: src/fs/gnunet-search.c:637
 msgid ""
 "Invalid URI. Valid URIs for searching are keyword query URIs\n"
 "(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
 "\").\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:659
+#: src/fs/gnunet-search.c:662
 #, fuzzy, c-format
 msgid "Could not initialize the `%s` subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-search.c:673
+#: src/fs/gnunet-search.c:676
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:699
+#: src/fs/gnunet-search.c:702
 msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:705
+#: src/fs/gnunet-search.c:708
 msgid "do not search, print only the URI that points to this search"
 msgstr ""
 
-#: src/fs/gnunet-search.c:712
+#: src/fs/gnunet-search.c:715
 msgid ""
 "write search results for directories according to FORMAT; accepted "
 "placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
 "printf when omitted or to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:722
+#: src/fs/gnunet-search.c:725
 msgid ""
 "write search results according to FORMAT; accepted placeholders are: %a, %f, "
 "%j, %l, %m, %n, %s; defaults to `"
 msgstr ""
 
-#: src/fs/gnunet-search.c:730
+#: src/fs/gnunet-search.c:733
 msgid ""
 "when the %a or %j placeholders appear in --printf or --dir-printf, list each "
 "metadata property according to FORMAT; accepted placeholders are: %i, %l, "
 "%n, %p"
 msgstr ""
 
-#: src/fs/gnunet-search.c:739
+#: src/fs/gnunet-search.c:742
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:751
+#: src/fs/gnunet-search.c:754
 msgid ""
 "create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
 "search --output=commons"
 msgstr ""
 
-#: src/fs/gnunet-search.c:758
+#: src/fs/gnunet-search.c:761
 msgid "silent mode (requires the --output argument)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:764
+#: src/fs/gnunet-search.c:767
 msgid ""
 "automatically terminate search after DELAY; the value given must be a number "
 "followed by a space and a time unit, for example \"500 ms\"; without a unit "
@@ -3280,52 +3280,52 @@ msgid ""
 "to wait for CTRL-C"
 msgstr ""
 
-#: src/fs/gnunet-search.c:773
+#: src/fs/gnunet-search.c:776
 #, c-format
 msgid ""
 "be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
 "arguments - ignored when these are provided by the user)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:786
+#: src/fs/gnunet-search.c:789
 msgid "Search for files that have been published on GNUnet\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:371 src/fs/gnunet-service-fs.c:878
+#: src/fs/gnunet-service-fs.c:370 src/fs/gnunet-service-fs.c:877
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:430
+#: src/fs/gnunet-service-fs.c:429
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:596
+#: src/fs/gnunet-service-fs.c:595
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:648 src/fs/gnunet-service-fs_cp.c:558
+#: src/fs/gnunet-service-fs.c:647 src/fs/gnunet-service-fs_cp.c:558
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:831
+#: src/fs/gnunet-service-fs.c:830
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:871
+#: src/fs/gnunet-service-fs.c:870
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1041
+#: src/fs/gnunet-service-fs.c:1040
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1288
+#: src/fs/gnunet-service-fs.c:1287
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/fs/gnunet-service-fs.c:1322 src/hostlist/gnunet-daemon-hostlist.c:343
+#: src/fs/gnunet-service-fs.c:1321 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3423,41 +3423,41 @@ msgstr ""
 msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:188
+#: src/fs/gnunet-service-fs_indexing.c:129
+#: src/fs/gnunet-service-fs_indexing.c:187
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:147
+#: src/fs/gnunet-service-fs_indexing.c:146
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-service-fs_indexing.c:244
+#: src/fs/gnunet-service-fs_indexing.c:243
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:297
+#: src/fs/gnunet-service-fs_indexing.c:296
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:311
+#: src/fs/gnunet-service-fs_indexing.c:310
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:315
+#: src/fs/gnunet-service-fs_indexing.c:314
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:328
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:435
+#: src/fs/gnunet-service-fs_indexing.c:434
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3587,33 +3587,52 @@ msgstr ""
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:93
+#: src/fs/gnunet-unindex.c:94
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:102
+#: src/fs/gnunet-unindex.c:103
 #, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-unindex.c:109
 msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-unindex.c:142
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:161
+#: src/fs/gnunet-unindex.c:162
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:194
+#: src/fs/gnunet-unindex.c:195
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
+#: src/fs/meta_data.c:1063 src/fs/meta_data.c:1116 src/fs/meta_data.c:1131
+msgid "metadata length"
+msgstr ""
+
+#: src/fs/meta_data.c:1074
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
+msgstr ""
+
+#: src/fs/meta_data.c:1091
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "发送消息失败。\n"
+
+#: src/fs/meta_data.c:1126
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "发送消息失败。\n"
+
 #: src/gns/gns_tld_api.c:293
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
@@ -3641,45 +3660,45 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:298
+#: src/gns/gnunet-dns2gns.c:296
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-dns2gns.c:379
+#: src/gns/gnunet-dns2gns.c:377
 #, fuzzy
 msgid "Failed to parse DNS response!\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-dns2gns.c:453
+#: src/gns/gnunet-dns2gns.c:451
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:656
+#: src/gns/gnunet-dns2gns.c:654
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:672
+#: src/gns/gnunet-dns2gns.c:670
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:680
+#: src/gns/gnunet-dns2gns.c:678
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:841
+#: src/gns/gnunet-dns2gns.c:839
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1001
+#: src/gns/gnunet-dns2gns.c:999
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1018
+#: src/gns/gnunet-dns2gns.c:1016
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3815,168 +3834,168 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:257
+#: src/gns/gnunet-gns.c:256
 #, fuzzy, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "“%s”不可用。\n"
 
-#: src/gns/gnunet-gns.c:267 src/util/dnsparser.c:253
+#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-gns.c:281
+#: src/gns/gnunet-gns.c:280
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:305
+#: src/gns/gnunet-gns.c:304
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:340
+#: src/gns/gnunet-gns.c:339
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:346
+#: src/gns/gnunet-gns.c:345
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:352
+#: src/gns/gnunet-gns.c:351
 msgid "Specify a timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:356
+#: src/gns/gnunet-gns.c:355
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:361
+#: src/gns/gnunet-gns.c:360
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:375
+#: src/gns/gnunet-gns.c:374
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet 错误日志"
 
-#: src/gns/gnunet-service-gns.c:519
+#: src/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "“%s”的参数无效。\n"
 
-#: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1346
+#: src/gns/gnunet-service-gns.c:554
+#: src/zonemaster/gnunet-service-zonemaster.c:1345
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:574
-#: src/zonemaster/gnunet-service-zonemaster.c:1385
+#: src/gns/gnunet-service-gns.c:573
+#: src/zonemaster/gnunet-service-zonemaster.c:1384
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:279
+#: src/gns/gnunet-service-gns_interceptor.c:278
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:380
+#: src/gns/gnunet-service-gns_interceptor.c:379
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:672
+#: src/gns/gnunet-service-gns_resolver.c:669
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:684
+#: src/gns/gnunet-service-gns_resolver.c:681
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:690
+#: src/gns/gnunet-service-gns_resolver.c:687
 #, c-format
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:903
+#: src/gns/gnunet-service-gns_resolver.c:900
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1094
+#: src/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1870
+#: src/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1885
+#: src/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1918
+#: src/gns/gnunet-service-gns_resolver.c:1915
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2320
+#: src/gns/gnunet-service-gns_resolver.c:2317
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2325
+#: src/gns/gnunet-service-gns_resolver.c:2322
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2348
+#: src/gns/gnunet-service-gns_resolver.c:2345
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2515
+#: src/gns/gnunet-service-gns_resolver.c:2512
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2663
+#: src/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:138
+#: src/gns/plugin_gnsrecord_gns.c:137
 msgid "This is a memento of an older block for internal maintenance."
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:177
+#: src/gns/plugin_gnsrecord_gns.c:176
 #, fuzzy, c-format
 msgid "Unable to parse zone key record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:191
+#: src/gns/plugin_gnsrecord_gns.c:190
 msgid "Record type does not match parsed record type\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:214
+#: src/gns/plugin_gnsrecord_gns.c:213
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:231
+#: src/gns/plugin_gnsrecord_gns.c:230
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:255
+#: src/gns/plugin_gnsrecord_gns.c:254
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:287
+#: src/gns/plugin_gnsrecord_gns.c:286
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -3985,109 +4004,109 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Gns REST API initialized\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:53
+#: src/gnsrecord/gnsrecord_misc.c:51
 msgid "Label is NULL which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:58
+#: src/gnsrecord/gnsrecord_misc.c:56
 msgid "Label  contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:481
+#: src/gnsrecord/gnsrecord_misc.c:479
 msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:489
+#: src/gnsrecord/gnsrecord_misc.c:487
 msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:499
+#: src/gnsrecord/gnsrecord_misc.c:497
 msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:508 src/gnsrecord/gnsrecord_misc.c:534
+#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
 msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:515
+#: src/gnsrecord/gnsrecord_misc.c:513
 msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:526
+#: src/gnsrecord/gnsrecord_misc.c:524
 msgid "Redirection records not allowed in apex.."
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:548
+#: src/gnsrecord/gnsrecord_misc.c:546
 msgid "Mutually exclusive records."
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:367
+#: src/gnsrecord/plugin_gnsrecord_dns.c:366
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:385
+#: src/gnsrecord/plugin_gnsrecord_dns.c:384
 #, fuzzy, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:406
+#: src/gnsrecord/plugin_gnsrecord_dns.c:405
 #, fuzzy, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:480
+#: src/gnsrecord/plugin_gnsrecord_dns.c:479
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:516
+#: src/gnsrecord/plugin_gnsrecord_dns.c:515
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:533
+#: src/gnsrecord/plugin_gnsrecord_dns.c:532
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:553
+#: src/gnsrecord/plugin_gnsrecord_dns.c:552
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:573
+#: src/gnsrecord/plugin_gnsrecord_dns.c:572
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:585
+#: src/gnsrecord/plugin_gnsrecord_dns.c:584
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:608
+#: src/gnsrecord/plugin_gnsrecord_dns.c:607
 #, fuzzy, c-format
 msgid "Unable to parse SRV record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:621
+#: src/gnsrecord/plugin_gnsrecord_dns.c:620
 #, fuzzy, c-format
 msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:640
+#: src/gnsrecord/plugin_gnsrecord_dns.c:639
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:660
-#: src/gnsrecord/plugin_gnsrecord_dns.c:674
+#: src/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/gnsrecord/plugin_gnsrecord_dns.c:673
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:693
+#: src/gnsrecord/plugin_gnsrecord_dns.c:692
 #, fuzzy, c-format
 msgid "Unable to parse CAA record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4557,64 +4576,64 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/my/my.c:196 src/my/my.c:215
+#: src/my/my.c:197 src/my/my.c:216
 #, fuzzy, c-format
 msgid "%s failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/mysql/mysql.c:190
+#: src/mysql/mysql.c:191
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/mysql/mysql.c:198
+#: src/mysql/mysql.c:199
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/namecache/gnunet-namecache.c:106
+#: src/namecache/gnunet-namecache.c:105
 #, fuzzy, c-format
 msgid "No records found for `%s'"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/namecache/gnunet-namecache.c:119 src/namestore/gnunet-namestore.c:888
+#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:887
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:175
+#: src/namecache/gnunet-namecache.c:174
 #, fuzzy, c-format
 msgid "You must specify which zone should be accessed\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/namecache/gnunet-namecache.c:182
+#: src/namecache/gnunet-namecache.c:181
 #, fuzzy, c-format
 msgid "Invalid public key for zone `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namecache/gnunet-namecache.c:188
+#: src/namecache/gnunet-namecache.c:187
 #, fuzzy, c-format
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方！\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:2020
+#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2019
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:221
+#: src/namecache/gnunet-namecache.c:220
 msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:2102
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2101
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
 
-#: src/namecache/namecache_api.c:285
+#: src/namecache/namecache_api.c:283
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:373
+#: src/namecache/namecache_api.c:371
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
@@ -4654,7 +4673,7 @@ msgid "Failed to setup database at `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
 #: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1951
+#: src/namestore/gnunet-namestore.c:1950
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
@@ -4828,250 +4847,250 @@ msgid "Failed to connect to IDENTITY\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2087
+#: src/namestore/gnunet-namestore.c:2086
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:412
+#: src/namestore/gnunet-namestore.c:411
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore.c:420
+#: src/namestore/gnunet-namestore.c:419
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:428 src/namestore/gnunet-namestore.c:443
+#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:435
+#: src/namestore/gnunet-namestore.c:434
 #, fuzzy, c-format
 msgid "Error parsing expiration time %s.\n"
 msgstr "保存配置出错。"
 
-#: src/namestore/gnunet-namestore.c:465
+#: src/namestore/gnunet-namestore.c:464
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:667
+#: src/namestore/gnunet-namestore.c:666
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:685 src/namestore/gnunet-namestore.c:701
+#: src/namestore/gnunet-namestore.c:684 src/namestore/gnunet-namestore.c:700
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr "“%s”以错误码 %d 失败：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1137
+#: src/namestore/gnunet-namestore.c:1136
 #, 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:1258
+#: src/namestore/gnunet-namestore.c:1257
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1301
+#: src/namestore/gnunet-namestore.c:1300
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1326
+#: src/namestore/gnunet-namestore.c:1325
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1355
+#: src/namestore/gnunet-namestore.c:1354
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1369
+#: src/namestore/gnunet-namestore.c:1368
 #, c-format
 msgid "Recordlines only work with option `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1378 src/namestore/gnunet-namestore.c:1430
-#: src/namestore/gnunet-namestore.c:1440 src/namestore/gnunet-namestore.c:1450
-#: src/namestore/gnunet-namestore.c:1479 src/namestore/gnunet-namestore.c:1500
-#: src/namestore/gnunet-namestore.c:1527 src/namestore/gnunet-namestore.c:1537
-#: src/namestore/gnunet-namestore.c:1570 src/namestore/gnunet-namestore.c:1595
-#: src/namestore/gnunet-namestore.c:1629 src/namestore/gnunet-namestore.c:1663
-#: src/namestore/gnunet-namestore.c:1686
+#: src/namestore/gnunet-namestore.c:1377 src/namestore/gnunet-namestore.c:1429
+#: src/namestore/gnunet-namestore.c:1439 src/namestore/gnunet-namestore.c:1449
+#: src/namestore/gnunet-namestore.c:1478 src/namestore/gnunet-namestore.c:1499
+#: src/namestore/gnunet-namestore.c:1526 src/namestore/gnunet-namestore.c:1536
+#: src/namestore/gnunet-namestore.c:1569 src/namestore/gnunet-namestore.c:1594
+#: src/namestore/gnunet-namestore.c:1628 src/namestore/gnunet-namestore.c:1662
+#: src/namestore/gnunet-namestore.c:1685
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:1380
+#: src/namestore/gnunet-namestore.c:1379
 #, fuzzy
 msgid "name"
 msgstr "无名称"
 
-#: src/namestore/gnunet-namestore.c:1409
+#: src/namestore/gnunet-namestore.c:1408
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:1432 src/namestore/gnunet-namestore.c:1442
-#: src/namestore/gnunet-namestore.c:1452 src/namestore/gnunet-namestore.c:1481
-#: src/namestore/gnunet-namestore.c:1502 src/namestore/gnunet-namestore.c:1688
+#: src/namestore/gnunet-namestore.c:1431 src/namestore/gnunet-namestore.c:1441
+#: src/namestore/gnunet-namestore.c:1451 src/namestore/gnunet-namestore.c:1480
+#: src/namestore/gnunet-namestore.c:1501 src/namestore/gnunet-namestore.c:1687
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1460
+#: src/namestore/gnunet-namestore.c:1459
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:1470
+#: src/namestore/gnunet-namestore.c:1469
 #, c-format
 msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1490
+#: src/namestore/gnunet-namestore.c:1489
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1509 src/namestore/gnunet-namestore.c:1695
+#: src/namestore/gnunet-namestore.c:1508 src/namestore/gnunet-namestore.c:1694
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:1529 src/namestore/gnunet-namestore.c:1539
+#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1571
 msgid "purge-zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1596
 msgid "list"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1631
+#: src/namestore/gnunet-namestore.c:1630
 msgid "reverse-pkey"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1641
+#: src/namestore/gnunet-namestore.c:1640
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-namestore.c:1665
+#: src/namestore/gnunet-namestore.c:1664
 msgid "uri"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1678
+#: src/namestore/gnunet-namestore.c:1677
 #: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:1966
+#: src/namestore/gnunet-namestore.c:1965
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1985
+#: src/namestore/gnunet-namestore.c:1984
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1988
+#: src/namestore/gnunet-namestore.c:1987
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1992
+#: src/namestore/gnunet-namestore.c:1991
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1996
+#: src/namestore/gnunet-namestore.c:1995
 msgid "read commands from stdin"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2003
+#: src/namestore/gnunet-namestore.c:2002
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2009
+#: src/namestore/gnunet-namestore.c:2008
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/namestore/gnunet-namestore.c:2014
+#: src/namestore/gnunet-namestore.c:2013
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:2024
+#: src/namestore/gnunet-namestore.c:2023
 #, fuzzy
 msgid "Output in recordline format"
 msgstr "以 gnuplot 格式输出"
 
-#: src/namestore/gnunet-namestore.c:2030
+#: src/namestore/gnunet-namestore.c:2029
 #, fuzzy
 msgid "determine our name for the given KEY"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/namestore/gnunet-namestore.c:2036
+#: src/namestore/gnunet-namestore.c:2035
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2041
+#: src/namestore/gnunet-namestore.c:2040
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2047
+#: src/namestore/gnunet-namestore.c:2046
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2051
+#: src/namestore/gnunet-namestore.c:2050
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2055
+#: src/namestore/gnunet-namestore.c:2054
 msgid "omit private records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2060
+#: src/namestore/gnunet-namestore.c:2059
 msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2065
+#: src/namestore/gnunet-namestore.c:2064
 msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2070
+#: src/namestore/gnunet-namestore.c:2069
 msgid ""
 "show private key for orphaned records for recovery using `gnunet-identity -C "
 "-P <key>'. Use in combination with --display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2075
+#: src/namestore/gnunet-namestore.c:2074
 msgid "delete all records in specified zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2081
+#: src/namestore/gnunet-namestore.c:2080
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1837
+#: src/namestore/gnunet-zoneimport.c:1835
 msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1843
+#: src/namestore/gnunet-zoneimport.c:1841
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
@@ -5414,7 +5433,7 @@ msgid "Show network size estimates from NSE service."
 msgstr ""
 
 #: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:242
+#: src/revocation/gnunet-service-revocation.c:920 src/util/gnunet-scrypt.c:243
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值不在合法范围内。"
@@ -5611,58 +5630,58 @@ msgstr "创建用户出错"
 msgid "Unable to create indices: %s.\n"
 msgstr "发送消息失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:418
+#: src/pt/gnunet-daemon-pt.c:416
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:424
+#: src/pt/gnunet-daemon-pt.c:422
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:478
+#: src/pt/gnunet-daemon-pt.c:476
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:673
+#: src/pt/gnunet-daemon-pt.c:671
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:680
+#: src/pt/gnunet-daemon-pt.c:678
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:718
+#: src/pt/gnunet-daemon-pt.c:716
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:773
+#: src/pt/gnunet-daemon-pt.c:771
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:779
+#: src/pt/gnunet-daemon-pt.c:777
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:788
+#: src/pt/gnunet-daemon-pt.c:786
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:881
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:900
+#: src/pt/gnunet-daemon-pt.c:898
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1227 src/pt/gnunet-daemon-pt.c:1236
-#: src/pt/gnunet-daemon-pt.c:1252 src/pt/gnunet-daemon-pt.c:1261
-#: src/pt/gnunet-daemon-pt.c:1270
+#: 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
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:1316
+#: src/pt/gnunet-daemon-pt.c:1314
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -5790,7 +5809,7 @@ msgstr ""
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:3096
+#: src/reclaim/plugin_rest_openid_connect.c:3095
 msgid "OpenID Connect REST API initialized\n"
 msgstr ""
 
@@ -5798,7 +5817,7 @@ msgstr ""
 msgid "Identity Provider REST API initialized\n"
 msgstr ""
 
-#: src/reclaim/reclaim_api.c:545
+#: src/reclaim/reclaim_api.c:544
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "运行 %s失败：%s %d\n"
@@ -5817,13 +5836,13 @@ msgid "No configuration file given. Exiting\n"
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:631
+#: src/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:639
+#: src/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
@@ -5869,15 +5888,15 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:700
+#: src/regex/gnunet-regex-simulation-profiler.c:701
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:706
+#: src/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:720
+#: src/regex/gnunet-regex-simulation-profiler.c:721
 msgid "Profiler for regex library"
 msgstr ""
 
@@ -6181,7 +6200,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1914 src/seti/gnunet-service-seti.c:2467
+#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
 #: src/setu/gnunet-service-setu.c:5389
 #, fuzzy
 msgid "Could not connect to CADET service\n"
@@ -6253,12 +6272,12 @@ msgstr ""
 msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/statistics/gnunet-service-statistics.c:319
+#: src/statistics/gnunet-service-statistics.c:314
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:984
+#: src/statistics/gnunet-service-statistics.c:979
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
@@ -6441,7 +6460,7 @@ msgid ""
 msgstr ""
 
 #: 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
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:319
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6456,57 +6475,57 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1153
+#: src/testbed/gnunet-service-testbed_peers.c:1154
 #, c-format
 msgid "%s is stopped"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1156
+#: src/testbed/gnunet-service-testbed_peers.c:1157
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1159
+#: src/testbed/gnunet-service-testbed_peers.c:1160
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1162
+#: src/testbed/gnunet-service-testbed_peers.c:1163
 #, c-format
 msgid "%s is starting already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/testbed/gnunet-service-testbed_peers.c:1166
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1168
+#: src/testbed/gnunet-service-testbed_peers.c:1169
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_peers.c:1172
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1174
+#: src/testbed/gnunet-service-testbed_peers.c:1175
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "服务已删除。\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1178
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1180
+#: src/testbed/gnunet-service-testbed_peers.c:1181
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1182
+#: src/testbed/gnunet-service-testbed_peers.c:1183
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -7795,17 +7814,17 @@ msgstr "“%s”已连接到“%s”。\n"
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1400
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1401
 #, 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:1412
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1413
 #, 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:1419
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1420
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
@@ -7817,7 +7836,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:838
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7827,23 +7846,23 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:950
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:951
 #, 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:991
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:992
 #, 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:1480
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1481
 #, 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:1504
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1505
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -7858,45 +7877,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:1750
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1751
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1756
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1761
 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
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1219
+#: src/util/service.c:1642
 #, 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:1643
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1644
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1658
 #, 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:2000
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:2001
 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
+#: src/transport/transport-testing-communicator.c:1045 src/util/service.c:2077
+#: src/util/service.c:2089
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2098
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2099
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -7910,241 +7929,222 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:228 src/util/bio.c:236
+#: src/util/bio.c:223 src/util/bio.c:231
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "创建用户出错"
 
-#: src/util/bio.c:238
+#: src/util/bio.c:233
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:267
+#: src/util/bio.c:262
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/util/bio.c:269
+#: src/util/bio.c:264
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:309
+#: src/util/bio.c:304
 #, fuzzy, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr "“%s”的参数无效。\n"
 
-#: src/util/bio.c:336 src/util/bio.c:840
+#: src/util/bio.c:331 src/util/bio.c:781
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:342
+#: src/util/bio.c:337
 #, fuzzy, c-format
 msgid "%s (while reading `%s')"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/util/bio.c:347
+#: src/util/bio.c:342
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:360
+#: src/util/bio.c:355
 #, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
-msgid "metadata length"
-msgstr ""
-
-#: src/util/bio.c:411
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
-msgstr ""
-
-#: src/util/bio.c:427
-#, fuzzy, c-format
-msgid "Failed to deserialize metadata `%s'"
-msgstr "发送消息失败。\n"
-
-#: src/util/bio.c:669
+#: src/util/bio.c:610
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:731 src/util/bio.c:752
+#: src/util/bio.c:672 src/util/bio.c:693
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/util/bio.c:733
+#: src/util/bio.c:674
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:817
+#: src/util/bio.c:758
 #, fuzzy, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/bio.c:877
-#, fuzzy, c-format
-msgid "Failed to serialize metadata `%s'"
-msgstr "发送消息失败。\n"
-
-#: src/util/client.c:750 src/util/client.c:941
+#: src/util/client.c:751 src/util/client.c:942
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1096
+#: src/util/client.c:1097
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:648 src/util/common_logging.c:687
+#: src/util/common_logging.c:647 src/util/common_logging.c:686
 #, c-format
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:911
+#: src/util/common_logging.c:910
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:1104
+#: src/util/common_logging.c:1103
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1105
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1107
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1109
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1111
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1113
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:1115
+#: src/util/common_logging.c:1114
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1360
+#: src/util/common_logging.c:1359
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1405
+#: src/util/common_logging.c:1404
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1417
+#: src/util/common_logging.c:1416
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/util/common_logging.c:1432
+#: src/util/common_logging.c:1431
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/util/configuration.c:790
+#: src/util/configuration.c:786
 #, c-format
 msgid "Illegal directive in line %u (parsing restricted section %s)\n"
 msgstr ""
 
-#: src/util/configuration.c:800
+#: src/util/configuration.c:796
 #, c-format
 msgid "Bad directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:853
+#: src/util/configuration.c:849
 #, c-format
 msgid "Bad inline-secret directive in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:875
+#: src/util/configuration.c:871
 #, c-format
 msgid "Unknown or malformed directive '%s' in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:905
+#: src/util/configuration.c:901
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u (option without section)\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:949
+#: src/util/configuration.c:945
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:1049
+#: src/util/configuration.c:1045
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/util/configuration.c:1062
+#: src/util/configuration.c:1058
 #, fuzzy, c-format
 msgid "Failed to parse configuration file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/configuration.c:1695
+#: src/util/configuration.c:1691
 #, fuzzy
 msgid "Not a valid relative time specification"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/util/configuration.c:1765
+#: src/util/configuration.c:1761
 #, 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
+#: src/util/configuration.c:1856
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1892
+#: src/util/configuration.c:1888
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/util/configuration.c:1958
+#: src/util/configuration.c:1954
 #, 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
+#: src/util/configuration_helper.c:134
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:147
+#: src/util/configuration_helper.c:148
 #, fuzzy, c-format
 msgid "%s, %s or %s argument is required\n"
 msgstr "设置要使用的昵称(必须)"
 
-#: src/util/configuration_helper.c:218
+#: src/util/configuration_helper.c:219
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:262
+#: src/util/configuration_helper.c:263
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8161,7 +8161,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:281
+#: src/util/crypto_ecc_setup.c:282
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -8171,575 +8171,575 @@ 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:907
+#: src/util/crypto_rsa.c:908
 #, 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:1207
+#: src/util/crypto_rsa.c:1208
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/disk.c:843
+#: src/util/disk.c:842
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 
-#: src/util/dnsparser.c:909
+#: src/util/dnsparser.c:910
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/dnsstub.c:227
+#: src/util/dnsstub.c:228
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/dnsstub.c:370
+#: src/util/dnsstub.c:371
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr ""
 
-#: src/util/dnsstub.c:503
+#: src/util/dnsstub.c:504
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/dnsstub.c:508
+#: src/util/dnsstub.c:509
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/getopt.c:565
+#: src/util/getopt.c:566
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/util/getopt.c:590
+#: src/util/getopt.c:591
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s：选项“--%s”不允许有参数\n"
 
-#: src/util/getopt.c:596
+#: src/util/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s：选项“%c%s”不允许有参数\n"
 
-#: src/util/getopt.c:616 src/util/getopt.c:797
+#: src/util/getopt.c:617 src/util/getopt.c:798
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s：选项“%s”要求有一个参数\n"
 
-#: src/util/getopt.c:647
+#: src/util/getopt.c:648
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s：无法识别的选项“--%s”\n"
 
-#: src/util/getopt.c:653
+#: src/util/getopt.c:654
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s：无法识别的选项“%c%s”\n"
 
-#: src/util/getopt.c:680
+#: src/util/getopt.c:681
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s：非法选项 -- %c\n"
 
-#: src/util/getopt.c:682
+#: src/util/getopt.c:683
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s：无效选项 -- %c\n"
 
-#: src/util/getopt.c:711 src/util/getopt.c:847
+#: src/util/getopt.c:712 src/util/getopt.c:848
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s：选项要求有一个参数 -- %c\n"
 
-#: src/util/getopt.c:761
+#: src/util/getopt.c:762
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s：选项“-W %s”有歧义\n"
 
-#: src/util/getopt.c:781
+#: src/util/getopt.c:782
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s：选项“-W %s” 不允许有参数\n"
 
-#: src/util/getopt.c:970
+#: src/util/getopt.c:971
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "请使用 --help 获取选项列表。\n"
 
-#: src/util/getopt.c:983
+#: src/util/getopt.c:984
 #, c-format
 msgid "Option `%s' can't be used with other options.\n"
 msgstr ""
 
-#: src/util/getopt.c:995
+#: src/util/getopt.c:996
 #, fuzzy, c-format
 msgid "Missing mandatory option `%s'.\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/util/getopt_helpers.c:63
+#: src/util/getopt_helpers.c:64
 msgid "print the version number"
 msgstr ""
 
-#: src/util/getopt_helpers.c:110
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "长选项的必选参数对短选项也是必选的。\n"
 
-#: src/util/getopt_helpers.c:197
+#: src/util/getopt_helpers.c:198
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:262
+#: src/util/getopt_helpers.c:263
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:378
+#: src/util/getopt_helpers.c:379
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:445
+#: src/util/getopt_helpers.c:446
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:462
+#: src/util/getopt_helpers.c:463
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/getopt_helpers.c:498 src/util/getopt_helpers.c:812
-#: src/util/getopt_helpers.c:868
+#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
+#: src/util/getopt_helpers.c:869
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:570
+#: src/util/getopt_helpers.c:571
 #, 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:577
+#: src/util/getopt_helpers.c:578
 #, c-format
 msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:595
+#: src/util/getopt_helpers.c:596
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:597
+#: src/util/getopt_helpers.c:598
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:631
+#: src/util/getopt_helpers.c:632
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:685
+#: src/util/getopt_helpers.c:686
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:742
+#: src/util/getopt_helpers.c:743
 #, fuzzy, c-format
 msgid "You must pass a timestamp to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:749
+#: src/util/getopt_helpers.c:750
 #, c-format
 msgid "The maximum precision allowed for timestamps is seconds.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:805
+#: src/util/getopt_helpers.c:806
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:875
+#: src/util/getopt_helpers.c:876
 #, fuzzy, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:953
+#: src/util/getopt_helpers.c:954
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-base32.c:46
+#: src/util/gnunet-base32.c:47
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/util/gnunet-config.c:153
+#: src/util/gnunet-config.c:154
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/util/gnunet-config.c:159
+#: src/util/gnunet-config.c:160
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:164
+#: src/util/gnunet-config.c:165
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:170
+#: src/util/gnunet-config.c:171
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/util/gnunet-config.c:176
+#: src/util/gnunet-config.c:177
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:192
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-crypto-tvg.c:1527
+#: src/util/gnunet-crypto-tvg.c:1528
 msgid "verify a test vector from stdin"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:94
+#: src/util/gnunet-ecc.c:95
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/gnunet-ecc.c:128
+#: src/util/gnunet-ecc.c:129
 #, c-format
 msgid "Generating %u keys like %s, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:136
+#: src/util/gnunet-ecc.c:137
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:177
+#: src/util/gnunet-ecc.c:178
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:185
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:186
+#: src/util/gnunet-ecc.c:187
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:303
+#: src/util/gnunet-ecc.c:304
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:313
+#: src/util/gnunet-ecc.c:314
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/gnunet-ecc.c:333
+#: src/util/gnunet-ecc.c:334
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/gnunet-ecc.c:387
+#: src/util/gnunet-ecc.c:388
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:451
+#: src/util/gnunet-ecc.c:452
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:457
+#: src/util/gnunet-ecc.c:458
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:463
+#: src/util/gnunet-ecc.c:464
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:468
+#: src/util/gnunet-ecc.c:469
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:473
+#: src/util/gnunet-ecc.c:474
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:478
+#: src/util/gnunet-ecc.c:479
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:484
+#: src/util/gnunet-ecc.c:485
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:498
+#: src/util/gnunet-ecc.c:499
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-qr.c:129 src/util/gnunet-qr.c:555
+#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
 #, fuzzy, c-format
 msgid "Failed to add URI %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/gnunet-qr.c:133
+#: src/util/gnunet-qr.c:134
 #, fuzzy, c-format
 msgid "Added URI %s\n"
 msgstr "无效条目。\n"
 
-#: src/util/gnunet-qr.c:160
+#: src/util/gnunet-qr.c:161
 #, fuzzy, c-format
 msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/util/gnunet-qr.c:170
+#: src/util/gnunet-qr.c:171
 #, c-format
 msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:181
+#: src/util/gnunet-qr.c:182
 #, c-format
 msgid "No known handler for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:217
+#: src/util/gnunet-qr.c:218
 #, fuzzy, c-format
 msgid "Unable to start child process `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/util/gnunet-qr.c:246
+#: src/util/gnunet-qr.c:247
 #, fuzzy, c-format
 msgid "Failed to open device: `%s': %d\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/gnunet-qr.c:260
+#: src/util/gnunet-qr.c:261
 #, fuzzy
 msgid "Capturing...\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/util/gnunet-qr.c:269 src/util/gnunet-qr.c:484
+#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
 msgid "No captured images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:273 src/util/gnunet-qr.c:488
+#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
 #, c-format
 msgid "Got %d images\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:320 src/util/gnunet-qr.c:501
+#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
 #, c-format
 msgid "Found %s: \"%s\"\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:364 src/util/gnunet-qr.c:366
+#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
 #, fuzzy, c-format
 msgid "%s is not a PNG file\n"
 msgstr "更改 GNUnet 目录的权限出错"
 
-#: src/util/gnunet-qr.c:545
+#: src/util/gnunet-qr.c:546
 msgid "No data found\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:561
+#: src/util/gnunet-qr.c:562
 msgid "Dispatching the URI\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:572
+#: src/util/gnunet-qr.c:573
 msgid "use the video device DEVICE (defaults to /dev/video0)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:579
+#: src/util/gnunet-qr.c:580
 msgid "read from the PNG-encoded file FILE"
 msgstr ""
 
-#: src/util/gnunet-qr.c:590
+#: src/util/gnunet-qr.c:591
 msgid "Scan a QR code and import the URI read"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:168
+#: src/util/gnunet-resolver.c:169
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:182
+#: src/util/gnunet-resolver.c:183
 msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:214
+#: src/util/gnunet-scrypt.c:215
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:280
+#: src/util/gnunet-scrypt.c:281
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:286
+#: src/util/gnunet-scrypt.c:287
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:292
+#: src/util/gnunet-scrypt.c:293
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:299
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:312
+#: src/util/gnunet-scrypt.c:313
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-service-resolver.c:1287
+#: src/util/gnunet-service-resolver.c:1288
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:88
+#: src/util/gnunet-uri.c:89
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:94
+#: src/util/gnunet-uri.c:95
 #, fuzzy, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/util/gnunet-uri.c:101
+#: src/util/gnunet-uri.c:102
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:108
+#: src/util/gnunet-uri.c:109
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:178
+#: src/util/gnunet-uri.c:179
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:59
+#: src/util/gnunet_error_codes.c:60
 msgid "No error (success)."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:65
+#: src/util/gnunet_error_codes.c:66
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "未知的用户“%s”\n"
 
-#: src/util/gnunet_error_codes.c:71
+#: src/util/gnunet_error_codes.c:72
 #, fuzzy
 msgid "Communication with service failed."
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/util/gnunet_error_codes.c:77
+#: src/util/gnunet_error_codes.c:78
 msgid "Ego not found."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:83
+#: src/util/gnunet_error_codes.c:84
 msgid "Identifier already in use for another ego."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:89
+#: src/util/gnunet_error_codes.c:90
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:95
+#: src/util/gnunet_error_codes.c:96
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "未知的用户“%s”\n"
 
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
+#: src/util/gnunet_error_codes.c:102 src/util/gnunet_error_codes.c:120
 msgid "Zone iteration failed."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:107
+#: src/util/gnunet_error_codes.c:108
 msgid "Zone not found."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:113
+#: src/util/gnunet_error_codes.c:114
 msgid "Record not found."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:125
+#: src/util/gnunet_error_codes.c:126
 msgid "Zone does not contain any records."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:131
+#: src/util/gnunet_error_codes.c:132
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/gnunet_error_codes.c:137
+#: src/util/gnunet_error_codes.c:138
 #, fuzzy
 msgid "No records given."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/util/gnunet_error_codes.c:143
+#: src/util/gnunet_error_codes.c:144
 msgid "Record data invalid."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:149
+#: src/util/gnunet_error_codes.c:150
 msgid "No label given."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:155
+#: src/util/gnunet_error_codes.c:156
 #, fuzzy
 msgid "No results given."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/util/gnunet_error_codes.c:161
+#: src/util/gnunet_error_codes.c:162
 msgid "Record already exists."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:167
+#: src/util/gnunet_error_codes.c:168
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:173
+#: src/util/gnunet_error_codes.c:174
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/util/gnunet_error_codes.c:179
+#: src/util/gnunet_error_codes.c:180
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/gnunet_error_codes.c:185
+#: src/util/gnunet_error_codes.c:186
 msgid "Label invalid or malformed."
 msgstr ""
 
-#: src/util/helper.c:306
+#: src/util/helper.c:305
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/helper.c:358
+#: src/util/helper.c:357
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/helper.c:573
+#: src/util/helper.c:572
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
@@ -8755,59 +8755,59 @@ msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:415
+#: src/util/os_installation.c:416
 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:786
+#: src/util/os_installation.c:787
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/os_installation.c:819
+#: src/util/os_installation.c:820
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/util/plugin.c:86
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "插件机构初始化失败：%s！\n"
 
-#: src/util/plugin.c:157
+#: src/util/plugin.c:158
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:214
+#: src/util/plugin.c:215
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:370
+#: src/util/plugin.c:371
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:286
+#: src/util/program.c:287
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/program.c:298
+#: src/util/program.c:299
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/program.c:313
+#: src/util/program.c:314
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/program.c:328
+#: src/util/program.c:329
 #, fuzzy
 msgid "Malformed configuration. Exiting ...\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -8817,318 +8817,318 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/resolver_api.c:220
+#: src/util/resolver_api.c:221
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:242
+#: src/util/resolver_api.c:243
 #, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
 "resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:887
+#: src/util/resolver_api.c:888
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:900
+#: src/util/resolver_api.c:901
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/util/resolver_api.c:1085
+#: src/util/resolver_api.c:1086
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1174 src/util/resolver_api.c:1197
-#: src/util/resolver_api.c:1211
+#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
+#: src/util/resolver_api.c:1212
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/service.c:653
+#: src/util/service.c:654
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1572
+#: src/util/service.c:1573
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/socks.c:635
+#: src/util/socks.c:636
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:652
+#: src/util/socks.c:653
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:395
+#: src/util/strings.c:394
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:514
+#: src/util/strings.c:513
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 
-#: src/util/strings.c:1050
+#: src/util/strings.c:1049
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1058
+#: src/util/strings.c:1057
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1065
+#: src/util/strings.c:1064
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1073
+#: src/util/strings.c:1072
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1082
+#: src/util/strings.c:1081
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/util/strings.c:1264 src/util/strings.c:1275
+#: src/util/strings.c:1263 src/util/strings.c:1274
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1284
+#: src/util/strings.c:1283
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/strings.c:1355 src/util/strings.c:1384 src/util/strings.c:1431
-#: src/util/strings.c:1451
+#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
+#: src/util/strings.c:1450
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1409
+#: src/util/strings.c:1408
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/strings.c:1460
+#: src/util/strings.c:1459
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1502
+#: src/util/strings.c:1501
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/util/strings.c:1552
+#: src/util/strings.c:1551
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/strings.c:1583
+#: src/util/strings.c:1582
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
 
-#: src/util/time.c:900 src/util/time.c:928
+#: src/util/time.c:901 src/util/time.c:929
 #, c-format
 msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/util/time.c:936
+#: src/util/time.c:937
 #, 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
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
 msgid "# Active channels"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:583
+#: src/vpn/gnunet-service-vpn.c:582
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:736
+#: src/vpn/gnunet-service-vpn.c:735
 msgid "# ICMP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1112
+#: src/vpn/gnunet-service-vpn.c:1111
 msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1262
+#: src/vpn/gnunet-service-vpn.c:1261
 msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1461
+#: src/vpn/gnunet-service-vpn.c:1460
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/vpn/gnunet-service-vpn.c:1685
+#: src/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1821
+#: src/vpn/gnunet-service-vpn.c:1820
 msgid "# Packets dropped (channel not yet online)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2019
+#: src/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2045
+#: src/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2282
+#: src/vpn/gnunet-service-vpn.c:2281
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2316 src/vpn/gnunet-service-vpn.c:2348
+#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2355
+#: src/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2371
+#: src/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2411
+#: src/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2463
+#: src/vpn/gnunet-service-vpn.c:2462
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2497 src/vpn/gnunet-service-vpn.c:2705
+#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2750
+#: src/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3008
+#: src/vpn/gnunet-service-vpn.c:3007
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3036
+#: src/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3046
+#: src/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3062
+#: src/vpn/gnunet-service-vpn.c:3061
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3079
+#: src/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:143
+#: src/vpn/gnunet-vpn.c:142
 #, fuzzy
 msgid "Error creating tunnel\n"
 msgstr "创建用户出错"
 
-#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:226
+#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:202
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/vpn/gnunet-vpn.c:217
+#: src/vpn/gnunet-vpn.c:216
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:240
+#: src/vpn/gnunet-vpn.c:239
 #, fuzzy, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:258
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:295
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:301
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:308
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:315
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:322
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:330
+#: src/vpn/gnunet-vpn.c:329
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:335
+#: src/vpn/gnunet-vpn.c:334
 msgid "service is offered via TCP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:340
+#: src/vpn/gnunet-vpn.c:339
 msgid "service is offered via UDP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:354
+#: src/vpn/gnunet-vpn.c:353
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:502
+#: src/zonemaster/gnunet-service-zonemaster.c:501
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1333
+#: src/zonemaster/gnunet-service-zonemaster.c:1332
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
diff --git a/src/arm/test_gnunet_service_arm.c b/src/arm/test_gnunet_service_arm.c
index 90fb8bfa0..df4ad95c2 100644
--- a/src/arm/test_gnunet_service_arm.c
+++ b/src/arm/test_gnunet_service_arm.c
@@ -26,8 +26,7 @@
 #include "platform.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_resolver_service.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
+#include "gnunet_util_lib.h"
 
 /**
  * Timeout for starting services, very short because of the strange way start works
diff --git a/src/fs/test_fs_directory.c b/src/fs/test_fs_directory.c
index f1f86fbf7..f5121a3e7 100644
--- a/src/fs/test_fs_directory.c
+++ b/src/fs/test_fs_directory.c
@@ -53,7 +53,7 @@ processor (void *cls, const char *filename, const struct GNUNET_FS_Uri *uri,
     return;                     /* ignore directory's meta data */
   for (i = 0; i < p->max; i++)
   {
-    if (GNUNET_CONTAINER_meta_data_test_equal (p->md[i], md) &&
+    if (GNUNET_FS_meta_data_test_equal (p->md[i], md) &&
         GNUNET_FS_uri_test_equal (p->uri[i], uri))
     {
       p->pos++;
@@ -86,28 +86,28 @@ testDirectory (unsigned int i)
   cls.max = i;
   uris = GNUNET_malloc (sizeof(struct GNUNET_FS_Uri *) * i);
   mds = GNUNET_malloc (sizeof(struct GNUNET_FS_MetaData *) * i);
-  meta = GNUNET_CONTAINER_meta_data_create ();
-  GNUNET_CONTAINER_meta_data_insert (meta, "<test>", EXTRACTOR_METATYPE_TITLE,
-                                     EXTRACTOR_METAFORMAT_UTF8, "text/plain",
-                                     "A title", strlen ("A title") + 1);
-  GNUNET_CONTAINER_meta_data_insert (meta, "<test>",
-                                     EXTRACTOR_METATYPE_AUTHOR_NAME,
-                                     EXTRACTOR_METAFORMAT_UTF8, "text/plain",
-                                     "An author", strlen ("An author") + 1);
+  meta = GNUNET_FS_meta_data_create ();
+  GNUNET_FS_meta_data_insert (meta, "<test>", EXTRACTOR_METATYPE_TITLE,
+                              EXTRACTOR_METAFORMAT_UTF8, "text/plain",
+                              "A title", strlen ("A title") + 1);
+  GNUNET_FS_meta_data_insert (meta, "<test>",
+                              EXTRACTOR_METATYPE_AUTHOR_NAME,
+                              EXTRACTOR_METAFORMAT_UTF8, "text/plain",
+                              "An author", strlen ("An author") + 1);
   for (p = 0; p < i; p++)
   {
-    mds[p] = GNUNET_CONTAINER_meta_data_create ();
+    mds[p] = GNUNET_FS_meta_data_create ();
     for (q = 0; q <= p; q++)
     {
       GNUNET_snprintf (txt, sizeof(txt), "%u -- %u\n", p, q);
-      GNUNET_CONTAINER_meta_data_insert (mds[p], "<test>",
+      GNUNET_FS_meta_data_insert (mds[p], "<test>",
 #if HAVE_EXTRACTOR_H && HAVE_LIBEXTRACTOR
-                                         q % EXTRACTOR_metatype_get_max (),
+                                  q % EXTRACTOR_metatype_get_max (),
 #else
-                                         q % 128,
+                                  q % 128,
 #endif
-                                         EXTRACTOR_METAFORMAT_UTF8,
-                                         "text/plain", txt, strlen (txt) + 1);
+                                  EXTRACTOR_METAFORMAT_UTF8,
+                                  "text/plain", txt, strlen (txt) + 1);
     }
     GNUNET_snprintf (uri, sizeof(uri),
                      "gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.%u",
@@ -116,16 +116,16 @@ testDirectory (unsigned int i)
     uris[p] = GNUNET_FS_uri_parse (uri, &emsg);
     if (uris[p] == NULL)
     {
-      GNUNET_CONTAINER_meta_data_destroy (mds[p]);
+      GNUNET_FS_meta_data_destroy (mds[p]);
       while (--p > 0)
       {
-        GNUNET_CONTAINER_meta_data_destroy (mds[p]);
+        GNUNET_FS_meta_data_destroy (mds[p]);
         GNUNET_FS_uri_destroy (uris[p]);
       }
       GNUNET_free (mds);
       GNUNET_free (uris);
       GNUNET_free (emsg);
-      GNUNET_CONTAINER_meta_data_destroy (meta);
+      GNUNET_FS_meta_data_destroy (meta);
       ABORT ();                 /* error in testcase */
     }
     GNUNET_assert (emsg == NULL);
@@ -150,10 +150,10 @@ testDirectory (unsigned int i)
     GNUNET_assert (cls.pos == i);
   }
   GNUNET_free (data);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
   for (p = 0; p < i; p++)
   {
-    GNUNET_CONTAINER_meta_data_destroy (mds[p]);
+    GNUNET_FS_meta_data_destroy (mds[p]);
     GNUNET_FS_uri_destroy (uris[p]);
   }
   GNUNET_free (uris);
diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c
index e8011f1e4..fc6b32c0f 100644
--- a/src/fs/test_fs_download.c
+++ b/src/fs/test_fs_download.c
@@ -286,7 +286,7 @@ run (void *cls,
   buf = GNUNET_malloc (FILESIZE);
   for (i = 0; i < FILESIZE; i++)
     buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
   bo.content_priority = 42;
   bo.anonymity_level = anonymity_level;
@@ -322,7 +322,7 @@ run (void *cls,
     indexed = GNUNET_NO;
   }
   GNUNET_FS_uri_destroy (kuri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
   GNUNET_assert (NULL != fi);
   timeout_kill =
     GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_kill_task, NULL);
diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c
index c77d9277e..b66fefd6b 100644
--- a/src/fs/test_fs_download_persistence.c
+++ b/src/fs/test_fs_download_persistence.c
@@ -315,7 +315,7 @@ run (void *cls,
   buf = GNUNET_malloc (FILESIZE);
   for (i = 0; i < FILESIZE; i++)
     buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
   bo.content_priority = 42;
   bo.anonymity_level = 1;
@@ -325,7 +325,7 @@ run (void *cls,
                                                     FILESIZE, buf, kuri, meta,
                                                     GNUNET_NO, &bo);
   GNUNET_FS_uri_destroy (kuri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
   GNUNET_assert (NULL != fi);
   timeout_kill =
     GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_kill_task, NULL);
diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c
index fb9ddaa3d..15380bfc4 100644
--- a/src/fs/test_fs_file_information.c
+++ b/src/fs/test_fs_file_information.c
@@ -100,7 +100,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                                        | GNUNET_DISK_PERM_USER_WRITE));
   GNUNET_free (buf);
 
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
   bo.content_priority = 42;
   bo.anonymity_level = 1;
@@ -125,7 +125,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi1));
   GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi2));
   GNUNET_FS_uri_destroy (kuri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
   GNUNET_assert (NULL != fidir);
   /* FIXME: test more of API! */
   GNUNET_FS_file_information_destroy (fidir, &mycleaner, NULL);
diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c
index 2f0c32756..7e06c47f5 100644
--- a/src/fs/test_fs_list_indexed.c
+++ b/src/fs/test_fs_list_indexed.c
@@ -216,7 +216,7 @@ run (void *cls,
                                        | GNUNET_DISK_PERM_USER_WRITE));
   GNUNET_free (buf);
 
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
   bo.content_priority = 42;
   bo.anonymity_level = 1;
@@ -241,7 +241,7 @@ run (void *cls,
   GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi1));
   GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi2));
   GNUNET_FS_uri_destroy (kuri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
   GNUNET_assert (NULL != fidir);
   start = GNUNET_TIME_absolute_get ();
   publish =
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index 3544b825e..85d489598 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -218,7 +218,7 @@ sks_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
     GNUNET_FS_stop (fs);
     return;
   }
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   msg = NULL;
   ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/ns-search", &msg);
   GNUNET_assert (NULL == msg);
@@ -231,7 +231,7 @@ sks_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
   GNUNET_FS_publish_ksk (fs, ksk_uri, meta, uri, &bo,
                          GNUNET_FS_PUBLISH_OPTION_NONE, &publish_cont, NULL);
   GNUNET_FS_uri_destroy (ksk_uri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
 }
 
 
@@ -250,7 +250,7 @@ adv_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
     return;
   }
   GNUNET_CRYPTO_ecdsa_key_create (&ns);
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   sks_expect_uri = GNUNET_FS_uri_dup (uri);
   bo.content_priority = 1;
   bo.anonymity_level = 1;
@@ -262,7 +262,7 @@ adv_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
   GNUNET_FS_publish_sks (fs,
                          &ns, "this", "next", meta, uri,
                          &bo, GNUNET_FS_PUBLISH_OPTION_NONE, &sks_cont, NULL);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
 }
 
 
@@ -274,7 +274,7 @@ testNamespace (void)
   struct GNUNET_FS_Uri *ksk_uri;
   struct GNUNET_FS_Uri *sks_uri;
 
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/testnsa", NULL);
   bo.content_priority = 1;
   bo.anonymity_level = 1;
@@ -291,7 +291,7 @@ testNamespace (void)
     GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &do_timeout,
                                   NULL);
   GNUNET_FS_uri_destroy (ksk_uri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
 }
 
 
diff --git a/src/fs/test_fs_namespace_list_updateable.c b/src/fs/test_fs_namespace_list_updateable.c
index 54f6c9a66..d883b7bea 100644
--- a/src/fs/test_fs_namespace_list_updateable.c
+++ b/src/fs/test_fs_namespace_list_updateable.c
@@ -59,7 +59,7 @@ do_shutdown ()
   if (uri_next != NULL)
     GNUNET_FS_uri_destroy (uri_next);
   if (meta != NULL)
-    GNUNET_CONTAINER_meta_data_destroy (meta);
+    GNUNET_FS_meta_data_destroy (meta);
 }
 
 
@@ -131,7 +131,7 @@ testNamespace (void)
   bo.replication_level = 0;
   bo.expiration_time =
     GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES);
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
 
   uri_this =
     GNUNET_FS_uri_parse
diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c
index 687ada0f1..0e379bc29 100644
--- a/src/fs/test_fs_publish.c
+++ b/src/fs/test_fs_publish.c
@@ -202,7 +202,7 @@ run (void *cls,
                                        | GNUNET_DISK_PERM_USER_WRITE));
   GNUNET_free (buf);
 
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
   bo.content_priority = 42;
   bo.anonymity_level = 1;
@@ -227,7 +227,7 @@ run (void *cls,
   GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi1));
   GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi2));
   GNUNET_FS_uri_destroy (kuri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
   GNUNET_assert (NULL != fidir);
   start = GNUNET_TIME_absolute_get ();
   publish =
diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c
index d92006853..e1563f448 100644
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/fs/test_fs_publish_persistence.c
@@ -276,7 +276,7 @@ run (void *cls,
                                        | GNUNET_DISK_PERM_USER_WRITE));
   GNUNET_free (buf);
 
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
   bo.content_priority = 42;
   bo.anonymity_level = 1;
@@ -299,7 +299,7 @@ run (void *cls,
   GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi1));
   GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi2));
   GNUNET_FS_uri_destroy (kuri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
   GNUNET_assert (NULL != fidir);
   start = GNUNET_TIME_absolute_get ();
   GNUNET_FS_publish_start (fs, fidir, NULL, NULL, NULL,
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c
index 252ab3de3..f9266582e 100644
--- a/src/fs/test_fs_search.c
+++ b/src/fs/test_fs_search.c
@@ -216,7 +216,7 @@ run (void *cls,
   buf = GNUNET_malloc (FILESIZE);
   for (i = 0; i < FILESIZE; i++)
     buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
   bo.content_priority = 42;
   bo.anonymity_level = 1;
@@ -226,7 +226,7 @@ run (void *cls,
                                                     FILESIZE, buf, kuri, meta,
                                                     GNUNET_NO, &bo);
   GNUNET_FS_uri_destroy (kuri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
   GNUNET_assert (NULL != fi);
   start = GNUNET_TIME_absolute_get ();
   publish =
diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c
index cbd87c077..4ddd40e73 100644
--- a/src/fs/test_fs_search_persistence.c
+++ b/src/fs/test_fs_search_persistence.c
@@ -282,7 +282,7 @@ run (void *cls,
   buf = GNUNET_malloc (FILESIZE);
   for (i = 0; i < FILESIZE; i++)
     buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
   bo.content_priority = 42;
   bo.anonymity_level = 1;
@@ -292,7 +292,7 @@ run (void *cls,
                                                     FILESIZE, buf, kuri, meta,
                                                     GNUNET_NO, &bo);
   GNUNET_FS_uri_destroy (kuri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
   GNUNET_assert (NULL != fi);
   start = GNUNET_TIME_absolute_get ();
   publish =
diff --git a/src/fs/test_fs_search_probes.c b/src/fs/test_fs_search_probes.c
index 510d18e9b..776babaee 100644
--- a/src/fs/test_fs_search_probes.c
+++ b/src/fs/test_fs_search_probes.c
@@ -222,7 +222,7 @@ run (void *cls,
   buf = GNUNET_malloc (FILESIZE);
   for (i = 0; i < FILESIZE; i++)
     buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
   bo.content_priority = 42;
   bo.anonymity_level = 1;
@@ -232,7 +232,7 @@ run (void *cls,
                                                     FILESIZE, buf, kuri, meta,
                                                     GNUNET_NO, &bo);
   GNUNET_FS_uri_destroy (kuri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
   GNUNET_assert (NULL != fi);
   start = GNUNET_TIME_absolute_get ();
   publish =
diff --git a/src/fs/test_fs_search_with_and.c b/src/fs/test_fs_search_with_and.c
index e0018cec4..9c20936b6 100644
--- a/src/fs/test_fs_search_with_and.c
+++ b/src/fs/test_fs_search_with_and.c
@@ -233,7 +233,7 @@ run (void *cls,
     buf = GNUNET_malloc (FILESIZE);
     for (i = 0; i < FILESIZE; i++)
       buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
-    meta = GNUNET_CONTAINER_meta_data_create ();
+    meta = GNUNET_FS_meta_data_create ();
     kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
     bo.content_priority = 42;
     bo.anonymity_level = 1;
@@ -243,7 +243,7 @@ run (void *cls,
                                                       FILESIZE, buf, kuri, meta,
                                                       GNUNET_NO, &bo);
     GNUNET_FS_uri_destroy (kuri);
-    GNUNET_CONTAINER_meta_data_destroy (meta);
+    GNUNET_FS_meta_data_destroy (meta);
     GNUNET_assert (NULL != fi);
     start = GNUNET_TIME_absolute_get ();
     publish =
diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c
index c72bbce97..dbc33090d 100644
--- a/src/fs/test_fs_unindex.c
+++ b/src/fs/test_fs_unindex.c
@@ -203,7 +203,7 @@ run (void *cls,
                                        GNUNET_DISK_PERM_USER_READ
                                        | GNUNET_DISK_PERM_USER_WRITE));
   GNUNET_free (buf);
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
   bo.content_priority = 42;
   bo.anonymity_level = 1;
@@ -213,7 +213,7 @@ run (void *cls,
                                                     kuri, meta, GNUNET_YES,
                                                     &bo);
   GNUNET_FS_uri_destroy (kuri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
   GNUNET_assert (NULL != fi);
   start = GNUNET_TIME_absolute_get ();
   publish =
diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c
index b903d07ee..b81ce64ab 100644
--- a/src/fs/test_fs_unindex_persistence.c
+++ b/src/fs/test_fs_unindex_persistence.c
@@ -273,7 +273,7 @@ run (void *cls,
                                        GNUNET_DISK_PERM_USER_READ
                                        | GNUNET_DISK_PERM_USER_WRITE));
   GNUNET_free (buf);
-  meta = GNUNET_CONTAINER_meta_data_create ();
+  meta = GNUNET_FS_meta_data_create ();
   kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
   bo.content_priority = 42;
   bo.anonymity_level = 1;
@@ -283,7 +283,7 @@ run (void *cls,
                                                     kuri, meta, GNUNET_YES,
                                                     &bo);
   GNUNET_FS_uri_destroy (kuri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_FS_meta_data_destroy (meta);
   GNUNET_assert (NULL != fi);
   start = GNUNET_TIME_absolute_get ();
   publish =
diff --git a/src/gnsrecord/test_gnsrecord_block_expiration.c b/src/gnsrecord/test_gnsrecord_block_expiration.c
index d14ce3914..69f7f6aa1 100644
--- a/src/gnsrecord/test_gnsrecord_block_expiration.c
+++ b/src/gnsrecord/test_gnsrecord_block_expiration.c
@@ -79,7 +79,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   rd[1].record_type = TEST_RECORD_TYPE;
   rd[1].data_size = TEST_RECORD_DATALEN;
   rd[1].data = GNUNET_malloc (TEST_RECORD_DATALEN);
-  rd[1].flags = GNUNET_GNSRECORD_RF_SHADOW_RECORD;
+  rd[1].flags = GNUNET_GNSRECORD_RF_SHADOW;
   memset ((char *) rd[1].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
 
   GNUNET_assert (expiration_abs_shadow.abs_value_us ==
diff --git a/src/gnsrecord/test_gnsrecord_crypto.c b/src/gnsrecord/test_gnsrecord_crypto.c
index ad7b62cc8..5b1032f1e 100644
--- a/src/gnsrecord/test_gnsrecord_crypto.c
+++ b/src/gnsrecord/test_gnsrecord_crypto.c
@@ -23,7 +23,6 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_gnsrecord_lib.h"
 
 #define RECORDS 5
diff --git a/src/gnsrecord/test_gnsrecord_serialization.c b/src/gnsrecord/test_gnsrecord_serialization.c
index d268cb7f3..b06b3a0fe 100644
--- a/src/gnsrecord/test_gnsrecord_serialization.c
+++ b/src/gnsrecord/test_gnsrecord_serialization.c
@@ -24,7 +24,6 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_gnsrecord_lib.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100)
 
diff --git a/src/my/test_my.c b/src/my/test_my.c
index ffb5a5f13..e646c0fd5 100644
--- a/src/my/test_my.c
+++ b/src/my/test_my.c
@@ -24,6 +24,7 @@
  */
 #include "platform.h"
 #include <mysql/mysql.h>
+#include "gnunet_mysql_compat.h"
 #include "gnunet_my_lib.h"
 #include "gnunet_mysql_lib.h"
 #include "gnunet_util_lib.h"
diff --git a/src/namecache/test_namecache_api_cache_block.c b/src/namecache/test_namecache_api_cache_block.c
index 2e8940ba3..d83758e7d 100644
--- a/src/namecache/test_namecache_api_cache_block.c
+++ b/src/namecache/test_namecache_api_cache_block.c
@@ -24,7 +24,6 @@
 #include "platform.h"
 #include "gnunet_namecache_service.h"
 #include "gnunet_testing_lib.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
@@ -227,8 +226,8 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  GNUNET_DISK_purge_cfg_dir 
-    ("test_namecache_api.conf", 
+  GNUNET_DISK_purge_cfg_dir
+    ("test_namecache_api.conf",
      "GNUNET_TEST_HOME");
   res = 1;
   if (0 !=
diff --git a/src/namestore/perf_namestore_api_import.c b/src/namestore/perf_namestore_api_import.c
index 4452de16c..cde5eaad5 100644
--- a/src/namestore/perf_namestore_api_import.c
+++ b/src/namestore/perf_namestore_api_import.c
@@ -26,7 +26,6 @@
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/namestore/perf_namestore_api_zone_iteration.c b/src/namestore/perf_namestore_api_zone_iteration.c
index 33868784f..0e0b6d93b 100644
--- a/src/namestore/perf_namestore_api_zone_iteration.c
+++ b/src/namestore/perf_namestore_api_zone_iteration.c
@@ -26,7 +26,6 @@
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/namestore/test_namestore_api_lookup_nick.c b/src/namestore/test_namestore_api_lookup_nick.c
index 85a7a4025..8fa001196 100644
--- a/src/namestore/test_namestore_api_lookup_nick.c
+++ b/src/namestore/test_namestore_api_lookup_nick.c
@@ -25,7 +25,6 @@
 #include "gnunet_namestore_service.h"
 #include "gnunet_gns_service.h"
 #include "gnunet_testing_lib.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c
index 018cf89b1..b129c2996 100644
--- a/src/namestore/test_namestore_api_monitoring.c
+++ b/src/namestore/test_namestore_api_monitoring.c
@@ -25,7 +25,6 @@
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/namestore/test_namestore_api_monitoring_existing.c
index 0123613fb..bc03de541 100644
--- a/src/namestore/test_namestore_api_monitoring_existing.c
+++ b/src/namestore/test_namestore_api_monitoring_existing.c
@@ -25,7 +25,6 @@
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c
index c6a4549d4..5aab2ebe6 100644
--- a/src/namestore/test_namestore_api_remove.c
+++ b/src/namestore/test_namestore_api_remove.c
@@ -24,7 +24,6 @@
 #include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/namestore/test_namestore_api_store.c b/src/namestore/test_namestore_api_store.c
index f4f1e36d3..d291045e5 100644
--- a/src/namestore/test_namestore_api_store.c
+++ b/src/namestore/test_namestore_api_store.c
@@ -24,7 +24,6 @@
 #include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/namestore/test_namestore_api_store_update.c b/src/namestore/test_namestore_api_store_update.c
index 8f1f33542..bef19385c 100644
--- a/src/namestore/test_namestore_api_store_update.c
+++ b/src/namestore/test_namestore_api_store_update.c
@@ -26,7 +26,6 @@
 #include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/namestore/test_namestore_api_tx_rollback.c b/src/namestore/test_namestore_api_tx_rollback.c
index 3d0884e24..5b4bc6174 100644
--- a/src/namestore/test_namestore_api_tx_rollback.c
+++ b/src/namestore/test_namestore_api_tx_rollback.c
@@ -24,7 +24,6 @@
 #include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c
index 6e07f78f2..e072dbef9 100644
--- a/src/namestore/test_namestore_api_zone_iteration.c
+++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -25,7 +25,6 @@
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/namestore/test_namestore_api_zone_iteration_nick.c
index 941d43c28..e371bb312 100644
--- a/src/namestore/test_namestore_api_zone_iteration_nick.c
+++ b/src/namestore/test_namestore_api_zone_iteration_nick.c
@@ -26,7 +26,6 @@
 #include "gnunet_gns_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
index daf711c3d..074cd4dbb 100644
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -26,7 +26,6 @@
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c
index c51224d91..7efe59648 100644
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -25,7 +25,6 @@
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c
index c9d781d39..dfdefa039 100644
--- a/src/namestore/test_namestore_api_zone_to_name.c
+++ b/src/namestore/test_namestore_api_zone_to_name.c
@@ -25,7 +25,6 @@
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c
index 24af148bf..b89cc95d0 100644
--- a/src/namestore/test_plugin_namestore.c
+++ b/src/namestore/test_plugin_namestore.c
@@ -26,7 +26,6 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_namestore_plugin.h"
 #include "gnunet_testing_lib.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
diff --git a/src/reclaim/test_reclaim_attribute.c b/src/reclaim/test_reclaim_attribute.c
index f8faf8021..0740812eb 100644
--- a/src/reclaim/test_reclaim_attribute.c
+++ b/src/reclaim/test_reclaim_attribute.c
@@ -1,7 +1,6 @@
 #include "platform.h"
 #include "gnunet_common.h"
 #include "gnunet_reclaim_lib.h"
-#include "gnunet_container_lib.h"
 
 int
 main (int argc, char *argv[])
diff --git a/src/regex/test_regex_integration.c b/src/regex/test_regex_integration.c
index 2e6874e4d..1f422e5a3 100644
--- a/src/regex/test_regex_integration.c
+++ b/src/regex/test_regex_integration.c
@@ -27,7 +27,6 @@
 #include "platform.h"
 #include "gnunet_applications.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_tun_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_regex_service.h"
 
diff --git a/src/util/test_bio.c b/src/util/test_bio.c
index f655f8924..0b76bbb43 100644
--- a/src/util/test_bio.c
+++ b/src/util/test_bio.c
@@ -46,19 +46,14 @@ test_normal_rw (void)
   int64_t wNum = TESTNUMBER64;
   int64_t rNum = 0;
 
-  mdW = GNUNET_CONTAINER_meta_data_create ();
-  GNUNET_CONTAINER_meta_data_add_publication_date (mdW);
-
   struct GNUNET_BIO_WriteSpec ws[] = {
     GNUNET_BIO_write_spec_string ("test-normal-rw-string", TESTSTRING),
-    GNUNET_BIO_write_spec_meta_data ("test-normal-rw-metadata", mdW),
     GNUNET_BIO_write_spec_int64 ("test-normal-rw-int64", &wNum),
     GNUNET_BIO_write_spec_end (),
   };
 
   struct GNUNET_BIO_ReadSpec rs[] = {
     GNUNET_BIO_read_spec_string ("test-normal-rw-string", &rString, 200),
-    GNUNET_BIO_read_spec_meta_data ("test-normal-rw-metadata", &mdR),
     GNUNET_BIO_read_spec_int64 ("test-normal-rw-int64", &rNum),
     GNUNET_BIO_read_spec_end (),
   };
@@ -74,11 +69,8 @@ test_normal_rw (void)
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_spec_commit (rh, rs));
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_close (rh, NULL));
   GNUNET_assert (0 == strcmp (TESTSTRING, rString));
-  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_meta_data_test_equal (mdR,
-                                                                      mdW));
   GNUNET_assert (wNum == rNum);
 
-  GNUNET_CONTAINER_meta_data_destroy (mdR);
   GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (filename));
   GNUNET_free (filename);
 
@@ -98,14 +90,10 @@ test_normal_rw (void)
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_spec_commit (rh, rs));
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_close (rh, NULL));
   GNUNET_assert (0 == strcmp (TESTSTRING, rString));
-  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_meta_data_test_equal (mdR,
-                                                                      mdW));
   GNUNET_assert (wNum == rNum);
 
   GNUNET_free (buffer);
 
-  GNUNET_CONTAINER_meta_data_destroy (mdW);
-  GNUNET_CONTAINER_meta_data_destroy (mdR);
   return 0;
 }
 
@@ -225,10 +213,6 @@ test_bigmeta_rw (void)
 
   rh = GNUNET_BIO_read_open_file (filename);
   GNUNET_assert (NULL != rh);
-  GNUNET_assert (GNUNET_SYSERR ==
-                 GNUNET_BIO_read_meta_data (rh,
-                                            "test-bigmeta-rw-metadata",
-                                            &mdR));
   GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read_close (rh, NULL));
 
   GNUNET_assert (NULL == mdR);
@@ -294,17 +278,12 @@ test_fullfile_rw (void)
   struct GNUNET_CONTAINER_MetaData *mdW;
   struct GNUNET_CONTAINER_MetaData *mdR = NULL;
 
-  mdW = GNUNET_CONTAINER_meta_data_create ();
-  GNUNET_CONTAINER_meta_data_add_publication_date (mdW);
-
   struct GNUNET_BIO_WriteSpec ws[] = {
     GNUNET_BIO_write_spec_object ("test-fullfile-rw-bytes",
                                   TESTSTRING,
                                   strlen (TESTSTRING)),
     GNUNET_BIO_write_spec_string ("test-fullfile-rw-string",
                                   TESTSTRING),
-    GNUNET_BIO_write_spec_meta_data ("test-fullfile-rw-metadata",
-                                     mdW),
     GNUNET_BIO_write_spec_end (),
   };
 
@@ -315,8 +294,6 @@ test_fullfile_rw (void)
     GNUNET_BIO_read_spec_string ("test-fullfile-rw-string",
                                  &rString,
                                  200),
-    GNUNET_BIO_read_spec_meta_data ("test-fullfile-rw-metadata",
-                                    &mdR),
     GNUNET_BIO_read_spec_end (),
   };
 
@@ -385,10 +362,6 @@ test_fakemeta_rw (void)
 
   rh = GNUNET_BIO_read_open_file (filename);
   GNUNET_assert (NULL != rh);
-  GNUNET_assert (GNUNET_SYSERR ==
-                 GNUNET_BIO_read_meta_data (rh,
-                                            "test-fakestring-rw-metadata",
-                                            &mdR));
   GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read_close (rh, NULL));
 
   GNUNET_assert (NULL == mdR);
@@ -417,10 +390,6 @@ test_fakebigmeta_rw (void)
 
   rh = GNUNET_BIO_read_open_file (filename);
   GNUNET_assert (NULL != rh);
-  GNUNET_assert (GNUNET_SYSERR ==
-                 GNUNET_BIO_read_meta_data (rh,
-                                            "test-fakebigmeta-rw-metadata",
-                                            &mdR));
   GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read_close (rh, NULL));
 
   GNUNET_assert (NULL == mdR);
diff --git a/src/util/test_crypto_hkdf.c b/src/util/test_crypto_hkdf.c
index b9742468d..a9a4db7a0 100644
--- a/src/util/test_crypto_hkdf.c
+++ b/src/util/test_crypto_hkdf.c
@@ -31,7 +31,7 @@
 #include <gcrypt.h>
 
 
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 
 void
 tc1 ()
diff --git a/src/util/test_crypto_kdf.c b/src/util/test_crypto_kdf.c
index 583b1bf30..81e4b4451 100644
--- a/src/util/test_crypto_kdf.c
+++ b/src/util/test_crypto_kdf.c
@@ -30,7 +30,7 @@
 #include <gcrypt.h>
 
 
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 
 
 int
diff --git a/src/util/test_hexcoder.c b/src/util/test_hexcoder.c
index 7861d3aa0..e04631188 100644
--- a/src/util/test_hexcoder.c
+++ b/src/util/test_hexcoder.c
@@ -27,7 +27,6 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_dnsparser_lib.h"
 
 #define TESTSTRING "Hello World!"