BUILD: Move gnunet_config.h to gnunet_private_config.h and add new, partially generated gnunet_config.h

1 files changed, 135 insertions, 143 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 576e6b0b7..ae10f0218 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-11-14 08:54+0100\n"
+"POT-Creation-Date: 2022-12-04 14:58+0900\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -19,7 +19,6 @@ msgstr ""
 #: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
 #: src/namestore/gnunet-namestore-zonefile.c:657
 #: src/namestore/gnunet-namestore-zonefile.c:676
-#: src/namestore/gnunet-namestore.c:1579
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -31,7 +30,7 @@ msgstr "“%s”的参数无效。\n"
 
 #: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1751
 #: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1183
+#: src/namestore/gnunet-namestore.c:1958
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -1537,7 +1536,7 @@ msgstr "sqlite 数据仓库"
 #: src/datastore/plugin_datastore_sqlite.c:81 src/my/my.c:81 src/my/my.c:93
 #: src/mysql/mysql.c:46 src/mysql/mysql.c:64
 #: src/namecache/plugin_namecache_sqlite.c:54
-#: src/namestore/plugin_namestore_sqlite.c:55
+#: src/namestore/plugin_namestore_sqlite.c:56
 #: src/peerstore/plugin_peerstore_sqlite.c:54
 #: src/testbed/generate-underlay-topology.c:48
 #: src/testbed/gnunet-daemon-latency-logger.c:53
@@ -1551,7 +1550,7 @@ msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 #: src/datacache/plugin_datacache_sqlite.c:1035
 #: src/datastore/plugin_datastore_sqlite.c:532
 #: src/namecache/plugin_namecache_sqlite.c:237
-#: src/namestore/plugin_namestore_sqlite.c:227
+#: src/namestore/plugin_namestore_sqlite.c:228
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1863,20 +1862,16 @@ msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:273
-#: src/datastore/plugin_datastore_postgres.c:886
+#: src/datastore/plugin_datastore_postgres.c:238
+#: src/datastore/plugin_datastore_postgres.c:850
 msgid "Postgresql exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:847
+#: src/datastore/plugin_datastore_postgres.c:811
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "发送消息失败。\n"
 
-#: src/datastore/plugin_datastore_postgres.c:945
-msgid "Postgres database running\n"
-msgstr ""
-
 #: src/datastore/plugin_datastore_sqlite.c:87
 #: src/testbed/generate-underlay-topology.c:55
 #: src/testbed/gnunet-daemon-latency-logger.c:56
@@ -1887,7 +1882,7 @@ msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:311
 #: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:891
+#: src/namestore/plugin_namestore_sqlite.c:894
 #: src/peerstore/plugin_peerstore_sqlite.c:540
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
@@ -3825,7 +3820,7 @@ msgstr ""
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "“%s”不可用。\n"
 
-#: src/gns/gnunet-gns.c:267 src/util/dnsparser.c:254
+#: src/gns/gnunet-gns.c:267 src/util/dnsparser.c:253
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
@@ -3870,13 +3865,13 @@ msgid "Properly base32-encoded public key required"
 msgstr "“%s”的参数无效。\n"
 
 #: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1353
+#: src/zonemaster/gnunet-service-zonemaster.c:1346
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/gns/gnunet-service-gns.c:574
-#: src/zonemaster/gnunet-service-zonemaster.c:1392
+#: src/zonemaster/gnunet-service-zonemaster.c:1385
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u：%s\n"
@@ -4582,7 +4577,7 @@ msgstr "无法解析“%s”(%s)：%s\n"
 msgid "No records found for `%s'"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/namecache/gnunet-namecache.c:119 src/namestore/gnunet-namestore.c:670
+#: src/namecache/gnunet-namecache.c:119 src/namestore/gnunet-namestore.c:888
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4602,7 +4597,7 @@ msgstr "“%s”的参数无效。\n"
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方！\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1886
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:2020
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4610,7 +4605,7 @@ msgstr ""
 msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1971
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:2102
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
@@ -4658,25 +4653,25 @@ msgstr "sqlite 数据仓库"
 msgid "Failed to setup database at `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/namestore/gnunet-namestore-dbtool.c:86
