Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into ledger-big-txs
Browse files Browse the repository at this point in the history
  • Loading branch information
Duddino committed Jan 22, 2025
2 parents 65b506f + 05d5883 commit d736e4c
Show file tree
Hide file tree
Showing 22 changed files with 154 additions and 25 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</h2>

<p align="center">
<a href="https://mypivxwallet.org/">Production</a> (Stable) | <a href="https://pivx-labs.github.io/MyPIVXWallet/">Bleeding-Edge</a> (Unstable)
<a href="https://mypivxwallet.org/">Production</a> (Stable) | <a href="https://cheery-moxie-4f1121.netlify.app/">Bleeding-Edge</a> (Unstable)
</p>

---
Expand Down
5 changes: 3 additions & 2 deletions locale/cnr/translation.toml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ saveWalletFile = "" # Save Wallet File
proposalOverBudget = "" # Over Budget
badSaplingRoot = "" # There was an error while syncing. Resyncing from scratch (Bad sapling root)
creatingShieldTransaction = "" # Creating SHIELD transaction...
immatureRewards = "" # Part of your staked balance may be locked for 100 blocks as your reward matures.

[ALERTS]
INTERNAL_ERROR = "Interna greška, molimo pokušajte ponovo kasnije" # Internal error, please try again later
Expand All @@ -225,7 +226,7 @@ QR_SCANNER_BAD_RECEIVER = "nije validan primalac plaćanja" # is not a valid pay
UNSUPPORTED_CHARACTER = "Karakter '{char}' nije podržan u adresama! (Nije kompatibilan sa Base58)" # The character '{char}' is unsupported in addresses! (Not Base58 compatible)
UNSUPPORTED_WEBWORKERS = "Ovaj pretraživač ne podržava Web Workers (višenitni JS), nažalost ne možete generisati Personalizovane novčanike!" # This browser doesn't support Web Workers (multi-threaded JS), unfortunately you cannot generate Vanity wallets!
INVALID_ADDRESS = "<b>Neispravna PIVX adresa!</b><br> {address}" # <b>Invalid PIVX address!</b><br> {address}
VALIDATE_AMOUNT_LOW = "Minimalni iznos je {minimumAmount} {coinTicker}!" # <br>Minimum amount is {minimumAmount} {coinTicker}!
VALIDATE_AMOUNT_LOW = "Minimalni iznos je {minimumAmount} {coinTicker}!" # Minimum amount is {minimumAmount} {coinTicker}!
VALIDATE_AMOUNT_DECIMAL = "{coinDecimal} decimalno prekoračenje" # {coinDecimal} decimal limit exceeded
SUCCESS_STAKING_ADDR = "<b>Staking adresa je postavljena!</b><br>Sada možete unstake-ovati!" # <b>Staking Address set!</b><br>Now go ahead and unstake!
CONFIRM_UNSTAKE_H_WALLET = "<b>Potvrdite vaše unstake-ovanje</b><br>Potvrdite TX na svom {strHardwareName}" # <b>Confirm your Unstake</b><br>Confirm the TX on your {strHardwareName}
Expand Down Expand Up @@ -313,7 +314,7 @@ WALLET_LOCKED = "Novčanik je uspešno zaključan!" # Wallet successfully Locked
WALLET_UNLOCKED = "Novčanik je uspešno otključan!" # Wallet successfully Unlocked!
CONFIRM_LEDGER_TX = "" # Confirm this transaction matches the one on your {hardwareWallet}
CONFIRM_LEDGER_TX_OUT = "" # You will send {value} {ticker} to <div class="inline-address">{address}</div>
MISSING_FUNDS = "" # Balance is too small! Missing {sats} sats!
MISSING_FUNDS = "" # <b>Balance is too small!</b> <br> Missing {sats} sats!
MISSING_SHIELD = "" # Shield is not enabled in this wallet!
MN_START_FAILED = "" # <b>Masternode failed to start!</b>
MN_RESTART_FAILED = "" # <b>Masternode failed to restart!</b>
Expand Down
5 changes: 3 additions & 2 deletions locale/de/translation.toml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ saveWalletFile = "" # Save Wallet File
proposalOverBudget = "" # Over Budget
badSaplingRoot = "" # There was an error while syncing. Resyncing from scratch (Bad sapling root)
creatingShieldTransaction = "" # Creating SHIELD transaction...
immatureRewards = "" # Part of your staked balance may be locked for 100 blocks as your reward matures.

