BUILD: Remove gnurl. Improve curl-gnutls detection

1 files changed, 233 insertions, 234 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6be8601c7..98b1d7d80 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-08-05 13:57+0200\n"
+"POT-Creation-Date: 2022-09-04 11:01+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -661,25 +661,25 @@ msgstr ""
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:326
+#: src/ats/gnunet-service-ats_plugins.c:321
 #, 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:336
+#: src/ats/gnunet-service-ats_plugins.c:331
 #, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:382
+#: src/ats/gnunet-service-ats_plugins.c:377
 #, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:474
+#: src/ats/gnunet-service-ats_plugins.c:462
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "无法初始化 SQLite：%s。\n"
@@ -1458,40 +1458,40 @@ msgstr ""
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1513
+#: src/core/gnunet-service-core_kx.c:1506
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1524
+#: src/core/gnunet-service-core_kx.c:1517
 #, 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:1528
+#: src/core/gnunet-service-core_kx.c:1521
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1606
-#: src/core/gnunet-service-core_kx.c:1633
+#: src/core/gnunet-service-core_kx.c:1599
+#: src/core/gnunet-service-core_kx.c:1626
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1619
+#: src/core/gnunet-service-core_kx.c:1612
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1664
+#: src/core/gnunet-service-core_kx.c:1657
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1673
+#: src/core/gnunet-service-core_kx.c:1666
 msgid "# bytes of payload decrypted"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1519
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1582,31 +1582,31 @@ msgstr ""
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1007
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1093
+#: src/datastore/datastore_api.c:1068
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1158
+#: src/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1236
+#: src/datastore/datastore_api.c:1171
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1295
+#: src/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1357
+#: src/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1438
+#: src/datastore/datastore_api.c:1357
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1939,46 +1939,46 @@ msgstr ""
 msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:238
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:229 src/dht/gnunet-dht-hello.c:119
+#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
 #: src/dht/gnunet-dht-monitor.c:255
 #, fuzzy, c-format
 msgid "Failed to connect to DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-dht-get.c:239
+#: src/dht/gnunet-dht-get.c:256
 msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:275 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:302
 #: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:298
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:286 src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-get.c:303 src/dht/gnunet-dht-put.c:217
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:309 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:298
+#: src/dht/gnunet-dht-get.c:315
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:206
+#: src/dht/gnunet-dht-get.c:321 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:321
+#: src/dht/gnunet-dht-get.c:338
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -2402,71 +2402,71 @@ msgstr ""
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:480
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:502
+#: src/fs/fs_api.c:491
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/fs_api.c:510
+#: src/fs/fs_api.c:499
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1173
+#: src/fs/fs_api.c:1156
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:1724
+#: src/fs/fs_api.c:1707
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1739
+#: src/fs/fs_api.c:1722
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2451
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2479
+#: src/fs/fs_api.c:2462
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
+#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2645
+#: src/fs/fs_api.c:2628
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
+#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2863
+#: src/fs/fs_api.c:2846
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:3124
+#: src/fs/fs_api.c:3107
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3219
+#: src/fs/fs_api.c:3202
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2501,38 +2501,38 @@ msgstr "打开日志文件“%s”失败：%s\n"
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1053
+#: src/fs/fs_download.c:1044
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1066
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1089
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:1109
+#: src/fs/fs_download.c:1100
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:1119
+#: src/fs/fs_download.c:1110
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_download.c:1227
+#: src/fs/fs_download.c:1218
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_download.c:1899
+#: src/fs/fs_download.c:1890
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
@@ -2644,11 +2644,11 @@ msgstr "“%s”已连接到“%s”。\n"
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:218
+#: src/fs/fs_publish_ksk.c:212
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish_ublock.c:240
+#: src/fs/fs_publish_ublock.c:215
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
@@ -3379,60 +3379,60 @@ msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/fs/gnunet-service-fs_cp.c:680
+#: src/fs/gnunet-service-fs_cp.c:665
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:669
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1342
+#: src/fs/gnunet-service-fs_cp.c:702 src/fs/gnunet-service-fs_cp.c:1327
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:812
+#: src/fs/gnunet-service-fs_cp.c:797
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1009
+#: src/fs/gnunet-service-fs_cp.c:994
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1034
+#: src/fs/gnunet-service-fs_cp.c:1019
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:1029
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1141
+#: src/fs/gnunet-service-fs_cp.c:1126
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1199
+#: src/fs/gnunet-service-fs_cp.c:1184
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1223
+#: src/fs/gnunet-service-fs_cp.c:1208
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1237
+#: src/fs/gnunet-service-fs_cp.c:1222
 msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1279
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1338
+#: src/fs/gnunet-service-fs_cp.c:1323
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1708
+#: src/fs/gnunet-service-fs_cp.c:1679
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3452,25 +3452,25 @@ msgstr "创建用户出错"
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:317
+#: src/fs/gnunet-service-fs_indexing.c:297
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:331
+#: src/fs/gnunet-service-fs_indexing.c:311
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:335
+#: src/fs/gnunet-service-fs_indexing.c:315
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:349
+#: src/fs/gnunet-service-fs_indexing.c:329
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:455
+#: src/fs/gnunet-service-fs_indexing.c:435
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3506,97 +3506,97 @@ msgstr ""
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:325
+#: src/fs/gnunet-service-fs_pr.c:305
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:416 src/fs/gnunet-service-fs_pr.c:654
+#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:795
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:869
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1037
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1066
+#: src/fs/gnunet-service-fs_pr.c:1032
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1107
+#: src/fs/gnunet-service-fs_pr.c:1073
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1228
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1317
+#: src/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1405
+#: src/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1522
+#: src/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1537
+#: src/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1560
+#: src/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1577
+#: src/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1598
+#: src/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1604
+#: src/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1650
+#: src/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1663
+#: src/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1714
+#: src/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1778
+#: src/fs/gnunet-service-fs_pr.c:1744
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:648
+#: src/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3720,11 +3720,11 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:544
 #: src/hostlist/gnunet-daemon-hostlist_client.c:772
 #: src/hostlist/gnunet-daemon-hostlist_client.c:781
