Partial application of diff send in beberking, Issue #5476

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

diff --git a/po/vi.po b/po/vi.po
index db522ea4779e9ca3268b76ebf58e80915b51e418..85131f055d8d5182442544e2e73ec03c9d88a204 100644 (file)
--- 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: 2017-02-20 12:08-0600\n"
+"POT-Creation-Date: 2018-10-20 11:13+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -19,509 +19,502 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/gnunet-arm.c:154
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:160
 #, fuzzy, c-format
 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:222 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1137
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224
-#, fuzzy
-msgid "Misconfiguration (can not connect to the ARM service)"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
 #, 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:228 src/testbed/gnunet-service-testbed_peers.c:1145
-msgid "ARM API is busy"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:230 src/testbed/gnunet-service-testbed_peers.c:1147
-#, fuzzy
-msgid "Request timed out"
-msgstr "# các khoá phiên chạy được chấp nhận"
-
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1165
-#, fuzzy, c-format
-msgid "%s is stopped"
+#: src/arm/gnunet-arm.c:240
+#, fuzzy
+msgid "is stopped"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1167
-#, c-format
-msgid "%s is starting"
-msgstr ""
+#: src/arm/gnunet-arm.c:242
+#, fuzzy
+msgid "is starting"
+msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1169
-#, c-format
-msgid "%s is stopping"
-msgstr ""
+#: src/arm/gnunet-arm.c:244
+#, fuzzy
+msgid "is stopping"
+msgstr "# các byte trong kho dữ liệu"
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1171
-#, fuzzy, c-format
-msgid "%s is starting already"
+#: src/arm/gnunet-arm.c:246
+#, fuzzy
+msgid "is starting already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1173
-#, c-format
-msgid "%s is stopping already"
-msgstr ""
+#: src/arm/gnunet-arm.c:248
+#, fuzzy
+msgid "is stopping already"
+msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1175
-#, c-format
-msgid "%s is started already"
-msgstr ""
+#: src/arm/gnunet-arm.c:250
+#, fuzzy
+msgid "is started already"
+msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1177
-#, c-format
-msgid "%s is stopped already"
-msgstr ""
+#: src/arm/gnunet-arm.c:252
+#, fuzzy
+msgid "is stopped already"
+msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1179
-#, fuzzy, c-format
-msgid "%s service is not known to ARM"
+#: src/arm/gnunet-arm.c:254
+#, fuzzy
+msgid "service is not known to ARM"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1181
-#, fuzzy, c-format
-msgid "%s service failed to start"
+#: src/arm/gnunet-arm.c:256
+#, fuzzy
+msgid "service failed to start"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:266
-#, fuzzy, c-format
-msgid "%s service cannot be started because ARM is shutting down"
+#: src/arm/gnunet-arm.c:258
+#, fuzzy
+msgid "service cannot be manipulated because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
 
-#: src/arm/gnunet-arm.c:268 src/testbed/gnunet-service-testbed_peers.c:1185
-#, c-format
-msgid "%.s Unknown result code."
-msgstr ""
+#: src/arm/gnunet-arm.c:260
+#, fuzzy
+msgid "Unknown result code."
+msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:300
+#: src/arm/gnunet-arm.c:292
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:328 src/arm/gnunet-arm.c:337
+#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:371
+#: src/arm/gnunet-arm.c:363
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:382
+#: src/arm/gnunet-arm.c:374
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Lỗi vào phòng « %s »\n"
 
-#: src/arm/gnunet-arm.c:422
+#: src/arm/gnunet-arm.c:413
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:432
+#: src/arm/gnunet-arm.c:423
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:469
+#: src/arm/gnunet-arm.c:460
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:480
+#: src/arm/gnunet-arm.c:471
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/arm/gnunet-arm.c:521
+#: src/arm/gnunet-arm.c:511
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:530
+#: src/arm/gnunet-arm.c:520
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/arm/gnunet-arm.c:536
+#: src/arm/gnunet-arm.c:526
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:624
+#: src/arm/gnunet-arm.c:614
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:646
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:649
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:652
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:666
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:774
+#: src/arm/gnunet-arm.c:767
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:773
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:779
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:784
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:783
+#: src/arm/gnunet-arm.c:789
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:786
+#: src/arm/gnunet-arm.c:793
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:789
+#: src/arm/gnunet-arm.c:798
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:791
+#: src/arm/gnunet-arm.c:803
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:794
+#: src/arm/gnunet-arm.c:809
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:814
 #, fuzzy
 msgid "list currently running services"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:798
+#: src/arm/gnunet-arm.c:819
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:800
+#: src/arm/gnunet-arm.c:824
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:812
+#: src/arm/gnunet-arm.c:837
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
-#: src/util/service.c:565 src/util/service_new.c:612
+#: src/arm/gnunet-service-arm.c:386 src/transport/plugin_transport_tcp.c:1118
+#: src/transport/plugin_transport_xt.c:1118
+#: src/transport/tcp_service_legacy.c:555 src/util/service.c:610
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
-#: src/transport/plugin_transport_tcp.c:652
-#: src/transport/plugin_transport_tcp.c:658
-#: src/transport/plugin_transport_tcp.c:3337 src/util/service.c:584
-#: src/util/service.c:590 src/util/service_new.c:637
-#: src/util/service_new.c:643
+#: src/arm/gnunet-service-arm.c:410 src/arm/gnunet-service-arm.c:416
+#: src/transport/plugin_transport_tcp.c:1137
+#: src/transport/plugin_transport_tcp.c:1143
+#: src/transport/plugin_transport_tcp.c:3823
+#: src/transport/plugin_transport_xt.c:1137
+#: src/transport/plugin_transport_xt.c:1143
+#: src/transport/plugin_transport_xt.c:3831
+#: src/transport/tcp_service_legacy.c:574
+#: src/transport/tcp_service_legacy.c:580 src/util/service.c:635
+#: src/util/service.c:641
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
-#: src/util/client.c:466 src/util/service.c:621 src/util/service_new.c:682
+#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1174
+#: src/transport/plugin_transport_xt.c:1174
+#: src/transport/tcp_service_legacy.c:611 src/util/client.c:504
+#: src/util/service.c:680
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
-#: src/util/client.c:471 src/util/service.c:625 src/util/service_new.c:687
+#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1178
+#: src/transport/plugin_transport_xt.c:1178
+#: src/transport/tcp_service_legacy.c:615 src/util/client.c:509
+#: src/util/service.c:685
 #, 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:465 src/transport/plugin_transport_tcp.c:724
-#: src/util/service.c:656 src/util/service_new.c:723
+#: src/arm/gnunet-service-arm.c:493 src/transport/plugin_transport_tcp.c:1209
+#: src/transport/plugin_transport_xt.c:1209
+#: src/transport/tcp_service_legacy.c:646 src/util/service.c:721
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:741
-#: src/util/service.c:673 src/util/service_new.c:741
+#: src/arm/gnunet-service-arm.c:515 src/transport/plugin_transport_tcp.c:1226
+#: src/transport/plugin_transport_xt.c:1226
+#: src/transport/tcp_service_legacy.c:663 src/util/service.c:739
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:513
-#: src/transport/plugin_transport_http_server.c:2620
-#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
-#: src/util/service_new.c:782
+#: src/arm/gnunet-service-arm.c:554
+#: src/transport/plugin_transport_http_server.c:2682
+#: src/transport/plugin_transport_tcp.c:1257
+#: src/transport/plugin_transport_xt.c:1257
+#: src/transport/tcp_service_legacy.c:694 src/util/service.c:780
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/arm/gnunet-service-arm.c:532
-#: src/transport/plugin_transport_http_server.c:2638
-#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
-#: src/util/service_new.c:802
+#: src/arm/gnunet-service-arm.c:573
+#: src/transport/plugin_transport_http_server.c:2700
+#: src/transport/plugin_transport_tcp.c:1276
+#: src/transport/plugin_transport_xt.c:1276
+#: src/transport/tcp_service_legacy.c:713 src/util/service.c:800
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/arm/gnunet-service-arm.c:932
+#: src/arm/gnunet-service-arm.c:984
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-service-arm.c:943
+#: src/arm/gnunet-service-arm.c:995
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:1055
+#: src/arm/gnunet-service-arm.c:1107
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/arm/gnunet-service-arm.c:1090
+#: src/arm/gnunet-service-arm.c:1142
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1133
+#: src/arm/gnunet-service-arm.c:1185
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1309
+#: src/arm/gnunet-service-arm.c:1364
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:1611
+#: src/arm/gnunet-service-arm.c:1669
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:1771
+#: src/arm/gnunet-service-arm.c:1830
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1776
+#: src/arm/gnunet-service-arm.c:1835
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1781
+#: src/arm/gnunet-service-arm.c:1840
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:1787
+#: src/arm/gnunet-service-arm.c:1846
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-service-arm.c:1813
+#: src/arm/gnunet-service-arm.c:1872
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1829
+#: src/arm/gnunet-service-arm.c:1888
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:42
+#: src/arm/mockup-service.c:40
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
+#: src/ats/gnunet-ats-solver-eval.c:2779 src/ats/gnunet-ats-solver-eval.c:2820
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2799
+#: src/ats/gnunet-ats-solver-eval.c:2797
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2840
+#: src/ats/gnunet-ats-solver-eval.c:2838
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats/gnunet-ats-solver-eval.c:3292 src/ats-tests/gnunet-solver-eval.c:937
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:938
-#: src/ats-tests/gnunet-solver-eval.c:941
+#: src/ats/gnunet-ats-solver-eval.c:3297 src/ats-tests/gnunet-solver-eval.c:943
+#: src/ats-tests/gnunet-solver-eval.c:948
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3299
-msgid "be verbose"
-msgstr "xuất chi tiết"
-
-#: src/ats/gnunet-ats-solver-eval.c:3302
+#: src/ats/gnunet-ats-solver-eval.c:3304
 #, fuzzy
 msgid "print logging"
 msgstr "Theo dõi"
 
-#: src/ats/gnunet-ats-solver-eval.c:3305
+#: src/ats/gnunet-ats-solver-eval.c:3309
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3308
+#: src/ats/gnunet-ats-solver-eval.c:3314
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:304
+#: src/ats/gnunet-service-ats_plugins.c:302
 #, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:314
+#: src/ats/gnunet-service-ats_plugins.c:312
 #, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:359
+#: src/ats/gnunet-service-ats_plugins.c:357
 #, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:451
+#: src/ats/gnunet-service-ats_plugins.c:449
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/ats/plugin_ats_mlp.c:1274
+#: src/ats/plugin_ats_mlp.c:1272
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1869
+#: src/ats/plugin_ats_mlp.c:1868
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/ats/plugin_ats_mlp.c:1913
+#: src/ats/plugin_ats_mlp.c:1912
 #, fuzzy, c-format
 msgid "Updating address property for peer `%s' %p not added before\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/ats/plugin_ats_mlp.c:2475
+#: src/ats/plugin_ats_mlp.c:2474
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
-#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
-#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
-#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
-#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
-#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#: src/ats/plugin_ats_mlp.c:2514 src/ats/plugin_ats_mlp.c:2531
+#: src/ats/plugin_ats_mlp.c:2563 src/ats/plugin_ats_mlp.c:2581
+#: src/ats/plugin_ats_mlp.c:2600 src/ats/plugin_ats_proportional.c:1139
+#: src/ats/plugin_ats_ril.c:2610 src/ats/plugin_ats_ril.c:2627
+#: src/ats/plugin_ats_ril.c:2644 src/ats/plugin_ats_ril.c:2661
+#: src/ats/plugin_ats_ril.c:2678 src/ats/plugin_ats_ril.c:2695
+#: src/ats/plugin_ats_ril.c:2712 src/ats/plugin_ats_ril.c:2729
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/ats/plugin_ats_mlp.c:2670
+#: src/ats/plugin_ats_mlp.c:2669
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2679
+#: src/ats/plugin_ats_mlp.c:2678
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2689
+#: src/ats/plugin_ats_mlp.c:2688
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2698
+#: src/ats/plugin_ats_mlp.c:2697
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1164
+#: src/ats/plugin_ats_proportional.c:1162
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/ats-tests/ats-testing.c:422
+#: src/ats-tests/ats-testing.c:420
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:429
+#: src/ats-tests/ats-testing.c:427
 #, fuzzy, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/ats-tests/ats-testing-log.c:837
+#: src/ats-tests/ats-testing-log.c:835
 #, fuzzy
 msgid "Stop logging\n"
 msgstr "Theo dõi"
 
-#: src/ats-tests/ats-testing-log.c:892
+#: src/ats-tests/ats-testing-log.c:890
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
@@ -533,543 +526,541 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:307
+#: src/ats-tool/gnunet-ats.c:305
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:311
+#: src/ats-tool/gnunet-ats.c:309
 #, c-format
 msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:395
+#: src/ats-tool/gnunet-ats.c:393
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u và địa chỉ « %s »\n"
 
-#: src/ats-tool/gnunet-ats.c:402
+#: src/ats-tool/gnunet-ats.c:400
 msgid "active "
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:402
+#: src/ats-tool/gnunet-ats.c:400
 msgid "inactive "
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:512
+#: src/ats-tool/gnunet-ats.c:510
 #, fuzzy, c-format
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/ats-tool/gnunet-ats.c:705
+#: src/ats-tool/gnunet-ats.c:703
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1255
+#: src/ats-tool/gnunet-ats.c:746 src/ats-tool/gnunet-ats.c:759
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/ats-tool/gnunet-ats.c:773
+#: src/ats-tool/gnunet-ats.c:771
 #, c-format
 msgid "Please select one operation: %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820
-#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896
+#: src/ats-tool/gnunet-ats.c:793 src/ats-tool/gnunet-ats.c:818
+#: src/ats-tool/gnunet-ats.c:849 src/ats-tool/gnunet-ats.c:894
 #, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832
+#: src/ats-tool/gnunet-ats.c:804 src/ats-tool/gnunet-ats.c:830
 #, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/ats-tool/gnunet-ats.c:862
+#: src/ats-tool/gnunet-ats.c:860
 #, fuzzy
 msgid "No preference type given!\n"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/ats-tool/gnunet-ats.c:869
+#: src/ats-tool/gnunet-ats.c:867
 #, fuzzy
 msgid "No peer given!\n"
 msgstr "chưa đưa ra tên"
 
-#: src/ats-tool/gnunet-ats.c:887
+#: src/ats-tool/gnunet-ats.c:885
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:949
+#: src/ats-tool/gnunet-ats.c:948
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:951
+#: src/ats-tool/gnunet-ats.c:952
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:954
+#: src/ats-tool/gnunet-ats.c:958
 #, fuzzy
 msgid "connect to PEER"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/ats-tool/gnunet-ats.c:957
+#: src/ats-tool/gnunet-ats.c:962
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/ats-tool/gnunet-ats.c:959
+#: src/ats-tool/gnunet-ats.c:967
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:961
+#: src/ats-tool/gnunet-ats.c:972
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/ats-tool/gnunet-ats.c:963
+#: src/ats-tool/gnunet-ats.c:977
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:965
+#: src/ats-tool/gnunet-ats.c:982
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:968
+#: src/ats-tool/gnunet-ats.c:988
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:970
+#: src/ats-tool/gnunet-ats.c:994
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:973
+#: src/ats-tool/gnunet-ats.c:999
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:1009
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/auction/gnunet-auction-create.c:160
+#: src/auction/gnunet-auction-create.c:161
 msgid "description of the item to be sold"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:163
+#: src/auction/gnunet-auction-create.c:167
 msgid "mapping of possible prices"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:166
+#: src/auction/gnunet-auction-create.c:173
 msgid "max duration per round"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:169
+#: src/auction/gnunet-auction-create.c:179
 msgid "duration until auction starts"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:172
+#: src/auction/gnunet-auction-create.c:184
 msgid ""
 "number of items to sell\n"
 "0 for first price auction\n"
 ">0 for vickrey/M+1st price auction"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:177
+#: src/auction/gnunet-auction-create.c:191
 #, fuzzy
 msgid "public auction outcome"
 msgstr "Ứng dụng bị hủy bỏ."
 
-#: src/auction/gnunet-auction-create.c:180
+#: src/auction/gnunet-auction-create.c:196
 msgid "keep running in foreground until auction completes"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:190
+#: src/auction/gnunet-auction-create.c:207
 msgid "create a new auction and start listening for bidders"
 msgstr ""
 
-#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
-#: src/conversation/gnunet-conversation-test.c:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
+#: src/auction/gnunet-auction-info.c:74 src/auction/gnunet-auction-join.c:74
+#: src/conversation/gnunet-conversation-test.c:252
+#: src/revocation/gnunet-revocation.c:560 src/template/gnunet-template.c:74
 msgid "help text"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:668
+#: src/cadet/gnunet-cadet.c:705
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/cadet/gnunet-cadet.c:706
+#: src/cadet/gnunet-cadet.c:744
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/cadet/gnunet-cadet.c:779
-msgid "You must NOT give a TARGET when using 'request all' options\n"
+#: src/cadet/gnunet-cadet.c:817
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:870
+#: src/cadet/gnunet-cadet.c:908
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/cadet/gnunet-cadet.c:907
+#: src/cadet/gnunet-cadet.c:945
 #, fuzzy
 msgid "No action requested\n"
 msgstr "Thu thập bị dừng.\n"
 
-#: src/cadet/gnunet-cadet.c:929
+#: src/cadet/gnunet-cadet.c:970
 #, fuzzy
-msgid "provide information about a particular connection"
+msgid "Provide information about a particular connection"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:932
-msgid "activate echo mode"
+#: src/cadet/gnunet-cadet.c:975
+msgid "Activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:935
-msgid "dump debug information to STDERR"
+#: src/cadet/gnunet-cadet.c:980
+msgid "Dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:938
-msgid "port to listen to"
+#: src/cadet/gnunet-cadet.c:986
+msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:941
+#: src/cadet/gnunet-cadet.c:993
 #, fuzzy
-msgid "provide information about a patricular peer"
+msgid "Provide information about a patricular peer"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:944
+#: src/cadet/gnunet-cadet.c:999
 #, fuzzy
-msgid "provide information about all peers"
+msgid "Provide information about all peers"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:947
+#: src/cadet/gnunet-cadet.c:1005
 #, fuzzy
-msgid "provide information about a particular tunnel"
+msgid "Provide information about a particular tunnel"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:950
+#: src/cadet/gnunet-cadet.c:1011
 #, fuzzy
-msgid "provide information about all tunnels"
+msgid "Provide information about all tunnels"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-service-cadet_peer.c:687
-msgid "Wrong CORE service\n"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-profiler.c:499
-#: src/secretsharing/gnunet-secretsharing-profiler.c:607
+#: src/consensus/gnunet-consensus-profiler.c:521
+#: src/secretsharing/gnunet-secretsharing-profiler.c:608
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "số lần lặp lại"
 
-#: src/consensus/gnunet-consensus-profiler.c:502
+#: src/consensus/gnunet-consensus-profiler.c:527
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:505
-#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
-#: src/set/gnunet-set-profiler.c:384
+#: src/consensus/gnunet-consensus-profiler.c:533
+#: src/set/gnunet-set-profiler.c:431 src/set/gnunet-set-profiler.c:437
+#: src/set/gnunet-set-profiler.c:460
 #, fuzzy
 msgid "number of values"
 msgstr "số lần lặp lại"
 
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:539
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/consensus/gnunet-consensus-profiler.c:511
+#: src/consensus/gnunet-consensus-profiler.c:546
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:514
-#: src/set/gnunet-set-profiler.c:390
+#: src/consensus/gnunet-consensus-profiler.c:552
+#: src/set/gnunet-set-profiler.c:478
 msgid "write statistics to file"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:517
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+#: src/consensus/gnunet-consensus-profiler.c:557
+msgid "distribute elements to a static subset of good peers"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:562
 msgid "be more verbose (print received values)"
 msgstr ""
 
 #: src/conversation/conversation_api.c:513
-#: src/conversation/conversation_api_call.c:490
+#: src/conversation/conversation_api_call.c:492
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:269
+#: src/conversation/gnunet-conversation.c:275
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:294
+#: src/conversation/gnunet-conversation.c:300
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:329
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:334
+#: src/conversation/gnunet-conversation.c:340
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:352
+#: src/conversation/gnunet-conversation.c:358
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:367
+#: src/conversation/gnunet-conversation.c:373
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/conversation/gnunet-conversation.c:379
+#: src/conversation/gnunet-conversation.c:385
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:401
+#: src/conversation/gnunet-conversation.c:409
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:408
+#: src/conversation/gnunet-conversation.c:416
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/conversation/gnunet-conversation.c:415
+#: src/conversation/gnunet-conversation.c:423
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:431
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/conversation/gnunet-conversation.c:440
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:438
+#: src/conversation/gnunet-conversation.c:446
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:443
+#: src/conversation/gnunet-conversation.c:451
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:512
+#: src/conversation/gnunet-conversation.c:522
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/conversation/gnunet-conversation.c:528
-#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:538
+#: src/conversation/gnunet-conversation.c:552
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:535
-#: src/conversation/gnunet-conversation.c:592
+#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:601
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:550
-#: src/conversation/gnunet-conversation.c:605
+#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:614
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:570
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:625
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:633
+#: src/conversation/gnunet-conversation.c:642
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:663
+#: src/conversation/gnunet-conversation.c:673
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:691
+#: src/conversation/gnunet-conversation.c:702
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:697
-#: src/conversation/gnunet-conversation.c:721
+#: src/conversation/gnunet-conversation.c:708
+#: src/conversation/gnunet-conversation.c:732
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:702
+#: src/conversation/gnunet-conversation.c:713
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/conversation/gnunet-conversation.c:722
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/conversation/gnunet-conversation.c:716
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
-msgid "We are calling `%s', his phone should be ringing.\n"
+msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:735
+#: src/conversation/gnunet-conversation.c:746
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:741
+#: src/conversation/gnunet-conversation.c:752
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/conversation/gnunet-conversation.c:769
-#: src/conversation/gnunet-conversation.c:784
+#: src/conversation/gnunet-conversation.c:781
+#: src/conversation/gnunet-conversation.c:796
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:817
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:829
+#: src/conversation/gnunet-conversation.c:845
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:840
+#: src/conversation/gnunet-conversation.c:852
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:849
+#: src/conversation/gnunet-conversation.c:861
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:866
+#: src/conversation/gnunet-conversation.c:878
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:901
+#: src/conversation/gnunet-conversation.c:913
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:909
+#: src/conversation/gnunet-conversation.c:921
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:926
+#: src/conversation/gnunet-conversation.c:938
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:954
+#: src/conversation/gnunet-conversation.c:966
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:956
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/conversation/gnunet-conversation.c:970
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:960
+#: src/conversation/gnunet-conversation.c:972
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:962
+#: src/conversation/gnunet-conversation.c:974
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:964
+#: src/conversation/gnunet-conversation.c:976
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:966
+#: src/conversation/gnunet-conversation.c:978
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
 
-#: src/conversation/gnunet-conversation.c:968
+#: src/conversation/gnunet-conversation.c:980
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
 
-#: src/conversation/gnunet-conversation.c:1172
+#: src/conversation/gnunet-conversation.c:1196
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/conversation/gnunet-conversation.c:1185
+#: src/conversation/gnunet-conversation.c:1209
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Biệt hiệu « %s » bị xoá.\n"
 
-#: src/conversation/gnunet-conversation.c:1220
+#: src/conversation/gnunet-conversation.c:1247
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/conversation/gnunet-conversation.c:1244
+#: src/conversation/gnunet-conversation.c:1271
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/conversation/gnunet-conversation.c:1270
-msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+#: src/conversation/gnunet-conversation.c:1300
+msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1305
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1299
+#: src/conversation/gnunet-conversation.c:1334
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:119
+#: src/conversation/gnunet-conversation-test.c:118
 #, c-format
 msgid ""
 "\n"
 "End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:145
+#: src/conversation/gnunet-conversation-test.c:143
 #, c-format
 msgid ""
 "\n"
@@ -1077,150 +1068,155 @@ msgid ""
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:210
+#: src/conversation/gnunet-conversation-test.c:214
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet_gst.c:630
-#: src/conversation/gnunet-helper-audio-playback-gst.c:357
+#: src/conversation/gnunet_gst.c:620
+#: src/conversation/gnunet-helper-audio-playback-gst.c:359
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:320
+#: src/conversation/gnunet-helper-audio-playback.c:323
 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:608
+#: src/conversation/gnunet-helper-audio-playback.c:625
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:633
-#: src/conversation/gnunet-helper-audio-record.c:545
+#: src/conversation/gnunet-helper-audio-playback.c:651
+#: src/conversation/gnunet-helper-audio-record.c:561
 #, fuzzy
 msgid "Connection established.\n"
 msgstr "Thu thập bị dừng.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:638
-#: src/conversation/gnunet-helper-audio-record.c:550
+#: src/conversation/gnunet-helper-audio-playback.c:656
+#: src/conversation/gnunet-helper-audio-record.c:566
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:652
+#: src/conversation/gnunet-helper-audio-playback.c:670
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:665
-#: src/conversation/gnunet-helper-audio-record.c:576
+#: src/conversation/gnunet-helper-audio-playback.c:683
+#: src/conversation/gnunet-helper-audio-record.c:592
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:686
-#: src/conversation/gnunet-helper-audio-record.c:599
+#: src/conversation/gnunet-helper-audio-playback.c:704
+#: src/conversation/gnunet-helper-audio-record.c:615
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:692
-#: src/conversation/gnunet-helper-audio-record.c:605
+#: src/conversation/gnunet-helper-audio-playback.c:710
+#: src/conversation/gnunet-helper-audio-record.c:621
 #, fuzzy
 msgid "pa_mainloop_new() failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:706