[ALERTS]
INTERNAL_ERROR = "Interner Fehler, bitte versuche es später erneut" # Internal error, please try again later
Expand All @@ -225,7 +226,7 @@ INVALID_AMOUNT = "<b>Ungültige Menge!</b><br>" # <b>Invalid amount!</b><br>
TX_SENT = "Transaktion gesendet!" # Transaction sent!
TX_FAILED = "Transaktion fehlgeschlagen!" # Transaction Failed!
QR_SCANNER_BAD_RECEIVER = "ist kein gültiger Empfänger" # is not a valid payment receiver
VALIDATE_AMOUNT_LOW = "Minimale Menge ist {minimumAmount} {coinTicker}!" # <br>Minimum amount is {minimumAmount} {coinTicker}!
VALIDATE_AMOUNT_LOW = "Minimale Menge ist {minimumAmount} {coinTicker}!" # Minimum amount is {minimumAmount} {coinTicker}!
VALIDATE_AMOUNT_DECIMAL = "{coinDecimal} Nachkommastellen überschritten" # {coinDecimal} decimal limit exceeded
SUCCESS_STAKING_ADDR = "<b>Staking Adresse gesetzt</b><br>Gehe nun über zum Abberufen!" # <b>Staking Address set!</b><br>Now go ahead and unstake!
STAKE_ADDR_SET = "<b>Kalte Adresse gesetzt!</b><br>Zukünftige Delegierungen benutzen diese Adresse." # <b>Cold Address set!</b><br>Future stakes will use this address.
Expand Down Expand Up @@ -313,7 +314,7 @@ WALLET_LOCKED = "" # Wallet successfully Locked!
WALLET_UNLOCKED = "" # Wallet successfully Unlocked!
CONFIRM_LEDGER_TX = "" # Confirm this transaction matches the one on your {hardwareWallet}
CONFIRM_LEDGER_TX_OUT = "" # You will send {value} {ticker} to <div class="inline-address">{address}</div>
MISSING_FUNDS = "" # Balance is too small! Missing {sats} sats!
MISSING_FUNDS = "" # <b>Balance is too small!</b> <br> Missing {sats} sats!
MISSING_SHIELD = "" # Shield is not enabled in this wallet!
MN_START_FAILED = "" # <b>Masternode failed to start!</b>
MN_RESTART_FAILED = "" # <b>Masternode failed to restart!</b>
Expand Down
6 changes: 5 additions & 1 deletion locale/en/translation.toml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ saveWalletFile = "Save Wallet File" # Save Wallet File
proposalOverBudget = "Over Budget" # Over Budget
badSaplingRoot = "There was an error while syncing. Resyncing from scratch (Bad sapling root)" # There was an error while syncing. Resyncing from scratch (Bad sapling root)
creatingShieldTransaction = "Creating SHIELD transaction..." # Creating SHIELD transaction...
immatureRewards = "Part of your staked balance may be locked for 100 blocks as your reward matures." # Part of your staked balance may be locked for 100 blocks as your reward matures.