-#: src/hostlist/gnunet-daemon-hostlist_client.c:836
-#: src/hostlist/gnunet-daemon-hostlist_client.c:848
-#: src/hostlist/gnunet-daemon-hostlist_client.c:964
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1066
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1074
+#: src/hostlist/gnunet-daemon-hostlist_client.c:835
+#: src/hostlist/gnunet-daemon-hostlist_client.c:847
+#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1059
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1067
 #: src/transport/plugin_transport_http_client.c:600
 #: src/transport/plugin_transport_http_client.c:618
 #, c-format
@@ -3776,59 +3776,59 @@ msgstr ""
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2658
+#: src/gns/gnunet-gns-proxy.c:2653
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户："
 
-#: src/gns/gnunet-gns-proxy.c:2690
+#: src/gns/gnunet-gns-proxy.c:2685
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "无法保存配置文件“%s”："
 
-#: src/gns/gnunet-gns-proxy.c:2899
+#: src/gns/gnunet-gns-proxy.c:2894
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2923 src/rest/gnunet-rest-server.c:917
+#: src/gns/gnunet-gns-proxy.c:2918 src/rest/gnunet-rest-server.c:917
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3267
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3304
+#: src/gns/gnunet-gns-proxy.c:3299
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3390
+#: src/gns/gnunet-gns-proxy.c:3385
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3731
+#: src/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3865
+#: src/gns/gnunet-gns-proxy.c:3860
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3865
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3900
+#: src/gns/gnunet-gns-proxy.c:3895
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3897,7 +3897,7 @@ msgstr "无法连接到 %s:%u：%s\n"
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:386
+#: src/gns/gnunet-service-gns_interceptor.c:380
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -3917,50 +3917,50 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:904
+#: src/gns/gnunet-service-gns_resolver.c:903
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1095
+#: src/gns/gnunet-service-gns_resolver.c:1094
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1871
+#: src/gns/gnunet-service-gns_resolver.c:1870
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1886
+#: src/gns/gnunet-service-gns_resolver.c:1885
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1926
+#: src/gns/gnunet-service-gns_resolver.c:1918
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2328
+#: src/gns/gnunet-service-gns_resolver.c:2320
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2333
+#: src/gns/gnunet-service-gns_resolver.c:2325
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2356
+#: src/gns/gnunet-service-gns_resolver.c:2348
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2523
+#: src/gns/gnunet-service-gns_resolver.c:2515
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2671
+#: src/gns/gnunet-service-gns_resolver.c:2663
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4230,7 +4230,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4246,114 +4246,114 @@ msgid ""
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:893
+#: src/hostlist/gnunet-daemon-hostlist_client.c:886
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:908
+#: src/hostlist/gnunet-daemon-hostlist_client.c:901
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:921
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:934
+#: src/hostlist/gnunet-daemon-hostlist_client.c:927
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:942
+#: src/hostlist/gnunet-daemon-hostlist_client.c:935
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:998
+#: src/hostlist/gnunet-daemon-hostlist_client.c:991
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1007
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1000
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1732
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1137
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1154
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1147
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1212
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1233
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1205
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1226
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1412
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1514
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1566
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1560
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1661
-#: src/transport/plugin_transport_http_client.c:2300
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
+#: src/transport/plugin_transport_http_client.c:2294
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1690
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1703
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1717
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4423,7 +4423,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2662
+#: src/transport/gnunet-service-transport.c:2657
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -4590,7 +4590,7 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/plugin_rest_identity.c:1401
+#: src/identity/plugin_rest_identity.c:1529
 msgid "Identity REST API initialized\n"
 msgstr ""
 