-#: src/conversation/gnunet-helper-audio-record.c:620
+#: src/conversation/gnunet-helper-audio-playback.c:724
+#: src/conversation/gnunet-helper-audio-record.c:636
 #, fuzzy
 msgid "pa_context_new() failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:713
-#: src/conversation/gnunet-helper-audio-record.c:626
+#: src/conversation/gnunet-helper-audio-playback.c:731
+#: src/conversation/gnunet-helper-audio-record.c:642
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/conversation/gnunet-helper-audio-playback.c:719
-#: src/conversation/gnunet-helper-audio-record.c:632
+#: src/conversation/gnunet-helper-audio-playback.c:737
+#: src/conversation/gnunet-helper-audio-record.c:648
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:789
+#: src/conversation/gnunet-helper-audio-playback.c:816
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:344
+#: src/conversation/gnunet-helper-audio-record.c:351
 #, fuzzy, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/conversation/gnunet-helper-audio-record.c:420
+#: src/conversation/gnunet-helper-audio-record.c:430
 #, fuzzy, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:458
+#: src/conversation/gnunet-helper-audio-record.c:472
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:483
+#: src/conversation/gnunet-helper-audio-record.c:498
 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:488
+#: src/conversation/gnunet-helper-audio-record.c:503
 #, fuzzy, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:496
+#: src/conversation/gnunet-helper-audio-record.c:511
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:500
+#: src/conversation/gnunet-helper-audio-record.c:515
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:507
+#: src/conversation/gnunet-helper-audio-record.c:522
 #, fuzzy, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:516
+#: src/conversation/gnunet-helper-audio-record.c:531
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:563
+#: src/conversation/gnunet-helper-audio-record.c:579
 #, fuzzy, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:676
+#: src/conversation/gnunet-helper-audio-record.c:693
 #, fuzzy
 msgid "ogg_stream_init() failed.\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:721
+#: src/conversation/gnunet-helper-audio-record.c:738
 #, fuzzy, c-format
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/conversation/microphone.c:121
+#: src/conversation/gnunet-service-conversation.c:1303
+#, fuzzy, c-format
+msgid "Could not open line, port %s already in use!\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/conversation/microphone.c:119
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/conversation/plugin_gnsrecord_conversation.c:71
+#: src/conversation/plugin_gnsrecord_conversation.c:70
 #, c-format
 msgid "PHONE version %u not supported\n"
 msgstr ""
@@ -1231,444 +1227,638 @@ msgstr ""
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/conversation/speaker.c:75
+#: src/conversation/speaker.c:73
 #, fuzzy
 msgid "Could not start playback audio helper.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/core/gnunet-core.c:90
+#: src/core/gnunet-core.c:88
 #, fuzzy
 msgid "fresh connection"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/core/gnunet-core.c:93
+#: src/core/gnunet-core.c:91
 msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:96
+#: src/core/gnunet-core.c:94
 #, fuzzy
 msgid "key received"
 msgstr "# các khoá phiên chạy bị từ chối"
 
-#: src/core/gnunet-core.c:99
+#: src/core/gnunet-core.c:97
 #, fuzzy
 msgid "connection established"
 msgstr "Thu thập bị dừng.\n"
 
-#: src/core/gnunet-core.c:102
+#: src/core/gnunet-core.c:100
 msgid "rekeying"
 msgstr ""
 
-#: src/core/gnunet-core.c:105
+#: src/core/gnunet-core.c:103
 #, fuzzy
 msgid "disconnected"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/core/gnunet-core.c:112
+#: src/core/gnunet-core.c:110
 msgid "Connection to CORE service lost (reconnecting)"
 msgstr ""
 
-#: src/core/gnunet-core.c:115
+#: src/core/gnunet-core.c:113
 #, fuzzy
 msgid "unknown state"
 msgstr "Lỗi không rõ"
 
-#: src/core/gnunet-core.c:120
+#: src/core/gnunet-core.c:118
 #, c-format
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728
+#: src/core/gnunet-core.c:142 src/peerinfo-tool/gnunet-peerinfo.c:726
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/core/gnunet-core.c:155
+#: src/core/gnunet-core.c:153
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1456
+#: src/core/gnunet-core.c:175 src/transport/gnunet-transport.c:1447
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-core.c:185
+#: src/core/gnunet-core.c:184
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-service-core.c:339
+#: src/core/gnunet-service-core.c:345
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core.c:363
+#: src/core/gnunet-service-core.c:369
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:432
+#: src/core/gnunet-service-core.c:441
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core.c:530
+#: src/core/gnunet-service-core.c:539
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core.c:937
+#: src/core/gnunet-service-core.c:877
+#, fuzzy, c-format
+msgid "# messages of type %u discarded (client busy)"
+msgstr "# các byte nhiễu được nhận"
+
+#: src/core/gnunet-service-core.c:986
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/core/gnunet-service-core.c:958
+#: src/core/gnunet-service-core.c:1007
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/core/gnunet-service-core_kx.c:566
+#: src/core/gnunet-service-core_kx.c:615
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
 
-#: src/core/gnunet-service-core_kx.c:626
+#: src/core/gnunet-service-core_kx.c:675
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:726
+#: src/core/gnunet-service-core_kx.c:777
+#, fuzzy
+msgid "# PAYLOAD dropped (out of order)"
+msgstr "# các byte loại bỏ bởi UDP (đi ra)"
+
+#: src/core/gnunet-service-core_kx.c:827
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:786
+#: src/core/gnunet-service-core_kx.c:889
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:819
+#: src/core/gnunet-service-core_kx.c:923
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:886
+#: src/core/gnunet-service-core_kx.c:990
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:893
+#: src/core/gnunet-service-core_kx.c:1003
 #, fuzzy
-msgid "# ephemeral keys received"
+msgid "# duplicate ephemeral keys ignored"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_kx.c:932
+#: src/core/gnunet-service-core_kx.c:1038
+#, fuzzy
+msgid "# EPHEMERAL_KEYs rejected (bad signature)"
+msgstr "# các thông báo được chắp liền"
+
+#: src/core/gnunet-service-core_kx.c:1052
 #, c-format
 msgid ""
-"Ephemeral key message from peer `%s' rejected as its validity range does not "
-"match our system time (%llu not in [%llu,%llu]).\n"
+"EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
+"our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:943
+#: src/core/gnunet-service-core_kx.c:1058
 #, fuzzy
-msgid "# EPHEMERAL_KEY messages received"
+msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:1039
-#: src/transport/gnunet-service-transport_validation.c:1119
+#: src/core/gnunet-service-core_kx.c:1078
+#, fuzzy
+msgid "# valid ephemeral keys received"
+msgstr "# các thông báo phát hiện dht được nhận"
+
+#: src/core/gnunet-service-core_kx.c:1178
+#: src/transport/gnunet-service-transport_validation.c:1126
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1048
+#: src/core/gnunet-service-core_kx.c:1187
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:1106
+#: src/core/gnunet-service-core_kx.c:1246
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1132
+#: src/core/gnunet-service-core_kx.c:1272
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1145
+#: src/core/gnunet-service-core_kx.c:1285
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# các thông báo PING nhập thô được gửi"
 
-#: src/core/gnunet-service-core_kx.c:1209
-#: src/transport/gnunet-service-transport_validation.c:1442
+#: src/core/gnunet-service-core_kx.c:1349
+#: src/transport/gnunet-service-transport_validation.c:1459
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1216
+#: src/core/gnunet-service-core_kx.c:1356
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1361
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:1256
+#: src/core/gnunet-service-core_kx.c:1396
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1294
+#: src/core/gnunet-service-core_kx.c:1434
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1305
+#: src/core/gnunet-service-core_kx.c:1445
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/core/gnunet-service-core_kx.c:1312
+#: src/core/gnunet-service-core_kx.c:1452
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1485
+#: src/core/gnunet-service-core_kx.c:1640
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1493
+#: src/core/gnunet-service-core_kx.c:1648
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1496
+#: src/core/gnunet-service-core_kx.c:1651
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1557
-#: src/core/gnunet-service-core_kx.c:1583
+#: src/core/gnunet-service-core_kx.c:1740
+#: src/core/gnunet-service-core_kx.c:1766
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1570
+#: src/core/gnunet-service-core_kx.c:1753
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1795
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1620
+#: src/core/gnunet-service-core_kx.c:1803
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1681
-#, fuzzy
-msgid "# PAYLOAD dropped (out of order)"
-msgstr "# các byte loại bỏ bởi UDP (đi ra)"
-
-#: src/core/gnunet-service-core_sessions.c:266
-#: src/core/gnunet-service-core_sessions.c:356
-#: src/dht/gnunet-service-dht_neighbours.c:732
-#: src/dht/gnunet-service-dht_neighbours.c:794
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
-#: src/topology/gnunet-daemon-topology.c:612
-#: src/topology/gnunet-daemon-topology.c:714
+#: src/core/gnunet-service-core_sessions.c:258
+#: src/core/gnunet-service-core_sessions.c:348
+#: src/dht/gnunet-service-dht_neighbours.c:739
+#: src/dht/gnunet-service-dht_neighbours.c:802
+#: src/fs/gnunet-service-fs_cp.c:613 src/fs/gnunet-service-fs_cp.c:1520
+#: src/topology/gnunet-daemon-topology.c:615
+#: src/topology/gnunet-daemon-topology.c:717
 #: src/transport/gnunet-service-transport_neighbours.c:719
 #: src/transport/gnunet-service-transport_neighbours.c:727
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/core/gnunet-service-core_sessions.c:302
+#: src/core/gnunet-service-core_sessions.c:294
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# tổng số yêu cầu lỗ hổng được gửi"
 
-#: src/core/gnunet-service-core_sessions.c:422
+#: src/core/gnunet-service-core_sessions.c:414
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/core/gnunet-service-core_sessions.c:439
+#: src/core/gnunet-service-core_sessions.c:431
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:181
+#: src/core/gnunet-service-core_typemap.c:167
+#: src/core/gnunet-service-core_typemap.c:179
 #, fuzzy
 msgid "# type maps received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_typemap.c:212
+#: src/core/gnunet-service-core_typemap.c:210
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:770
+#: src/credential/credential_misc.c:86
+#, fuzzy, c-format
+msgid "Unable to parse CRED record string `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/credential/gnunet-credential.c:262 src/namestore/gnunet-namestore.c:887
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:278
+#: src/credential/gnunet-credential.c:432
+#, fuzzy, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/credential/gnunet-credential.c:359
+#: src/credential/gnunet-credential.c:421
+#, fuzzy, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/credential/gnunet-credential.c:370
+#: src/credential/gnunet-credential.c:442
+#, fuzzy, c-format
+msgid "Failed to connect to CREDENTIAL\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/credential/gnunet-credential.c:377
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:385
+#, c-format
+msgid "ego required\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:401
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:412
+#, fuzzy, c-format
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/credential/gnunet-credential.c:449
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:502
+#, c-format
+msgid "Issuer ego required\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:514
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:534
+msgid "create credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:538
+msgid "verify credential against attribute"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:543
+#, fuzzy
+msgid "The public key of the subject to lookup the credential for"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/credential/gnunet-credential.c:548
+msgid "The name of the credential presented by the subject"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:553
+#, fuzzy
+msgid "The public key of the authority to verify the credential against"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/credential/gnunet-credential.c:558
+#, fuzzy
+msgid "The ego to use"
+msgstr "kích cỡ tin nhắn"
+
+#: src/credential/gnunet-credential.c:563
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:568
+msgid "The time to live for the credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:572
+msgid "collect credentials"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:586
+#, fuzzy
+msgid "GNUnet credential resolver tool"
+msgstr "Bản ghi lỗi GNUnet"
+
+#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:183
+#: src/gns/gnunet-gns-helper-service-w32.c:725
+#, fuzzy, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/credential/gnunet-service-credential.c:1142
+#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
+#, fuzzy, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/credential/plugin_gnsrecord_credential.c:184
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:309
+#: src/datastore/gnunet-service-datastore.c:755
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datacache/datacache.c:123 src/datacache/datacache.c:298
+#: src/datacache/datacache.c:121 src/datacache/datacache.c:313
 #, fuzzy
 msgid "# items stored"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datacache/datacache.c:202
+#: src/datacache/datacache.c:204
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:213
+#: src/datacache/datacache.c:215
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/datacache/datacache.c:329
+#: src/datacache/datacache.c:343
 #, fuzzy
 msgid "# requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datacache/datacache.c:339
+#: src/datacache/datacache.c:353
 msgid "# requests filtered by bloom filter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/datacache/datacache.c:367
+#: src/datacache/datacache.c:383
 #, fuzzy
 msgid "# requests for random value received"
 msgstr "# tổng số yêu cầu lỗ hổng được nhận"
 
-#: src/datacache/datacache.c:399
+#: src/datacache/datacache.c:415
 #, fuzzy
 msgid "# proximity search requests received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/datacache/plugin_datacache_heap.c:466
+#: src/datacache/plugin_datacache_heap.c:551
 #, fuzzy
 msgid "Heap datacache running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/datacache/plugin_datacache_sqlite.c:77
-#: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:1024
-#: src/datastore/plugin_datastore_sqlite.c:57
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
-#: src/mysql/mysql.c:42 src/mysql/mysql.c:49
-#: src/namecache/plugin_namecache_postgres.c:53
-#: src/namecache/plugin_namecache_sqlite.c:52
-#: src/namestore/plugin_namestore_postgres.c:53
-#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/datacache/plugin_datacache_sqlite.c:116
+#: src/datacache/plugin_datacache_sqlite.c:125
+#: src/datastore/plugin_datastore_mysql.c:890
+#: src/datastore/plugin_datastore_sqlite.c:56
+#: src/datastore/plugin_datastore_sqlite.c:64 src/my/my.c:79 src/my/my.c:91
+#: src/mysql/mysql.c:40 src/mysql/mysql.c:47
+#: src/namecache/plugin_namecache_sqlite.c:50
+#: src/namestore/plugin_namestore_sqlite.c:51
 #: src/peerstore/plugin_peerstore_sqlite.c:50
-#: src/psycstore/plugin_psycstore_mysql.c:62
-#: src/testbed/generate-underlay-topology.c:47
-#: src/testbed/gnunet-daemon-latency-logger.c:52
-#: src/testbed/gnunet-daemon-testbed-underlay.c:56
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
-#: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:720 src/include/gnunet_common.h:729
-#: src/scalarproduct/scalarproduct.h:35
+#: src/psycstore/plugin_psycstore_mysql.c:60
+#: src/reclaim/plugin_reclaim_sqlite.c:50
+#: src/testbed/generate-underlay-topology.c:45
+#: src/testbed/gnunet-daemon-latency-logger.c:50
+#: src/testbed/gnunet-daemon-testbed-underlay.c:54
+#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:51
+#: src/util/crypto_ecc_setup.c:39 src/util/crypto_mpi.c:37
+#: src/include/gnunet_common.h:816 src/include/gnunet_common.h:825
+#: src/scalarproduct/scalarproduct.h:33
 #, 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/datacache/plugin_datacache_sqlite.c:749
-#: src/datastore/plugin_datastore_sqlite.c:415
-#: src/namecache/plugin_namecache_sqlite.c:292
-#: src/namestore/plugin_namestore_sqlite.c:343
+#: src/datacache/plugin_datacache_sqlite.c:861
+#: src/datastore/plugin_datastore_sqlite.c:506
+#: src/namecache/plugin_namecache_sqlite.c:327
+#: src/namestore/plugin_namestore_sqlite.c:262
+#: src/reclaim/plugin_reclaim_sqlite.c:334
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:309
+#: src/datastore/datastore_api.c:346
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/datastore/datastore_api.c:425
+#: src/datastore/datastore_api.c:466
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:567
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:597
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/datastore/datastore_api.c:680
+#: src/datastore/datastore_api.c:758
 #, fuzzy
 msgid "# status messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/datastore/datastore_api.c:754
+#: src/datastore/datastore_api.c:812
 #, fuzzy
 msgid "# Results received"
 msgstr "# các kết quả dht được nhận"
 
-#: src/datastore/datastore_api.c:879
+#: src/datastore/datastore_api.c:918
 #, fuzzy
 msgid "# datastore connections (re)created"
 msgstr "# các kết nối dht"
 
-#: src/datastore/datastore_api.c:995
+#: src/datastore/datastore_api.c:1032
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1056
+#: src/datastore/datastore_api.c:1093
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1121
+#: src/datastore/datastore_api.c:1158
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1205
+#: src/datastore/datastore_api.c:1236
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1265
+#: src/datastore/datastore_api.c:1296
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1358
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1411
+#: src/datastore/datastore_api.c:1439
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/gnunet-datastore.c:113
+#: src/datastore/gnunet-datastore.c:187
+#, c-format
+msgid "Dumped %<PRIu64> records\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:215 src/datastore/gnunet-datastore.c:227
+#, c-format
+msgid "Short write to file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:259
+#, fuzzy
+msgid "Error queueing datastore GET operation\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/datastore/gnunet-datastore.c:285 src/datastore/gnunet-datastore.c:410
+#, fuzzy, c-format
+msgid "Unable to open dump file: %s\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/datastore/gnunet-datastore.c:324
 #, fuzzy, c-format
 msgid "Failed to store item: %s, aborting\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/datastore/gnunet-datastore.c:199
+#: src/datastore/gnunet-datastore.c:338
 #, c-format
-msgid "Cannot use the same configuration for source and destination\n"
+msgid "Inserted %<PRIu64> records\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:244
-msgid ""
-"specifies the configuration to use to access an alternative datastore; will "
-"merge that datastore into our current datastore"
+#: src/datastore/gnunet-datastore.c:347 src/datastore/gnunet-datastore.c:361
+#, c-format
+msgid "Short read from file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:387
+#, fuzzy
+msgid "Error queueing datastore PUT operation\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/datastore/gnunet-datastore.c:430
+msgid "Input file is not of a supported format\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:456
+#, fuzzy
+msgid "Failed connecting to the datastore.\n"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/datastore/gnunet-datastore.c:468
+#, c-format
+msgid "Please choose at least one operation: %s, %s\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:491
+#, fuzzy
+msgid "Dump all records from the datastore"
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
+
+#: src/datastore/gnunet-datastore.c:495
+#, fuzzy
+msgid "Insert records into the datastore"
+msgstr "# các byte trong kho dữ liệu"
+
+#: src/datastore/gnunet-datastore.c:500
+msgid "File to dump or insert"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:253
+#: src/datastore/gnunet-datastore.c:509
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -1678,813 +1868,645 @@ msgstr "cập nhật một giá trị trong tập tin cấu hình"
 msgid "# bytes expired"
 msgstr "# các byte được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:416
+#: src/datastore/gnunet-service-datastore.c:418
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:557
+#: src/datastore/gnunet-service-datastore.c:560
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:598
+#: src/datastore/gnunet-service-datastore.c:601
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:609
+#: src/datastore/gnunet-service-datastore.c:612
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:615
+#: src/datastore/gnunet-service-datastore.c:618
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:622
+#: src/datastore/gnunet-service-datastore.c:625
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:629
-#: src/datastore/gnunet-service-datastore.c:684
-#: src/datastore/gnunet-service-datastore.c:969
-#: src/datastore/gnunet-service-datastore.c:1619
+#: src/datastore/gnunet-service-datastore.c:632
+#: src/datastore/gnunet-service-datastore.c:687
+#: src/datastore/gnunet-service-datastore.c:835
+#: src/datastore/gnunet-service-datastore.c:1467
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:702
+#: src/datastore/gnunet-service-datastore.c:705
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:787
+#: src/datastore/gnunet-service-datastore.c:771
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1017
+#: src/datastore/gnunet-service-datastore.c:874
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:905
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1061
+#: src/datastore/gnunet-service-datastore.c:918
 #, fuzzy
 msgid "# requests filtered by bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/datastore/gnunet-service-datastore.c:1097
+#: src/datastore/gnunet-service-datastore.c:954
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1130
+#: src/datastore/gnunet-service-datastore.c:987
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1034
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1186
+#: src/datastore/gnunet-service-datastore.c:1041
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1233
+#: src/datastore/gnunet-service-datastore.c:1086
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1287
+#: src/datastore/gnunet-service-datastore.c:1135
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1293
-#: src/datastore/gnunet-service-datastore.c:1468
+#: src/datastore/gnunet-service-datastore.c:1141
+#: src/datastore/gnunet-service-datastore.c:1316
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1347
+#: src/datastore/gnunet-service-datastore.c:1195
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1359
+#: src/datastore/gnunet-service-datastore.c:1207
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:1419
+#: src/datastore/gnunet-service-datastore.c:1267
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1323
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1486
+#: src/datastore/gnunet-service-datastore.c:1334
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1656
+#: src/datastore/gnunet-service-datastore.c:1504
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# các byte được phép trong kho dữ liệu"
 
-#: src/datastore/gnunet-service-datastore.c:1672
+#: src/datastore/gnunet-service-datastore.c:1520
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1677
+#: src/datastore/gnunet-service-datastore.c:1525
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1693
+#: src/datastore/gnunet-service-datastore.c:1541
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1711
-#: src/datastore/gnunet-service-datastore.c:1727
+#: src/datastore/gnunet-service-datastore.c:1559
+#: src/datastore/gnunet-service-datastore.c:1575
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/datastore/gnunet-service-datastore.c:1759
+#: src/datastore/gnunet-service-datastore.c:1607
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/datastore/plugin_datastore_heap.c:823
+#: src/datastore/plugin_datastore_heap.c:891
 #, fuzzy
 msgid "Heap database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/datastore/plugin_datastore_mysql.c:347
-#: src/datastore/plugin_datastore_sqlite.c:513
+#: src/datastore/plugin_datastore_mysql.c:369
+#: src/datastore/plugin_datastore_mysql.c:421
+#: src/datastore/plugin_datastore_mysql.c:1073
+msgid "MySQL statement run failure"
+msgstr ""
+
+#: src/datastore/plugin_datastore_mysql.c:408
+#: src/datastore/plugin_datastore_sqlite.c:676
 #, fuzzy
 msgid "Data too large"
 msgstr "số lần lặp lại"
 
-#: src/datastore/plugin_datastore_mysql.c:363
-msgid "MySQL statement run failure"
-msgstr ""
-
-#: src/datastore/plugin_datastore_mysql.c:980
+#: src/datastore/plugin_datastore_mysql.c:846
 #, 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:1254
-#: src/psycstore/plugin_psycstore_mysql.c:1936
+#: src/datastore/plugin_datastore_mysql.c:1178
+#: src/psycstore/plugin_psycstore_mysql.c:1934
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:350
+#: src/datastore/plugin_datastore_postgres.c:274
+#: src/datastore/plugin_datastore_postgres.c:891
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:977
+#: src/datastore/plugin_datastore_postgres.c:852
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1014
-#: src/namecache/plugin_namecache_postgres.c:398
-#: src/namestore/plugin_namestore_postgres.c:571
-#: src/psycstore/plugin_psycstore_postgres.c:1721
+#: src/datastore/plugin_datastore_postgres.c:950
+#: src/psycstore/plugin_psycstore_postgres.c:1504
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:65
-#: src/testbed/generate-underlay-topology.c:50
-#: src/testbed/gnunet-daemon-latency-logger.c:55
-#: src/testbed/gnunet-daemon-testbed-underlay.c:59
+#: src/datastore/plugin_datastore_sqlite.c:64
+#: src/testbed/generate-underlay-topology.c:48
+#: src/testbed/gnunet-daemon-latency-logger.c:53
+#: src/testbed/gnunet-daemon-testbed-underlay.c:57
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 
-#: src/datastore/plugin_datastore_sqlite.c:263
-#: src/namecache/plugin_namecache_sqlite.c:193
-#: src/namestore/plugin_namestore_sqlite.c:213
-#: src/peerstore/plugin_peerstore_sqlite.c:479
-#: src/psycstore/plugin_psycstore_sqlite.c:325
+#: src/datastore/plugin_datastore_sqlite.c:269
+#: src/namecache/plugin_namecache_sqlite.c:207
+#: src/namestore/plugin_namestore_sqlite.c:203
+#: src/peerstore/plugin_peerstore_sqlite.c:533
+#: src/psycstore/plugin_psycstore_sqlite.c:323
+#: src/reclaim/plugin_reclaim_sqlite.c:210
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:692
-#, fuzzy
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "Dữ liệu sai trong %s. Đang thử sửa chữa (bằng cách xoá).\n"
+#: src/datastore/plugin_datastore_sqlite.c:627
+msgid "sqlite bind failure"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1189
+#: src/datastore/plugin_datastore_sqlite.c:1325
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1209
+#: src/datastore/plugin_datastore_sqlite.c:1359
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1249
-#: src/namecache/plugin_namecache_sqlite.c:580
-#: src/namestore/plugin_namestore_sqlite.c:766
+#: src/datastore/plugin_datastore_sqlite.c:1403
+#: src/namecache/plugin_namecache_sqlite.c:638
+#: src/namestore/plugin_namestore_sqlite.c:753
+#: src/reclaim/plugin_reclaim_sqlite.c:709
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/datastore/plugin_datastore_template.c:258
+#: src/datastore/plugin_datastore_template.c:251
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:157
+#: src/dht/gnunet-dht-get.c:156
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204
+#: src/dht/gnunet-dht-get.c:157
+#, c-format
+msgid "Result %d, type %d:\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:202
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248
+#: src/dht/gnunet-dht-get.c:208 src/dht/gnunet-dht-monitor.c:255
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:218
+#: src/dht/gnunet-dht-get.c:217
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:235 src/dht/gnunet-dht-monitor.c:289
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-monitor.c:305
+#: src/dht/gnunet-dht-put.c:196
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:238
+#: src/dht/gnunet-dht-get.c:251
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:241 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:256 src/dht/gnunet-dht-monitor.c:311
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:244
+#: src/dht/gnunet-dht-get.c:261
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:247 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:265 src/dht/gnunet-dht-put.c:200
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:250 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:222 src/fs/gnunet-auto-share.c:780
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
-#: src/fs/gnunet-search.c:322 src/fs/gnunet-unindex.c:167
-#: src/nse/gnunet-nse-profiler.c:855
-msgid "be verbose (print progress information)"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:271
+#: src/dht/gnunet-dht-get.c:278
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:295
+#: src/dht/gnunet-dht-monitor.c:317
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:320
+#: src/dht/gnunet-dht-monitor.c:322 src/fs/gnunet-download.c:370
+#: src/nse/gnunet-nse-profiler.c:876
+msgid "be verbose (print progress information)"
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:335
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161
-#: src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:914 src/testbed/gnunet-testbed-profiler.c:251
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/dht/gnunet_dht_profiler.c:1186
+#: src/dht/gnunet_dht_profiler.c:947 src/rps/gnunet-rps-profiler.c:2764
 #, fuzzy
 msgid "number of peers to start"
 msgstr "số lần lặp lại"
 