[ALERTS]
INTERNAL_ERROR = "Internal error, please try again later" # Internal error, please try again later
Expand All @@ -225,7 +226,7 @@ QR_SCANNER_BAD_RECEIVER = "is not a valid payment receiver" # is not a valid pay
UNSUPPORTED_CHARACTER = "The character '{char}' is unsupported in addresses! (Not Base58 compatible)" # The character '{char}' is unsupported in addresses! (Not Base58 compatible)
UNSUPPORTED_WEBWORKERS = "This browser doesn't support Web Workers (multi-threaded JS), unfortunately you cannot generate Vanity wallets!" # This browser doesn't support Web Workers (multi-threaded JS), unfortunately you cannot generate Vanity wallets!
INVALID_ADDRESS = "<b>Invalid PIVX address!</b><br> {address}" # <b>Invalid PIVX address!</b><br> {address}
VALIDATE_AMOUNT_LOW = "Minimum amount is {minimumAmount} {coinTicker}!" # <br>Minimum amount is {minimumAmount} {coinTicker}!
VALIDATE_AMOUNT_LOW = "Minimum amount is {minimumAmount} {coinTicker}!" # Minimum amount is {minimumAmount} {coinTicker}!
VALIDATE_AMOUNT_DECIMAL = "{coinDecimal} decimal limit exceeded" # {coinDecimal} decimal limit exceeded
SUCCESS_STAKING_ADDR = "<b>Staking Address set!</b><br>Now go ahead and unstake!" # <b>Staking Address set!</b><br>Now go ahead and unstake!
CONFIRM_UNSTAKE_H_WALLET = "<b>Confirm your Unstake</b><br>Confirm the TX on your {strHardwareName}" # <b>Confirm your Unstake</b><br>Confirm the TX on your {strHardwareName}
Expand Down Expand Up @@ -319,3 +320,6 @@ MN_START_FAILED = " <b>Masternode failed to start!</b>"
MN_RESTART_FAILED = " <b>Masternode failed to restart!</b>"
LEDGER_TX_TOO_BIG = "Transaction length exceeds 9000 bytes"
MISSING_FUNDS = "<b>Balance is too small!</b> <br> Missing {sats} sats!" # <b>Balance is too small!<b> <br> Missing {sats} sats!
MN_START_FAILED = "<b>Masternode failed to start!</b>" # <b>Masternode failed to start!</b>
MN_RESTART_FAILED = "<b>Masternode failed to restart!</b>" # <b>Masternode failed to restart!</b>
MISSING_FUNDS = "<b>Balance is too small!</b> <br> Missing {sats} sats!" # <b>Balance is too small!</b> <br> Missing {sats} sats!
5 changes: 3 additions & 2 deletions locale/es-mx/translation.toml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ saveWalletFile = "" # Save Wallet File
proposalOverBudget = "" # Over Budget
badSaplingRoot = "" # There was an error while syncing. Resyncing from scratch (Bad sapling root)
creatingShieldTransaction = "" # Creating SHIELD transaction...
immatureRewards = "" # Part of your staked balance may be locked for 100 blocks as your reward matures.