-#: src/namestore/gnunet-namestore.c:1657
+#: src/namestore/gnunet-namestore-dbtool.c:87
+#: src/namestore/gnunet-namestore.c:1951
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:153
+#: src/namestore/gnunet-namestore-dbtool.c:158
 msgid "initialize database"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:157
+#: src/namestore/gnunet-namestore-dbtool.c:163
 msgid "reset database (DANGEROUS: All existing data is lost!"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:164
+#: src/namestore/gnunet-namestore-dbtool.c:170
 msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:178
+#: src/namestore/gnunet-namestore-dbtool.c:189
 #: src/namestore/gnunet-namestore-zonefile.c:753
 #, fuzzy
 msgid "GNUnet namestore database manipulation tool"
@@ -4833,232 +4828,240 @@ msgid "Failed to connect to IDENTITY\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:1956
+#: src/namestore/gnunet-namestore.c:2087
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:449
+#: src/namestore/gnunet-namestore.c:412
+#, fuzzy, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/gnunet-namestore.c:420
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/namestore/gnunet-namestore.c:428 src/namestore/gnunet-namestore.c:443
+msgid "Empty record line argument is not allowed.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:435
+#, fuzzy, c-format
+msgid "Error parsing expiration time %s.\n"
+msgstr "保存配置出错。"
+
+#: src/namestore/gnunet-namestore.c:465
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/namestore/gnunet-namestore.c:667
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:467 src/namestore/gnunet-namestore.c:483
+#: src/namestore/gnunet-namestore.c:685 src/namestore/gnunet-namestore.c:701
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr "“%s”以错误码 %d 失败：%s\n"
 
-#: src/namestore/gnunet-namestore.c:904
+#: src/namestore/gnunet-namestore.c:1137
 #, c-format
 msgid ""
 "A SOA record exists already under `%s', cannot add a second SOA to the same "
 "zone.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1025
+#: src/namestore/gnunet-namestore.c:1258
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1068
+#: src/namestore/gnunet-namestore.c:1301
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1146
+#: src/namestore/gnunet-namestore.c:1326
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1175
+#: src/namestore/gnunet-namestore.c:1355
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1196 src/namestore/gnunet-namestore.c:1206
-#: src/namestore/gnunet-namestore.c:1258 src/namestore/gnunet-namestore.c:1268
-#: src/namestore/gnunet-namestore.c:1278 src/namestore/gnunet-namestore.c:1307
-#: src/namestore/gnunet-namestore.c:1328 src/namestore/gnunet-namestore.c:1355
-#: src/namestore/gnunet-namestore.c:1365 src/namestore/gnunet-namestore.c:1398
-#: src/namestore/gnunet-namestore.c:1423 src/namestore/gnunet-namestore.c:1457
-#: src/namestore/gnunet-namestore.c:1489 src/namestore/gnunet-namestore.c:1512
+#: src/namestore/gnunet-namestore.c:1369
+#, c-format
+msgid "Recordlines only work with option `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1378 src/namestore/gnunet-namestore.c:1430
+#: src/namestore/gnunet-namestore.c:1440 src/namestore/gnunet-namestore.c:1450
+#: src/namestore/gnunet-namestore.c:1479 src/namestore/gnunet-namestore.c:1500
+#: src/namestore/gnunet-namestore.c:1527 src/namestore/gnunet-namestore.c:1537
+#: src/namestore/gnunet-namestore.c:1570 src/namestore/gnunet-namestore.c:1595
+#: src/namestore/gnunet-namestore.c:1629 src/namestore/gnunet-namestore.c:1663
+#: src/namestore/gnunet-namestore.c:1686
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:1198 src/namestore/gnunet-namestore.c:1208
-msgid "replace"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:1380
+#, fuzzy
+msgid "name"
+msgstr "无名称"
 