-#: src/dht/gnunet_dht_profiler.c:1189
-msgid ""
-"maximum number of times we try to search for successor circle formation (0 "
-"for R5N)"
+#: src/dht/gnunet_dht_profiler.c:952
+msgid "number of PUTs to perform per peer"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
-#: src/testbed/gnunet-testbed-profiler.c:294
+#: src/dht/gnunet_dht_profiler.c:957 src/nse/gnunet-nse-profiler.c:858
+#: src/testbed/gnunet-testbed-profiler.c:302
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1195
+#: src/dht/gnunet_dht_profiler.c:962
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1198
+#: src/dht/gnunet_dht_profiler.c:967
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1201
+#: src/dht/gnunet_dht_profiler.c:972
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1204
+#: src/dht/gnunet_dht_profiler.c:977
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1207
+#: src/dht/gnunet_dht_profiler.c:982
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:987
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1225
+#: src/dht/gnunet_dht_profiler.c:1007
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/dht/gnunet-dht-put.c:120
-#, fuzzy
-msgid "PUT request sent with key"
-msgstr "# độ tin cậy được tiêu phí"
-
-#: src/dht/gnunet-dht-put.c:123
-msgid "Timeout sending PUT request!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:126
-#, fuzzy
-msgid "PUT request not confirmed!\n"
-msgstr "# độ tin cậy được tiêu phí"
-
-#: src/dht/gnunet-dht-put.c:157
+#: src/dht/gnunet-dht-put.c:132
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:164
-#, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
+#: src/dht/gnunet-dht-put.c:140
+#, fuzzy
+msgid "Could not connect to DHT service!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/dht/gnunet-dht-put.c:175
+#: src/dht/gnunet-dht-put.c:151
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-put.c:186
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:191
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:213
+#: src/dht/gnunet-dht-put.c:205
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:209
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:219
+#: src/dht/gnunet-dht-put.c:214
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:247
+#: src/dht/gnunet-dht-put.c:231
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:369
-#: src/dht/gnunet-service-wdht_clients.c:864
+#: src/dht/gnunet-service-dht_clients.c:367
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:482
-#: src/dht/gnunet-service-wdht_clients.c:945
+#: src/dht/gnunet-service-dht_clients.c:481
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dht/gnunet-service-dht_clients.c:621
-#: src/dht/gnunet-service-wdht_clients.c:1011
+#: src/dht/gnunet-service-dht_clients.c:614
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:847
-#: src/dht/gnunet-service-wdht_clients.c:1220
+#: src/dht/gnunet-service-dht_clients.c:840
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:1032
-#: src/dht/gnunet-service-wdht_clients.c:510
+#: src/dht/gnunet-service-dht_clients.c:1025
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1047
-#: src/dht/gnunet-service-wdht_clients.c:524
+#: src/dht/gnunet-service-dht_clients.c:1040
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1093
-#: src/dht/gnunet-service-wdht_clients.c:566
+#: src/dht/gnunet-service-dht_clients.c:1086
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1100
-#: src/dht/gnunet-service-wdht_clients.c:589
+#: src/dht/gnunet-service-dht_clients.c:1093
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1178
-#: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:693
+#: src/dht/gnunet-service-dht_clients.c:1171
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:72
+#: src/dht/gnunet-service-dht_datacache.c:71
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/dht/gnunet-service-dht_datacache.c:82
+#: src/dht/gnunet-service-dht_datacache.c:81
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:198
+#: src/dht/gnunet-service-dht_datacache.c:205
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:210
+#: src/dht/gnunet-service-dht_datacache.c:217
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:216
+#: src/dht/gnunet-service-dht_datacache.c:223
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:222
+#: src/dht/gnunet-service-dht_datacache.c:229
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:241
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:245
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:280
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_hello.c:86
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:671
+#: src/dht/gnunet-service-dht_neighbours.c:677
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:842
+#: src/dht/gnunet-service-dht_neighbours.c:850
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1045
-#: src/dht/gnunet-service-dht_neighbours.c:1082
+#: src/dht/gnunet-service-dht_neighbours.c:1053
+#: src/dht/gnunet-service-dht_neighbours.c:1096
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1062
-#: src/dht/gnunet-service-dht_neighbours.c:1098
+#: src/dht/gnunet-service-dht_neighbours.c:1070
+#: src/dht/gnunet-service-dht_neighbours.c:1112
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr "# các cuộc gọi HTTP select (lựa chọn)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1269
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1279
+#: src/dht/gnunet-service-dht_neighbours.c:1302
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1290
-#: src/dht/gnunet-service-dht_neighbours.c:1430
-#: src/dht/gnunet-service-dht_neighbours.c:1533
-#: src/dht/gnunet-service-xdht_neighbours.c:946
-#: src/dht/gnunet-service-xdht_neighbours.c:1007
-#: src/dht/gnunet-service-xdht_neighbours.c:1047
-#: src/dht/gnunet-service-xdht_neighbours.c:1103
-#: src/dht/gnunet-service-xdht_neighbours.c:1158
-#: src/dht/gnunet-service-xdht_neighbours.c:1208
-#: src/dht/gnunet-service-xdht_neighbours.c:1262
-#: src/dht/gnunet-service-xdht_neighbours.c:1317
-#: src/dht/gnunet-service-xdht_neighbours.c:1370
+#: src/dht/gnunet-service-dht_neighbours.c:1313
+#: src/dht/gnunet-service-dht_neighbours.c:1453
+#: src/dht/gnunet-service-dht_neighbours.c:1556
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1375
+#: src/dht/gnunet-service-dht_neighbours.c:1398
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1418
+#: src/dht/gnunet-service-dht_neighbours.c:1441
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1548
+#: src/dht/gnunet-service-dht_neighbours.c:1571
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1647
+#: src/dht/gnunet-service-dht_neighbours.c:1674
+msgid "# Expired PUTs discarded"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1682
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1651
+#: src/dht/gnunet-service-dht_neighbours.c:1686
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1869
+#: src/dht/gnunet-service-dht_neighbours.c:1912
 #, fuzzy
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1877
+#: src/dht/gnunet-service-dht_neighbours.c:1920
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2029
+#: src/dht/gnunet-service-dht_neighbours.c:2082
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2033
+#: src/dht/gnunet-service-dht_neighbours.c:2086
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2104
+#: src/dht/gnunet-service-dht_neighbours.c:2151
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2125
+#: src/dht/gnunet-service-dht_neighbours.c:2172
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2223
+#: src/dht/gnunet-service-dht_neighbours.c:2349
+msgid "# Expired results discarded"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:2365
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2227
+#: src/dht/gnunet-service-dht_neighbours.c:2369
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/dht/gnunet-service-dht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:57
 #, fuzzy
 msgid "# Network size estimates received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:221
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:235
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:238
+#: src/dht/gnunet-service-dht_routing.c:241
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:247
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:256
+#: src/dht/gnunet-service-dht_routing.c:259
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:335
+#: src/dht/gnunet-service-dht_routing.c:337
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:411
+#: src/dht/gnunet-service-dht_routing.c:413
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:433
+#: src/dht/gnunet-service-dht_routing.c:435
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-wdht_clients.c:653
-msgid "Could not pass reply to client, message too big!\n"
+#: src/dht/plugin_block_dht.c:187
+#, fuzzy, c-format
+msgid "Block not of type %u\n"
+msgstr "Không biết truyền tải nào kiểu %d.\n"
+
+#: src/dht/plugin_block_dht.c:196
+msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1572
+#: src/dht/plugin_block_dht.c:207
 #, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail_length = %d"
+msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1577
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d]=%s"
+#: src/dns/gnunet-dns-monitor.c:351 src/dns/gnunet-dns-monitor.c:356
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1597
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FRIEND_PEERMAP of %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1607
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1628
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FINGER_TABLE of %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1644
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail_id[%d]=%s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1650
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d] = %s "
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:3366
-msgid "# FINGERS_COUNT"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:3522
-#: src/dht/gnunet-service-xdht_neighbours.c:3743
-#: src/dht/gnunet-service-xdht_neighbours.c:3900
-#: src/dht/gnunet-service-xdht_neighbours.c:4070
-#: src/dht/gnunet-service-xdht_neighbours.c:4281
-#: src/dht/gnunet-service-xdht_neighbours.c:4836
-#: src/dht/gnunet-service-xdht_neighbours.c:5254
-#: src/dht/gnunet-service-xdht_neighbours.c:5365
-#: src/dht/gnunet-service-xdht_neighbours.c:5451
-#: src/dht/gnunet-service-xdht_neighbours.c:5567
-#: src/dht/gnunet-service-xdht_neighbours.c:5712
-#: src/dht/gnunet-service-xdht_neighbours.c:5812
-#, fuzzy
-msgid "# Bytes received from other peers"
-msgstr "# các byte kiểu %d được nhận"
-
-#: src/dht/gnunet-service-xdht_routing.c:261
-#, c-format
-msgid ""
-"\n"
-"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_routing.c:269
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->trail_id = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_routing.c:272
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->next_hop = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_routing.c:275
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->prev_hop = %s"
-msgstr ""
-
-#: src/dht/plugin_block_dht.c:167
-#, fuzzy, c-format
-msgid "Block not of type %u\n"
-msgstr "Không biết truyền tải nào kiểu %d.\n"
-
-#: src/dht/plugin_block_dht.c:174
-msgid "Size mismatch for block\n"
-msgstr ""
-
-#: src/dht/plugin_block_dht.c:184
-#, c-format
-msgid "Block of type %u is malformed\n"
-msgstr ""
-
-#: src/dns/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/dns/dnsparser.c:818
-#, 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/dns/dnsstub.c:176
-#, 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/dns/dnsstub.c:294 src/dns/dnsstub.c:382
-#, fuzzy, c-format
-msgid "Failed to send DNS request to %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/dns/dnsstub.c:298
-#, 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/dns/dnsstub.c:367
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:437
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:351
-msgid "only monitor DNS queries"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:354
-msgid "only monitor DNS replies"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:365
+#: src/dns/gnunet-dns-monitor.c:368
 msgid "Monitor DNS queries."
 msgstr ""
 
@@ -2492,15 +2514,15 @@ msgstr ""
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:238
+#: src/dns/gnunet-dns-redirector.c:241
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:250
+#: src/dns/gnunet-dns-redirector.c:254
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:462
+#: src/dns/gnunet-service-dns.c:460
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
@@ -2516,388 +2538,384 @@ msgstr ""
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:929
+#: src/dns/gnunet-service-dns.c:928
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:945
+#: src/dns/gnunet-service-dns.c:944
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:953
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:964
+#: src/dns/gnunet-service-dns.c:963
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:966
+#: src/dns/gnunet-service-dns.c:965
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1033
+#: src/dns/gnunet-service-dns.c:1032
 #, 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:1078 src/exit/gnunet-daemon-exit.c:3642
+#: src/dns/gnunet-service-dns.c:1080 src/exit/gnunet-daemon-exit.c:3563
 #, 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:1091
+#: src/dns/gnunet-service-dns.c:1090
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:166
-msgid "verbose output"
-msgstr ""
-
-#: src/dv/gnunet-dv.c:175
+#: src/dv/gnunet-dv.c:173
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/exit/gnunet-daemon-exit.c:804 src/exit/gnunet-daemon-exit.c:3108
+#: src/exit/gnunet-daemon-exit.c:958
 #, 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:860
-#, c-format
-msgid "Got duplicate service records for `%s:%u'\n"
-msgstr ""
+msgid "# TCP packets sent via TUN"
+msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:913
+#: src/exit/gnunet-daemon-exit.c:1059
 #, fuzzy
-msgid "# Bytes transmitted via cadet channels"
-msgstr "# các byte được gửi"
-
-#: src/exit/gnunet-daemon-exit.c:1032 src/exit/gnunet-daemon-exit.c:2492
-#: src/exit/gnunet-daemon-exit.c:2745 src/vpn/gnunet-service-vpn.c:1454
-#: src/vpn/gnunet-service-vpn.c:1845 src/vpn/gnunet-service-vpn.c:2008
-msgid "# ICMPv4 packets dropped (type not allowed)"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1069 src/exit/gnunet-daemon-exit.c:2551
-#: src/exit/gnunet-daemon-exit.c:2804 src/vpn/gnunet-service-vpn.c:1510
-#: src/vpn/gnunet-service-vpn.c:1904 src/vpn/gnunet-service-vpn.c:2041
-msgid "# ICMPv6 packets dropped (type not allowed)"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1117
-msgid "# ICMP packets dropped (not allowed)"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1125
-msgid "ICMP Packet dropped, have no matching connection information\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1202
-msgid "UDP Packet dropped, have no matching connection information\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1277
-msgid "TCP Packet dropped, have no matching connection information\n"
-msgstr ""
+msgid "# ICMP packets sent via TUN"
+msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1330
+#: src/exit/gnunet-daemon-exit.c:1338
 #, fuzzy
-msgid "# Packets received from TUN"
-msgstr "# các byte đã nhận qua HTTP"
+msgid "# UDP packets sent via TUN"
+msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1344
+#: src/exit/gnunet-daemon-exit.c:1462 src/exit/gnunet-daemon-exit.c:1570
+#: src/exit/gnunet-daemon-exit.c:1617 src/exit/gnunet-daemon-exit.c:1699
+#: src/exit/gnunet-daemon-exit.c:1820 src/exit/gnunet-daemon-exit.c:1951
+#: src/exit/gnunet-daemon-exit.c:2205
 #, fuzzy
-msgid "# Bytes received from TUN"
+msgid "# Bytes received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1370
-msgid "IPv4 packet options received.  Ignored.\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1397
-#, c-format
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1443
-#, c-format
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1451
-#, c-format
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
-msgstr ""
+#: src/exit/gnunet-daemon-exit.c:1465
+#, 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:1852
+#: src/exit/gnunet-daemon-exit.c:1573
 #, fuzzy
-msgid "# TCP packets sent via TUN"
-msgstr "# các byte đã gửi qua UDP"
+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:1976
+#: src/exit/gnunet-daemon-exit.c:1613
 #, 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:1980 src/exit/gnunet-daemon-exit.c:2059
-#: src/exit/gnunet-daemon-exit.c:2166 src/exit/gnunet-daemon-exit.c:2416
-#: src/exit/gnunet-daemon-exit.c:2666 src/exit/gnunet-daemon-exit.c:2953
-#: src/exit/gnunet-daemon-exit.c:3056
-#, fuzzy
-msgid "# Bytes received from CADET"
-msgstr "# các byte đã nhận qua HTTP"
-
-#: src/exit/gnunet-daemon-exit.c:2062
+#: src/exit/gnunet-daemon-exit.c:1702
 #, 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:2169
-#, 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:2183
+#: src/exit/gnunet-daemon-exit.c:1786
 #, 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:2245
+#: src/exit/gnunet-daemon-exit.c:1823
 #, fuzzy
-msgid "# ICMP packets sent via TUN"
-msgstr "# các byte đã gửi qua UDP"
+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:2419
+#: src/exit/gnunet-daemon-exit.c:1954
 #, 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:2669
+#: src/exit/gnunet-daemon-exit.c:2020 src/exit/gnunet-daemon-exit.c:2277
+#: src/exit/gnunet-daemon-exit.c:2632 src/vpn/gnunet-service-vpn.c:826
+#: src/vpn/gnunet-service-vpn.c:989 src/vpn/gnunet-service-vpn.c:2103
+msgid "# ICMPv4 packets dropped (type not allowed)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2079 src/exit/gnunet-daemon-exit.c:2336
+#: src/exit/gnunet-daemon-exit.c:2669 src/vpn/gnunet-service-vpn.c:885
+#: src/vpn/gnunet-service-vpn.c:1022 src/vpn/gnunet-service-vpn.c:2156
+msgid "# ICMPv6 packets dropped (type not allowed)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2208
 #, 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:2730 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:2002
+#: src/exit/gnunet-daemon-exit.c:2262 src/vpn/gnunet-service-vpn.c:983
+#: src/vpn/gnunet-service-vpn.c:2094
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2789 src/vpn/gnunet-service-vpn.c:1480
-#: src/vpn/gnunet-service-vpn.c:1492 src/vpn/gnunet-service-vpn.c:1892
+#: src/exit/gnunet-daemon-exit.c:2321 src/vpn/gnunet-service-vpn.c:873
+#: src/vpn/gnunet-service-vpn.c:2128 src/vpn/gnunet-service-vpn.c:2139
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2840
+#: src/exit/gnunet-daemon-exit.c:2400 src/exit/gnunet-daemon-exit.c:3066
 #, fuzzy
-msgid "# UDP packets sent via TUN"
-msgstr "# các byte đã gửi qua UDP"
+msgid "# Inbound CADET channels created"
+msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/exit/gnunet-daemon-exit.c:2956
+#: src/exit/gnunet-daemon-exit.c:2520
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2539
 #, fuzzy
-msgid "# UDP IP-exit requests received via cadet"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
+msgid "# Messages transmitted via cadet channels"
+msgstr "# các byte được gửi"
 
-#: src/exit/gnunet-daemon-exit.c:3059
+#: src/exit/gnunet-daemon-exit.c:2717
+msgid "# ICMP packets dropped (not allowed)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2725
+msgid "ICMP Packet dropped, have no matching connection information\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2799
+msgid "UDP Packet dropped, have no matching connection information\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2871
+msgid "TCP Packet dropped, have no matching connection information\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2919
 #, fuzzy
-msgid "# UDP service requests received via cadet"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
+msgid "# Packets received from TUN"
+msgstr "# các byte đã nhận qua HTTP"
+
+#: src/exit/gnunet-daemon-exit.c:2933
+#, fuzzy
+msgid "# Bytes received from TUN"
+msgstr "# các byte đã nhận qua HTTP"
+
+#: src/exit/gnunet-daemon-exit.c:2959
+msgid "IPv4 packet options received.  Ignored.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2986
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3032
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
+msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3326 src/exit/gnunet-daemon-exit.c:3336
+#: src/exit/gnunet-daemon-exit.c:3040
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3243 src/exit/gnunet-daemon-exit.c:3253
 #, 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:3350 src/exit/gnunet-daemon-exit.c:3358
+#: src/exit/gnunet-daemon-exit.c:3267 src/exit/gnunet-daemon-exit.c:3275
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3399
+#: src/exit/gnunet-daemon-exit.c:3316
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3413 src/exit/gnunet-daemon-exit.c:3426
+#: src/exit/gnunet-daemon-exit.c:3330 src/exit/gnunet-daemon-exit.c:3343
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3438
+#: src/exit/gnunet-daemon-exit.c:3355
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3583
+#: src/exit/gnunet-daemon-exit.c:3499
 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:3591
+#: src/exit/gnunet-daemon-exit.c:3507
 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:3598
+#: src/exit/gnunet-daemon-exit.c:3514
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3604
+#: src/exit/gnunet-daemon-exit.c:3520
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3764
+#: src/exit/gnunet-daemon-exit.c:3688
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3871
+#: src/exit/gnunet-daemon-exit.c:3803
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3883 src/pt/gnunet-daemon-pt.c:1279
+#: src/exit/gnunet-daemon-exit.c:3815 src/pt/gnunet-daemon-pt.c:1202
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4028
+#: src/exit/gnunet-daemon-exit.c:3964
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:275
+#: src/fragmentation/defragmentation.c:273
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:468
-#: src/transport/plugin_transport_wlan.c:1528
+#: src/fragmentation/defragmentation.c:466
+#: src/transport/plugin_transport_wlan.c:1552
 #, fuzzy
 msgid "# fragments received"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/fragmentation/defragmentation.c:538
+#: src/fragmentation/defragmentation.c:536
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# các kết quả dht được nhận"
 
-#: src/fragmentation/defragmentation.c:556
+#: src/fragmentation/defragmentation.c:554
 msgid "# messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/fragmentation/fragmentation.c:240
+#: src/fragmentation/fragmentation.c:238
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:245
+#: src/fragmentation/fragmentation.c:243
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:278
+#: src/fragmentation/fragmentation.c:276
 #, 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:323
 msgid "# messages fragmented"
 msgstr "# các thông báo bị tế phân"
 
-#: src/fragmentation/fragmentation.c:331
+#: src/fragmentation/fragmentation.c:329
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:456
+#: src/fragmentation/fragmentation.c:454
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Các quảng cáo đồng đẳng được nhận"
 
-#: src/fragmentation/fragmentation.c:463
+#: src/fragmentation/fragmentation.c:461
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:487
+#: src/fragmentation/fragmentation.c:485
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/fs/fs_api.c:499
+#: src/fs/fs_api.c:497
 #, 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:510
+#: src/fs/fs_api.c:508
 #, 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:518
+#: src/fs/fs_api.c:516
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1126
+#: src/fs/fs_api.c:1124
 #, 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:1646
+#: src/fs/fs_api.c:1644
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1662
+#: src/fs/fs_api.c:1660
 #, 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:2322
+#: src/fs/fs_api.c:2320
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2332
+#: src/fs/fs_api.c:2330
 #, 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:2460 src/fs/fs_api.c:2706
+#: src/fs/fs_api.c:2458 src/fs/fs_api.c:2704
 #, 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:2478
+#: src/fs/fs_api.c:2476
 #, 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:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016
+#: src/fs/fs_api.c:2491 src/fs/fs_api.c:2510 src/fs/fs_api.c:3014
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2696
+#: src/fs/fs_api.c:2694
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2959
+#: src/fs/fs_api.c:2957
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3054
+#: src/fs/fs_api.c:3052
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:208
+#: src/fs/fs_directory.c:211
 #, 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"
@@ -2908,57 +2926,63 @@ msgid ""
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:328
+#: src/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
+#: src/fs/fs_download.c:345
+#, fuzzy, c-format
+msgid ""
+"Failed to access full directroy 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:532 src/fs/fs_download.c:544
 #, 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:926
+#: src/fs/fs_download.c:954
 #, 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:1011
+#: src/fs/fs_download.c:1045
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1039
+#: src/fs/fs_download.c:1073
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1063
+#: src/fs/fs_download.c:1097
 #, 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:1075
+#: src/fs/fs_download.c:1109
 #, 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:1084
+#: src/fs/fs_download.c:1118
 #, 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:1184
+#: src/fs/fs_download.c:1218
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_download.c:1845
+#: src/fs/fs_download.c:1883
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/fs/fs_getopt.c:197
+#: src/fs/fs_getopt.c:224
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2967,14 +2991,14 @@ 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:152
+#: src/fs/fs_list_indexed.c:150
 #, fuzzy, c-format
 msgid "Failed to receive response from `%s' service.\n"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/fs/fs_list_indexed.c:196
+#: src/fs/fs_list_indexed.c:194
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -2984,339 +3008,339 @@ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:207
+#: src/fs/fs_namespace.c:205
 #, 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:232
+#: src/fs/fs_namespace.c:230
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:324
+#: src/fs/fs_namespace.c:322
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:470
+#: src/fs/fs_namespace.c:468
 #, 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:127 src/fs/fs_publish.c:438
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:436
 #, 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:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
-#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
+#: src/fs/fs_publish.c:722 src/fs/fs_publish.c:776 src/fs/fs_publish.c:821
+#: src/fs/fs_publish.c:842 src/fs/fs_publish.c:872 src/fs/fs_publish.c:1138
 #, 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:780
+#: src/fs/fs_publish.c:778
 #, 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:825
+#: src/fs/fs_publish.c:823
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:845
+#: src/fs/fs_publish.c:843
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:876
+#: src/fs/fs_publish.c:874
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:902
+#: src/fs/fs_publish.c:900
 #, 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:991 src/fs/fs_publish.c:1027
+#: src/fs/fs_publish.c:989 src/fs/fs_publish.c:1025
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1094
+#: src/fs/fs_publish.c:1092
 #, 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:1102
+#: src/fs/fs_publish.c:1100
 #, 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:1142
+#: src/fs/fs_publish.c:1140
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1381
+#: src/fs/fs_publish.c:1379
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "Kho dữ liệu đầy.\n"
 
-#: src/fs/fs_publish.c:1472
+#: src/fs/fs_publish.c:1470
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:220
+#: src/fs/fs_publish_ksk.c:218
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/fs/fs_publish_ublock.c:241
+#: src/fs/fs_publish_ublock.c:239
 #, fuzzy
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
+#: src/fs/fs_search.c:820 src/fs/fs_search.c:890
 #, 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:966
+#: src/fs/fs_search.c:977
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:61
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:68
+#: src/fs/fs_unindex.c:66
 #, 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:273
 #, 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:328
+#: src/fs/fs_unindex.c:324
 #, 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:378 src/fs/fs_unindex.c:390
+#: src/fs/fs_unindex.c:374 src/fs/fs_unindex.c:386
 #, 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:386