[ALERTS]
INTERNAL_ERROR = "Error interno, vuelve a intentarlo más tarde" # Internal error, please try again later
Expand All @@ -225,7 +226,7 @@ INVALID_AMOUNT = "<b>¡Cantidad no válida!</b><br>" # <b>Invalid amount!</b><br
TX_SENT = "¡Transacción enviada!" # Transaction sent!
TX_FAILED = "¡Transacción fallida!" # Transaction Failed!
QR_SCANNER_BAD_RECEIVER = "no es un receptor de pago válido" # is not a valid payment receiver
VALIDATE_AMOUNT_LOW = "¡La cantidad mínima es {minimum Amount} {coinTicker}!" # <br>Minimum amount is {minimumAmount} {coinTicker}!
VALIDATE_AMOUNT_LOW = "¡La cantidad mínima es {minimum Amount} {coinTicker}!" # Minimum amount is {minimumAmount} {coinTicker}!
VALIDATE_AMOUNT_DECIMAL = "{coinDecimal} límite decimal excedido" # {coinDecimal} decimal limit exceeded
SUCCESS_STAKING_ADDR = "<b>¡Dirección de Staking establecida!</b><br>¡Ahora puedes dejar de hacer stake!" # <b>Staking Address set!</b><br>Now go ahead and unstake!
STAKE_ADDR_SET = "<b>¡Dirección de Cold Staking establecida!</b><br>El Staking futuro usarán esta dirección." # <b>Cold Address set!</b><br>Future stakes will use this address.
Expand Down Expand Up @@ -313,7 +314,7 @@ WALLET_LOCKED = "" # Wallet successfully Locked!
WALLET_UNLOCKED = "" # Wallet successfully Unlocked!
CONFIRM_LEDGER_TX = "" # Confirm this transaction matches the one on your {hardwareWallet}
CONFIRM_LEDGER_TX_OUT = "" # You will send {value} {ticker} to <div class="inline-address">{address}</div>
MISSING_FUNDS = "" # Balance is too small! Missing {sats} sats!
MISSING_FUNDS = "" # <b>Balance is too small!</b> <br> Missing {sats} sats!
MISSING_SHIELD = "" # Shield is not enabled in this wallet!
MN_START_FAILED = "" # <b>Masternode failed to start!</b>
MN_RESTART_FAILED = "" # <b>Masternode failed to restart!</b>
Expand Down
5 changes: 3 additions & 2 deletions locale/fr/translation.toml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ saveWalletFile = "" # Save Wallet File
proposalOverBudget = "" # Over Budget
badSaplingRoot = "" # There was an error while syncing. Resyncing from scratch (Bad sapling root)
creatingShieldTransaction = "" # Creating SHIELD transaction...
immatureRewards = "" # Part of your staked balance may be locked for 100 blocks as your reward matures.

[ALERTS]
INTERNAL_ERROR = "Erreur interne, veuillez réessayer plus tard" # Internal error, please try again later
Expand All @@ -225,7 +226,7 @@ INVALID_AMOUNT = "<b>Valeur non valide!</b><br>" # <b>Invalid amount!</b><br>
TX_SENT = "Transaction envoyée!" # Transaction sent!
TX_FAILED = "Échec de la Transaction!" # Transaction Failed!
QR_SCANNER_BAD_RECEIVER = "n'est pas un récepteur de paiement valide" # is not a valid payment receiver
VALIDATE_AMOUNT_LOW = "La valeur minimale est de {minimumAmount} {coinTicker}!" # <br>Minimum amount is {minimumAmount} {coinTicker}!
VALIDATE_AMOUNT_LOW = "La valeur minimale est de {minimumAmount} {coinTicker}!" # Minimum amount is {minimumAmount} {coinTicker}!
VALIDATE_AMOUNT_DECIMAL = "{coinDecimal} limite décimale dépassée" # {coinDecimal} decimal limit exceeded
SUCCESS_STAKING_ADDR = "<b>Adresse de Staking défini!</b><br>Poursuivre avec le unstake!" # <b>Staking Address set!</b><br>Now go ahead and unstake!
STAKE_ADDR_SET = "<b>Adresse du Cold Staking défini!</b><br>Cette adresse sera utilisée à l'avenir pour la réalisation de Stake.." # <b>Cold Address set!</b><br>Future stakes will use this address.
Expand Down Expand Up @@ -313,7 +314,7 @@ WALLET_LOCKED = "" # Wallet successfully Locked!
WALLET_UNLOCKED = "" # Wallet successfully Unlocked!
CONFIRM_LEDGER_TX = "" # Confirm this transaction matches the one on your {hardwareWallet}
CONFIRM_LEDGER_TX_OUT = "" # You will send {value} {ticker} to <div class="inline-address">{address}</div>
MISSING_FUNDS = "" # Balance is too small! Missing {sats} sats!
MISSING_FUNDS = "" # <b>Balance is too small!</b> <br> Missing {sats} sats!
MISSING_SHIELD = "" # Shield is not enabled in this wallet!
MN_START_FAILED = "" # <b>Masternode failed to start!</b>
MN_RESTART_FAILED = "" # <b>Masternode failed to restart!</b>
Expand Down
5 changes: 3 additions & 2 deletions locale/hi/translation.toml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ shieldAddress = "शील्ड एड्रेस" # Shield address
cantShieldToExc = "यह एड्रेस शील्ड ट्रांसफर का समर्थन नहीं करता" # This address does not support shield transfers
badSaplingRoot = "सिंक करते समय एक त्रुटि हुई। रिसिंकिंग कर रहे हैं स्क्रैच से(खराब सैपलिंग रूट)" # There was an error while syncing. Resyncing from scratch (Bad sapling root)
creatingShieldTransaction = "क्रिएटिंग शील्ड ट्रांजेक्शन..." # Creating SHIELD transaction...
immatureRewards = "" # Part of your staked balance may be locked for 100 blocks as your reward matures.

