Merge branch 'master' into increase-online-timestamp-modulus

2025-07-26 03:31:23 +00:00 · 2022-06-02 12:38:05 +01:00
parent f7dabcaeb0 987446cf7f
commit 0c3988202e
82 changed files with 4605 additions and 152 deletions
--- a/src/main/resources/blockchain.json
+++ b/src/main/resources/blockchain.json
@@ -59,7 +59,8 @@
 		"newBlockSigHeight": 320000,
 		"shareBinFix": 399000,
 		"calcChainWeightTimestamp": 1620579600000,
-		"transactionV5Timestamp": 1642176000000
+		"transactionV5Timestamp": 1642176000000,
+		"transactionV6Timestamp": 9999999999999
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/main/resources/i18n/SysTray_de.properties
+++ b/src/main/resources/i18n/SysTray_de.properties
@@ -27,6 +27,8 @@ DB_MAINTENANCE = Datenbank Instandhaltung

 EXIT = Verlassen

+LITE_NODE = Lite node
+
 MINTING_DISABLED = NOT minting

 MINTING_ENABLED = \u2714 Minting
--- a/src/main/resources/i18n/SysTray_en.properties
+++ b/src/main/resources/i18n/SysTray_en.properties
@@ -27,6 +27,8 @@ DB_MAINTENANCE = Database Maintenance

 EXIT = Exit

+LITE_NODE = Lite node
+
 MINTING_DISABLED = NOT minting

 MINTING_ENABLED = \u2714 Minting
--- a/src/main/resources/i18n/SysTray_fi.properties
+++ b/src/main/resources/i18n/SysTray_fi.properties
@@ -27,6 +27,8 @@ DB_MAINTENANCE = Tietokannan ylläpito

 EXIT = Pois

+LITE_NODE = Lite node
+
 MINTING_DISABLED = EI lyö rahaa

 MINTING_ENABLED = \u2714 Lyö rahaa
--- a/src/main/resources/i18n/SysTray_fr.properties
+++ b/src/main/resources/i18n/SysTray_fr.properties
@@ -27,6 +27,8 @@ DB_MAINTENANCE = Maintenance de la base de données

 EXIT = Quitter

+LITE_NODE = Lite node
+
 MINTING_DISABLED = NE mint PAS

 MINTING_ENABLED = \u2714 Minting
--- a/src/main/resources/i18n/SysTray_hu.properties
+++ b/src/main/resources/i18n/SysTray_hu.properties
@@ -27,6 +27,8 @@ DB_MAINTENANCE = Adatbázis karbantartás

 EXIT = Kilépés

+LITE_NODE = Lite node
+
 MINTING_DISABLED = QORT-érmeverés jelenleg nincs folyamatban

 MINTING_ENABLED = \u2714 QORT-érmeverés folyamatban
--- a/src/main/resources/i18n/SysTray_it.properties
+++ b/src/main/resources/i18n/SysTray_it.properties
@@ -27,6 +27,8 @@ DB_MAINTENANCE = Manutenzione del database

 EXIT = Uscita

+LITE_NODE = Lite node
+
 MINTING_DISABLED = Conio disabilitato

 MINTING_ENABLED = \u2714 Conio abilitato
--- a/src/main/resources/i18n/SysTray_nl.properties
+++ b/src/main/resources/i18n/SysTray_nl.properties
@@ -27,6 +27,8 @@ DB_MAINTENANCE = Database Onderhoud

 EXIT = Verlaten

+LITE_NODE = Lite node
+
 MINTING_DISABLED = Minten is uitgeschakeld

 MINTING_ENABLED = \u2714 Minten is ingeschakeld
--- a/src/main/resources/i18n/SysTray_ru.properties
+++ b/src/main/resources/i18n/SysTray_ru.properties
@@ -27,6 +27,8 @@ DB_MAINTENANCE = Обслуживание базы данных

 EXIT = Выход

+LITE_NODE = Lite node
+
 MINTING_DISABLED = Чеканка отключена

 MINTING_ENABLED = \u2714 Чеканка активна
--- a/src/main/resources/i18n/SysTray_zh_CN.properties
+++ b/src/main/resources/i18n/SysTray_zh_CN.properties
@@ -27,6 +27,8 @@ DB_MAINTENANCE = 数据库维护

 EXIT = 退出核心

+LITE_NODE = Lite node
+
 MINTING_DISABLED = 没有铸币

 MINTING_ENABLED = \u2714 铸币
--- a/src/main/resources/i18n/SysTray_zh_TW.properties
+++ b/src/main/resources/i18n/SysTray_zh_TW.properties
@@ -27,6 +27,8 @@ DB_MAINTENANCE = 數據庫維護

 EXIT = 退出核心

+LITE_NODE = Lite node
+
 MINTING_DISABLED = 沒有鑄幣

 MINTING_ENABLED = \u2714 鑄幣