-fix test; modify NAMESTORE JSON booleans, Fixes #7398

12 files changed, 147 insertions, 147 deletions

diff --git a/po/de.po b/po/de.po
index 242ebbacc..e280b7cef 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-21 13:20+0900\n"
+"POT-Creation-Date: 2022-10-21 13:49+0900\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -22,8 +22,8 @@ msgstr ""
 "X-Generator: Poedit 1.7.4\n"
 
 #: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:652
-#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore-zonefile.c:655
+#: src/namestore/gnunet-namestore-zonefile.c:674
 #: src/namestore/gnunet-namestore.c:1245
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
@@ -3978,13 +3978,13 @@ msgid "Properly base32-encoded public key required"
 msgstr "# Bytes empfangen über TCP"
 
 #: src/gns/gnunet-service-gns.c:536
-#: src/zonemaster/gnunet-service-zonemaster.c:1396
+#: src/zonemaster/gnunet-service-zonemaster.c:1373
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
 #: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1435
+#: src/zonemaster/gnunet-service-zonemaster.c:1412
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -4832,7 +4832,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
-#: src/namestore/gnunet-namestore-zonefile.c:750
+#: src/namestore/gnunet-namestore-zonefile.c:751
 #, fuzzy
 msgid "GNUnet namestore database manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -4940,43 +4940,43 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
+#: src/namestore/gnunet-namestore-zonefile.c:331
 #, fuzzy, c-format
 msgid "Failed to store records...\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:437
-#: src/namestore/gnunet-namestore-zonefile.c:469
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
 #, fuzzy, c-format
 msgid "Name `%s' is too long\n"
 msgstr "Dienst »%s« läuft nicht\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:515
+#: src/namestore/gnunet-namestore-zonefile.c:518
 #, c-format
 msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:524
+#: src/namestore/gnunet-namestore-zonefile.c:527
 #, c-format
 msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:586
+#: src/namestore/gnunet-namestore-zonefile.c:589
 #, fuzzy, c-format
 msgid "Data `%s' invalid\n"
 msgstr "Schlüssel »%s« ist gültig\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:702
+#: src/namestore/gnunet-namestore-zonefile.c:703
 #, fuzzy, c-format
 msgid "Failed to connect to NAMESTORE\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:709
+#: src/namestore/gnunet-namestore-zonefile.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IDENTITY\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore-zonefile.c:736
 #: src/namestore/gnunet-namestore.c:1628
 msgid "name of the ego controlling the zone"
 msgstr ""
@@ -9212,7 +9212,7 @@ msgstr "Tunnel über VPN einrichten."
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1383
+#: src/zonemaster/gnunet-service-zonemaster.c:1360
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
diff --git a/po/es.po b/po/es.po
index ce83de043..aab7e245e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-21 13:20+0900\n"
+"POT-Creation-Date: 2022-10-21 13:49+0900\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:652
-#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore-zonefile.c:655
+#: src/namestore/gnunet-namestore-zonefile.c:674
 #: src/namestore/gnunet-namestore.c:1245
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
@@ -4105,13 +4105,13 @@ msgid "Properly base32-encoded public key required"
 msgstr "Tipo requerido\n"
 
 #: src/gns/gnunet-service-gns.c:536
-#: src/zonemaster/gnunet-service-zonemaster.c:1396
+#: src/zonemaster/gnunet-service-zonemaster.c:1373
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
 #: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1435
+#: src/zonemaster/gnunet-service-zonemaster.c:1412
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
@@ -5000,7 +5000,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
-#: src/namestore/gnunet-namestore-zonefile.c:750
+#: src/namestore/gnunet-namestore-zonefile.c:751
 #, fuzzy
 msgid "GNUnet namestore database manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
@@ -5111,43 +5111,43 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
+#: src/namestore/gnunet-namestore-zonefile.c:331
 #, fuzzy, c-format
 msgid "Failed to store records...\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:437
-#: src/namestore/gnunet-namestore-zonefile.c:469
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
 #, fuzzy, c-format
 msgid "Name `%s' is too long\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:515
+#: src/namestore/gnunet-namestore-zonefile.c:518
 #, c-format
 msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:524
+#: src/namestore/gnunet-namestore-zonefile.c:527
 #, c-format
 msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:586
+#: src/namestore/gnunet-namestore-zonefile.c:589
 #, fuzzy, c-format
 msgid "Data `%s' invalid\n"
 msgstr "Formato del pseudónimo '%s' no es válido.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:702