[ALERTS]
INTERNAL_ERROR = "आंतरिक त्रुटि, कृपया कुछ समय बाद पुनः प्रयास करें" # Internal error, please try again later
Expand All @@ -225,7 +226,7 @@ QR_SCANNER_BAD_RECEIVER = "एक मान्य पेमेंट रिस
UNSUPPORTED_CHARACTER = "वर्ण '{char}' एड्रेसिस में समर्थित नहीं है! (Base58 संगत नहीं)" # The character '{char}' is unsupported in addresses! (Not Base58 compatible)
UNSUPPORTED_WEBWORKERS = "इस ब्राउज़र में वेब वर्कर्स (मल्टी-थ्रेडेड JS) का समर्थन नहीं है, दुर्भाग्यवश आप वैनीटी वॉलेट नहीं बना सकते!" # This browser doesn't support Web Workers (multi-threaded JS), unfortunately you cannot generate Vanity wallets!
INVALID_ADDRESS = "अवैध PIVX अमाउन्ट!" # <b>Invalid PIVX address!</b><br> {address}
VALIDATE_AMOUNT_LOW = "न्यूनतम अमाउन्ट {minimumAmount} {coinTicker} है!" # <br>Minimum amount is {minimumAmount} {coinTicker}!
VALIDATE_AMOUNT_LOW = "न्यूनतम अमाउन्ट {minimumAmount} {coinTicker} है!" # Minimum amount is {minimumAmount} {coinTicker}!
VALIDATE_AMOUNT_DECIMAL = "{coinDecimal} दशमलव सीमा से अधिक" # {coinDecimal} decimal limit exceeded
SUCCESS_STAKING_ADDR = "<b>स्टेकिंग एड्रेस सेट हो गया!</b><br>अब आगे बढ़ें और अनस्टेक करें!" # <b>Staking Address set!</b><br>Now go ahead and unstake!
CONFIRM_UNSTAKE_H_WALLET = "<b>अपने अनस्टेक की कन्फर्म करें</b><br>अपने {strHardwareName} पर TX कन्फर्म करें" # <b>Confirm your Unstake</b><br>Confirm the TX on your {strHardwareName}
Expand Down Expand Up @@ -314,7 +315,7 @@ CONFIRM_POPUP_DELETE_ACCOUNT = "यह आपके सभी डेटा क
CONFIRM_POPUP_DELETE_ACCOUNT_TITLE = "क्या आप सुनिश्चित हैं?" # Are you sure?
CONFIRM_LEDGER_TX = "कन्फर्म करें कि यह ट्रांजैक्शन आपके {hardwareWallet} पर जोड़े गए ट्रांजैक्शन से मेल खाता है" # Confirm this transaction matches the one on your {hardwareWallet}
CONFIRM_LEDGER_TX_OUT = "आप {value} {ticker} को <div class=\"inline-address\">{address}</div> भेजेंगे" # You will send {value} {ticker} to <div class="inline-address">{address}</div>
MISSING_FUNDS = "बैलेंस बहुत कम है! {sats} सैट्स की कमी है!" # Balance is too small! Missing {sats} sats!
MISSING_FUNDS = "बैलेंस बहुत कम है! {sats} सैट्स की कमी है!" # <b>Balance is too small!</b> <br> Missing {sats} sats!
MISSING_SHIELD = "इस वॉलेट में शील्ड सक्षम नहीं है!" # Shield is not enabled in this wallet!
WALLET_HARDWARE_USB_UNSUPPORTED = "" # <b>Firefox doesn't support this!</b><br>Unfortunately, Firefox does not support hardware wallets
MN_UNLOCK_WALLET = "" # Please import your <b> COLLATERAL WALLET</b> first.
Expand Down
5 changes: 3 additions & 2 deletions locale/it/translation.toml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ saveWalletFile = "" # Save Wallet File
proposalOverBudget = "" # Over Budget
badSaplingRoot = "" # There was an error while syncing. Resyncing from scratch (Bad sapling root)
creatingShieldTransaction = "" # Creating SHIELD transaction...
immatureRewards = "" # Part of your staked balance may be locked for 100 blocks as your reward matures.