+#: src/fs/fs_unindex.c:382
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_unindex.c:445
+#: src/fs/fs_unindex.c:441
 #, 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:606 src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:586 src/fs/fs_unindex.c:650
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_unindex.c:682
+#: src/fs/fs_unindex.c:663
 #, 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:721
+#: src/fs/fs_unindex.c:702
 #, 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:223
+#: 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:282
+#: src/fs/fs_uri.c:291
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:300
+#: src/fs/fs_uri.c:309
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:307
+#: src/fs/fs_uri.c:316
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:376
+#: src/fs/fs_uri.c:386
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:417
+#: src/fs/fs_uri.c:427
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:432
+#: src/fs/fs_uri.c:442
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:511
+#: src/fs/fs_uri.c:521
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:526
+#: src/fs/fs_uri.c:536
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:536
+#: src/fs/fs_uri.c:546
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:554
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:558
+#: src/fs/fs_uri.c:568
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:574
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:573
+#: src/fs/fs_uri.c:583
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:579
+#: src/fs/fs_uri.c:589
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:595
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:607
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:641
 #, fuzzy
 msgid "invalid argument"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:653
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1045 src/fs/fs_uri.c:1072
+#: src/fs/fs_uri.c:1057 src/fs/fs_uri.c:1084
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1078
+#: src/fs/fs_uri.c:1090
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
-#: src/fs/gnunet-auto-share.c:232
+#: src/fs/gnunet-auto-share.c:230
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295
-#: src/fs/gnunet-auto-share.c:305
+#: src/fs/gnunet-auto-share.c:283 src/fs/gnunet-auto-share.c:293
+#: src/fs/gnunet-auto-share.c:303
 #, fuzzy, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-auto-share.c:407
+#: src/fs/gnunet-auto-share.c:405
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:494
+#: src/fs/gnunet-auto-share.c:492
 #, fuzzy, c-format
 msgid "Publishing `%s'\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/gnunet-auto-share.c:504
+#: src/fs/gnunet-auto-share.c:502
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/fs/gnunet-auto-share.c:713
+#: src/fs/gnunet-auto-share.c:711
 #, fuzzy, c-format
 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:764 src/fs/gnunet-publish.c:898
+#: src/fs/gnunet-auto-share.c:765 src/fs/gnunet-publish.c:898
 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"
 
-#: src/fs/gnunet-auto-share.c:768 src/fs/gnunet-publish.c:902
+#: src/fs/gnunet-auto-share.c:770 src/fs/gnunet-publish.c:902
 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:771 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:775 src/fs/gnunet-publish.c:907
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:774 src/fs/gnunet-publish.c:929
+#: src/fs/gnunet-auto-share.c:781 src/fs/gnunet-publish.c:942
 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:777 src/fs/gnunet-publish.c:936
+#: src/fs/gnunet-auto-share.c:787 src/fs/gnunet-publish.c:954
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:801
+#: src/fs/gnunet-auto-share.c:811
 #, fuzzy
 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:648
+#: src/fs/gnunet-daemon-fsprofiler.c:646
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:51
 #, 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:103
 #, 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:106
 #, fuzzy, c-format
 msgid "Directory `%s' contents:\n"
 msgstr "==> Thư mục « %s »:\n"
 
-#: src/fs/gnunet-directory.c:143
+#: src/fs/gnunet-directory.c:141
 #, 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:156
+#: src/fs/gnunet-directory.c:154
 #, 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:165
+#: src/fs/gnunet-directory.c:163
 #, 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:194
+#: src/fs/gnunet-directory.c:192
 #, 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"
@@ -3331,85 +3355,85 @@ msgstr "Đang bắt đầu tài về « %s »\n"
 msgid "<unknown time>"
 msgstr "Lỗi không rõ"
 
-#: src/fs/gnunet-download.c:157
+#: src/fs/gnunet-download.c:156
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:182
 #, 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:194
+#: src/fs/gnunet-download.c:199
 #, 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:208 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-download.c:214 src/fs/gnunet-publish.c:293
+#: src/fs/gnunet-search.c:210 src/fs/gnunet-unindex.c:105
 #, 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:244
 #, 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:726
+#: src/fs/gnunet-download.c:251 src/fs/gnunet-publish.c:724
 #, 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:262
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:271
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-download.c:289 src/fs/gnunet-publish.c:868
+#: src/fs/gnunet-search.c:268 src/fs/gnunet-unindex.c:137
 #, 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:304 src/fs/gnunet-search.c:310
+#: src/fs/gnunet-download.c:337 src/fs/gnunet-search.c:311
 #, 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:307
+#: src/fs/gnunet-download.c:342
 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:310 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:347 src/fs/gnunet-search.c:317
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:313
+#: src/fs/gnunet-download.c:352
 msgid "write the file to FILENAME"
 msgstr "ghi tập tin vào TÊN_TẬP_TIN"
 
-#: src/fs/gnunet-download.c:317
+#: src/fs/gnunet-download.c:357
 #, 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:321
+#: src/fs/gnunet-download.c:362
 #, 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:324
+#: src/fs/gnunet-download.c:366
 msgid "download a GNUnet directory recursively"
 msgstr "tải xuống đệ quy một thư mục GNUnet"
 
-#: src/fs/gnunet-download.c:338
+#: src/fs/gnunet-download.c:384
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -3419,163 +3443,163 @@ msgstr ""
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:127
+#: src/fs/gnunet-fs.c:128
 #, fuzzy
 msgid "Special file-sharing operations"
 msgstr "Tùy chọn chia sẻ tập tin"
 
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:209
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/fs/gnunet-fs-profiler.c:215
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:214
+#: src/fs/gnunet-fs-profiler.c:221
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:223
+#: src/fs/gnunet-fs-profiler.c:231
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
+#: src/fs/gnunet-publish.c:217 src/fs/gnunet-publish.c:229
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:239
+#: src/fs/gnunet-publish.c:237
 #, 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:246
+#: src/fs/gnunet-publish.c:244
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:251
+#: src/fs/gnunet-publish.c:249
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/fs/gnunet-publish.c:259
+#: src/fs/gnunet-publish.c:257
 #, fuzzy, c-format
 msgid "Namespace URI is `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/fs/gnunet-publish.c:275
+#: src/fs/gnunet-publish.c:273
 #, fuzzy
 msgid "Starting cleanup after abort\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:282
+#: src/fs/gnunet-publish.c:280
 #, fuzzy
 msgid "Cleanup after abort completed.\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:288
+#: src/fs/gnunet-publish.c:286
 #, fuzzy
 msgid "Cleanup after abort failed.\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:430
+#: src/fs/gnunet-publish.c:428
 #, 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:435
+#: src/fs/gnunet-publish.c:433
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/fs/gnunet-publish.c:589
+#: src/fs/gnunet-publish.c:587
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:614
+#: 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:648
+#: src/fs/gnunet-publish.c:646
 #, 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:652
+#: src/fs/gnunet-publish.c:650
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:656
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:665
+#: src/fs/gnunet-publish.c:663
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:670
+#: src/fs/gnunet-publish.c:668
 #, 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:677
+#: src/fs/gnunet-publish.c:675
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:686
+#: src/fs/gnunet-publish.c:684
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/gnunet-publish.c:714
+#: src/fs/gnunet-publish.c:712
 #, 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:747
+#: src/fs/gnunet-publish.c:745
 #, 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:761
+#: src/fs/gnunet-publish.c:759
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:817
+#: src/fs/gnunet-publish.c:815
 #, 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:824
+#: src/fs/gnunet-publish.c:822
 #, 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:830
+#: src/fs/gnunet-publish.c:828
 #, 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:838 src/vpn/gnunet-vpn.c:210
+#: src/fs/gnunet-publish.c:836 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:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1296 src/transport/gnunet-transport.c:1321
+#: src/fs/gnunet-publish.c:847 src/fs/gnunet-publish.c:855
+#: src/transport/gnunet-transport.c:1280 src/transport/gnunet-transport.c:1307
 #, 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:909
+#: src/fs/gnunet-publish.c:911
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3583,7 +3607,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:913
+#: src/fs/gnunet-publish.c:917
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3591,11 +3615,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:917
+#: src/fs/gnunet-publish.c:923
 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:920
+#: src/fs/gnunet-publish.c:928
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3603,7 +3627,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:925
+#: src/fs/gnunet-publish.c:935
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3611,12 +3635,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:933
+#: src/fs/gnunet-publish.c:948
 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:939
+#: src/fs/gnunet-publish.c:958
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -3624,13 +3648,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:943
+#: src/fs/gnunet-publish.c:964
 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:947
+#: src/fs/gnunet-publish.c:971
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3638,97 +3662,97 @@ 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:963
+#: src/fs/gnunet-publish.c:987
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:127
+#: src/fs/gnunet-search.c:125
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:204
+#: src/fs/gnunet-search.c:202
 #, 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:260
+#: src/fs/gnunet-search.c:258
 #, 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:284
+#: src/fs/gnunet-search.c:282
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:316
+#: src/fs/gnunet-search.c:323
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:319
+#: src/fs/gnunet-search.c:329
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:338
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:337
+#: src/fs/gnunet-search.c:351
 #, fuzzy
 msgid "Search GNUnet for files that were published on GNUnet"
 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:378 src/fs/gnunet-service-fs.c:883
+#: src/fs/gnunet-service-fs.c:375 src/fs/gnunet-service-fs.c:880
 #, 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:437
+#: src/fs/gnunet-service-fs.c:434
 #, 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:606
+#: src/fs/gnunet-service-fs.c:603
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
+#: src/fs/gnunet-service-fs.c:655 src/fs/gnunet-service-fs_cp.c:562
 #, 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:837
+#: src/fs/gnunet-service-fs.c:834
 #, 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:876
+#: src/fs/gnunet-service-fs.c:873
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1047
+#: src/fs/gnunet-service-fs.c:1044
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1287
+#: src/fs/gnunet-service-fs.c:1284
 #, 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:1312 src/hostlist/gnunet-daemon-hostlist.c:355
-#: src/topology/gnunet-daemon-topology.c:1203
+#: src/fs/gnunet-service-fs.c:1309 src/hostlist/gnunet-daemon-hostlist.c:353
+#: src/topology/gnunet-daemon-topology.c:1200
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:370
+#: src/fs/gnunet-service-fs_cadet_client.c:368
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:384
+#: src/fs/gnunet-service-fs_cadet_client.c:382
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# các byte kiểu %d được nhận"
@@ -3738,87 +3762,87 @@ msgstr "# các byte kiểu %d được nhận"
 msgid "# queries received via CADET not answered"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:317
+#: src/fs/gnunet-service-fs_cadet_server.c:318
 #, fuzzy
 msgid "# Blocks transferred via cadet"
 msgstr "# các byte được gửi"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:343
+#: src/fs/gnunet-service-fs_cadet_server.c:344
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:384
+#: src/fs/gnunet-service-fs_cadet_server.c:386
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:391
-#: src/fs/gnunet-service-fs_cadet_server.c:431
+#: src/fs/gnunet-service-fs_cadet_server.c:393
+#: src/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_cp.c:686
+#: src/fs/gnunet-service-fs_cp.c:684
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:690
+#: src/fs/gnunet-service-fs_cp.c:688
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
+#: src/fs/gnunet-service-fs_cp.c:721 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:818
+#: src/fs/gnunet-service-fs_cp.c:816
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:875
+#: src/fs/gnunet-service-fs_cp.c:873
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:883
+#: src/fs/gnunet-service-fs_cp.c:881
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:897
+#: src/fs/gnunet-service-fs_cp.c:895
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:944
+#: src/fs/gnunet-service-fs_cp.c:942
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1015
+#: src/fs/gnunet-service-fs_cp.c:1013
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1040
+#: src/fs/gnunet-service-fs_cp.c:1038
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1050
+#: src/fs/gnunet-service-fs_cp.c:1048
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1148
+#: src/fs/gnunet-service-fs_cp.c:1146
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1205
+#: src/fs/gnunet-service-fs_cp.c:1203
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1228
+#: src/fs/gnunet-service-fs_cp.c:1226
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
@@ -3843,18 +3867,18 @@ 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:134
-#: src/fs/gnunet-service-fs_indexing.c:195
+#: src/fs/gnunet-service-fs_indexing.c:132
+#: src/fs/gnunet-service-fs_indexing.c:193
 #, 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:151
+#: src/fs/gnunet-service-fs_indexing.c:149
 #, 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:253
+#: src/fs/gnunet-service-fs_indexing.c:251
 #, 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"
@@ -3877,48 +3901,48 @@ msgstr ""
 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:515
+#: src/fs/gnunet-service-fs_indexing.c:516
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:265
+#: src/fs/gnunet-service-fs_pe.c:263
 #, fuzzy
 msgid "# average retransmission delay (ms)"
 msgstr "# thời gian trung bình còn kết nối (theo miligiây)"
 
-#: src/fs/gnunet-service-fs_pe.c:427
+#: src/fs/gnunet-service-fs_pe.c:425
 msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:438
+#: src/fs/gnunet-service-fs_pe.c:436
 #, fuzzy
 msgid "# query plans executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_pe.c:466
+#: src/fs/gnunet-service-fs_pe.c:464
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/fs/gnunet-service-fs_pe.c:536
+#: src/fs/gnunet-service-fs_pe.c:534
 #, fuzzy
 msgid "# requests merged"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:546
+#: src/fs/gnunet-service-fs_pe.c:544
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709
-#: src/fs/gnunet-service-fs_pe.c:788
+#: src/fs/gnunet-service-fs_pe.c:604 src/fs/gnunet-service-fs_pe.c:707
+#: src/fs/gnunet-service-fs_pe.c:786
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:327
+#: src/fs/gnunet-service-fs_pr.c:328
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -3980,666 +4004,587 @@ msgstr ""
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1385
+#: src/fs/gnunet-service-fs_pr.c:1393
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1452
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1507
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1400
+#: src/fs/gnunet-service-fs_pr.c:1522
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1409
+#: src/fs/gnunet-service-fs_pr.c:1546
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1424
-msgid "# requested DBLOCK or IBLOCK not found"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:1438
+#: src/fs/gnunet-service-fs_pr.c:1560
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1451
+#: src/fs/gnunet-service-fs_pr.c:1581
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1456
+#: src/fs/gnunet-service-fs_pr.c:1586
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1482 src/fs/gnunet-service-fs_pr.c:1521
-#: src/fs/gnunet-service-fs_pr.c:1688
-msgid "# Datastore lookups concluded (error queueing)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:1540
+#: src/fs/gnunet-service-fs_pr.c:1624
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1552
+#: src/fs/gnunet-service-fs_pr.c:1637
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1665
+#: src/fs/gnunet-service-fs_pr.c:1691
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1745
+#: src/fs/gnunet-service-fs_pr.c:1747
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/fs/gnunet-service-fs_push.c:642
+#: src/fs/gnunet-service-fs_push.c:644
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:89
+#: src/fs/gnunet-unindex.c:87
 #, 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:95
+#: src/fs/gnunet-unindex.c:93
 #, 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:100
+#: src/fs/gnunet-unindex.c:98
 #, fuzzy
 msgid "Unindexing done.\n"
 msgstr "Bỏ chỉ mục tập tin."
 
-#: src/fs/gnunet-unindex.c:129
+#: src/fs/gnunet-unindex.c:127
 #, 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:146
+#: src/fs/gnunet-unindex.c:144
 #, 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:178
+#: src/fs/gnunet-unindex.c:176
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:127
+#: src/gns/gns_tld_api.c:274
+msgid "Expected a base32-encoded public zone key\n"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:125
 #, fuzzy, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/gns/gnunet-bcd.c:357
+#: src/gns/gnunet-bcd.c:355
 #, c-format
 msgid "Invalid port number %u.  Exiting.\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:362
+#: src/gns/gnunet-bcd.c:360
 #, fuzzy, c-format
 msgid "Businesscard HTTP server starts on %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 
-#: src/gns/gnunet-bcd.c:376
+#: src/gns/gnunet-bcd.c:374
 #, fuzzy, c-format
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 
-#: src/gns/gnunet-bcd.c:519
+#: src/gns/gnunet-bcd.c:521
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:534
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:238
+#: src/gns/gnunet-dns2gns.c:201
 #, 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:408
+#: src/gns/gnunet-dns2gns.c:403
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:419
 #, 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:432
+#: src/gns/gnunet-dns2gns.c:427
 #, 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:712
-msgid "No ego configured for `dns2gns` subsystem\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:740
+#: src/gns/gnunet-dns2gns.c:586
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:761
-#, fuzzy
-msgid "No valid GNS zone specified!\n"
-msgstr "Chưa ghi rõ từ khoá.\n"
-
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:686
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:785
-msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:788
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:791
+#: src/gns/gnunet-dns2gns.c:691
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:794
-msgid "Public key of the GNS zone to use (overrides default)"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:807
+#: src/gns/gnunet-dns2gns.c:708
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
+#: src/gns/gnunet-gns-benchmark.c:580
+msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:295
-#, c-format
-msgid "Please specify name to lookup!\n"
+#: src/gns/gnunet-gns-benchmark.c:585
+msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:376
-#, c-format
-msgid "Ego for `%s' not found, cannot perform lookup.\n"
+#: src/gns/gnunet-gns-benchmark.c:589
+msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
-#: src/gns/plugin_rest_gns.c:472
+#: src/gns/gnunet-gns.c:197
 #, c-format
-msgid ""
-"Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
-"gns-import.sh?\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
-#, fuzzy, c-format
-msgid "Failed to connect to GNS\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/gns/gnunet-gns.c:470 src/gns/gnunet-gns.c:500
-#, c-format
-msgid "Reverse key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:484
-#, c-format
-msgid "Public key `%s' is not well-formed\n"
+msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:548
+#: src/gns/gnunet-gns.c:231
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:551
+#: src/gns/gnunet-gns.c:236
 #, 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:554
-#, fuzzy
-msgid "Specify timeout for the lookup"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/gns/gnunet-gns.c:557
+#: src/gns/gnunet-gns.c:240
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:560
-#, fuzzy
-msgid "Specify the public key of the zone to lookup the record in"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/gns/gnunet-gns.c:563
-#, fuzzy
-msgid "Specify the name of the ego of the zone to lookup the record in"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/gns/gnunet-gns.c:566
-#, fuzzy
-msgid "Specify the public key of the zone to reverse lookup a name for"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/gns/gnunet-gns.c:580
+#: src/gns/gnunet-gns.c:256
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
 
-#: src/gns/gnunet-gns-helper-service-w32.c:221
-msgid "Transmission to client failed!\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-helper-service-w32.c:260
-msgid "Shutdown in progress, aborting transmission.\n"
+#: src/gns/gnunet-gns-helper-service-w32.c:600
+msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:766
-#, c-format
+#: src/gns/gnunet-gns-helper-service-w32.c:699
 msgid ""
-"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
-"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
-"sh?\n"
+"Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
+"gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:836
+#: src/gns/gnunet-gns-helper-service-w32.c:737
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns-import.c:482
+#: src/gns/gnunet-gns-import.c:450
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:569
-#: src/hostlist/gnunet-daemon-hostlist_client.c:787
-#: src/hostlist/gnunet-daemon-hostlist_client.c:793
-#: src/hostlist/gnunet-daemon-hostlist_client.c:845
-#: src/hostlist/gnunet-daemon-hostlist_client.c:854
-#: src/hostlist/gnunet-daemon-hostlist_client.c:965
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
-#: src/transport/plugin_transport_http_client.c:598
-#: src/transport/plugin_transport_http_client.c:616
+#: src/gns/gnunet-gns-proxy.c:110
+#: src/hostlist/gnunet-daemon-hostlist_client.c:533
+#: src/hostlist/gnunet-daemon-hostlist_client.c:751
+#: src/hostlist/gnunet-daemon-hostlist_client.c:757
+#: src/hostlist/gnunet-daemon-hostlist_client.c:809
+#: src/hostlist/gnunet-daemon-hostlist_client.c:818
+#: src/hostlist/gnunet-daemon-hostlist_client.c:929
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1024
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1029
+#: src/transport/plugin_transport_http_client.c:596
+#: src/transport/plugin_transport_http_client.c:614
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:887
+#: src/gns/gnunet-gns-proxy.c:960
 #, fuzzy, c-format
-msgid "Unsupported CURL SSL backend %d\n"
+msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:985
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:1008
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:946
+#: src/gns/gnunet-gns-proxy.c:1021
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:1036
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:1046
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:1070
 #, c-format
-msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1200
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1708
+#: src/gns/gnunet-gns-proxy.c:2062
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2168
+#: src/gns/gnunet-gns-proxy.c:2583
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/gns/gnunet-gns-proxy.c:2198
+#: src/gns/gnunet-gns-proxy.c:2615
 #, fuzzy, c-format
-msgid "Unable to import certificate %s\n"
+msgid "Unable to import certificate from `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:2371
+#: src/gns/gnunet-gns-proxy.c:2814
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2390 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2839 src/rest/gnunet-rest-server.c:656
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2710
+#: src/gns/gnunet-gns-proxy.c:3169
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2739
+#: src/gns/gnunet-gns-proxy.c:3198
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2757 src/gns/gnunet-gns-proxy.c:2786
-msgid "SSL connection to plain IPv4 address requested\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:2837
+#: src/gns/gnunet-gns-proxy.c:3280
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3172
-msgid "No ego configured for `shorten-zone`\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3212 src/gns/gnunet-service-gns.c:493
-#: src/gns/gnunet-service-gns.c:548
-#, c-format
-msgid "No ego configured for `%s`\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3274
+#: src/gns/gnunet-gns-proxy.c:3570
 #, fuzzy, c-format
-msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:3314
+#: src/gns/gnunet-gns-proxy.c:3698
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3317
+#: src/gns/gnunet-gns-proxy.c:3703
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3336
+#: src/gns/gnunet-gns-proxy.c:3707
+msgid "disable use of IPv6"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3733
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:585
-#: src/zonemaster/gnunet-service-zonemaster.c:705
+#: src/gns/gnunet-service-gns.c:511
 #, fuzzy
-msgid "Failed to connect to the namestore!\n"
-msgstr "Không kết nối được đến trình nền gnunetd."
+msgid "Properly base32-encoded public key required"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/gns/gnunet-service-gns.c:593
+#: src/gns/gnunet-service-gns.c:547
 #, 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:612
-#: src/zonemaster/gnunet-service-zonemaster.c:741
+#: src/gns/gnunet-service-gns.c:566
+#: src/zonemaster/gnunet-service-zonemaster.c:873
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:438
 #, 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:263
+#: src/gns/gnunet-service-gns_interceptor.c:257
 #, 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:371
+#: src/gns/gnunet-service-gns_interceptor.c:364
 #, 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:648
+#: src/gns/gnunet-service-gns_resolver.c:717
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:659
+#: src/gns/gnunet-service-gns_resolver.c:728
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:851
+#: src/gns/gnunet-service-gns_resolver.c:931
 #, 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:993
+#: src/gns/gnunet-service-gns_resolver.c:1112
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1354
+#: src/gns/gnunet-service-gns_resolver.c:1382
+#, c-format
+msgid "VPN returned empty result for `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1823
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:1866
+#, 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:2281
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1913
+#: src/gns/gnunet-service-gns_resolver.c:2304
 #, 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:2195
+#: src/gns/gnunet-service-gns_resolver.c:2467
 #, c-format
-msgid "Zone %s was revoked, resolution fails\n"
+msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2342
+#: src/gns/gnunet-service-gns_resolver.c:2602
 #, c-format
-msgid "Hostname `%s' is not well-formed, resolution fails\n"
+msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:203
+#: src/gns/plugin_gnsrecord_gns.c:179
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:232
+#: src/gns/plugin_gnsrecord_gns.c:210
 #, 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:253
+#: src/gns/plugin_gnsrecord_gns.c:231
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:276
+#: src/gns/plugin_gnsrecord_gns.c:256
 #, 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:311
+#: src/gns/plugin_gnsrecord_gns.c:292
 #, 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"
 
-#: src/gns/plugin_gnsrecord_gns.c:359
-#, fuzzy, c-format
-msgid "Unable to parse REVERSE record string `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/gns/plugin_rest_gns.c:435
-msgid "Ego for not found, cannot perform lookup.\n"
-msgstr ""
-
-#: src/gns/plugin_rest_gns.c:717
-#, fuzzy
-msgid "GNS REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:359
+#: src/gnsrecord/plugin_gnsrecord_dns.c:357
 #, 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:380
+#: src/gnsrecord/plugin_gnsrecord_dns.c:378
 #, 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:402
+#: src/gnsrecord/plugin_gnsrecord_dns.c:400
 #, 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:487
+#: src/gnsrecord/plugin_gnsrecord_dns.c:485
 #, 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:523
+#: src/gnsrecord/plugin_gnsrecord_dns.c:521
 #, 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:542
+#: src/gnsrecord/plugin_gnsrecord_dns.c:540
 #, 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:565
+#: src/gnsrecord/plugin_gnsrecord_dns.c:563
 #, 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:588
+#: src/gnsrecord/plugin_gnsrecord_dns.c:586
 #, 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:603
+#: src/gnsrecord/plugin_gnsrecord_dns.c:601
 #, 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:630
+#: src/gnsrecord/plugin_gnsrecord_dns.c:628
 #, 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:646
+#: src/gnsrecord/plugin_gnsrecord_dns.c:644
 #, 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:663
+#: src/gnsrecord/plugin_gnsrecord_dns.c:661
 #, 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:687
-#: src/gnsrecord/plugin_gnsrecord_dns.c:703
+#: src/gnsrecord/plugin_gnsrecord_dns.c:685
+#: src/gnsrecord/plugin_gnsrecord_dns.c:701
 #, 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/hello/gnunet-hello.c:126
+#: src/hello/gnunet-hello.c:124
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:132
+#: src/hello/gnunet-hello.c:130
 #, fuzzy, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/hello/gnunet-hello.c:140