+#: src/namestore/gnunet-namestore-zonefile.c:703
 #, fuzzy, c-format
 msgid "Failed to connect to NAMESTORE\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:709
+#: src/namestore/gnunet-namestore-zonefile.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IDENTITY\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore-zonefile.c:736
 #: src/namestore/gnunet-namestore.c:1628
 #, fuzzy
 msgid "name of the ego controlling the zone"
@@ -9546,7 +9546,7 @@ msgstr "Configurar túneles vía VPN."
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1383
+#: src/zonemaster/gnunet-service-zonemaster.c:1360
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
diff --git a/po/fr.po b/po/fr.po
index 034e6f387..f2ecec94d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-21 13:20+0900\n"
+"POT-Creation-Date: 2022-10-21 13:49+0900\n"
 "PO-Revision-Date: 2021-11-21 00:53+0100\n"
 "Last-Translator: Stéphane  Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -18,8 +18,8 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:652
-#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore-zonefile.c:655
+#: src/namestore/gnunet-namestore-zonefile.c:674
 #: src/namestore/gnunet-namestore.c:1245
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
@@ -3810,12 +3810,12 @@ msgid "Properly base32-encoded public key required"
 msgstr ""
 
 #: src/gns/gnunet-service-gns.c:536
-#: src/zonemaster/gnunet-service-zonemaster.c:1396
+#: src/zonemaster/gnunet-service-zonemaster.c:1373
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
 #: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1435
+#: src/zonemaster/gnunet-service-zonemaster.c:1412
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
@@ -4642,7 +4642,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
-#: src/namestore/gnunet-namestore-zonefile.c:750
+#: src/namestore/gnunet-namestore-zonefile.c:751
 msgid "GNUnet namestore database manipulation tool"
 msgstr ""
 
@@ -4744,43 +4744,43 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
+#: src/namestore/gnunet-namestore-zonefile.c:331
 #, fuzzy, c-format
 msgid "Failed to store records...\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:437
-#: src/namestore/gnunet-namestore-zonefile.c:469
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
 #, c-format
 msgid "Name `%s' is too long\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:515
+#: src/namestore/gnunet-namestore-zonefile.c:518
 #, c-format
 msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:524
+#: src/namestore/gnunet-namestore-zonefile.c:527
 #, c-format
 msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:586
+#: src/namestore/gnunet-namestore-zonefile.c:589
 #, fuzzy, c-format
 msgid "Data `%s' invalid\n"
 msgstr "Appel terminé\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:702
+#: src/namestore/gnunet-namestore-zonefile.c:703
 #, fuzzy, c-format
 msgid "Failed to connect to NAMESTORE\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:709
+#: src/namestore/gnunet-namestore-zonefile.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IDENTITY\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore-zonefile.c:736
 #: src/namestore/gnunet-namestore.c:1628
 msgid "name of the ego controlling the zone"
 msgstr ""
@@ -8886,7 +8886,7 @@ msgstr "Configurer des tunnels via VPN."
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1383
+#: src/zonemaster/gnunet-service-zonemaster.c:1360
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index c3c3ab7e3..af873ed77 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-21 13:20+0900\n"
+"POT-Creation-Date: 2022-10-21 13:49+0900\n"
 "PO-Revision-Date: 2019-10-16 11:00+0200\n"
 "Last-Translator: Sebastiano Pistore <sebastianopistore.info@protonmail.ch>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -21,8 +21,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:652
-#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore-zonefile.c:655
+#: src/namestore/gnunet-namestore-zonefile.c:674
 #: src/namestore/gnunet-namestore.c:1245
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
@@ -3834,12 +3834,12 @@ msgid "Properly base32-encoded public key required"
 msgstr "# messaggi PONG ricevuti"
 
 #: src/gns/gnunet-service-gns.c:536
-#: src/zonemaster/gnunet-service-zonemaster.c:1396
+#: src/zonemaster/gnunet-service-zonemaster.c:1373
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
 #: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1435
+#: src/zonemaster/gnunet-service-zonemaster.c:1412
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
@@ -4667,7 +4667,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
-#: src/namestore/gnunet-namestore-zonefile.c:750
+#: src/namestore/gnunet-namestore-zonefile.c:751
 msgid "GNUnet namestore database manipulation tool"
 msgstr ""
 