-#: src/namestore/gnunet-namestore.c:1237
+#: src/namestore/gnunet-namestore.c:1409
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:1260 src/namestore/gnunet-namestore.c:1270
-#: src/namestore/gnunet-namestore.c:1280 src/namestore/gnunet-namestore.c:1309
-#: src/namestore/gnunet-namestore.c:1330 src/namestore/gnunet-namestore.c:1514
+#: src/namestore/gnunet-namestore.c:1432 src/namestore/gnunet-namestore.c:1442
+#: src/namestore/gnunet-namestore.c:1452 src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1502 src/namestore/gnunet-namestore.c:1688
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1288
+#: src/namestore/gnunet-namestore.c:1460
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:1298
+#: src/namestore/gnunet-namestore.c:1470
 #, c-format
 msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1318
+#: src/namestore/gnunet-namestore.c:1490
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1337 src/namestore/gnunet-namestore.c:1521
+#: src/namestore/gnunet-namestore.c:1509 src/namestore/gnunet-namestore.c:1695
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:1357 src/namestore/gnunet-namestore.c:1367
+#: src/namestore/gnunet-namestore.c:1529 src/namestore/gnunet-namestore.c:1539
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1400
+#: src/namestore/gnunet-namestore.c:1572
 msgid "purge-zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1425
+#: src/namestore/gnunet-namestore.c:1597
 msgid "list"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1459
+#: src/namestore/gnunet-namestore.c:1631
 msgid "reverse-pkey"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1469
+#: src/namestore/gnunet-namestore.c:1641
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-namestore.c:1491
+#: src/namestore/gnunet-namestore.c:1665
 msgid "uri"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1504
+#: src/namestore/gnunet-namestore.c:1678
 #: src/peerinfo-tool/gnunet-peerinfo.c:737
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:1684
+#: src/namestore/gnunet-namestore.c:1966
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1728
-msgid "Empty record line argument is not allowed.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1740
-#, c-format
-msgid "Invalid expiration time `%s' (must be without unit)\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1752 src/namestore/gnunet-namestore.c:1768
-#: src/namestore/gnunet-namestore.c:1785
-#, fuzzy, c-format
-msgid "Missing entries in record line `%s'.\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/gnunet-namestore.c:1760
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/namestore/gnunet-namestore.c:1798
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "IP 格式无效：“%s”\n"
-
-#: src/namestore/gnunet-namestore.c:1855
+#: src/namestore/gnunet-namestore.c:1985
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1858
+#: src/namestore/gnunet-namestore.c:1988
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1862
+#: src/namestore/gnunet-namestore.c:1992
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1869
+#: src/namestore/gnunet-namestore.c:1996
+msgid "read commands from stdin"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:2003
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1875
+#: src/namestore/gnunet-namestore.c:2009
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1880
+#: src/namestore/gnunet-namestore.c:2014
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:1892
+#: src/namestore/gnunet-namestore.c:2024
 #, fuzzy
-msgid "determine our name for the given PKEY"
-msgstr "���法获��有���用户“%s”的信息：%s\n"
+msgid "Output in recordline format"
+msgstr "以 gnuplot �����输���"
 
-#: src/namestore/gnunet-namestore.c:1899
-msgid ""
-"set record set to values given by (possibly multiple) RECORDLINES; can be "
-"specified multiple times"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:2030
+#, fuzzy
+msgid "determine our name for the given KEY"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1905
+#: src/namestore/gnunet-namestore.c:2036
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1910
+#: src/namestore/gnunet-namestore.c:2041
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1916
+#: src/namestore/gnunet-namestore.c:2047
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1920
+#: src/namestore/gnunet-namestore.c:2051
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1924
+#: src/namestore/gnunet-namestore.c:2055
 msgid "omit private records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1929
+#: src/namestore/gnunet-namestore.c:2060
 msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1934
+#: src/namestore/gnunet-namestore.c:2065
 msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1939
+#: src/namestore/gnunet-namestore.c:2070
 msgid ""
 "show private key for orphaned records for recovery using `gnunet-identity -C "
 "-P <key>'. Use in combination with --display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1944
+#: src/namestore/gnunet-namestore.c:2075
 msgid "delete all records in specified zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1950
+#: src/namestore/gnunet-namestore.c:2081
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
@@ -5087,19 +5090,13 @@ msgstr ""
 msgid "Flat file database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/namestore/plugin_namestore_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:190
