From beffdd7ed980005f0eb41c76d995fd994890c166 Mon Sep 17 00:00:00 2001 From: Some Random Crypto Guy Date: Tue, 13 Aug 2024 12:51:29 +0100 Subject: [PATCH] fixed refresh height for testnet/stagenet; updated some DE translations; bumped version --- src/version.cpp.in | 2 +- src/wallet/wallet2.cpp | 2 ++ translations/monero_de.ts | 64 +++++++++++++++++++-------------------- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/src/version.cpp.in b/src/version.cpp.in index 7041ce7..c08aec9 100644 --- a/src/version.cpp.in +++ b/src/version.cpp.in @@ -1,5 +1,5 @@ #define DEF_SALVIUM_VERSION_TAG "@VERSIONTAG@" -#define DEF_SALVIUM_VERSION "0.4.4-beta1" +#define DEF_SALVIUM_VERSION "0.4.4-beta2" #define DEF_MONERO_VERSION_TAG "release" #define DEF_MONERO_VERSION "0.18.3.3" #define DEF_MONERO_RELEASE_NAME "Zero" diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index ccf3c26..6daeddc 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -13106,6 +13106,8 @@ uint64_t wallet2::get_daemon_blockchain_target_height(string &err) uint64_t wallet2::get_approximate_blockchain_height() const { + if (m_nettype != MAINNET) return 0; + // time of v1 fork const time_t fork_time = 1719997643; // v1 fork block diff --git a/translations/monero_de.ts b/translations/monero_de.ts index 2dddbec..8fb41fe 100644 --- a/translations/monero_de.ts +++ b/translations/monero_de.ts @@ -1442,37 +1442,37 @@ - Welcome to Monero, the private cryptocurrency. - Willkommen bei Monero, der privaten Kryptowährung. + Welcome to Salvium, the private cryptocurrency. + Willkommen bei Salvium, der privaten Kryptowährung. - Monero, like Bitcoin, is a cryptocurrency. That is, it is digital money. - Monero ist, wie Bitcoin, eine Kryptowährung. Also: digitales Geld. + Salvium, like Bitcoin, is a cryptocurrency. That is, it is digital money. + Salvium ist, wie Bitcoin, eine Kryptowährung. Also: digitales Geld. - Monero protects your privacy on the blockchain, and while Monero strives to improve all the time, - Monero schützt deine Privatsphäre auf der Blockchain, und während Monero bestrebt ist, sich andauernd zu verbessern, + Salvium protects your privacy on the blockchain, and while Salvium strives to improve all the time, + Salvium schützt deine Privatsphäre auf der Blockchain, und während Salvium bestrebt ist, sich andauernd zu verbessern, - no privacy technology can be 100% perfect, Monero included. - kann keine Privatsphärentechnologie hundertprozentig perfekt sein - Monero mit eingeschlossen. + no privacy technology can be 100% perfect, Salvium included. + kann keine Privatsphärentechnologie hundertprozentig perfekt sein - Salvium mit eingeschlossen. - Monero cannot protect you from malware, and it may not be as effective as we hope against powerful adversaries. - Monero kann dich nicht vor bösartiger Software schützen, und es könnte nicht so effektiv gegen machtvolle Gegner sein, wie wir hoffen. + Salvium cannot protect you from malware, and it may not be as effective as we hope against powerful adversaries. + Salvium kann dich nicht vor bösartiger Software schützen, und es könnte nicht so effektiv gegen machtvolle Gegner sein, wie wir hoffen. - Flaws in Monero may be discovered in the future, and attacks may be developed to peek under some + Flaws in Salvium may be discovered in the future, and attacks may be developed to peek under some - of the layers of privacy Monero provides. Be safe and practice defense in depth. + of the layers of privacy Salvium provides. Be safe and practice defense in depth. @@ -1930,8 +1930,8 @@ Key Image, "absolute", list of rings - Prints basic info about Monero for first time users - Drucke grundlegende Informationen über Monero für Erstnutzer + Prints basic info about Salvium for first time users + Drucke grundlegende Informationen über Salvium für Erstnutzer @@ -2008,7 +2008,7 @@ Key Image, "absolute", list of rings monero, millinero, micronero, nanonero, piconero - Monero, Millinero, Micronero, Nanonero, Piconero + Salvium, Millinero, Micronero, Nanonero, Piconero @@ -2648,9 +2648,9 @@ deine Wallet erneut zu synchronisieren (deine Wallet-Schlüssel sind in KEINEM F auto-low-priority <1|0> Whether to automatically use the low priority fee level when it's safe to do so. segregate-pre-fork-outputs <1|0> - Set this if you intend to spend outputs on both Monero AND a key reusing fork. + Set this if you intend to spend outputs on both Salvium AND a key reusing fork. key-reuse-mitigation2 <1|0> - Set this if you are not sure whether you will spend on a key reusing Monero fork later. + Set this if you are not sure whether you will spend on a key reusing Salvium fork later. subaddress-lookahead <major>:<minor> Set the lookahead sizes for the subaddress hash table. segregation-height <n> @@ -3294,7 +3294,7 @@ Get help about a subcommand with: help mms <subcommand>, or mms help <s - Set or modify authorized signer info (single-word label, transport address, Monero address), or list all signers + Set or modify authorized signer info (single-word label, transport address, Salvium address), or list all signers @@ -3548,7 +3548,7 @@ By using 'sync' processing of waiting messages with multisig sync info - You are strongly encouraged to connect to the Monero network using your own daemon + You are strongly encouraged to connect to the Salvium network using your own daemon @@ -3563,7 +3563,7 @@ By using 'sync' processing of waiting messages with multisig sync info - If you are new to Monero, type "welcome" for a brief overview. + If you are new to Salvium, type "welcome" for a brief overview. @@ -3588,8 +3588,8 @@ By using 'sync' processing of waiting messages with multisig sync info - Background mining enabled. Thank you for supporting the Monero network. - Hintergrund-Mining aktiviert. Danke, dass du das Monero-Netzwerk unterstützt. + Background mining enabled. Thank you for supporting the Salvium network. + Hintergrund-Mining aktiviert. Danke, dass du das Salvium-Netzwerk unterstützt. @@ -3610,7 +3610,7 @@ By using 'sync' processing of waiting messages with multisig sync info Enabling this supports the network you are using, and makes you eligible for receiving new monero - Indem du dies einschaltest, unterstützt du das von dir genutzte Netzwerk, und du bist dadurch berechtigt, neue Monero zu erhalten + Indem du dies einschaltest, unterstützt du das von dir genutzte Netzwerk, und du bist dadurch berechtigt, neue Salvium zu erhalten @@ -3651,7 +3651,7 @@ Eingabe &llu/%llu (%s): Betrag=%s - I locked your Monero wallet to protect you while you were away + I locked your Salvium wallet to protect you while you were away @@ -3693,7 +3693,7 @@ Eingabe &llu/%llu (%s): Betrag=%s - Unlike Bitcoin, your Monero transactions and balance stay private and are not visible to the world by default. + Unlike Bitcoin, your Salvium transactions and balance stay private and are not visible to the world by default. @@ -3703,7 +3703,7 @@ Eingabe &llu/%llu (%s): Betrag=%s - Welcome to Monero and financial privacy. For more information see https://GetMonero.org + Welcome to Salvium and financial privacy. For more information see https://GetSalvium.org @@ -4029,7 +4029,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Monero Address + Salvium Address @@ -4141,12 +4141,12 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Invalid Monero address + Invalid Salvium address - Wallet state does not allow changing Monero addresses anymore + Wallet state does not allow changing Salvium addresses anymore @@ -4525,7 +4525,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The Monero Project (donate.getmonero.org or %s). + Donating %s %s to The Salvium Project (donate.getmonero.org or %s). @@ -5533,7 +5533,7 @@ Use "mms note" to display the waiting notes - Monero Address = + Salvium Address = @@ -5681,7 +5681,7 @@ Use "mms note" to display the waiting notes This is the command line monero wallet. It needs to connect to a monero daemon to work correctly. -WARNING: Do not reuse your Monero keys on another fork, UNLESS this fork has key reuse mitigations built in. Doing so will harm your privacy. +WARNING: Do not reuse your Salvium keys on another fork, UNLESS this fork has key reuse mitigations built in. Doing so will harm your privacy.