@@ -4770,43 +4770,43 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
+#: src/namestore/gnunet-namestore-zonefile.c:331
 #, fuzzy, c-format
 msgid "Failed to store records...\n"
 msgstr "Impossibile avviare il servizio.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:437
-#: src/namestore/gnunet-namestore-zonefile.c:469
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
 #, fuzzy, c-format
 msgid "Name `%s' is too long\n"
 msgstr "nome file troppo lungo"
 
-#: src/namestore/gnunet-namestore-zonefile.c:515
+#: src/namestore/gnunet-namestore-zonefile.c:518
 #, c-format
 msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:524
+#: src/namestore/gnunet-namestore-zonefile.c:527
 #, c-format
 msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:586
+#: src/namestore/gnunet-namestore-zonefile.c:589
 #, c-format
 msgid "Data `%s' invalid\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:702
+#: src/namestore/gnunet-namestore-zonefile.c:703
 #, fuzzy, c-format
 msgid "Failed to connect to NAMESTORE\n"
 msgstr "Impossibile avviare il servizio.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:709
+#: src/namestore/gnunet-namestore-zonefile.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IDENTITY\n"
 msgstr "Impossibile avviare il servizio.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore-zonefile.c:736
 #: src/namestore/gnunet-namestore.c:1628
 msgid "name of the ego controlling the zone"
 msgstr ""
@@ -8942,7 +8942,7 @@ msgstr ""
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1383
+#: src/zonemaster/gnunet-service-zonemaster.c:1360
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index cd0ac004a..410f5b620 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-21 13:20+0900\n"
+"POT-Creation-Date: 2022-10-21 13:49+0900\n"
 "PO-Revision-Date: 2020-10-23 18:39+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -19,8 +19,8 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:652
-#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore-zonefile.c:655
+#: src/namestore/gnunet-namestore-zonefile.c:674
 #: src/namestore/gnunet-namestore.c:1245
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
@@ -3997,12 +3997,12 @@ msgid "Properly base32-encoded public key required"
 msgstr "исправан јавни кључ се захтева"
 
 #: src/gns/gnunet-service-gns.c:536
-#: src/zonemaster/gnunet-service-zonemaster.c:1396
+#: src/zonemaster/gnunet-service-zonemaster.c:1373
 msgid "Failed to connect to the namecache!\n"
 msgstr "Нисам успео да се повежем са оставом назива!\n"
 
 #: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1435
+#: src/zonemaster/gnunet-service-zonemaster.c:1412
 msgid "Could not connect to DHT!\n"
 msgstr "Не могу да се повежем на ДХТ!\n"
 
@@ -4855,7 +4855,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
-#: src/namestore/gnunet-namestore-zonefile.c:750
+#: src/namestore/gnunet-namestore-zonefile.c:751
 #, fuzzy
 msgid "GNUnet namestore database manipulation tool"
 msgstr "Алат манипуслисања ГНУнет зоном"
@@ -4963,43 +4963,43 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr "Услуга регистрације назива Први Стиже Први Служи ГНУ Система Назива"
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
+#: src/namestore/gnunet-namestore-zonefile.c:331
 #, fuzzy, c-format
 msgid "Failed to store records...\n"
 msgstr "Смештај назива није успео да смести запис\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:437
-#: src/namestore/gnunet-namestore-zonefile.c:469
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
 #, fuzzy, c-format
 msgid "Name `%s' is too long\n"
 msgstr "Регуларни израз „%s“ је превелик!\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:515
+#: src/namestore/gnunet-namestore-zonefile.c:518
 #, c-format
 msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:524
+#: src/namestore/gnunet-namestore-zonefile.c:527
 #, c-format
 msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:586
+#: src/namestore/gnunet-namestore-zonefile.c:589
 #, fuzzy, c-format
 msgid "Data `%s' invalid\n"
 msgstr "Кључ „%s“ је исправан\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:702
+#: src/namestore/gnunet-namestore-zonefile.c:703
 #, fuzzy, c-format
 msgid "Failed to connect to NAMESTORE\n"
 msgstr "Нисам успео да се повежем са ГНС-ом\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:709
+#: src/namestore/gnunet-namestore-zonefile.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IDENTITY\n"
 msgstr "Нисам успео да се повежем са ГНС-ом\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore-zonefile.c:736
 #: src/namestore/gnunet-namestore.c:1628
 msgid "name of the ego controlling the zone"
 msgstr "назив егоа који контролише зону"