+#: src/hello/gnunet-hello.c:138
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:147
+#: src/hello/gnunet-hello.c:145
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:198
+#: src/hello/gnunet-hello.c:155 src/hello/gnunet-hello.c:196
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/hello/gnunet-hello.c:174
+#: src/hello/gnunet-hello.c:172
 #, fuzzy, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr "Không tìm thấy tập tin nào trong thư mục « %s »\n"
 
-#: src/hello/gnunet-hello.c:210
+#: src/hello/gnunet-hello.c:208
 #, fuzzy, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/hello/gnunet-hello.c:219
+#: src/hello/gnunet-hello.c:217
 #, c-format
 msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:1103
+#: src/hello/hello.c:1108
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:1112
+#: src/hello/hello.c:1117
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:1122
+#: src/hello/hello.c:1127
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/hello/hello.c:1133
+#: src/hello/hello.c:1138
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/hello/hello.c:1151
+#: src/hello/hello.c:1156
 #, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:1159
+#: src/hello/hello.c:1164
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1174
+#: src/hello/hello.c:1179
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:314
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:375
+#: src/hostlist/gnunet-daemon-hostlist.c:374
 #, fuzzy
 msgid "advertise our hostlist to other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:380
+#: src/hostlist/gnunet-daemon-hostlist.c:379
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
@@ -4650,488 +4595,465 @@ msgstr ""
 msgid "enable learning about hostlist servers from other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:387
+#: src/hostlist/gnunet-daemon-hostlist.c:388
 #, fuzzy
 msgid "provide a hostlist server"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:403
+#: src/hostlist/gnunet-daemon-hostlist.c:404
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:371
+#: src/hostlist/gnunet-daemon-hostlist_client.c:347
 #, fuzzy
 msgid "# bytes downloaded from hostlist servers"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:392
-#: src/hostlist/gnunet-daemon-hostlist_client.c:437
+#: src/hostlist/gnunet-daemon-hostlist_client.c:368
+#: src/hostlist/gnunet-daemon-hostlist_client.c:401
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:395
-#: src/hostlist/gnunet-daemon-hostlist_client.c:440
+#: src/hostlist/gnunet-daemon-hostlist_client.c:371
+#: src/hostlist/gnunet-daemon-hostlist_client.c:404
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:413
+#: src/hostlist/gnunet-daemon-hostlist_client.c:389
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:695
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
+#: src/hostlist/gnunet-daemon-hostlist_client.c:659
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:689
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:768
+#: src/hostlist/gnunet-daemon-hostlist_client.c:732
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:860
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:874
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:930
+#: src/hostlist/gnunet-daemon-hostlist_client.c:894
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:936
+#: src/hostlist/gnunet-daemon-hostlist_client.c:900
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:944
+#: src/hostlist/gnunet-daemon-hostlist_client.c:908
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:997
+#: src/hostlist/gnunet-daemon-hostlist_client.c:961
 #, fuzzy, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1005
+#: src/hostlist/gnunet-daemon-hostlist_client.c:969
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1096
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1663
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1105
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1164
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1185
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1351
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1356
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1365
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1399
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1402
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1448
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1515
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1479
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1496
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
-#: src/transport/plugin_transport_http_client.c:2277
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1593
+#: src/transport/plugin_transport_http_client.c:2272
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1622
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1636
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1649
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:176
+#: src/hostlist/gnunet-daemon-hostlist_server.c:174
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:201
+#: src/hostlist/gnunet-daemon-hostlist_server.c:199
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:237
-#: src/hostlist/gnunet-daemon-hostlist_server.c:531
-#: src/peerinfo-tool/gnunet-peerinfo.c:385
-#: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:857
+#: src/hostlist/gnunet-daemon-hostlist_server.c:235
+#: src/hostlist/gnunet-daemon-hostlist_server.c:529
+#: src/peerinfo-tool/gnunet-peerinfo.c:383
+#: src/peerinfo-tool/gnunet-peerinfo.c:532
+#: src/topology/gnunet-daemon-topology.c:860
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:261
+#: src/hostlist/gnunet-daemon-hostlist_server.c:259
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:278
+#: src/hostlist/gnunet-daemon-hostlist_server.c:276
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:385
+#: src/hostlist/gnunet-daemon-hostlist_server.c:383
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:397
+#: src/hostlist/gnunet-daemon-hostlist_server.c:395
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:408
+#: src/hostlist/gnunet-daemon-hostlist_server.c:406
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:411
+#: src/hostlist/gnunet-daemon-hostlist_server.c:409
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:416
+#: src/hostlist/gnunet-daemon-hostlist_server.c:414
 #, fuzzy
 msgid "Received request for our hostlist\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:418
+#: src/hostlist/gnunet-daemon-hostlist_server.c:416
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:466
+#: src/hostlist/gnunet-daemon-hostlist_server.c:464
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2803
+#: src/hostlist/gnunet-daemon-hostlist_server.c:677
+#: src/transport/gnunet-service-transport.c:2813
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:691
+#: src/hostlist/gnunet-daemon-hostlist_server.c:689
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:703
+#: src/hostlist/gnunet-daemon-hostlist_server.c:701
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:718
+#: src/hostlist/gnunet-daemon-hostlist_server.c:716
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:731
+#: src/hostlist/gnunet-daemon-hostlist_server.c:729
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:748
+#: src/hostlist/gnunet-daemon-hostlist_server.c:746
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:769
+#: src/hostlist/gnunet-daemon-hostlist_server.c:767
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:789
+#: src/hostlist/gnunet-daemon-hostlist_server.c:787
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#: src/hostlist/gnunet-daemon-hostlist_server.c:827
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 
-#: src/identity/gnunet-identity.c:163
+#: src/identity/gnunet-identity.c:177
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/identity/gnunet-identity.c:182
+#: src/identity/gnunet-identity.c:199
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/identity/gnunet-identity.c:324
+#: src/identity/gnunet-identity.c:354
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:360
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:365
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:371
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:336
+#: src/identity/gnunet-identity.c:376
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:382
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:348
+#: src/identity/gnunet-identity.c:396
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:390
+#: src/identity/gnunet-service-identity.c:389
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:412
+#: src/identity/gnunet-service-identity.c:414
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:501
-#: src/identity/gnunet-service-identity.c:773
-#: src/identity/gnunet-service-identity.c:895
+#: src/identity/gnunet-service-identity.c:505
+#: src/identity/gnunet-service-identity.c:788
+#: src/identity/gnunet-service-identity.c:916
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:508
+#: src/identity/gnunet-service-identity.c:513
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:601
+#: src/identity/gnunet-service-identity.c:608
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:750
+#: src/identity/gnunet-service-identity.c:763
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:789
-#: src/identity/gnunet-service-identity.c:912
+#: src/identity/gnunet-service-identity.c:806
+#: src/identity/gnunet-service-identity.c:934
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:946
+#: src/identity/gnunet-service-identity.c:969
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:1004
+#: src/identity/gnunet-service-identity.c:1027
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/identity/gnunet-service-identity.c:1014
+#: src/identity/gnunet-service-identity.c:1037
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/plugin_rest_identity.c:967
-#, fuzzy
-msgid "Identity REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/identity-provider/gnunet-identity-token.c:66
-#, fuzzy
-msgid "Option `-t' is required\n"
-msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
-
-#: src/identity-provider/gnunet-identity-token.c:77
+#: src/json/json.c:121
 #, fuzzy, c-format
-msgid "Token `%s' is malformed\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/identity-provider/gnunet-identity-token.c:163
-msgid "GNUid token"
-msgstr ""
-
-#: src/identity-provider/gnunet-identity-token.c:166
-msgid "Print token contents"
-msgstr ""
-
-#: src/identity-provider/plugin_rest_identity_provider.c:1163
-#, fuzzy
-msgid "Identity Token REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
+#: src/multicast/gnunet-multicast.c:46 src/multicast/gnunet-multicast.c:70
 msgid "This command doesn't do anything yet."
 msgstr ""
 
-#: src/my/my.c:198 src/my/my.c:217
+#: src/my/my.c:194 src/my/my.c:213
 #, 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:180
+#: src/mysql/mysql.c:178
 #, 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:187
+#: src/mysql/mysql.c:185
 #, 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:107
+#: 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:122 src/namestore/gnunet-namestore.c:415
+#: src/namecache/gnunet-namecache.c:120 src/namestore/gnunet-namestore.c:424
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:183
+#: src/namecache/gnunet-namecache.c:181
 #, 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:193
+#: src/namecache/gnunet-namecache.c:191
 #, 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:201
+#: src/namecache/gnunet-namecache.c:199
 #, 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:230 src/namestore/gnunet-namestore.c:1153
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1290
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:233
+#: src/namecache/gnunet-namecache.c:236
 #, fuzzy
 msgid "spezifies 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:244 src/namestore/gnunet-namestore.c:1189
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1342
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
 
-#: src/namecache/namecache_api.c:296
+#: src/namecache/namecache_api.c:294
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:383
+#: src/namecache/namecache_api.c:381
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
 #: src/namecache/plugin_namecache_flat.c:119
 #: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:179
-#: src/namestore/plugin_namestore_flat.c:375
-#: src/peerstore/plugin_peerstore_flat.c:379
-#: src/peerstore/plugin_peerstore_flat.c:527
+#: src/namestore/plugin_namestore_heap.c:146
+#: src/namestore/plugin_namestore_heap.c:393
+#: src/peerstore/plugin_peerstore_flat.c:377
+#: src/peerstore/plugin_peerstore_flat.c:536
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
 #: src/namecache/plugin_namecache_flat.c:130
-#: src/namestore/plugin_namestore_flat.c:190
-#: src/peerstore/plugin_peerstore_flat.c:394
+#: src/namestore/plugin_namestore_heap.c:157
+#: src/peerstore/plugin_peerstore_flat.c:392
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "Không thể tạo miền tên.\n"
 
 #: src/namecache/plugin_namecache_flat.c:149
-#: src/namestore/plugin_namestore_flat.c:203
-#: src/peerstore/plugin_peerstore_flat.c:406
+#: src/namestore/plugin_namestore_heap.c:170
+#: src/peerstore/plugin_peerstore_flat.c:404
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "Không thể tạo miền tên.\n"
@@ -5141,619 +5063,600 @@ msgstr "Không thể tạo miền tên.\n"
 msgid "flat plugin running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/namecache/plugin_namecache_postgres.c:90
-#: src/namestore/plugin_namestore_postgres.c:97
-#, fuzzy
-msgid "Failed to create indices\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/namestore/gnunet-namestore.c:301
+#: src/namestore/gnunet-namestore.c:311
 #, 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:330
-#: src/namestore/plugin_rest_namestore.c:562
+#: src/namestore/gnunet-namestore.c:341
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:571
+#: src/namestore/gnunet-namestore.c:348
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
-#: src/namestore/gnunet-namestore.c:535
+#: src/namestore/gnunet-namestore.c:628 src/namestore/gnunet-namestore.c:636
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
-#: src/namestore/gnunet-namestore.c:573
+#: src/namestore/gnunet-namestore.c:650 src/namestore/gnunet-namestore.c:662
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-#: src/namestore/plugin_rest_namestore.c:597
+#: src/namestore/gnunet-namestore.c:675
 #, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
+msgid ""
+"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:739
+#: src/namestore/gnunet-namestore.c:809
 #, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
+msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:776
-#: src/namestore/plugin_rest_namestore.c:1003
+#: src/namestore/gnunet-namestore.c:850
 #, c-format
-msgid "Ego `%s' not known to identity service\n"
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:791
+#: src/namestore/gnunet-namestore.c:902
 #, fuzzy, c-format
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:802
-#: src/namestore/gnunet-namestore-fcfsd.c:1034
-#: src/namestore/plugin_rest_namestore.c:1016
-#, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr "Không kết nối được đến trình nền gnunetd."
-
-#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819
-#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
-#: src/namestore/gnunet-namestore.c:915
+#: src/namestore/gnunet-namestore.c:921 src/namestore/gnunet-namestore.c:930
+#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:972
+#: src/namestore/gnunet-namestore.c:1026
 #, 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:811 src/namestore/gnunet-namestore.c:820
-#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:974
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:829
-#: src/namestore/plugin_rest_namestore.c:671
+#: src/namestore/gnunet-namestore.c:940
 #, 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:851
-#: src/namestore/plugin_rest_namestore.c:689
-#: src/namestore/plugin_rest_namestore.c:729
+#: src/namestore/gnunet-namestore.c:962
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:896
+#: src/namestore/gnunet-namestore.c:1007
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1027
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:950
+#: src/namestore/gnunet-namestore.c:1070
 #, 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:979
-#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:1099
+#: src/peerinfo-tool/gnunet-peerinfo.c:773
 #, 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:1014
+#: src/namestore/gnunet-namestore.c:1134
 #, 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:1051
-#: src/namestore/plugin_rest_namestore.c:1046
+#: src/namestore/gnunet-namestore.c:1174
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1108
-#: src/namestore/plugin_rest_namestore.c:1142
+#: src/namestore/gnunet-namestore.c:1238
 #, 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:1135
+#: src/namestore/gnunet-namestore.c:1263
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1138
+#: src/namestore/gnunet-namestore.c:1267
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1141
+#: src/namestore/gnunet-namestore.c:1271
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1144
+#: src/namestore/gnunet-namestore.c:1276
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1281
 #, 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:1150
+#: src/namestore/gnunet-namestore.c:1285
 #, 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:1156
+#: src/namestore/gnunet-namestore.c:1295
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1300
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1162
+#: src/namestore/gnunet-namestore.c:1305
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1165
+#: src/namestore/gnunet-namestore.c:1310
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1314
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1171
+#: src/namestore/gnunet-namestore.c:1318
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1174
+#: src/namestore/gnunet-namestore.c:1323
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:508
+#: src/namestore/gnunet-namestore-fcfsd.c:547
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:535
+#: src/namestore/gnunet-namestore-fcfsd.c:574
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:555
+#: src/namestore/gnunet-namestore-fcfsd.c:595
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:585
+#: src/namestore/gnunet-namestore-fcfsd.c:627
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:662
+#: src/namestore/gnunet-namestore-fcfsd.c:687
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:718
+#: src/namestore/gnunet-namestore-fcfsd.c:775
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:734
+#: src/namestore/gnunet-namestore-fcfsd.c:794
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:770
+#: src/namestore/gnunet-namestore-fcfsd.c:830
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:778
+#: src/namestore/gnunet-namestore-fcfsd.c:839
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:974
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1000
+#: src/namestore/gnunet-namestore-fcfsd.c:1097
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1042
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1074
+#: src/namestore/gnunet-namestore-fcfsd.c:1171
+msgid "name of the zone that is to be managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:612
+#: src/namestore/gnunet-service-namestore.c:749
 #, 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/namestore/namestore_api.c:379
+#: src/namestore/gnunet-zoneimport.c:2036
+msgid "size to use for the main hash map"
+msgstr ""
+
+#: src/namestore/gnunet-zoneimport.c:2041
+msgid "minimum expiration time we assume for imported records"
+msgstr ""
+
+#: src/namestore/namestore_api.c:389
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:656
+#: src/namestore/plugin_namestore_heap.c:776
 #, fuzzy
-msgid "flat file database running\n"
+msgid "heap file database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/namestore/plugin_rest_namestore.c:1187
-#, fuzzy
-msgid "Namestore REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
+#: src/namestore/plugin_namestore_sqlite.c:216
+#: src/namestore/plugin_namestore_sqlite.c:227
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/nat-auto/gnunet-nat-auto.c:192
+#: src/nat-auto/gnunet-nat-auto.c:191
 #, fuzzy
 msgid "Suggested configuration changes:\n"
 msgstr ""
 "\n"
 "CHƯA lưu các thay đổi trong cấu hình.\n"
 
-#: src/nat-auto/gnunet-nat-auto.c:220
+#: src/nat-auto/gnunet-nat-auto.c:217
 #, fuzzy, c-format
 msgid "Failed to write configuration to `%s'\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/nat-auto/gnunet-nat-auto.c:227
+#: src/nat-auto/gnunet-nat-auto.c:224
 #, fuzzy, c-format
 msgid "Wrote updated configuration to `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/nat-auto/gnunet-nat-auto.c:345
+#: src/nat-auto/gnunet-nat-auto.c:343
 #, fuzzy
 msgid "run autoconfiguration"
 msgstr "Cấu hình hạn ngạch"
 
-#: src/nat-auto/gnunet-nat-auto.c:348
+#: src/nat-auto/gnunet-nat-auto.c:349
 msgid "section name providing the configuration for the adapter"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:436
+#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:451
 msgid "use TCP"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:439
+#: src/nat-auto/gnunet-nat-auto.c:359 src/nat/gnunet-nat.c:456
 msgid "use UDP"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:357
+#: src/nat-auto/gnunet-nat-auto.c:364
 msgid "write configuration file (for autoconfiguration)"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:369
+#: src/nat-auto/gnunet-nat-auto.c:376
 #, fuzzy
 msgid "GNUnet NAT traversal autoconfiguration"
 msgstr "Cấu hình GNUnet"
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:403
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681
-#: src/nat-auto/nat_auto_api_test.c:405
+#: src/nat-auto/gnunet-nat-auto_legacy.c:401
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:679
+#: src/nat-auto/nat_auto_api_test.c:403
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:518
+#: src/nat-auto/gnunet-nat-auto_legacy.c:516
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:568
-#: src/nat-auto/nat_auto_api_test.c:571
+#: src/nat-auto/gnunet-nat-auto_legacy.c:566
+#: src/nat-auto/nat_auto_api_test.c:569
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat-auto/gnunet-nat-server.c:338
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-server.c:388
-msgid "GNUnet NAT traversal test helper daemon"
-msgstr ""
-
-#: src/nat-auto/gnunet-service-nat-auto.c:342
+#: src/nat-auto/gnunet-service-nat-auto.c:340
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:383
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:384
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:403
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:435
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:570
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:588
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:722
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:723
 msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:760
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:772
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:832
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:784
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:844
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:821
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:76
+#: src/nat-auto/nat_auto_api.c:74
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:78
+#: src/nat-auto/nat_auto_api.c:76
 msgid "IPC failure"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:80
+#: src/nat-auto/nat_auto_api.c:78
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:82
+#: src/nat-auto/nat_auto_api.c:80
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:84
+#: src/nat-auto/nat_auto_api.c:82
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:86
+#: src/nat-auto/nat_auto_api.c:84
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:88
+#: src/nat-auto/nat_auto_api.c:86
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat-auto/nat_auto_api.c:90
+#: src/nat-auto/nat_auto_api.c:88
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:92
+#: src/nat-auto/nat_auto_api.c:90
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:94
+#: src/nat-auto/nat_auto_api.c:92
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:96
+#: src/nat-auto/nat_auto_api.c:94
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat-auto/nat_auto_api.c:98
+#: src/nat-auto/nat_auto_api.c:96
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:100
+#: src/nat-auto/nat_auto_api.c:98
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:102
+#: src/nat-auto/nat_auto_api.c:100
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/nat-auto/nat_auto_api.c:104
+#: src/nat-auto/nat_auto_api.c:102
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:106
+#: src/nat-auto/nat_auto_api.c:104
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:108
+#: src/nat-auto/nat_auto_api.c:106
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:110
+#: src/nat-auto/nat_auto_api.c:108
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:112
+#: src/nat-auto/nat_auto_api.c:110
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api_test.c:477
+#: src/nat-auto/nat_auto_api_test.c:475
 #, fuzzy, c-format
 msgid "Failed to find valid PORT in section `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/nat-auto/nat_auto_api_test.c:522
+#: src/nat-auto/nat_auto_api_test.c:520
 #, fuzzy, c-format
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/nat/gnunet-nat.c:424
+#: src/nat/gnunet-nat.c:429
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:427
+#: src/nat/gnunet-nat.c:435
 msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:430
+#: src/nat/gnunet-nat.c:441
 msgid ""
 "name of configuration section to find additional options, such as manual "
 "host punching data"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:433
+#: src/nat/gnunet-nat.c:446
 msgid "enable STUN processing"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:442
+#: src/nat/gnunet-nat.c:461
 msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:454
+#: src/nat/gnunet-nat.c:473
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1317
+#: src/nat/gnunet-service-nat.c:1337
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1327
+#: src/nat/gnunet-service-nat.c:1347
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1343
+#: src/nat/gnunet-service-nat.c:1363
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1354
+#: src/nat/gnunet-service-nat.c:1374
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1813
+#: src/nat/gnunet-service-nat.c:1839
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Thu thập bị dừng.\n"
 
-#: src/nat/gnunet-service-nat.c:1886
+#: src/nat/gnunet-service-nat.c:1912
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:186
+#: src/nat/gnunet-service-nat_helper.c:184
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:260
+#: src/nat/gnunet-service-nat_helper.c:271
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/gnunet-service-nat_mini.c:196
+#: src/nat/gnunet-service-nat_mini.c:194
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:656
+#: src/nat/gnunet-service-nat_mini.c:654
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:122
+#: src/nse/gnunet-nse.c:120
 #, fuzzy
 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-nse-profiler.c:840
+#: src/nse/gnunet-nse-profiler.c:847
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/nse/gnunet-nse-profiler.c:843
+#: src/nse/gnunet-nse-profiler.c:852
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:849
+#: src/nse/gnunet-nse-profiler.c:864
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:852
+#: src/nse/gnunet-nse-profiler.c:871
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:858
+#: src/nse/gnunet-nse-profiler.c:882
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:867
+#: src/nse/gnunet-nse-profiler.c:891
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
+#: src/nse/gnunet-service-nse.c:1532
+#: src/revocation/gnunet-service-revocation.c:841 src/util/gnunet-scrypt.c:274
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "Giá trị không nằm trong phạm vi được phép."
 
-#: src/peerinfo/gnunet-service-peerinfo.c:178
+#: src/peerinfo/gnunet-service-peerinfo.c:176
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:310
+#: src/peerinfo/gnunet-service-peerinfo.c:311
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:331
-#: src/peerinfo/gnunet-service-peerinfo.c:362
+#: src/peerinfo/gnunet-service-peerinfo.c:332
+#: src/peerinfo/gnunet-service-peerinfo.c:363
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:446
+#: src/peerinfo/gnunet-service-peerinfo.c:447
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:489
+#: src/peerinfo/gnunet-service-peerinfo.c:490
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5761,980 +5664,1139 @@ msgstr ""
 "Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
 "bỏ.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:655
+#: src/peerinfo/gnunet-service-peerinfo.c:657
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:663
+#: src/peerinfo/gnunet-service-peerinfo.c:665
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1076
+#: src/peerinfo/gnunet-service-peerinfo.c:1098
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1405
+#: src/peerinfo/gnunet-service-peerinfo.c:1436
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1418
+#: src/peerinfo/gnunet-service-peerinfo.c:1449
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:220
+#: src/peerinfo/peerinfo_api.c:218
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:237
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:246
+#: src/peerinfo-tool/gnunet-peerinfo.c:244
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:299
+#: src/peerinfo-tool/gnunet-peerinfo.c:297
+#: src/rest-plugins/plugin_rest_peerinfo.c:499
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:466
+#: src/peerinfo-tool/gnunet-peerinfo.c:464
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:480
+#: src/peerinfo-tool/gnunet-peerinfo.c:478
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:499
+#: src/peerinfo-tool/gnunet-peerinfo.c:497
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:799
+#: src/peerinfo-tool/gnunet-peerinfo.c:797
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:842
+#: src/peerinfo-tool/gnunet-peerinfo.c:841
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:845
+#: src/peerinfo-tool/gnunet-peerinfo.c:846
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:848
+#: src/peerinfo-tool/gnunet-peerinfo.c:850
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:851
+#: src/peerinfo-tool/gnunet-peerinfo.c:855
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:854
+#: src/peerinfo-tool/gnunet-peerinfo.c:860
 #, fuzzy
 msgid "list all known peers"
 msgstr "liệt kê mọi bộ tiếp hợp mạng"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:857
+#: src/peerinfo-tool/gnunet-peerinfo.c:866
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:860
+#: src/peerinfo-tool/gnunet-peerinfo.c:871
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:863
+#: src/peerinfo-tool/gnunet-peerinfo.c:877
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:880
+#: src/peerinfo-tool/gnunet-peerinfo.c:895
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:168
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:103
+#: src/transport/gnunet-service-transport_plugins.c:166
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:173
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:107
+#: src/transport/gnunet-service-transport_plugins.c:171
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:208
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:206
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/peerstore/gnunet-peerstore.c:91
+#: src/peerstore/gnunet-peerstore.c:89
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:588
+#: src/peerstore/gnunet-service-peerstore.c:596
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/peerstore/peerstore_api.c:296
-#, c-format
-msgid "Received an error notification from MQ of type: %d\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:344
+#: src/peerstore/peerstore_api.c:348
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
+#: src/peerstore/peerstore_api.c:564 src/peerstore/peerstore_api.c:613
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "Định dạng kết xuất không rõ, điều này không nên xảy ra.\n"
 
-#: src/peerstore/peerstore_api.c:623
+#: src/peerstore/peerstore_api.c:627
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/peerstore/peerstore_api.c:768
+#: src/peerstore/peerstore_api.c:776
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:398
-#: src/psycstore/plugin_psycstore_sqlite.c:282
+#: src/peerstore/plugin_peerstore_sqlite.c:451
+#: src/psycstore/plugin_psycstore_sqlite.c:280
 #, fuzzy, c-format
 msgid ""
 "Error executing SQL query: %s\n"
 "  %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:422
-#: src/psycstore/plugin_psycstore_mysql.c:250
-#: src/psycstore/plugin_psycstore_sqlite.c:259
+#: src/peerstore/plugin_peerstore_sqlite.c:486
+#: src/psycstore/plugin_psycstore_mysql.c:248
+#: src/psycstore/plugin_psycstore_sqlite.c:257
 #, fuzzy, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
 "  %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:504