-#: src/namestore/plugin_namestore_sqlite.c:829
+#: src/namestore/plugin_namestore_sqlite.c:181
+#: src/namestore/plugin_namestore_sqlite.c:191
 #, fuzzy, c-format
 msgid "Failed to setup database with: `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/namestore/plugin_namestore_sqlite.c:820
-#, fuzzy, c-format
-msgid "Failed to drop database with: `%s'\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/namestore/plugin_namestore_sqlite.c:961
+#: src/namestore/plugin_namestore_sqlite.c:956
 #, fuzzy
 msgid "SQlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -6597,17 +6594,17 @@ msgid ""
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1021 src/testing/testing.c:2700
+#: src/testbed/testbed_api_topology.c:1021 src/testing/testing.c:2725
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1029 src/testing/testing.c:2708
+#: src/testbed/testbed_api_topology.c:1029 src/testing/testing.c:2733
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1037 src/testing/testing.c:2716
+#: src/testbed/testbed_api_topology.c:1037 src/testing/testing.c:2741
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
@@ -6687,53 +6684,53 @@ msgstr ""
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:725
+#: src/testing/testing.c:724
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1199
+#: src/testing/testing.c:1198
 #, 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:1208
+#: src/testing/testing.c:1207
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:1218
+#: src/testing/testing.c:1217
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1231
+#: src/testing/testing.c:1230
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1247
+#: src/testing/testing.c:1246
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing.c:1261
+#: src/testing/testing.c:1260
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:1289
+#: src/testing/testing.c:1288
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1395
+#: src/testing/testing.c:1394
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/testing/testing.c:1646
+#: src/testing/testing.c:1645
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -6814,7 +6811,7 @@ msgstr ""
 
 #: src/transport/gnunet-communicator-tcp.c:3347
 #: src/transport/gnunet-communicator-udp.c:3872
-#: src/transport/gnunet-service-tng.c:11334
+#: src/transport/gnunet-service-tng.c:11367
 #: src/transport/gnunet-service-transport.c:2617
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
@@ -8189,7 +8186,7 @@ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 
-#: src/util/dnsparser.c:910
+#: src/util/dnsparser.c:909
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
@@ -9126,17 +9123,21 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:507
+#: src/zonemaster/gnunet-service-zonemaster.c:502
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1340
+#: src/zonemaster/gnunet-service-zonemaster.c:1333
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy, c-format
+#~ msgid "Failed to drop database with: `%s'\n"
+#~ msgstr "运行 %s失败：%s %d\n"
+
+#, fuzzy, c-format
 #~ msgid "Failed to receive response from `%s' service (error code is %d).\n"
 #~ msgstr "“%s”的参数无效。\n"
 
@@ -9982,9 +9983,6 @@ msgstr "初始化“%s”服务失败。\n"
 #~ msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 #~ msgstr "打开日志文件“%s”失败：%s\n"
 
-#~ msgid "no-name"
-#~ msgstr "无名称"
-
 #, fuzzy
 #~ msgid "Option `%s' ignored\n"
 #~ msgstr "%s：选项“%s”有歧义\n"
@@ -10585,9 +10583,6 @@ msgstr "初始化“%s”服务失败。\n"
 #~ msgid "Configuration changed. Save?"
 #~ msgstr "配置已更改。保存吗？"
 
-#~ msgid "Error saving configuration."
-#~ msgstr "保存配置出错。"
-
 #~ msgid "(unknown connection)"
 #~ msgstr "(未知连接)"
 
@@ -10847,9 +10842,6 @@ msgstr "初始化“%s”服务失败。\n"
 #~ msgid "%s:%d - async RPC %s:%p could not be unregistered: not found\n"
 #~ msgstr "%s:%d - 异步 RPC %s:%p 无法解除注册：找不到\n"
 
-#~ msgid "output in gnuplot format"
-#~ msgstr "以 gnuplot 格式输出"
-
 #~ msgid "receiver host identifier (ENC file name)"
 #~ msgstr "接收方主机标识(ENC 文件名)"