[ALERTS]
INTERNAL_ERROR = "Errore interno, rirova più tardi" # Internal error, please try again later
Expand All @@ -225,7 +226,7 @@ INVALID_AMOUNT = "<b>Importo non valido!</b><br>" # <b>Invalid amount!</b><br>
TX_SENT = "Transazione inviata!" # Transaction sent!
TX_FAILED = "Transazione fallita!" # Transaction Failed!
QR_SCANNER_BAD_RECEIVER = "Il destinatario del pagamento non è valido" # is not a valid payment receiver
VALIDATE_AMOUNT_LOW = "L'importo minimo è di {minimumAmount} {coinTicker}!" # <br>Minimum amount is {minimumAmount} {coinTicker}!
VALIDATE_AMOUNT_LOW = "L'importo minimo è di {minimumAmount} {coinTicker}!" # Minimum amount is {minimumAmount} {coinTicker}!
VALIDATE_AMOUNT_DECIMAL = "{coinDecimal} limite decimale superato" # {coinDecimal} decimal limit exceeded
SUCCESS_STAKING_ADDR = "<b>Indirizzo di staking impostato!</b><br>Ora vai avanti e annulla lo staking!" # <b>Staking Address set!</b><br>Now go ahead and unstake!
STAKE_ADDR_SET = "<b>Cold Address impostato!</b><br>Gli stake futuri utilizzeranno questo indirizzo." # <b>Cold Address set!</b><br>Future stakes will use this address.
Expand Down Expand Up @@ -313,7 +314,7 @@ WALLET_LOCKED = "Wallet bloccato con successo!" # Wallet successfully Locked!
WALLET_UNLOCKED = "Wallet sbloccato con successo!" # Wallet successfully Unlocked!
CONFIRM_LEDGER_TX = "Conferma che questa transazione combacia quella nel tuo {hardwareWallet}" # Confirm this transaction matches the one on your {hardwareWallet}
CONFIRM_LEDGER_TX_OUT = "Manderai {value} {ticker} a <div class=\"inline-address\">{address}</div>" # You will send {value} {ticker} to <div class="inline-address">{address}</div>
MISSING_FUNDS = "Il bilancio non è sufficiente! Mancano {sats} sats!" # Balance is too small! Missing {sats} sats!
MISSING_FUNDS = "Il bilancio non è sufficiente! Mancano {sats} sats!" # <b>Balance is too small!</b> <br> Missing {sats} sats!
MISSING_SHIELD = "Lo Shield non è abilitato nel wallet!" # Shield is not enabled in this wallet!
MN_START_FAILED = "" # <b>Masternode failed to start!</b>
MN_RESTART_FAILED = "" # <b>Masternode failed to restart!</b>
Expand Down
Loading

0 comments on commit d736e4c

Please sign in to comment.