+#: src/peerstore/plugin_peerstore_sqlite.c:568
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/postgres/postgres.c:67
-#, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s\n"
-msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
-
-#: src/postgres/postgres.c:192
+#: src/pq/pq_prepare.c:82
 #, fuzzy, c-format
-msgid "Unable to connect to Postgres database '%s': %s\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
+msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
+msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:249
+#: src/psycstore/gnunet-service-psycstore.c:247
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:271
+#: src/psycstore/gnunet-service-psycstore.c:269
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:300
+#: src/psycstore/gnunet-service-psycstore.c:298
 #, fuzzy
 msgid "Dropping invalid fragment\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:311
+#: src/psycstore/gnunet-service-psycstore.c:309
 #, fuzzy
 msgid "Failed to store fragment\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:368
+#: src/psycstore/gnunet-service-psycstore.c:366
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:434
+#: src/psycstore/gnunet-service-psycstore.c:432
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:464
+#: src/psycstore/gnunet-service-psycstore.c:462
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:494
+#: src/psycstore/gnunet-service-psycstore.c:492
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:675
+#: src/psycstore/gnunet-service-psycstore.c:673
 #, fuzzy, c-format
 msgid "Failed to begin modifying state: %d\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:685
+#: src/psycstore/gnunet-service-psycstore.c:683
 #, fuzzy, c-format
 msgid "Failed to modify state: %d\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:693
+#: src/psycstore/gnunet-service-psycstore.c:691
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:730
+#: src/psycstore/gnunet-service-psycstore.c:728
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:744
+#: src/psycstore/gnunet-service-psycstore.c:742
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:761
+#: src/psycstore/gnunet-service-psycstore.c:759
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:779
-#: src/psycstore/gnunet-service-psycstore.c:795
+#: src/psycstore/gnunet-service-psycstore.c:777
+#: src/psycstore/gnunet-service-psycstore.c:793
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:824
-#: src/psycstore/gnunet-service-psycstore.c:881
+#: src/psycstore/gnunet-service-psycstore.c:822
+#: src/psycstore/gnunet-service-psycstore.c:879
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:851
-#: src/psycstore/gnunet-service-psycstore.c:896
+#: src/psycstore/gnunet-service-psycstore.c:849
+#: src/psycstore/gnunet-service-psycstore.c:894
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/plugin_psycstore_mysql.c:281
+#: src/psycstore/plugin_psycstore_mysql.c:279
 #, fuzzy
 msgid "Unable to initialize Mysql.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/psycstore/plugin_psycstore_mysql.c:291
+#: src/psycstore/plugin_psycstore_mysql.c:289
 #, fuzzy, c-format
 msgid "Failed to run SQL statement `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:61
+#: src/psycstore/plugin_psycstore_sqlite.c:59
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1924
+#: src/psycstore/plugin_psycstore_sqlite.c:1922
 #, fuzzy
 msgid "SQLite database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/pt/gnunet-daemon-pt.c:493
+#: src/pt/gnunet-daemon-pt.c:421
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:499
+#: src/pt/gnunet-daemon-pt.c:427
 #, 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:553
+#: src/pt/gnunet-daemon-pt.c:481
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:737
+#: src/pt/gnunet-daemon-pt.c:665
 #, fuzzy
 msgid "# DNS replies intercepted"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/pt/gnunet-daemon-pt.c:744
+#: src/pt/gnunet-daemon-pt.c:672
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:851
+#: src/pt/gnunet-daemon-pt.c:710
 #, 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:909
+#: src/pt/gnunet-daemon-pt.c:766
 #, 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:914
+#: src/pt/gnunet-daemon-pt.c:771
 #, 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:922
+#: src/pt/gnunet-daemon-pt.c:779
 #, 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:995
+#: src/pt/gnunet-daemon-pt.c:874
 #, 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:1011
+#: src/pt/gnunet-daemon-pt.c:891
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/pt/gnunet-daemon-pt.c:1294 src/pt/gnunet-daemon-pt.c:1303
-#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
-#: src/pt/gnunet-daemon-pt.c:1345
+#: src/pt/gnunet-daemon-pt.c:1217 src/pt/gnunet-daemon-pt.c:1226
+#: src/pt/gnunet-daemon-pt.c:1242 src/pt/gnunet-daemon-pt.c:1251
+#: src/pt/gnunet-daemon-pt.c:1260
 #, 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:1390
+#: src/pt/gnunet-daemon-pt.c:1305
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:267
+#: src/reclaim/gnunet-reclaim.c:465
+#, fuzzy, c-format
+msgid "Ego is required\n"
+msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
+
+#: src/reclaim/gnunet-reclaim.c:473
+#, c-format
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:481
+#, fuzzy, c-format
+msgid "Requesting party key is required!\n"
+msgstr "đặt tên hiệu cần dùng (cần thiết)"
+
+#: src/reclaim/gnunet-reclaim.c:504
+msgid "Add attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:510
+msgid "Attribute value"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:515
+msgid "Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:520
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:529
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:534
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:539
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:544
+msgid "Type of attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:549
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/reclaim/reclaim_api.c:434
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/regex/gnunet-daemon-regexprofiler.c:265
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:380
+#: src/regex/gnunet-daemon-regexprofiler.c:378
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1314
+#: src/regex/gnunet-regex-profiler.c:1384
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/regex/gnunet-regex-profiler.c:1355
-#: src/regex/gnunet-regex-simulation-profiler.c:630
+#: src/regex/gnunet-regex-profiler.c:1425
+#: src/regex/gnunet-regex-simulation-profiler.c:628
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1361
-#: src/regex/gnunet-regex-simulation-profiler.c:638
+#: src/regex/gnunet-regex-profiler.c:1431
+#: src/regex/gnunet-regex-simulation-profiler.c:636
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1368
+#: src/regex/gnunet-regex-profiler.c:1438
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/regex/gnunet-regex-profiler.c:1377
+#: src/regex/gnunet-regex-profiler.c:1447
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1397
+#: src/regex/gnunet-regex-profiler.c:1467
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1482
+#: src/regex/gnunet-regex-profiler.c:1555
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1485
+#: src/regex/gnunet-regex-profiler.c:1561
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1488
+#: src/regex/gnunet-regex-profiler.c:1567
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1491
+#: src/regex/gnunet-regex-profiler.c:1574
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1494
+#: src/regex/gnunet-regex-profiler.c:1580
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1506
+#: src/regex/gnunet-regex-profiler.c:1593
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:696
+#: src/regex/gnunet-regex-simulation-profiler.c:697
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:699
+#: src/regex/gnunet-regex-simulation-profiler.c:703
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:712
+#: src/regex/gnunet-regex-simulation-profiler.c:717
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api_announce.c:152
+#: src/regex/regex_api_announce.c:150
 #, fuzzy, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/regex/regex_api_search.c:212
+#: src/regex/regex_api_search.c:210
 #, fuzzy, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/rest/gnunet-rest-server.c:788
+#: src/rest/gnunet-rest-server.c:925
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:805
+#: src/rest/gnunet-rest-server.c:942
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Bản ghi lỗi GNUnet"
 
-#: src/revocation/gnunet-revocation.c:129
+#: src/rest-plugins/plugin_rest_copying.c:207
+#, fuzzy
+msgid "COPYING REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugins/plugin_rest_credential.c:1126
+#, fuzzy
+msgid "GNS REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugins/plugin_rest_gns.c:450
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugins/plugin_rest_identity.c:1295
+#, fuzzy
+msgid "Identity REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugins/plugin_rest_namestore.c:1077
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugins/plugin_rest_openid_connect.c:2135
+#: src/rest-plugins/plugin_rest_reclaim.c:1079
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugins/plugin_rest_peerinfo.c:794
+#, fuzzy
+msgid "Peerinfo REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/revocation/gnunet-revocation.c:127
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
 msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
 
-#: src/revocation/gnunet-revocation.c:134
+#: src/revocation/gnunet-revocation.c:132
 #, fuzzy, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/revocation/gnunet-revocation.c:140
+#: src/revocation/gnunet-revocation.c:138
 #, fuzzy
 msgid "Internal error\n"
 msgstr "Lỗi VR."
 
-#: src/revocation/gnunet-revocation.c:166
+#: src/revocation/gnunet-revocation.c:164
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:171
+#: src/revocation/gnunet-revocation.c:169
 #, fuzzy
 msgid "Revocation failed (!)\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/revocation/gnunet-revocation.c:176
+#: src/revocation/gnunet-revocation.c:174
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:181
+#: src/revocation/gnunet-revocation.c:179
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:186
+#: src/revocation/gnunet-revocation.c:184
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:323
+#: src/revocation/gnunet-revocation.c:321
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:352
+#: src/revocation/gnunet-revocation.c:350
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/revocation/gnunet-revocation.c:373
+#: src/revocation/gnunet-revocation.c:371
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:393
+#: src/revocation/gnunet-revocation.c:391
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:403
+#: src/revocation/gnunet-revocation.c:401
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1176
+#: src/revocation/gnunet-revocation.c:435 src/social/gnunet-social.c:1178
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/revocation/gnunet-revocation.c:450
+#: src/revocation/gnunet-revocation.c:448
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:470
+#: src/revocation/gnunet-revocation.c:468
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/revocation/gnunet-revocation.c:491
+#: src/revocation/gnunet-revocation.c:489
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/revocation/gnunet-revocation.c:516
+#: src/revocation/gnunet-revocation.c:514
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Chưa xác định giao diện nên dùng mặc định.\n"
 
-#: src/revocation/gnunet-revocation.c:532
+#: src/revocation/gnunet-revocation.c:533
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:535
+#: src/revocation/gnunet-revocation.c:539
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:538
+#: src/revocation/gnunet-revocation.c:544
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:541
+#: src/revocation/gnunet-revocation.c:550
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:456
+#: src/revocation/gnunet-service-revocation.c:457
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/revocation/gnunet-service-revocation.c:464
+#: src/revocation/gnunet-service-revocation.c:466
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/revocation/gnunet-service-revocation.c:469
+#: src/revocation/gnunet-service-revocation.c:471
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:473
+#: src/revocation/gnunet-service-revocation.c:475
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/revocation/gnunet-service-revocation.c:482
+#: src/revocation/gnunet-service-revocation.c:484
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/revocation/gnunet-service-revocation.c:519
-#: src/revocation/gnunet-service-revocation.c:765
-msgid "SET service crashed, terminating revocation service\n"
+#: src/revocation/gnunet-service-revocation.c:523
+msgid "SET service crashed, terminating revocation service\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:865
+#, fuzzy
+msgid "Could not open revocation database file!"
+msgstr "« %s »: Không thể kết nối.\n"
+
+#: src/rps/gnunet-rps.c:258
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:262
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:266
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2770
+msgid "duration of the profiling"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:856
+#: src/rps/gnunet-rps-profiler.c:2776
 #, fuzzy
-msgid "Could not open revocation database file!"
-msgstr "« %s »: Không thể kết nối.\n"
+msgid "timeout for the profiling"
+msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/rps/gnunet-rps.c:177
-msgid "Seed a PeerID"
-msgstr ""
+#: src/rps/gnunet-rps-profiler.c:2782
+#, fuzzy
+msgid "number of PeerIDs to request"
+msgstr "số lần lặp lại"
+
+#: src/rps/gnunet-rps-profiler.c:2797
+#, fuzzy
+msgid "Measure quality and performance of the RPS service."
+msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:220
+#: src/scalarproduct/gnunet-scalarproduct.c:218
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:227
+#: src/scalarproduct/gnunet-scalarproduct.c:225
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:240
+#: src/scalarproduct/gnunet-scalarproduct.c:238
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:258
+#: src/scalarproduct/gnunet-scalarproduct.c:256
 msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:280
+#: src/scalarproduct/gnunet-scalarproduct.c:278
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:298
+#: src/scalarproduct/gnunet-scalarproduct.c:296
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:325
+#: src/scalarproduct/gnunet-scalarproduct.c:323
 #, c-format
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:349
+#: src/scalarproduct/gnunet-scalarproduct.c:355
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:361
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:354
+#: src/scalarproduct/gnunet-scalarproduct.c:367
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:363
+#: src/scalarproduct/gnunet-scalarproduct.c:377
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1404
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1342
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1177
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1060
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1399
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1343
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1170
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1061
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Không kết nối được (lỗi ?)\n"
 
-#: src/scalarproduct/scalarproduct_api.c:185
+#: src/scalarproduct/scalarproduct_api.c:183
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/secretsharing/gnunet-secretsharing-profiler.c:614
 msgid "dkg start delay"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+#: src/secretsharing/gnunet-secretsharing-profiler.c:620
 msgid "dkg timeout"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+#: src/secretsharing/gnunet-secretsharing-profiler.c:626
 msgid "threshold"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+#: src/secretsharing/gnunet-secretsharing-profiler.c:631
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2068
+#: src/set/gnunet-service-set.c:2004
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:249
+#: src/set/gnunet-set-ibf-profiler.c:250
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "số lần lặp lại"
 
-#: src/set/gnunet-set-ibf-profiler.c:252
+#: src/set/gnunet-set-ibf-profiler.c:256
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "số lần lặp lại"
 
-#: src/set/gnunet-set-ibf-profiler.c:255
+#: src/set/gnunet-set-ibf-profiler.c:262
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:258
+#: src/set/gnunet-set-ibf-profiler.c:268
 msgid "hash num"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:261
+#: src/set/gnunet-set-ibf-profiler.c:274
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:387
+#: src/set/gnunet-set-profiler.c:442
+msgid "use byzantine mode"
+msgstr ""
+
+#: src/set/gnunet-set-profiler.c:448
+msgid "force sending full set"
+msgstr ""
+
+#: src/set/gnunet-set-profiler.c:454
+msgid "number delta operation"
+msgstr ""
+
+#: src/set/gnunet-set-profiler.c:466
 msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1163
+#: src/set/gnunet-set-profiler.c:472
+msgid "element size"
+msgstr ""
+
+#: src/social/gnunet-social.c:1164
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/social/gnunet-social.c:1212
+#: src/social/gnunet-social.c:1215
 msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/social/gnunet-social.c:1216
+#: src/social/gnunet-social.c:1220
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1220
+#: src/social/gnunet-social.c:1225
 msgid "create a place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1224
+#: src/social/gnunet-social.c:1230
 msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1228
+#: src/social/gnunet-social.c:1235
 msgid "enter somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1232
+#: src/social/gnunet-social.c:1241
 msgid "find state matching name prefix"
 msgstr ""
 
-#: src/social/gnunet-social.c:1236
+#: src/social/gnunet-social.c:1246
 msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/social/gnunet-social.c:1240
+#: src/social/gnunet-social.c:1251
 msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1244
+#: src/social/gnunet-social.c:1256
 msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1248
+#: src/social/gnunet-social.c:1261
 msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1252
+#: src/social/gnunet-social.c:1266
 msgid "search for state matching exact name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1256
+#: src/social/gnunet-social.c:1271
 msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1260
+#: src/social/gnunet-social.c:1276
 msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/social/gnunet-social.c:1264
+#: src/social/gnunet-social.c:1281
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/social/gnunet-social.c:1271
+#: src/social/gnunet-social.c:1290
 msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1275
+#: src/social/gnunet-social.c:1296
 msgid "message body or state value"
 msgstr ""
 
-#: src/social/gnunet-social.c:1279
+#: src/social/gnunet-social.c:1302
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/social/gnunet-social.c:1283
+#: src/social/gnunet-social.c:1307
 #, fuzzy
 msgid "wait for incoming messages"
 msgstr "Lỗi gửi tin nhẳn.\n"
 
-#: src/social/gnunet-social.c:1287
+#: src/social/gnunet-social.c:1313
 msgid "GNS name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1291
+#: src/social/gnunet-social.c:1319
 msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/social/gnunet-social.c:1295
+#: src/social/gnunet-social.c:1325
 msgid "name (key) to query from state"
 msgstr ""
 
-#: src/social/gnunet-social.c:1299
+#: src/social/gnunet-social.c:1331
 msgid "method name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1303
+#: src/social/gnunet-social.c:1337
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "số tin nhắn cần dùng mỗi lần lặp"
 
-#: src/social/gnunet-social.c:1307
+#: src/social/gnunet-social.c:1343
 msgid "key address of place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1311
+#: src/social/gnunet-social.c:1349
 msgid "start message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1315
+#: src/social/gnunet-social.c:1354
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1319
+#: src/social/gnunet-social.c:1360
 msgid "end message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1323
+#: src/social/gnunet-social.c:1365
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1333
+#: src/social/gnunet-social.c:1375
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:338
+#: src/sq/sq.c:52
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+
+#: src/sq/sq.c:59
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+
+#: src/sq/sq.c:137
+#, fuzzy, c-format
+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:336
 #, 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:1083
+#: src/statistics/gnunet-service-statistics.c:1084
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:158
+#: src/statistics/gnunet-statistics.c:407
+#: src/statistics/gnunet-statistics.c:448
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:161
+#: src/statistics/gnunet-statistics.c:410
+#: src/statistics/gnunet-statistics.c:451
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:219
+#: src/statistics/gnunet-statistics.c:526
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:227
+#: src/statistics/gnunet-statistics.c:534
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:270
+#: src/statistics/gnunet-statistics.c:577
 #, fuzzy, c-format
 msgid "No subsystem or name given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/statistics/gnunet-statistics.c:285
+#: src/statistics/gnunet-statistics.c:592
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:321
+#: src/statistics/gnunet-statistics.c:727
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:339
+#: src/statistics/gnunet-statistics.c:745
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/statistics/gnunet-statistics.c:347
+#: src/statistics/gnunet-statistics.c:753
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:383
+#: src/statistics/gnunet-statistics.c:784
+#, c-format
+msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:817
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:386
+#: src/statistics/gnunet-statistics.c:822
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:389
+#: src/statistics/gnunet-statistics.c:828
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:392
+#: src/statistics/gnunet-statistics.c:834
+msgid "use as csv separator"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:840
+msgid "path to the folder containing the testbed data"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:845
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:395
+#: src/statistics/gnunet-statistics.c:850
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:398
+#: src/statistics/gnunet-statistics.c:856
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:401
+#: src/statistics/gnunet-statistics.c:862
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:417
+#: src/statistics/gnunet-statistics.c:879
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
-#: src/statistics/statistics_api.c:753
+#: src/statistics/statistics_api.c:751
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/testbed/generate-underlay-topology.c:225
+#: src/testbed/generate-underlay-topology.c:223
 #, fuzzy
 msgid "Need at least 2 arguments\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/testbed/generate-underlay-topology.c:230
+#: src/testbed/generate-underlay-topology.c:228
 msgid "Database filename missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:237
+#: src/testbed/generate-underlay-topology.c:235
 msgid "Topology string missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:242
+#: src/testbed/generate-underlay-topology.c:240
 #, fuzzy, c-format
 msgid "Invalid topology: %s\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/testbed/generate-underlay-topology.c:255
+#: src/testbed/generate-underlay-topology.c:253
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:261
+#: src/testbed/generate-underlay-topology.c:259
 #, fuzzy, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/testbed/generate-underlay-topology.c:269
+#: src/testbed/generate-underlay-topology.c:267
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:283
+#: src/testbed/generate-underlay-topology.c:281
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:289
+#: src/testbed/generate-underlay-topology.c:287
 #, fuzzy, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/testbed/generate-underlay-topology.c:339
+#: src/testbed/generate-underlay-topology.c:340
 #: src/testbed/gnunet-testbed-profiler.c:281
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:348
+#: src/testbed/generate-underlay-topology.c:350
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6758,7 +6820,7 @@ msgid ""
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:315
+#: src/testbed/gnunet-daemon-latency-logger.c:313
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6768,8 +6830,8 @@ msgid ""
 "deployments"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:50
-#: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:46
+#: src/testing/testing.c:286 src/util/gnunet-ecc.c:310
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6778,22 +6840,67 @@ msgstr ""
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:728
+#: src/testbed/gnunet-service-testbed_cpustatus.c:726
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1141
-#, fuzzy
-msgid "Misconfiguration (can't connect to the ARM service)"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1157
+#, fuzzy, c-format
+msgid "%s is stopped"
+msgstr "# các byte trong kho dữ liệu"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1159
+#, c-format
+msgid "%s is starting"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1161
+#, c-format
+msgid "%s is stopping"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "%s is stopping already"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1167
+#, c-format
+msgid "%s is started already"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1169
+#, c-format
+msgid "%s is stopped already"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1171
+#, 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:1173
+#, 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:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1175
 #, 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:1177
+#, c-format
+msgid "%.s Unknown result code."
+msgstr ""
+
 #: src/testbed/gnunet_testbed_mpi_spawn.c:118
 #, fuzzy
 msgid "Waiting for child to exit.\n"
@@ -6804,146 +6911,146 @@ msgstr "Đang đợi các đồng đẳng kết nối"
 msgid "Spawning process `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:287
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:287
+#: src/testbed/gnunet-testbed-profiler.c:292
 msgid ""
 "run profiler in non-interactive mode where upon testbed setup the profiler "
 "does not wait for a keystroke but continues to run until a termination "
 "signal is received"
 msgstr ""
 
-#: src/testbed/testbed_api.c:410
+#: src/testbed/testbed_api.c:408
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "« %s » thất bại với mã lỗi %d: %s\n"
 
-#: src/testbed/testbed_api_hosts.c:413
+#: src/testbed/testbed_api_hosts.c:411
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_hosts.c:421
+#: src/testbed/testbed_api_hosts.c:419
 #, fuzzy, c-format
 msgid "Hosts file %s has no data\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_hosts.c:428
+#: src/testbed/testbed_api_hosts.c:426
 #, fuzzy, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_hosts.c:569
+#: src/testbed/testbed_api_hosts.c:567
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:818
+#: src/testbed/testbed_api_testbed.c:816
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:986
+#: src/testbed/testbed_api_testbed.c:984
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1052
+#: src/testbed/testbed_api_testbed.c:1050
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1141
+#: src/testbed/testbed_api_testbed.c:1139
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1145
+#: src/testbed/testbed_api_testbed.c:1143
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1183
+#: src/testbed/testbed_api_testbed.c:1181
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1201
+#: src/testbed/testbed_api_testbed.c:1199
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1261
+#: src/testbed/testbed_api_testbed.c:1259
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1273
+#: src/testbed/testbed_api_testbed.c:1271
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1297
+#: src/testbed/testbed_api_testbed.c:1295
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1347
+#: src/testbed/testbed_api_testbed.c:1345
 #, c-format
 msgid ""
 "Maximum number of edges a peer can have in a scale free topology cannot be "
 "more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1363
+#: src/testbed/testbed_api_testbed.c:1361
 #, c-format
 msgid ""
 "The number of edges that can established when adding a new node to scale "
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1028
+#: src/testbed/testbed_api_topology.c:1026
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:1036
+#: src/testbed/testbed_api_topology.c:1034
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:1044
+#: src/testbed/testbed_api_topology.c:1042
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:1066
+#: src/testbed/testbed_api_topology.c:1064
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testbed/testbed_api_topology.c:1075
-#: src/testbed/testbed_api_topology.c:1099
+#: src/testbed/testbed_api_topology.c:1073
+#: src/testbed/testbed_api_topology.c:1097
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1081
-#: src/testbed/testbed_api_topology.c:1105
+#: src/testbed/testbed_api_topology.c:1079
+#: src/testbed/testbed_api_topology.c:1103
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testbed/testbed_api_topology.c:1087
-#: src/testbed/testbed_api_topology.c:1111
+#: src/testbed/testbed_api_topology.c:1085
+#: src/testbed/testbed_api_topology.c:1109
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1145
+#: src/testbed/testbed_api_topology.c:1143
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
 
-#: src/testing/gnunet-testing.c:173
+#: src/testing/gnunet-testing.c:171
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/gnunet-testing.c:253
+#: src/testing/gnunet-testing.c:251
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
@@ -6953,228 +7060,224 @@ msgstr ""
 msgid "create unique configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/testing/gnunet-testing.c:354
+#: src/testing/gnunet-testing.c:357
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:356
+#: src/testing/gnunet-testing.c:363
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "in ra đầu ra tiêu chuẩn một giá trị từ tập tin cấu hình"
 
-#: src/testing/gnunet-testing.c:358
+#: src/testing/gnunet-testing.c:370
 #, fuzzy
 msgid "configuration template"
 msgstr "Cấu hình đã được lưu."
 
-#: src/testing/gnunet-testing.c:360
+#: src/testing/gnunet-testing.c:376
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:373
+#: src/testing/gnunet-testing.c:389
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:91
+#: src/testing/list-keys.c:89
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/list-keys.c:94
-msgid "skip COUNT number of keys in the beginning"
-msgstr ""
-
-#: src/testing/testing.c:272
+#: src/testing/testing.c:270
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:715
+#: src/testing/testing.c:713
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "đặt số trình nền cần khởi chạy"
 
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1157
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1167
+#: src/testing/testing.c:1166
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1176
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1189
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1203
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1215
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/testing/testing.c:1241
+#: src/testing/testing.c:1240
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/testing/testing.c:1343
+#: src/testing/testing.c:1342
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing.c:1644
+#: src/testing/testing.c:1645
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/topology/friends.c:100
+#: src/topology/friends.c:124
 #, fuzzy, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr ""
 "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/topology/friends.c:154
+#: src/topology/friends.c:178
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:225
+#: src/topology/gnunet-daemon-topology.c:228
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:339
+#: src/topology/gnunet-daemon-topology.c:342
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/topology/gnunet-daemon-topology.c:533
+#: src/topology/gnunet-daemon-topology.c:536
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# các thông báo gửi đi bị loại bỏ"
 