@@ -9324,7 +9324,7 @@ msgstr "Поставља тунеле путем ВПН-а."
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Нисам успео да реплицирам блок у остави назива: %s\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1383
+#: src/zonemaster/gnunet-service-zonemaster.c:1360
 msgid "Failed to connect to the namestore!\n"
 msgstr "Нисам успео да се повежем са смештајем назива!\n"
 
diff --git a/po/sv.po b/po/sv.po
index 2992f6d9e..12f923084 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-21 13:20+0900\n"
+"POT-Creation-Date: 2022-10-21 13:49+0900\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:652
-#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore-zonefile.c:655
+#: src/namestore/gnunet-namestore-zonefile.c:674
 #: src/namestore/gnunet-namestore.c:1245
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
@@ -3999,13 +3999,13 @@ msgid "Properly base32-encoded public key required"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
 #: src/gns/gnunet-service-gns.c:536
-#: src/zonemaster/gnunet-service-zonemaster.c:1396
+#: src/zonemaster/gnunet-service-zonemaster.c:1373
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1435
+#: src/zonemaster/gnunet-service-zonemaster.c:1412
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -4850,7 +4850,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
-#: src/namestore/gnunet-namestore-zonefile.c:750
+#: src/namestore/gnunet-namestore-zonefile.c:751
 #, fuzzy
 msgid "GNUnet namestore database manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -4959,43 +4959,43 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
+#: src/namestore/gnunet-namestore-zonefile.c:331
 #, fuzzy, c-format
 msgid "Failed to store records...\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:437
-#: src/namestore/gnunet-namestore-zonefile.c:469
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
 #, fuzzy, c-format
 msgid "Name `%s' is too long\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:515
+#: src/namestore/gnunet-namestore-zonefile.c:518
 #, c-format
 msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:524
+#: src/namestore/gnunet-namestore-zonefile.c:527
 #, c-format
 msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:586
+#: src/namestore/gnunet-namestore-zonefile.c:589
 #, fuzzy, c-format
 msgid "Data `%s' invalid\n"
 msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:702
+#: src/namestore/gnunet-namestore-zonefile.c:703
 #, fuzzy, c-format
 msgid "Failed to connect to NAMESTORE\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:709
+#: src/namestore/gnunet-namestore-zonefile.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IDENTITY\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore-zonefile.c:736
 #: src/namestore/gnunet-namestore.c:1628
 #, fuzzy
 msgid "name of the ego controlling the zone"
@@ -9300,7 +9300,7 @@ msgstr ""
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1383
+#: src/zonemaster/gnunet-service-zonemaster.c:1360
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
diff --git a/po/vi.po b/po/vi.po
index 72e2b2c7a..ad4053230 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-10-21 13:20+0900\n"
+"POT-Creation-Date: 2022-10-21 13:49+0900\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -20,8 +20,8 @@ msgstr ""
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
 #: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:652
-#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore-zonefile.c:655
+#: src/namestore/gnunet-namestore-zonefile.c:674
 #: src/namestore/gnunet-namestore.c:1245
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
@@ -4045,13 +4045,13 @@ msgid "Properly base32-encoded public key required"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
 #: src/gns/gnunet-service-gns.c:536
-#: src/zonemaster/gnunet-service-zonemaster.c:1396
+#: src/zonemaster/gnunet-service-zonemaster.c:1373
 #, 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:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1435
+#: src/zonemaster/gnunet-service-zonemaster.c:1412
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -4911,7 +4911,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
-#: src/namestore/gnunet-namestore-zonefile.c:750
+#: src/namestore/gnunet-namestore-zonefile.c:751
 #, fuzzy
 msgid "GNUnet namestore database manipulation tool"
 msgstr "Cấu hình GNUnet"
@@ -5020,43 +5020,43 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
+#: src/namestore/gnunet-namestore-zonefile.c:331
 #, fuzzy, c-format
 msgid "Failed to store records...\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:437
-#: src/namestore/gnunet-namestore-zonefile.c:469
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
 #, fuzzy, c-format
 msgid "Name `%s' is too long\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:515
+#: src/namestore/gnunet-namestore-zonefile.c:518
 #, c-format
 msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:524
+#: src/namestore/gnunet-namestore-zonefile.c:527
 #, c-format
 msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:586
+#: src/namestore/gnunet-namestore-zonefile.c:589
 #, fuzzy, c-format
 msgid "Data `%s' invalid\n"
 msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:702