@@ -5343,7 +5343,7 @@ msgstr "运行 %s失败：%s %d\n"
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:607
+#: src/nat/gnunet-service-nat_mini.c:602
 msgid "`upnpc' command not found\n"
 msgstr ""
 
@@ -5629,51 +5629,46 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:209
-#, fuzzy, c-format
-msgid "Invalid DID `%s'\n"
-msgstr "无效条目。\n"
-
-#: src/reclaim/gnunet-did.c:835
+#: src/reclaim/gnunet-did.c:591
 msgid "Create a DID Document and display its DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:840
+#: src/reclaim/gnunet-did.c:596
 msgid "Get the DID Document associated with the given DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:844
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:849
+#: src/reclaim/gnunet-did.c:601
 msgid "Remove the DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:853 src/reclaim/gnunet-did.c:857
+#: src/reclaim/gnunet-did.c:605
 msgid "Replace the DID Document."
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:863
+#: src/reclaim/gnunet-did.c:609
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:613
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:619
 msgid "The Decentralized Identity (DID)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:869
+#: src/reclaim/gnunet-did.c:625
 msgid "The DID Document to store in GNUNET"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:874
+#: src/reclaim/gnunet-did.c:630
 msgid "The name of the EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:880
+#: src/reclaim/gnunet-did.c:636
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:889
-msgid "Manage Decentralized Identities (DIDs)"
-msgstr ""
-
 #: src/reclaim/gnunet-reclaim.c:802
 #, fuzzy, c-format
 msgid "Ego is required\n"
@@ -5780,60 +5775,60 @@ msgstr "立即保存配置？"
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1388
+#: src/regex/gnunet-regex-profiler.c:1366
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/regex/gnunet-regex-profiler.c:1408
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1436
+#: src/regex/gnunet-regex-profiler.c:1414
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1444
+#: src/regex/gnunet-regex-profiler.c:1422
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/regex/gnunet-regex-profiler.c:1453
+#: src/regex/gnunet-regex-profiler.c:1431
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1473
+#: src/regex/gnunet-regex-profiler.c:1451
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:1562
+#: src/regex/gnunet-regex-profiler.c:1540
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1569
+#: src/regex/gnunet-regex-profiler.c:1547
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1575
+#: src/regex/gnunet-regex-profiler.c:1553
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1560
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1589
+#: src/regex/gnunet-regex-profiler.c:1567
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1604
+#: src/regex/gnunet-regex-profiler.c:1582
 msgid "Profiler for regex"
 msgstr ""
 
@@ -6780,7 +6775,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3342
 #: src/transport/gnunet-communicator-udp.c:3867
 #: src/transport/gnunet-service-tng.c:11039
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-service-transport.c:2622
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置？"
@@ -6835,21 +6830,21 @@ msgid "# bytes payload received"
 msgstr ""
 
 #: src/transport/gnunet-service-transport.c:2019