-#: src/topology/gnunet-daemon-topology.c:635
-#: src/topology/gnunet-daemon-topology.c:721
+#: src/topology/gnunet-daemon-topology.c:638
+#: src/topology/gnunet-daemon-topology.c:724
 #, fuzzy
 msgid "# friends connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/topology/gnunet-daemon-topology.c:918
+#: src/topology/gnunet-daemon-topology.c:921
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:954
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:961
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:983
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:986
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:993
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 "Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n"
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:999
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1059
-#: src/transport/plugin_transport_wlan.c:1491
+#: src/topology/gnunet-daemon-topology.c:1052
+#: src/transport/plugin_transport_wlan.c:1515
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/topology/gnunet-daemon-topology.c:1233
+#: src/topology/gnunet-daemon-topology.c:1230
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:141
+#: src/transport/gnunet-service-transport_ats.c:139
 msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:448
+#: src/transport/gnunet-service-transport.c:446
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport.c:809
+#: src/transport/gnunet-service-transport.c:816
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1539
+#: src/transport/gnunet-service-transport.c:1549
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/transport/gnunet-service-transport.c:1699
+#: src/transport/gnunet-service-transport.c:1709
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/transport/gnunet-service-transport.c:1796
+#: src/transport/gnunet-service-transport.c:1806
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:2113
-#: src/transport/gnunet-service-transport.c:2585
+#: src/transport/gnunet-service-transport.c:2123
+#: src/transport/gnunet-service-transport.c:2595
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2589
+#: src/transport/gnunet-service-transport.c:2599
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport.c:2697
+#: src/transport/gnunet-service-transport.c:2707
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-service-transport.c:2706
+#: src/transport/gnunet-service-transport.c:2716
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2771
+#: src/transport/gnunet-service-transport.c:2781
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/transport/gnunet-service-transport_hello.c:195
+#: src/transport/gnunet-service-transport_hello.c:193
 msgid "# refreshed my HELLO"
 msgstr ""
 
@@ -7183,495 +7286,500 @@ msgstr ""
 msgid "# session creation failed"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1051
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1167
+#: src/transport/gnunet-service-transport_neighbours.c:1174
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1310
-#: src/transport/gnunet-service-transport_neighbours.c:1763
+#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1783
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1327
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1321
+#: src/transport/gnunet-service-transport_neighbours.c:1333
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1381
+#: src/transport/gnunet-service-transport_neighbours.c:1393
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1457
+#: src/transport/gnunet-service-transport_neighbours.c:1477
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1493
+#: src/transport/gnunet-service-transport_neighbours.c:1513
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1501
+#: src/transport/gnunet-service-transport_neighbours.c:1521
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1511
+#: src/transport/gnunet-service-transport_neighbours.c:1531
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1556
+#: src/transport/gnunet-service-transport_neighbours.c:1576
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1565
+#: src/transport/gnunet-service-transport_neighbours.c:1585
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1573
+#: src/transport/gnunet-service-transport_neighbours.c:1593
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1582
+#: src/transport/gnunet-service-transport_neighbours.c:1602
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1587
+#: src/transport/gnunet-service-transport_neighbours.c:1607
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1593
+#: src/transport/gnunet-service-transport_neighbours.c:1613
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1660
+#: src/transport/gnunet-service-transport_neighbours.c:1680
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1694
+#: src/transport/gnunet-service-transport_neighbours.c:1714
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "theo dõi gnunetd sử dụng dải thông"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1709
+#: src/transport/gnunet-service-transport_neighbours.c:1729
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1829
+#: src/transport/gnunet-service-transport_neighbours.c:1852
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1849
+#: src/transport/gnunet-service-transport_neighbours.c:1872
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1911
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1905
+#: src/transport/gnunet-service-transport_neighbours.c:1928
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1935
+#: src/transport/gnunet-service-transport_neighbours.c:1958
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2000
+#: src/transport/gnunet-service-transport_neighbours.c:2026
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2054
+#: src/transport/gnunet-service-transport_neighbours.c:2080
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2071
+#: src/transport/gnunet-service-transport_neighbours.c:2097
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2227
+#: src/transport/gnunet-service-transport_neighbours.c:2260
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2232
+#: src/transport/gnunet-service-transport_neighbours.c:2265
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2606
+#: src/transport/gnunet-service-transport_neighbours.c:2652
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3137
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3096
+#: src/transport/gnunet-service-transport_neighbours.c:3145
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3114
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3163
+#: src/transport/gnunet-service-transport_neighbours.c:3187
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3199
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3175
+#: src/transport/gnunet-service-transport_neighbours.c:3224
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3237
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3360
+#: src/transport/gnunet-service-transport_neighbours.c:3410
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3396
+#: src/transport/gnunet-service-transport_neighbours.c:3446
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# các thông báo PONG đã mật mã được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3484
+#: src/transport/gnunet-service-transport_neighbours.c:3534
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3491
+#: src/transport/gnunet-service-transport_neighbours.c:3541
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3531
+#: src/transport/gnunet-service-transport_neighbours.c:3581
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3538
+#: src/transport/gnunet-service-transport_neighbours.c:3588
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3549
+#: src/transport/gnunet-service-transport_neighbours.c:3599
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3683
+#: src/transport/gnunet-service-transport_neighbours.c:3734
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_plugins.c:158
+#: src/transport/gnunet-service-transport_plugins.c:156
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:223
-#: src/transport/gnunet-service-transport_plugins.c:231
-#: src/transport/gnunet-service-transport_plugins.c:239
-#: src/transport/gnunet-service-transport_plugins.c:247
-#: src/transport/gnunet-service-transport_plugins.c:255
-#: src/transport/gnunet-service-transport_plugins.c:263
-#: src/transport/gnunet-service-transport_plugins.c:271
-#: src/transport/gnunet-service-transport_plugins.c:279
-#: src/transport/gnunet-service-transport_plugins.c:287
-#: src/transport/gnunet-service-transport_plugins.c:295
-#: src/transport/gnunet-service-transport_plugins.c:303
+#: src/transport/gnunet-service-transport_plugins.c:221
+#: src/transport/gnunet-service-transport_plugins.c:229
+#: src/transport/gnunet-service-transport_plugins.c:237
+#: src/transport/gnunet-service-transport_plugins.c:245
+#: src/transport/gnunet-service-transport_plugins.c:253
+#: src/transport/gnunet-service-transport_plugins.c:261
+#: src/transport/gnunet-service-transport_plugins.c:269
+#: src/transport/gnunet-service-transport_plugins.c:277
+#: src/transport/gnunet-service-transport_plugins.c:285
+#: src/transport/gnunet-service-transport_plugins.c:293
+#: src/transport/gnunet-service-transport_plugins.c:301
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:310
+#: src/transport/gnunet-service-transport_plugins.c:308
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Lỗi nạp phần bổ sung « %s » tại %s:%d. Đang hủy nạp phần bổ sung.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:388
+#: src/transport/gnunet-service-transport_validation.c:386
 msgid "# Addresses in validation map"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:491
-#: src/transport/gnunet-service-transport_validation.c:677
-#: src/transport/gnunet-service-transport_validation.c:988
-#: src/transport/gnunet-service-transport_validation.c:1590
+#: src/transport/gnunet-service-transport_validation.c:489
+#: src/transport/gnunet-service-transport_validation.c:675
+#: src/transport/gnunet-service-transport_validation.c:995
+#: src/transport/gnunet-service-transport_validation.c:1607
 #, fuzzy
 msgid "# validations running"
 msgstr "kho dữ liệu sqlite"
 
-#: src/transport/gnunet-service-transport_validation.c:532
+#: src/transport/gnunet-service-transport_validation.c:530
 #, fuzzy
 msgid "# address records discarded (timeout)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/gnunet-service-transport_validation.c:580
+#: src/transport/gnunet-service-transport_validation.c:578
 msgid "# address records discarded (blacklist)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:668
+#: src/transport/gnunet-service-transport_validation.c:666
 msgid "# PINGs for address validation sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:748
+#: src/transport/gnunet-service-transport_validation.c:746
 msgid "# validations delayed by global throttle"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:785
+#: src/transport/gnunet-service-transport_validation.c:783
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1114
+#: src/transport/gnunet-service-transport_validation.c:1121
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_validation.c:1165
+#: src/transport/gnunet-service-transport_validation.c:1172
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1178
+#: src/transport/gnunet-service-transport_validation.c:1185
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1181
+#: src/transport/gnunet-service-transport_validation.c:1188
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1189
+#: src/transport/gnunet-service-transport_validation.c:1196
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1202
+#: src/transport/gnunet-service-transport_validation.c:1209
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1257
+#: src/transport/gnunet-service-transport_validation.c:1264
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1308
+#: src/transport/gnunet-service-transport_validation.c:1315
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1317
+#: src/transport/gnunet-service-transport_validation.c:1324
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1480
+#: src/transport/gnunet-service-transport_validation.c:1497
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1498
+#: src/transport/gnunet-service-transport_validation.c:1515
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1553
+#: src/transport/gnunet-service-transport_validation.c:1570
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:418
+#: src/transport/gnunet-service-transport_validation.c:1625
+#, fuzzy
+msgid "# HELLOs given to peerinfo"
+msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
+
+#: src/transport/gnunet-transport.c:411
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:421
 #, fuzzy, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:472
+#: src/transport/gnunet-transport.c:465
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:485
+#: src/transport/gnunet-transport.c:478
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/gnunet-transport.c:499
+#: src/transport/gnunet-transport.c:492
 #, fuzzy
-msgid "Failed to list connections, timeout occured\n"
+msgid "Failed to list connections, timeout occurred\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/transport/gnunet-transport.c:532
+#: src/transport/gnunet-transport.c:525
 #, fuzzy, c-format
 msgid "Transmitting %u bytes\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:566
+#: src/transport/gnunet-transport.c:559
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:597
+#: src/transport/gnunet-transport.c:590
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:621 src/transport/gnunet-transport.c:650
+#: src/transport/gnunet-transport.c:614 src/transport/gnunet-transport.c:643
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:623
+#: src/transport/gnunet-transport.c:616
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/gnunet-transport.c:652
+#: src/transport/gnunet-transport.c:645
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:680
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:724
+#: src/transport/gnunet-transport.c:717
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:736
+#: src/transport/gnunet-transport.c:729
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1150
+#: src/transport/gnunet-transport.c:1142
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1267
+#: src/transport/gnunet-transport.c:1249
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1280
+#: src/transport/gnunet-transport.c:1262
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1308
+#: src/transport/gnunet-transport.c:1292
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1314
+#: src/transport/gnunet-transport.c:1298
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1337 src/transport/gnunet-transport.c:1367
-#: src/transport/gnunet-transport.c:1420
+#: src/transport/gnunet-transport.c:1323 src/transport/gnunet-transport.c:1353
+#: src/transport/gnunet-transport.c:1406
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1374
+#: src/transport/gnunet-transport.c:1360
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1444
+#: src/transport/gnunet-transport.c:1431
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1447
+#: src/transport/gnunet-transport.c:1435
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1450
+#: src/transport/gnunet-transport.c:1439
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1453
+#: src/transport/gnunet-transport.c:1443
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1459
+#: src/transport/gnunet-transport.c:1451
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport.c:1455
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:1465
-#: src/transport/gnunet-transport-profiler.c:631
+#: src/transport/gnunet-transport.c:1460
+#: src/transport/gnunet-transport-profiler.c:639
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1464
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1471
+#: src/transport/gnunet-transport.c:1469
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1482
-#: src/transport/gnunet-transport-profiler.c:642
+#: src/transport/gnunet-transport.c:1480
+#: src/transport/gnunet-transport-profiler.c:650
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport-profiler.c:219
+#: src/transport/gnunet-transport-profiler.c:217
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:616
+#: src/transport/gnunet-transport-profiler.c:615
 msgid "send data to peer"
 msgstr ""
 
@@ -7680,548 +7788,765 @@ msgstr ""
 msgid "receive data from peer"
 msgstr "Yêu cầu cấp %d từ đồng đẳng %d\n"
 
-#: src/transport/gnunet-transport-profiler.c:622
+#: src/transport/gnunet-transport-profiler.c:624
 #, fuzzy
 msgid "iterations"
 msgstr "Tùy chọn chung"
 
-#: src/transport/gnunet-transport-profiler.c:625
+#: src/transport/gnunet-transport-profiler.c:629
 #, fuzzy
 msgid "number of messages to send"
 msgstr "số tin nhắn cần dùng mỗi lần lặp"
 
-#: src/transport/gnunet-transport-profiler.c:628
+#: src/transport/gnunet-transport-profiler.c:634
 #, fuzzy
 msgid "message size to use"
 msgstr "kích cỡ tin nhắn"
 
-#: src/transport/plugin_transport_http_client.c:1477
-#: src/transport/plugin_transport_http_server.c:2248
-#: src/transport/plugin_transport_http_server.c:3462
-#: src/transport/plugin_transport_tcp.c:3403
-#: src/transport/plugin_transport_tcp.c:3410
+#: src/transport/plugin_transport_http_client.c:1472
+#: src/transport/plugin_transport_http_server.c:2310
+#: src/transport/plugin_transport_http_server.c:3524
+#: src/transport/plugin_transport_tcp.c:3889
+#: src/transport/plugin_transport_tcp.c:3896
+#: src/transport/plugin_transport_xt.c:3897
+#: src/transport/plugin_transport_xt.c:3904
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2118
+#: src/transport/plugin_transport_http_client.c:2113
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2167
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_client.c:2162
+#: src/transport/plugin_transport_http_server.c:3239
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/plugin_transport_http_client.c:2184
-#: src/transport/plugin_transport_http_server.c:3247
+#: src/transport/plugin_transport_http_client.c:2179
+#: src/transport/plugin_transport_http_server.c:3309
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/transport/plugin_transport_http_client.c:2218
+#: src/transport/plugin_transport_http_client.c:2213
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/transport/plugin_transport_http_server.c:1729
+#: src/transport/plugin_transport_http_server.c:1754
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1966
+#: src/transport/plugin_transport_http_server.c:2026
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1974
+#: src/transport/plugin_transport_http_server.c:2034
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2124
+#: src/transport/plugin_transport_http_server.c:2184
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2147
+#: src/transport/plugin_transport_http_server.c:2207
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:2336
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2586
+#: src/transport/plugin_transport_http_server.c:2648
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2813
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2837
-#: src/transport/plugin_transport_udp.c:3613
+#: src/transport/plugin_transport_http_server.c:2899
+#: src/transport/plugin_transport_udp.c:3621
+#: src/transport/plugin_transport_xu.c:2047
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2943
+#: src/transport/plugin_transport_http_server.c:3005
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2958
+#: src/transport/plugin_transport_http_server.c:3020
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2964
+#: src/transport/plugin_transport_http_server.c:3026
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2975
+#: src/transport/plugin_transport_http_server.c:3037
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/transport/plugin_transport_http_server.c:2981
+#: src/transport/plugin_transport_http_server.c:3043
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Đang thử nghiệm (các) truyền tải %s\n"
 
-#: src/transport/plugin_transport_http_server.c:3000
+#: src/transport/plugin_transport_http_server.c:3062
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/transport/plugin_transport_http_server.c:3035
+#: src/transport/plugin_transport_http_server.c:3097
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/transport/plugin_transport_http_server.c:3110
+#: src/transport/plugin_transport_http_server.c:3172
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/transport/plugin_transport_http_server.c:3131
+#: src/transport/plugin_transport_http_server.c:3193
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/plugin_transport_http_server.c:3148
+#: src/transport/plugin_transport_http_server.c:3210
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/transport/plugin_transport_http_server.c:3474
+#: src/transport/plugin_transport_http_server.c:3536
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/transport/plugin_transport_smtp.c:223
+#: src/transport/plugin_transport_smtp.c:221
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr "Nhận được thông báo dạng sai qua %s. Bị bỏ qua.\n"
 
-#: src/transport/plugin_transport_smtp.c:310
+#: src/transport/plugin_transport_smtp.c:308
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr "Chuỗi lọc vào SMTP không hợp lệ, còn thiếu « : »\n"
 
-#: src/transport/plugin_transport_smtp.c:319
+#: src/transport/plugin_transport_smtp.c:317
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "Chuỗi lọc vào SMTP quá dài, tối đa « %s »\n"
 
-#: src/transport/plugin_transport_smtp.c:414
-#: src/transport/plugin_transport_smtp.c:424
-#: src/transport/plugin_transport_smtp.c:437
-#: src/transport/plugin_transport_smtp.c:456
-#: src/transport/plugin_transport_smtp.c:479
-#: src/transport/plugin_transport_smtp.c:487
-#: src/transport/plugin_transport_smtp.c:500
-#: src/transport/plugin_transport_smtp.c:511
+#: src/transport/plugin_transport_smtp.c:412
+#: src/transport/plugin_transport_smtp.c:422
+#: src/transport/plugin_transport_smtp.c:435
+#: src/transport/plugin_transport_smtp.c:454
+#: src/transport/plugin_transport_smtp.c:477
+#: src/transport/plugin_transport_smtp.c:485
+#: src/transport/plugin_transport_smtp.c:498
+#: src/transport/plugin_transport_smtp.c:509
 #, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/transport/plugin_transport_smtp.c:652
+#: src/transport/plugin_transport_smtp.c:650
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr "Chưa ghi rõ địa chỉ thư điện tử nên không tạo được truyền tải SMTP.\n"
 
-#: src/transport/plugin_transport_smtp.c:664
+#: src/transport/plugin_transport_smtp.c:662
 msgid "# bytes received via SMTP"
 msgstr "# các byte đã nhận qua SMTP"
 
-#: src/transport/plugin_transport_smtp.c:665
+#: src/transport/plugin_transport_smtp.c:663
 msgid "# bytes sent via SMTP"
 msgstr "# các byte đã gửi qua SMTP"
 
-#: src/transport/plugin_transport_smtp.c:667
+#: src/transport/plugin_transport_smtp.c:665
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1060
-#: src/transport/plugin_transport_tcp.c:2386
+#: src/transport/plugin_transport_tcp.c:1545
+#: src/transport/plugin_transport_tcp.c:2871
+#: src/transport/plugin_transport_xt.c:1551
+#: src/transport/plugin_transport_xt.c:2877
 #, fuzzy, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:1243
-#: src/transport/plugin_transport_tcp.c:1467
-#: src/transport/plugin_transport_tcp.c:2650
-#: src/transport/plugin_transport_tcp.c:3526
+#: src/transport/plugin_transport_tcp.c:1728
+#: src/transport/plugin_transport_tcp.c:1952
+#: src/transport/plugin_transport_tcp.c:3135
+#: src/transport/plugin_transport_tcp.c:4012
+#: src/transport/plugin_transport_xt.c:1734
+#: src/transport/plugin_transport_xt.c:1958
+#: src/transport/plugin_transport_xt.c:3141
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:1285
-#: src/transport/plugin_transport_tcp.c:1449
-#: src/transport/plugin_transport_tcp.c:1573
-#: src/transport/plugin_transport_tcp.c:1646
-#: src/transport/plugin_transport_tcp.c:1746
-#: src/transport/plugin_transport_tcp.c:1771
+#: src/transport/plugin_transport_tcp.c:1770
+#: src/transport/plugin_transport_tcp.c:1934
+#: src/transport/plugin_transport_tcp.c:2058
+#: src/transport/plugin_transport_tcp.c:2131
+#: src/transport/plugin_transport_tcp.c:2231
+#: src/transport/plugin_transport_tcp.c:2256
+#: src/transport/plugin_transport_xt.c:1776
+#: src/transport/plugin_transport_xt.c:1940
+#: src/transport/plugin_transport_xt.c:2064
+#: src/transport/plugin_transport_xt.c:2137
+#: src/transport/plugin_transport_xt.c:2237
+#: src/transport/plugin_transport_xt.c:2262
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:1288
+#: src/transport/plugin_transport_tcp.c:1773
+#: src/transport/plugin_transport_xt.c:1779
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1576
+#: src/transport/plugin_transport_tcp.c:2061
+#: src/transport/plugin_transport_xt.c:2067
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1650
+#: src/transport/plugin_transport_tcp.c:2135
+#: src/transport/plugin_transport_xt.c:2141
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:2048
+#: src/transport/plugin_transport_tcp.c:2533
+#: src/transport/plugin_transport_xt.c:2539
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2224
+#: src/transport/plugin_transport_tcp.c:2709
+#: src/transport/plugin_transport_xt.c:2715
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2716
+#: src/transport/plugin_transport_tcp.c:3201
+#: src/transport/plugin_transport_xt.c:3207
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_tcp.c:2921
+#: src/transport/plugin_transport_tcp.c:3407
+#: src/transport/plugin_transport_xt.c:3413
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2972
-#: src/transport/plugin_transport_tcp.c:3030
+#: src/transport/plugin_transport_tcp.c:3458
+#: src/transport/plugin_transport_tcp.c:3516
+#: src/transport/plugin_transport_xt.c:3464
+#: src/transport/plugin_transport_xt.c:3522
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# các kết nối dht"
 
-#: src/transport/plugin_transport_tcp.c:2976
+#: src/transport/plugin_transport_tcp.c:3462
+#: src/transport/plugin_transport_xt.c:3468
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/plugin_transport_tcp.c:2982
+#: src/transport/plugin_transport_tcp.c:3468
+#: src/transport/plugin_transport_xt.c:3474
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2984
+#: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_xt.c:3476
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3024
+#: src/transport/plugin_transport_tcp.c:3510
+#: src/transport/plugin_transport_xt.c:3516
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3034
+#: src/transport/plugin_transport_tcp.c:3520
+#: src/transport/plugin_transport_xt.c:3526
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3353
+#: src/transport/plugin_transport_tcp.c:3839
+#: src/transport/plugin_transport_xt.c:3847
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:3514
+#: src/transport/plugin_transport_tcp.c:4000
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3518
+#: src/transport/plugin_transport_tcp.c:4004
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_tcp.c:4008
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
+#: src/transport/plugin_transport_udp_broadcasting.c:166
 #, fuzzy
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:545
+#: src/transport/plugin_transport_udp_broadcasting.c:546
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:566
+#: src/transport/plugin_transport_udp_broadcasting.c:563
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3357
+#: src/transport/plugin_transport_udp.c:3365
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3371
+#: src/transport/plugin_transport_udp.c:3379
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3689
-#: src/transport/plugin_transport_udp.c:3788
+#: src/transport/plugin_transport_udp.c:3697
+#: src/transport/plugin_transport_udp.c:3796
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:3707
+#: src/transport/plugin_transport_udp.c:3715
+#: src/transport/plugin_transport_xu.c:2141
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3798
+#: src/transport/plugin_transport_udp.c:3806
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:3869
-#: src/transport/plugin_transport_udp.c:3883
+#: src/transport/plugin_transport_udp.c:3877
+#: src/transport/plugin_transport_udp.c:3891
+#: src/transport/plugin_transport_xu.c:2299
+#: src/transport/plugin_transport_xu.c:2313
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3915
+#: src/transport/plugin_transport_udp.c:3923
+#: src/transport/plugin_transport_xu.c:2345
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/transport/plugin_transport_udp.c:3942
+#: src/transport/plugin_transport_udp.c:3950
+#: src/transport/plugin_transport_xu.c:2372
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/transport/plugin_transport_udp.c:4008
+#: src/transport/plugin_transport_udp.c:4014
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/plugin_transport_unix.c:1403
+#: src/transport/plugin_transport_unix.c:1401
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/plugin_transport_unix.c:1416
+#: src/transport/plugin_transport_unix.c:1414
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "Không thể tạo mẫu duy nhất đại diện cho « %s ».\n"
 
-#: src/transport/plugin_transport_unix.c:1816
+#: src/transport/plugin_transport_unix.c:1814
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_wlan.c:742
+#: src/transport/plugin_transport_wlan.c:766
 msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:762
+#: src/transport/plugin_transport_wlan.c:786
 #, fuzzy
 msgid "# Messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:803
-#: src/transport/plugin_transport_wlan.c:888
+#: src/transport/plugin_transport_wlan.c:827
+#: src/transport/plugin_transport_wlan.c:912
 #, fuzzy
 msgid "# Sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:1009
+#: src/transport/plugin_transport_wlan.c:1033
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "# các thông báo bị tế phân"
 
-#: src/transport/plugin_transport_wlan.c:1038
+#: src/transport/plugin_transport_wlan.c:1062
 #, fuzzy
 msgid "# messages pending (with fragmentation)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:1167
-#: src/transport/plugin_transport_wlan.c:1258
-#: src/transport/plugin_transport_wlan.c:2280
+#: src/transport/plugin_transport_wlan.c:1191
+#: src/transport/plugin_transport_wlan.c:1282
+#: src/transport/plugin_transport_wlan.c:2303
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1541
+#: src/transport/plugin_transport_wlan.c:1565
 #, fuzzy
 msgid "# ACKs received"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_wlan.c:1610
+#: src/transport/plugin_transport_wlan.c:1634
 #, fuzzy
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:1714
+#: src/transport/plugin_transport_wlan.c:1738
 #, fuzzy
 msgid "# HELLO beacons sent"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_wlan.c:1831
+#: src/transport/plugin_transport_wlan.c:1854
 #, fuzzy
 msgid "# DATA messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1865
+#: src/transport/plugin_transport_wlan.c:1888
 #, fuzzy
 msgid "# DATA messages processed"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2255
+#: src/transport/plugin_transport_wlan.c:2278
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2277
+#: src/transport/plugin_transport_wlan.c:2300
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/tun/regex.c:134
+#: src/transport/plugin_transport_xt.c:4008
 #, c-format