+#: src/namestore/gnunet-namestore-zonefile.c:703
 #, fuzzy, c-format
 msgid "Failed to connect to NAMESTORE\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:709
+#: src/namestore/gnunet-namestore-zonefile.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IDENTITY\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore-zonefile.c:736
 #: src/namestore/gnunet-namestore.c:1628
 msgid "name of the ego controlling the zone"
 msgstr ""
@@ -9359,7 +9359,7 @@ msgstr ""
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1383
+#: src/zonemaster/gnunet-service-zonemaster.c:1360
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8e6faf1c6..03596d9b2 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-10-21 13:20+0900\n"
+"POT-Creation-Date: 2022-10-21 13:49+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"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:652
-#: src/namestore/gnunet-namestore-zonefile.c:673
+#: src/namestore/gnunet-namestore-zonefile.c:655
+#: src/namestore/gnunet-namestore-zonefile.c:674
 #: src/namestore/gnunet-namestore.c:1245
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
@@ -3880,13 +3880,13 @@ msgid "Properly base32-encoded public key required"
 msgstr "“%s”的参数无效。\n"
 
 #: src/gns/gnunet-service-gns.c:536
-#: src/zonemaster/gnunet-service-zonemaster.c:1396
+#: src/zonemaster/gnunet-service-zonemaster.c:1373
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/gns/gnunet-service-gns.c:555
-#: src/zonemaster/gnunet-service-zonemaster.c:1435
+#: src/zonemaster/gnunet-service-zonemaster.c:1412
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u：%s\n"
@@ -4724,7 +4724,7 @@ msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-dbtool.c:178
-#: src/namestore/gnunet-namestore-zonefile.c:750
+#: src/namestore/gnunet-namestore-zonefile.c:751
 #, fuzzy
 msgid "GNUnet namestore database manipulation tool"
 msgstr "GNUnet 配置"
@@ -4833,43 +4833,43 @@ msgstr ""
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
+#: src/namestore/gnunet-namestore-zonefile.c:331
 #, fuzzy, c-format
 msgid "Failed to store records...\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:437
-#: src/namestore/gnunet-namestore-zonefile.c:469
+#: src/namestore/gnunet-namestore-zonefile.c:439
+#: src/namestore/gnunet-namestore-zonefile.c:471
 #, fuzzy, c-format
 msgid "Name `%s' is too long\n"
 msgstr "服务已删除。\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:515
+#: src/namestore/gnunet-namestore-zonefile.c:518
 #, c-format
 msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:524
+#: src/namestore/gnunet-namestore-zonefile.c:527
 #, c-format
 msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:586
+#: src/namestore/gnunet-namestore-zonefile.c:589
 #, c-format
 msgid "Data `%s' invalid\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:702
+#: src/namestore/gnunet-namestore-zonefile.c:703
 #, fuzzy, c-format
 msgid "Failed to connect to NAMESTORE\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:709
+#: src/namestore/gnunet-namestore-zonefile.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IDENTITY\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-zonefile.c:735
+#: src/namestore/gnunet-namestore-zonefile.c:736
 #: src/namestore/gnunet-namestore.c:1628
 msgid "name of the ego controlling the zone"
 msgstr ""
@@ -9068,7 +9068,7 @@ msgstr ""
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1383
+#: src/zonemaster/gnunet-service-zonemaster.c:1360
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
diff --git a/src/gnsrecord/json_gnsrecord.c b/src/gnsrecord/json_gnsrecord.c
index 068ff48c1..94916292f 100644
--- a/src/gnsrecord/json_gnsrecord.c
+++ b/src/gnsrecord/json_gnsrecord.c
@@ -32,9 +32,9 @@
 #define GNUNET_JSON_GNSRECORD_RECORD_DATA "data"
 #define GNUNET_JSON_GNSRECORD_TYPE "record_type"
 #define GNUNET_JSON_GNSRECORD_EXPIRATION_TIME "expiration_time"
-#define GNUNET_JSON_GNSRECORD_FLAG_PRIVATE "private"
+#define GNUNET_JSON_GNSRECORD_FLAG_PRIVATE "is_private"
 #define GNUNET_JSON_GNSRECORD_FLAG_SUPPLEMENTAL "supplemental"