-#: src/transport/gnunet-service-transport.c:2453
+#: src/transport/gnunet-service-transport.c:2448
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2457
+#: src/transport/gnunet-service-transport.c:2452
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport.c:2552
+#: src/transport/gnunet-service-transport.c:2547
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/gnunet-service-transport.c:2561
+#: src/transport/gnunet-service-transport.c:2556
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7356,24 +7351,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2140
+#: src/transport/plugin_transport_http_client.c:2134
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2189
+#: src/transport/plugin_transport_http_client.c:2183
 #: src/transport/plugin_transport_http_server.c:3276
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:2206
+#: src/transport/plugin_transport_http_client.c:2200
 #: src/transport/plugin_transport_http_server.c:3346
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2240
+#: src/transport/plugin_transport_http_client.c:2234
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
@@ -7878,81 +7873,81 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:227 src/util/bio.c:235
+#: src/util/bio.c:228 src/util/bio.c:236
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "创建用户出错"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:238
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:266
+#: src/util/bio.c:267
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/util/bio.c:268
+#: src/util/bio.c:269
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:308
+#: src/util/bio.c:309
 #, fuzzy, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr "“%s”的参数无效。\n"
 
-#: src/util/bio.c:335 src/util/bio.c:839
+#: src/util/bio.c:336 src/util/bio.c:840
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:341
+#: src/util/bio.c:342
 #, fuzzy, c-format
 msgid "%s (while reading `%s')"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/util/bio.c:346
+#: src/util/bio.c:347
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:359
+#: src/util/bio.c:360
 #, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/util/bio.c:398 src/util/bio.c:864 src/util/bio.c:881
+#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
 msgid "metadata length"
 msgstr ""
 
-#: src/util/bio.c:410
+#: src/util/bio.c:411
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:426
+#: src/util/bio.c:427
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "发送消息失败。\n"
 
-#: src/util/bio.c:668
+#: src/util/bio.c:669
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:730 src/util/bio.c:751
+#: src/util/bio.c:731 src/util/bio.c:752
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/util/bio.c:732
+#: src/util/bio.c:733
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:816
+#: src/util/bio.c:817
 #, fuzzy, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/bio.c:876
+#: src/util/bio.c:877
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "发送消息失败。\n"
@@ -7961,7 +7956,7 @@ msgstr "发送消息失败。\n"
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1106
+#: src/util/client.c:1095
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -7971,53 +7966,53 @@ msgstr ""
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:926
+#: src/util/common_logging.c:911
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:1131
+#: src/util/common_logging.c:1104
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:1133
+#: src/util/common_logging.c:1106
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:1135
+#: src/util/common_logging.c:1108
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:1137
+#: src/util/common_logging.c:1110
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:1139
+#: src/util/common_logging.c:1112
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:1141
+#: src/util/common_logging.c:1114
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:1142
+#: src/util/common_logging.c:1115
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1423
+#: src/util/common_logging.c:1396
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1441
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1487
+#: src/util/common_logging.c:1453
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/util/common_logging.c:1510
+#: src/util/common_logging.c:1468
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8112,7 +8107,7 @@ msgstr ""
 msgid "failed to load configuration defaults"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/container_bloomfilter.c:542
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8124,17 +8119,17 @@ msgstr ""
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/crypto_ecc.c:669
+#: src/util/crypto_ecc.c:689
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/crypto_ecc_setup.c:280
+#: src/util/crypto_ecc_setup.c:272
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/crypto_random.c:385
+#: src/util/crypto_random.c:372
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
@@ -8650,17 +8645,17 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "插件机构初始化失败：%s！\n"
 
-#: src/util/plugin.c:156
+#: src/util/plugin.c:157
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:234
+#: src/util/plugin.c:214
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:414
+#: src/util/plugin.c:370
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
@@ -9003,6 +8998,10 @@ msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy, c-format
+#~ msgid "Invalid DID `%s'\n"
+#~ msgstr "无效条目。\n"
+
+#, fuzzy, c-format
 #~ msgid "Businesscard HTTP server starts on %u\n"
 #~ msgstr "初始化“%s”服务失败。\n"