-msgid "Bad mask: %d\n"
+msgid "XT transport listening on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4012
+msgid "XT transport not listening on any port (client only)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4016
+#, c-format
+msgid "XT transport advertises itself as being on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4020
+#, fuzzy
+msgid "# XT sessions active"
+msgstr "# các khoá phiên chạy được chấp nhận"
+
+#: src/transport/plugin_transport_xu.c:1235
+#, c-format
+msgid ""
+"XU could not transmit message to `%s': Network seems down, please check your "
+"network configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xu.c:1249
+msgid ""
+"XU could not transmit IPv6 message! Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xu.c:2123
+#: src/transport/plugin_transport_xu.c:2222
+#, fuzzy, c-format
+msgid "Failed to bind XU socket to %s: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/transport/plugin_transport_xu.c:2232
+#, fuzzy
+msgid "Failed to open XU sockets\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/transport/plugin_transport_xu.c:2396
+#, fuzzy
+msgid "Failed to create XU network sockets\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/transport/tcp_connection_legacy.c:450
+#, fuzzy, c-format
+msgid "Access denied to `%s'\n"
+msgstr "Không đủ quyền cho « %s ».\n"
+
+#: src/transport/tcp_connection_legacy.c:467
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
+msgstr ""
+
+#: src/transport/tcp_server_legacy.c:472 src/util/service.c:1109
+#, 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:482 src/util/service.c:1119
+#, 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:488 src/util/service.c:1125
+#, 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"
+
+#: src/transport/tcp_server_legacy.c:888
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:337 src/util/service.c:2378
+#, fuzzy, c-format
+msgid "Unknown address family %d\n"
+msgstr "\tKhông rõ miền tên « %s »\n"
+
+#: src/transport/tcp_service_legacy.c:344
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:400 src/util/service.c:437
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:438 src/util/service.c:480
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:902 src/util/service.c:1040
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:951
+#: src/transport/tcp_service_legacy.c:969 src/util/service.c:1192
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:994 src/util/service.c:1224
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1159
+#, fuzzy, c-format
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "Lỗi chạy %s: %s %d\n"
+
+#: src/transport/tcp_service_legacy.c:1200
+#, fuzzy, c-format
+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:1249 src/util/service.c:1498
+msgid "Service process failed to initialize\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1253 src/util/service.c:1502
+msgid "Service process could not initialize server function\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1257 src/util/service.c:1506
+msgid "Service process failed to report status\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1311 src/util/disk.c:1521
+#: src/util/service.c:1376
+#, 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:1312 src/util/service.c:1378
+msgid "No such user"
+msgstr "Không có người dùng như vậy"
+
+#: src/transport/tcp_service_legacy.c:1325 src/util/service.c:1397
+#, 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:1396 src/util/service.c:1757
+msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/util/bio.c:177 src/util/bio.c:185
+#: src/transport/tcp_service_legacy.c:1446 src/util/program.c:277
+#: src/util/service.c:1820
+#, 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:1456 src/util/program.c:297
+#: src/util/service.c:1831
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/transport/tcp_service_legacy.c:1461 src/util/program.c:290
+#: src/util/service.c:1837
+#, fuzzy, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/util/bio.c:179 src/util/bio.c:187
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:189
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:244
+#: src/util/bio.c:246
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:256
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:300
+#: src/util/bio.c:304
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:314
+#: src/util/bio.c:326
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:868
+#: src/util/client.c:732
+msgid "not a valid filename"
+msgstr ""
+
+#: src/util/client.c:923
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:256 src/util/common_logging.c:1129
+#: src/util/common_logging.c:257 src/util/common_logging.c:1159
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1127
+#: src/util/common_logging.c:259 src/util/common_logging.c:1157
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1125
+#: src/util/common_logging.c:261 src/util/common_logging.c:1155
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1123
+#: src/util/common_logging.c:263 src/util/common_logging.c:1153
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1121
+#: src/util/common_logging.c:265 src/util/common_logging.c:1151
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1131
+#: src/util/common_logging.c:267 src/util/common_logging.c:1161
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:879
+#: src/util/common_logging.c:631 src/util/common_logging.c:661
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
+
+#: src/util/common_logging.c:895
 #, 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:1132
+#: src/util/common_logging.c:1162
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1302
+#: src/util/common_logging.c:1455
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1344
+#: src/util/common_logging.c:1497
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1362
+#: src/util/common_logging.c:1515
 #, 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:1383
+#: src/util/common_logging.c:1536
 #, 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:286
+#: src/util/configuration.c:294
 #, 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:344
+#: src/util/configuration.c:361
 #, 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:1017
+#: src/util/configuration.c:970
+#, 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:1059
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8230,114 +8555,129 @@ 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:1136
+#: src/util/configuration.c:1178
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1169
+#: src/util/configuration.c:1211
 #, 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:1237
+#: src/util/configuration.c:1279
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:441
-#, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "Không đủ quyền cho « %s ».\n"
-
-#: src/util/connection.c:458
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
-msgstr ""
-
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:530
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:777
+#: src/util/crypto_ecc.c:860
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_ecc.c:827
+#: src/util/crypto_ecc.c:915
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_ecc.c:901
+#: src/util/crypto_ecc.c:994
 #, fuzzy, c-format
 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.c:958
+#: src/util/crypto_ecc.c:1055
 #, fuzzy, c-format
 msgid "EdDSA 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:122 src/util/crypto_ecc_setup.c:160
-#: src/util/crypto_ecc_setup.c:278 src/util/crypto_ecc_setup.c:316
+#: src/util/crypto_ecc_setup.c:121 src/util/crypto_ecc_setup.c:160
+#: src/util/crypto_ecc_setup.c:303 src/util/crypto_ecc_setup.c:350
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/util/crypto_ecc_setup.c:127 src/util/crypto_ecc_setup.c:283
+#: src/util/crypto_ecc_setup.c:127 src/util/crypto_ecc_setup.c:309
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
 
-#: src/util/crypto_ecc_setup.c:164 src/util/crypto_ecc_setup.c:320
+#: src/util/crypto_ecc_setup.c:164 src/util/crypto_ecc_setup.c:354
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:194 src/util/crypto_ecc_setup.c:350
+#: src/util/crypto_ecc_setup.c:194 src/util/crypto_ecc_setup.c:396
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:198 src/util/crypto_ecc_setup.c:354
+#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:400
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:413
+#: src/util/crypto_ecc_setup.c:466
 #, 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"
 
-#: src/util/crypto_random.c:284
+#: src/util/crypto_random.c:304
 #, c-format
 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:835
+#: src/util/crypto_rsa.c:848
+#, 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:1187
+#, 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:1251
+#, 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:250
+#, 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/util/dnsparser.c:940
+#, 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:229
 #, fuzzy, c-format
-msgid "RSA signing failed at %s:%d: %s\n"
-msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+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/crypto_rsa.c:1166
+#: src/util/dnsstub.c:360
 #, 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"
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
 
-#: src/util/disk.c:1245
-#, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "Mong đợi « %s » là một thư mục.\n"
+#: src/util/dnsstub.c:507
+#, 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/disk.c:1486 src/util/service.c:1322 src/util/service_new.c:1379
-#, 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/util/dnsstub.c:513
+#, 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:568
 #, c-format
@@ -8394,13 +8734,22 @@ msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
 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:933
+#: src/util/getopt.c:947
 #, 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_helpers.c:91
+#: src/util/getopt.c:962
+#, 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:68
+msgid "print the version number"
+msgstr "hiển thị số thứ tự phiên bản"
+
+#: src/util/getopt_helpers.c:113
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8408,765 +8757,789 @@ 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:278 src/util/getopt_helpers.c:336
+#: src/util/getopt_helpers.c:201
+msgid "print this help"
+msgstr "hiển thị trợ giúp này"
+
+#: src/util/getopt_helpers.c:279
+msgid "be verbose"
+msgstr "xuất chi tiết"
+
+#: src/util/getopt_helpers.c:420
+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:500
+#, 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:522
+#, 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:559 src/util/getopt_helpers.c:763
+#: src/util/getopt_helpers.c:830
 #, 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:308
+#: src/util/getopt_helpers.c:624
 #, 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/gnunet-config.c:124
+#: src/util/getopt_helpers.c:690
+#, 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:754
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number \n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:837
+#, 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:923
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:157
 #, 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/gnunet-config.c:137
+#: src/util/gnunet-config.c:170
 #, fuzzy, c-format
 msgid "--section argument is required\n"
 msgstr "đặt tên hiệu cần dùng (cần thiết)"
 
-#: src/util/gnunet-config.c:140
+#: src/util/gnunet-config.c:173
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:224
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:228
+#: src/util/gnunet-config.c:263
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:231
+#: src/util/gnunet-config.c:268
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:273
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:237
+#: src/util/gnunet-config.c:278
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:240
+#: src/util/gnunet-config.c:282
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/util/gnunet-config.c:243
+#: src/util/gnunet-config.c:286
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:299
 #, 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-ecc.c:84
+#: src/util/gnunet-ecc.c:92
 #, 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:120
+#: src/util/gnunet-ecc.c:128
 #, c-format
 msgid "Generating %u keys like %s, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:133
+#: src/util/gnunet-ecc.c:141
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:174
+#: src/util/gnunet-ecc.c:182
 #, 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:192
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:187
+#: src/util/gnunet-ecc.c:195
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:280
+#: src/util/gnunet-ecc.c:288
 #, 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:291
+#: src/util/gnunet-ecc.c:303
 #, 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:313
+#: src/util/gnunet-ecc.c:332
 #, 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:364
+#: src/util/gnunet-ecc.c:389
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:414
+#: src/util/gnunet-ecc.c:454
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:417
+#: src/util/gnunet-ecc.c:459
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:420
+#: src/util/gnunet-ecc.c:464
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:423
+#: src/util/gnunet-ecc.c:468
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:426
+#: src/util/gnunet-ecc.c:472
+msgid "print the private key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:476
+msgid "print the public key in HEX format"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:480
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:496
 #, 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-resolver.c:149
+#: src/util/gnunet-resolver.c:166
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:160
+#: src/util/gnunet-resolver.c:177
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:242
+#: src/util/gnunet-scrypt.c:240
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:314
+#: src/util/gnunet-scrypt.c:315
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:317
+#: src/util/gnunet-scrypt.c:320
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:320
+#: src/util/gnunet-scrypt.c:325
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:323
+#: src/util/gnunet-scrypt.c:330
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:336
+#: src/util/gnunet-scrypt.c:343
 #, 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:371
-#, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "Không thể giải quyết « %s » (%s): %s\n"
-
-#: src/util/gnunet-service-resolver.c:460
-#: src/util/gnunet-service-resolver.c:512
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
+#: src/util/gnunet-service-resolver.c:1443
+msgid "No DNS server available. DNS resolution will not be possible.\n"
+msgstr ""
 
-#: src/util/gnunet-uri.c:85
+#: src/util/gnunet-uri.c:83
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:91
+#: src/util/gnunet-uri.c:89
 #, 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:98
+#: src/util/gnunet-uri.c:96
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:108
+#: src/util/gnunet-uri.c:106
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:170
+#: src/util/gnunet-uri.c:168
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:331
+#: src/util/helper.c:333
 #, 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:382
+#: src/util/helper.c:384
 #, 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:601
+#: src/util/helper.c:604
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/network.c:137
+#: src/util/network.c:134
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1735 src/util/network.c:1911
+#: src/util/network.c:1793 src/util/network.c:1977
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:501
+#: src/util/os_installation.c:507
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:861
+#: src/util/os_installation.c:879
 #, 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:921
+#: src/util/os_installation.c:920
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+
+#: src/util/os_installation.c:951
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/os_installation.c:931
+#: src/util/os_installation.c:961
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/plugin.c:86
+#: src/util/plugin.c:84
 #, 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:151
+#: src/util/plugin.c:149
 #, 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:226
+#: src/util/plugin.c:224
 #, 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:385
+#: src/util/plugin.c:383
 #, 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:244 src/util/service.c:1456 src/util/service_new.c:1809
-#, 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/util/program.c:256 src/util/service.c:1471 src/util/service_new.c:1826
-#, fuzzy, c-format
-msgid "Could not access configuration file `%s'\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/util/program.c:261 src/util/service.c:1466 src/util/service_new.c:1820
-#, fuzzy
-msgid "Malformed configuration, exit ...\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
+#: src/util/regex.c:132
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
 
-#: src/util/resolver_api.c:204
+#: src/util/resolver_api.c:216
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:223
+#: src/util/resolver_api.c:237
 #, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
 "resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:815
+#: src/util/resolver_api.c:873
 #, 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:827
+#: src/util/resolver_api.c:886
 #, 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:1004
+#: src/util/resolver_api.c:1071
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1086 src/util/resolver_api.c:1107
-#: src/util/resolver_api.c:1121
+#: src/util/resolver_api.c:1158 src/util/resolver_api.c:1181
+#: src/util/resolver_api.c:1195
 #, 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/server.c:478 src/util/service_new.c:1111
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
-
-#: src/util/server.c:488 src/util/service_new.c:1121
-#, 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/util/server.c:494 src/util/service_new.c:1127
-#, 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"
-
-#: src/util/server.c:894
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVER_receive_done' after %s\n"
-msgstr ""
-
-#: src/util/service.c:347 src/util/service_new.c:2344
-#, fuzzy, c-format
-msgid "Unknown address family %d\n"
-msgstr "\tKhông rõ miền tên « %s »\n"
-
-#: src/util/service.c:354
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
-msgstr ""
-
-#: src/util/service.c:410 src/util/service_new.c:439
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:448 src/util/service_new.c:482
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:912 src/util/service_new.c:1042
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
-msgstr ""
-
-#: src/util/service.c:961 src/util/service.c:979 src/util/service_new.c:1194
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
-
-#: src/util/service.c:1004 src/util/service_new.c:1226
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-
-#: src/util/service.c:1170
-#, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "Lỗi chạy %s: %s %d\n"
-
-#: src/util/service.c:1211
-#, fuzzy, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
-
-#: src/util/service.c:1260 src/util/service_new.c:1501
-msgid "Service process failed to initialize\n"
-msgstr ""
-
-#: src/util/service.c:1264 src/util/service_new.c:1505
-msgid "Service process could not initialize server function\n"
-msgstr ""
-
-#: src/util/service.c:1268 src/util/service_new.c:1509
-msgid "Service process failed to report status\n"
-msgstr ""
-
-#: src/util/service.c:1323 src/util/service_new.c:1381
-msgid "No such user"
-msgstr "Không có người dùng như vậy"
-
-#: src/util/service.c:1336 src/util/service_new.c:1400
-#, 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/util/service.c:1406 src/util/service_new.c:1737
-msgid "do daemonize (detach from terminal)"
-msgstr ""
-
-#: src/util/service_new.c:1306
+#: src/util/service.c:1303
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/service_new.c:2093
+#: src/util/service.c:2123
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/signal.c:89
+#: src/util/signal.c:87
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/socks.c:586
+#: src/util/socks.c:595
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:599
+#: src/util/socks.c:614
 #, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:146
+#: src/util/strings.c:174
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:441
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:568
+#: src/util/strings.c:598
 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:672
+#: src/util/strings.c:702
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:676
+#: src/util/strings.c:706
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:678
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:684
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:690
+#: src/util/strings.c:720
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:696
+#: src/util/strings.c:726
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:702
+#: src/util/strings.c:732
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:709
+#: src/util/strings.c:739
 #, fuzzy
 msgid "day"
 msgstr " ngày"
 
-#: src/util/strings.c:711
+#: src/util/strings.c:741
 #, fuzzy
 msgid "days"
 msgstr " ngày"
 
-#: src/util/strings.c:740
+#: src/util/strings.c:770
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1239
+#: src/util/strings.c:1272
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1247
+#: src/util/strings.c:1280
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1253
+#: src/util/strings.c:1286
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1260
+#: src/util/strings.c:1293
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1269
+#: src/util/strings.c:1302
 #, 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:1541 src/util/strings.c:1557
+#: src/util/strings.c:1574 src/util/strings.c:1590
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1566
+#: src/util/strings.c:1599
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/util/strings.c:1649 src/util/strings.c:1680 src/util/strings.c:1728
-#: src/util/strings.c:1749
+#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761
+#: src/util/strings.c:1782
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1706
+#: src/util/strings.c:1739
 #, 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:1758
+#: src/util/strings.c:1791
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1810
+#: src/util/strings.c:1843
 #, 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:1860
+#: src/util/strings.c:1893
 #, 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:1891
+#: src/util/strings.c:1924
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
 
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
+#: src/vpn/gnunet-service-vpn.c:538 src/vpn/gnunet-service-vpn.c:1805
 #, fuzzy
 msgid "# Active channels"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:629
+#: src/vpn/gnunet-service-vpn.c:597
 #, fuzzy
-msgid "# Bytes given to cadet for transmission"
-msgstr "# các thông báo PING được tạo"
+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:667
+#: src/vpn/gnunet-service-vpn.c:751
 #, fuzzy
-msgid "# Bytes dropped in cadet queue (overflow)"
-msgstr "# các byte loại bỏ bởi UDP (đi ra)"
+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:1094
+#, 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:1253
+#, 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:783
+#: src/vpn/gnunet-service-vpn.c:1465
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/vpn/gnunet-service-vpn.c:1005
+#: src/vpn/gnunet-service-vpn.c:1685
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1144
+#: src/vpn/gnunet-service-vpn.c:1824
 #, 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:1352
+#: src/vpn/gnunet-service-vpn.c:2004
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1373
+#: src/vpn/gnunet-service-vpn.c:2025
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1579
+#: src/vpn/gnunet-service-vpn.c:2233
 #, 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:1612 src/vpn/gnunet-service-vpn.c:1648
+#: src/vpn/gnunet-service-vpn.c:2266 src/vpn/gnunet-service-vpn.c:2302
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1658
+#: src/vpn/gnunet-service-vpn.c:2312
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1672
+#: src/vpn/gnunet-service-vpn.c:2326
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1754
-#, 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:2093
-#, 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:2248
-#, 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:2399
+#: src/vpn/gnunet-service-vpn.c:2365
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2454
+#: src/vpn/gnunet-service-vpn.c:2420
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2718
+#: src/vpn/gnunet-service-vpn.c:2462 src/vpn/gnunet-service-vpn.c:2684
 #, fuzzy
 msgid "# Active destinations"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:2767
+#: src/vpn/gnunet-service-vpn.c:2733
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3059
+#: src/vpn/gnunet-service-vpn.c:2996
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3083
+#: src/vpn/gnunet-service-vpn.c:3020
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3028
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3104
+#: src/vpn/gnunet-service-vpn.c:3041
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3117
+#: src/vpn/gnunet-service-vpn.c:3054
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3127
+#: src/vpn/gnunet-service-vpn.c:3064
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:147
+#: src/vpn/gnunet-vpn.c:145
 #, fuzzy
 msgid "Error creating tunnel\n"
 msgstr "Hoàn thành tạo khoá.\n"
 
-#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222
+#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:220
 #, 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:204
+#: 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:216
+#: src/vpn/gnunet-vpn.c:214
 #, 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:236
+#: src/vpn/gnunet-vpn.c:234
 #, 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:256
+#: src/vpn/gnunet-vpn.c:254
 #, 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:291
+#: src/vpn/gnunet-vpn.c:290
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:294
+#: src/vpn/gnunet-vpn.c:295
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:297
+#: src/vpn/gnunet-vpn.c:301
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:300
+#: src/vpn/gnunet-vpn.c:307
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:303
+#: src/vpn/gnunet-vpn.c:313
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:306
+#: src/vpn/gnunet-vpn.c:319
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:324
 #, fuzzy
 msgid "service is offered via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/vpn/gnunet-vpn.c:312
+#: src/vpn/gnunet-vpn.c:329
 #, fuzzy
 msgid "service is offered via UDP"
 msgstr "# các byte đã nhận qua UDP"
 
-#: src/vpn/gnunet-vpn.c:324
+#: src/vpn/gnunet-vpn.c:342
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:674 src/include/gnunet_common.h:681
-#: src/include/gnunet_common.h:691 src/include/gnunet_common.h:699
+#: src/zonemaster/gnunet-service-zonemaster.c:836
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:414
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/include/gnunet_common.h:770 src/include/gnunet_common.h:777
+#: src/include/gnunet_common.h:787
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d. Aborting.\n"
+msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
+
+#: src/include/gnunet_common.h:795
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:711
+#: src/include/gnunet_common.h:807
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:738 src/include/gnunet_common.h:747
+#: src/include/gnunet_common.h:834 src/include/gnunet_common.h:843
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
+#~ msgid "Could not resolve `%s' (%s): %s\n"
+#~ msgstr "Không thể giải quyết « %s » (%s): %s\n"
+
+#~ msgid "Could not find IP of host `%s': %s\n"
+#~ msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
+
+#, fuzzy
+#~ msgid "PUT request sent with key"
+#~ msgstr "# độ tin cậy được tiêu phí"
+
+#, fuzzy
+#~ msgid "PUT request not confirmed!\n"
+#~ msgstr "# độ tin cậy được tiêu phí"
+
+#, fuzzy
+#~ msgid "Could not connect to %s service!\n"
+#~ msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#, fuzzy
+#~ msgid "No valid GNS zone specified!\n"
+#~ msgstr "Chưa ghi rõ từ khoá.\n"
+
+#, fuzzy
+#~ msgid "Specify the name of the ego of the zone to lookup the record in"
+#~ msgstr "xác định mức ưu tiên của nội dung"
+
+#, fuzzy
+#~ msgid "Token `%s' is malformed\n"
+#~ msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#, fuzzy
+#~ msgid "Failed to create indices\n"
+#~ msgstr "Không thể tạo miền tên.\n"
+
+#, fuzzy
+#~ msgid "`%s:%s' failed at %s:%d with error: %s\n"
+#~ msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
+
+#, fuzzy
+#~ msgid "Unable to connect to Postgres database '%s': %s\n"
+#~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#, fuzzy
+#~ msgid "Misconfiguration (can not connect to the ARM service)"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Request timed out"
+#~ msgstr "# các khoá phiên chạy được chấp nhận"
+
+#, fuzzy
+#~ msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+#~ msgstr "Dữ liệu sai trong %s. Đang thử sửa chữa (bằng cách xoá).\n"
+
+#, fuzzy
+#~ msgid "# Bytes received from other peers"
+#~ msgstr "# các byte kiểu %d được nhận"
+
+#, fuzzy
+#~ msgid "Specify the public key of the zone to reverse lookup a name for"
+#~ msgstr "xác định mức ưu tiên của nội dung"
+
+#, fuzzy
+#~ msgid "Misconfiguration (can't connect to the ARM service)"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
+#~ msgid "# Bytes given to cadet for transmission"
+#~ msgstr "# các thông báo PING được tạo"
+
 #, fuzzy
 #~ msgid "# UPDATE requests executed"
 #~ msgstr "# các yêu cầu dht được định tuyến"
@@ -9247,10 +9620,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "# transmission request failures"
 #~ msgstr "# các sự truyền PONG bị lỗi"
 
-#, fuzzy
-#~ msgid "# bytes sent to datastore"
-#~ msgstr "# các byte trong kho dữ liệu"
-
 #, fuzzy
 #~ msgid "Failed to receive status response from database."
 #~ msgstr ""
@@ -9567,10 +9936,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Timeout transmitting iteration request to `SENSOR' service."
 #~ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#, fuzzy
-#~ msgid "Error reading sensor version\n"
-#~ msgstr "Gặp lỗi khi tạo người dùng"
-
 #, fuzzy
 #~ msgid "Error reading sensor category\n"
 #~ msgstr "Gặp lỗi khi tạo người dùng"
@@ -9651,10 +10016,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Insufficient space for publishing: %s"
 #~ msgstr "Không đủ quyền truy cập cho « %s »: %s\n"
 
-#, fuzzy
-#~ msgid "valid public key required"
-#~ msgstr "Đối số không hợp lệ cho « %s ».\n"
-
 #, fuzzy
 #~ msgid "Failed to create or access directory for log file `%s'\n"
 #~ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
@@ -9987,10 +10348,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Found %u transport plugins: `%s'\n"
 #~ msgstr "Đang nạp các truyền tải « %s »\n"
 
-#, fuzzy
-#~ msgid "Failed to parse HELLO in file `%s': %s %u \n"
-#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
 #, fuzzy
 #~ msgid "Internal error %d\n"
 #~ msgstr "Lỗi VR."
@@ -10160,11 +10517,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Mesh service could not access hostkey: %s. Exiting.\n"
 #~ msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#, fuzzy
-#~ msgid "No valid expiration time for operation `%s'\n"
-#~ msgstr ""
-#~ "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
 #, fuzzy
 #~ msgid "Failed to find record to remove\n"
 #~ msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -10179,12 +10531,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ "\n"
 #~ "Không nhận được đáp ứng từ gnunetd.\n"
 
-#, fuzzy
-#~ msgid "Failed to remove records from database"
-#~ msgstr ""
-#~ "\n"
-#~ "Không nhận được đáp ứng từ gnunetd.\n"
-
 #, fuzzy
 #~ msgid "Failed to access database"
 #~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -10786,19 +11132,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "# wlan messages queued"
 #~ msgstr "# các thông báo phát hiện dht được nhận"
 
-#~ msgid "print this help"
-#~ msgstr "hiển thị trợ giúp này"
-
-#~ msgid "print the version number"
-#~ msgstr "hiển thị số thứ tự phiên bản"
-
-#, fuzzy
-#~ msgid "configure logging to write logs to LOGFILE"
-#~ msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
-
-#~ 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"
-
 #, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "Lỗi bắt đầu thu thập.\n"
@@ -11133,9 +11466,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Unable to create user account for daemon."
 #~ msgstr "Không thể tạo tài khoản người dùng cho trình nền."
 
-#~ msgid "Unable to setup autostart for daemon."
-#~ msgstr "Không thể thiết lập chức năng tự động khởi chạy cho trình nền."
-
 #~ msgid "Save configuration?"
 #~ msgstr "Lưu cấu hình không?"