-#define GNUNET_JSON_GNSRECORD_FLAG_RELATIVE "relative_expiration"
+#define GNUNET_JSON_GNSRECORD_FLAG_RELATIVE "is_relative_expiration"
 #define GNUNET_JSON_GNSRECORD_FLAG_SHADOW "shadow"
 #define GNUNET_JSON_GNSRECORD_RECORD_NAME "record_name"
 #define GNUNET_JSON_GNSRECORD_NEVER "never"
@@ -350,9 +350,9 @@ GNUNET_GNSRECORD_JSON_from_gnsrecord (const char*rname,
                         record_type_str,
                         "expiration_time",
                         expiration_time_str,
-                        "private",
+                        GNUNET_JSON_GNSRECORD_FLAG_PRIVATE,
                         rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE,
-                        "relative_expiration",
+                        GNUNET_JSON_GNSRECORD_FLAG_RELATIVE,
                         rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION,
                         "supplemental",
                         rd[i].flags & GNUNET_GNSRECORD_RF_SUPPLEMENTAL,
diff --git a/src/namestore/gnunet-namestore-zonefile.c b/src/namestore/gnunet-namestore-zonefile.c
index 5cf25abec..f8d876108 100644
--- a/src/namestore/gnunet-namestore-zonefile.c
+++ b/src/namestore/gnunet-namestore-zonefile.c
@@ -271,13 +271,11 @@ parse_origin (char *token, char *origin)
 {
   char *next;
   next = strchr (token, ';');
-  if (NULL == next)
-    return GNUNET_SYSERR;
-  next[0] = '\0';
+  if (NULL != next)
+    next[0] = '\0';
   next = strchr (token, ' ');
-  if (NULL == next)
-    return GNUNET_SYSERR;
-  next[0] = '\0';
+  if (NULL != next)
+    next[0] = '\0';
   strcpy (origin, token);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Origin is: %s\n", origin);
   return GNUNET_OK;
@@ -495,6 +493,7 @@ parse (void *cls)
       {
         if (GNUNET_SYSERR == parse_ttl (token, &ttl))
         {
+          fprintf (stderr, _("Failed to parse $TTL\n"));
           ret = 1;
           GNUNET_SCHEDULER_shutdown ();
           return;
@@ -505,6 +504,7 @@ parse (void *cls)
       {
         if (GNUNET_SYSERR == parse_origin (token, origin))
         {
+          fprintf (stderr, _("Failed to parse $ORIGIN from %s\n"), token);
           ret = 1;
           GNUNET_SCHEDULER_shutdown ();
           return;
diff --git a/src/namestore/test_namestore_zonefile_import.sh b/src/namestore/test_namestore_zonefile_import.sh
index 9f156e9c9..d6345257f 100755
--- a/src/namestore/test_namestore_zonefile_import.sh
+++ b/src/namestore/test_namestore_zonefile_import.sh
@@ -20,7 +20,7 @@ which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 5"
 MY_EGO="myego"
 gnunet-arm -s -c test_namestore_api.conf
 gnunet-identity -C $MY_EGO -c test_namestore_api.conf
-gnunet-namestore-zonefile -c test_namestore_api.conf -z $MY_EGO < example_zonefile
+gnunet-namestore-zonefile -c test_namestore_api.conf < example_zonefile
 res=$?
 gnunet-identity -D $MY_EGO -c test_namestore_api.conf
 gnunet-arm -e -c test_namestore_api.conf
diff --git a/src/namestore/test_plugin_rest_namestore.sh b/src/namestore/test_plugin_rest_namestore.sh
index 83c6015c7..cd4162abe 100755
--- a/src/namestore/test_plugin_rest_namestore.sh
+++ b/src/namestore/test_plugin_rest_namestore.sh
@@ -92,11 +92,11 @@ curl_get "${namestore_link}/$public" "error"
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf
 
 #Test POST with NAME
-curl_post "${namestore_link}/$name" '{"data": [{"value":"000G006WVZ8HQ5YTVFNX09HK0VJVVQ9ZCBYDSCH3ERT04N5ZRBKEB82EP8", "record_type":"PKEY", "expiration_time":"1d","private": false, "relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "HTTP/1.1 204 No Content"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"000G006WVZ8HQ5YTVFNX09HK0VJVVQ9ZCBYDSCH3ERT04N5ZRBKEB82EP8", "record_type":"PKEY", "expiration_time":"1d","is_private": false, "is_relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "HTTP/1.1 204 No Content"
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf > /dev/null 2>&1
 
 # invalid values
-curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRGxxx", "record_type":"PKEY", "expiration_time":"1d","private": false, "relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "error"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRGxxx", "record_type":"PKEY", "expiration_time":"1d","is_private": false, "is_relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "error"
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf > /dev/null 2>&1
 
 
@@ -107,22 +107,22 @@ curl_post "${namestore_link}/$name" '{"data": [{"record_type":"PKEY", "expiratio
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf > /dev/null 2>&1
 
 #expirations
-curl_post "${namestore_link}/$name" '{"data": [{"value":"000G006WVZ8HQ5YTVFNX09HK0VJVVQ9ZCBYDSCH3ERT04N5ZRBKEB82EP8", "record_type":"PKEY", "expiration_time":"0d","private": false, "relative_expiration": true, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "HTTP/1.1 204"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"000G006WVZ8HQ5YTVFNX09HK0VJVVQ9ZCBYDSCH3ERT04N5ZRBKEB82EP8", "record_type":"PKEY", "expiration_time":"0d","is_private": false, "is_relative_expiration": true, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "HTTP/1.1 204"
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf > /dev/null 2>&1
 
-curl_post "${namestore_link}/$name" '{"data": [{"value":"000G006WVZ8HQ5YTVFNX09HK0VJVVQ9ZCBYDSCH3ERT04N5ZRBKEB82EP8", "record_type":"PKEY", "expiration_time":"10000d","private": false, "relative_expiration": true, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "HTTP/1.1 204"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"000G006WVZ8HQ5YTVFNX09HK0VJVVQ9ZCBYDSCH3ERT04N5ZRBKEB82EP8", "record_type":"PKEY", "expiration_time":"10000d","is_private": false, "is_relative_expiration": true, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "HTTP/1.1 204"
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf > /dev/null 2>&1
 
-curl_post "${namestore_link}/$name" '{"data": [{"value":"000G006WVZ8HQ5YTVFNX09HK0VJVVQ9ZCBYDSCH3ERT04N5ZRBKEB82EP8", "record_type":"PKEY", "expiration_time":"now","private": false, "relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "error"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"000G006WVZ8HQ5YTVFNX09HK0VJVVQ9ZCBYDSCH3ERT04N5ZRBKEB82EP8", "record_type":"PKEY", "expiration_time":"now","is_private": false, "is_relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "error"
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf > /dev/null 2>&1
 
-curl_post "${namestore_link}/$name" '{"data": [{"value":"000G006WVZ8HQ5YTVFNX09HK0VJVVQ9ZCBYDSCH3ERT04N5ZRBKEB82EP8", "record_type":"PKEY", "expiration_time_missing":"1d","private": false, "relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "error"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"000G006WVZ8HQ5YTVFNX09HK0VJVVQ9ZCBYDSCH3ERT04N5ZRBKEB82EP8", "record_type":"PKEY", "expiration_time_missing":"1d","is_private": false, "is_relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "error"
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf > /dev/null 2>&1
 
 #record_name
-curl_post "${namestore_link}/$name" '{"data": [{"value":"000G006WVZ8HQ5YTVFNX09HK0VJVVQ9ZCBYDSCH3ERT04N5ZRBKEB82EP8", "record_type":"PKEY", "expiration_time":"1d","private": false, "relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":""}' "error"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"000G006WVZ8HQ5YTVFNX09HK0VJVVQ9ZCBYDSCH3ERT04N5ZRBKEB82EP8", "record_type":"PKEY", "expiration_time":"1d","is_private": false, "is_relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":""}' "error"
 gnunet-namestore -z $name -d -n "test_entry"  -c test_namestore_api.conf > /dev/null 2>&1
-curl_post "${namestore_link}/$name" '{"data": [{"value":"000G006WVZ8HQ5YTVFNX09HK0VJVVQ9ZCBYDSCH3ERT04N5ZRBKEB82EP8", "record_type":"PKEY", "expiration_time":"1d","private": false, "relative_expiration": false, "supplemental": false, "shadow": false}],"record_name_missing":"test_entry"}' "error"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"000G006WVZ8HQ5YTVFNX09HK0VJVVQ9ZCBYDSCH3ERT04N5ZRBKEB82EP8", "record_type":"PKEY", "expiration_time":"1d","is_private": false, "is_relative_expiration": false, "supplemental": false, "shadow": false}],"record_name_missing":"test_entry"}' "error"
 gnunet-namestore -z $name -d -n "test_entry"  -c test_namestore_api.conf > /dev/null 2>&1
 
 #Test DELETE