From 705e6a0f20145708a40e94bd58b5029cdb9dea92 Mon Sep 17 00:00:00 2001 From: LitecoinZ Date: Sun, 11 Nov 2018 14:42:59 +0100 Subject: [PATCH 1/2] List LitecoinZ (LTZ) --- assets/src/main/java/bisq/asset/Coin.java | 4 +- .../main/java/bisq/asset/coins/LitecoinZ.java | 42 ++++++++++++++++++ .../META-INF/services/bisq.asset.Asset | 1 + .../java/bisq/asset/coins/LitecoinZTest.java | 43 +++++++++++++++++++ .../java/bisq/core/locale/CurrencyUtil.java | 1 + .../resources/i18n/displayStrings.properties | 2 + .../i18n/displayStrings_de.properties | 2 + .../i18n/displayStrings_el.properties | 2 + .../i18n/displayStrings_es.properties | 2 + .../i18n/displayStrings_fa.properties | 2 + .../i18n/displayStrings_fr.properties | 2 + .../i18n/displayStrings_hu.properties | 2 + .../i18n/displayStrings_pt.properties | 2 + .../i18n/displayStrings_ro.properties | 2 + .../i18n/displayStrings_ru.properties | 2 + .../i18n/displayStrings_sr.properties | 2 + .../i18n/displayStrings_th.properties | 2 + .../i18n/displayStrings_vi.properties | 2 + .../i18n/displayStrings_zh.properties | 2 + .../java/bisq/core/user/PreferencesTest.java | 2 +- .../altcoinaccounts/AltCoinAccountsView.java | 5 +++ 21 files changed, 123 insertions(+), 3 deletions(-) create mode 100644 assets/src/main/java/bisq/asset/coins/LitecoinZ.java create mode 100644 assets/src/test/java/bisq/asset/coins/LitecoinZTest.java diff --git a/assets/src/main/java/bisq/asset/Coin.java b/assets/src/main/java/bisq/asset/Coin.java index 5eb596e4710..c1c8e74b447 100644 --- a/assets/src/main/java/bisq/asset/Coin.java +++ b/assets/src/main/java/bisq/asset/Coin.java @@ -21,8 +21,8 @@ * Abstract base class for {@link Asset}s with their own dedicated blockchain, such as * {@link bisq.asset.coins.Bitcoin} itself or one of its many derivatives, competitors and * alternatives, often called "altcoins", such as {@link bisq.asset.coins.Litecoin}, - * {@link bisq.asset.coins.Ether}, {@link bisq.asset.coins.Monero} and - * {@link bisq.asset.coins.Zcash}. + * {@link bisq.asset.coins.Ether}, {@link bisq.asset.coins.Monero}, {@link bisq.asset.coins.Zcash} + * and {@link bisq.asset.coins.LitecoinZ}. *

* In addition to the usual {@code Asset} properties, a {@code Coin} maintains information * about which {@link Network} it may be used on. By default, coins are constructed with diff --git a/assets/src/main/java/bisq/asset/coins/LitecoinZ.java b/assets/src/main/java/bisq/asset/coins/LitecoinZ.java new file mode 100644 index 00000000000..386875ba59b --- /dev/null +++ b/assets/src/main/java/bisq/asset/coins/LitecoinZ.java @@ -0,0 +1,42 @@ +/* + * This file is part of Bisq. + * + * Bisq is free software: you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or (at + * your option) any later version. + * + * Bisq is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public + * License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Bisq. If not, see . + */ + +package bisq.asset.coins; + +import bisq.asset.AddressValidationResult; +import bisq.asset.AddressValidator; +import bisq.asset.Coin; + +public class LitecoinZ extends Coin { + + public LitecoinZ() { + super("LitecoinZ", "LTZ", new LitecoinZAddressValidator()); + } + + + public static class LitecoinZAddressValidator implements AddressValidator { + + @Override + public AddressValidationResult validate(String address) { + // We only support L addresses (transparent transactions) + if (!address.startsWith("L")) + return AddressValidationResult.invalidAddress("", "validation.altcoin.ltz.zAddressesNotSupported"); + + return AddressValidationResult.validAddress(); + } + } +} diff --git a/assets/src/main/resources/META-INF/services/bisq.asset.Asset b/assets/src/main/resources/META-INF/services/bisq.asset.Asset index 95a18eaa688..20995f3fd1b 100644 --- a/assets/src/main/resources/META-INF/services/bisq.asset.Asset +++ b/assets/src/main/resources/META-INF/services/bisq.asset.Asset @@ -40,6 +40,7 @@ bisq.asset.coins.Kekcoin bisq.asset.coins.Litecoin$Mainnet bisq.asset.coins.Litecoin$Regtest bisq.asset.coins.Litecoin$Testnet +bisq.asset.coins.LitecoinZ bisq.asset.coins.Lobstex bisq.asset.coins.Loki bisq.asset.coins.Mask diff --git a/assets/src/test/java/bisq/asset/coins/LitecoinZTest.java b/assets/src/test/java/bisq/asset/coins/LitecoinZTest.java new file mode 100644 index 00000000000..e8f2e63ed0b --- /dev/null +++ b/assets/src/test/java/bisq/asset/coins/LitecoinZTest.java @@ -0,0 +1,43 @@ +/* + * This file is part of Bisq. + * + * Bisq is free software: you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or (at + * your option) any later version. + * + * Bisq is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public + * License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Bisq. If not, see . + */ + +package bisq.asset.coins; + +import bisq.asset.AbstractAssetTest; + +import org.junit.Test; + +public class LitecoinZTest extends AbstractAssetTest { + + public LitecoinZTest() { + super(new LitecoinZ()); + } + + @Test + public void testValidAddresses() { + assertValidAddress("L17opZaVcRK4h9MV4KhkCmzUBa56BxSRb8A"); + assertValidAddress("L1EjNbAPVtg8jE9EyvbsA7epibZ9j8bdYmV"); + } + + @Test + public void testInvalidAddresses() { + assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhem"); + assertInvalidAddress("38NwrYsD1HxQW5zfLT0QcUUXGMPvQgzTSn"); + assertInvalidAddress("8tP9rh3SH6n9cSLmV22vnSNNw56LKGpLrB"); + assertInvalidAddress("8Zbvjr"); + } +} diff --git a/core/src/main/java/bisq/core/locale/CurrencyUtil.java b/core/src/main/java/bisq/core/locale/CurrencyUtil.java index a235ab973f5..f3e4c4dbbed 100644 --- a/core/src/main/java/bisq/core/locale/CurrencyUtil.java +++ b/core/src/main/java/bisq/core/locale/CurrencyUtil.java @@ -144,6 +144,7 @@ public static List getMainCryptoCurrencies() { result.add(new CryptoCurrency("GRC", "Gridcoin")); if (!baseCurrencyCode.equals("LTC")) result.add(new CryptoCurrency("LTC", "Litecoin")); + result.add(new CryptoCurrency("LTZ", "LitecoinZ")); result.add(new CryptoCurrency("XMR", "Monero")); result.add(new CryptoCurrency("MT", "Mycelium Token", true)); result.add(new CryptoCurrency("NMC", "Namecoin")); diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 07b103dbafc..b137aa04420 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -1042,6 +1042,7 @@ If you cannot provide the above data or if you used an incompatible wallet it wo dispute case. The Dragonglass sender is responsible to be able to verify the DRGL transfer to the \ arbitrator in case of a dispute. Use of PaymentID is not required.\n\n\ If you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help. +account.altcoin.popup.LTZ.msg=When using {0} you can only use the transparent addresses (starting with L) not the z-addresses (private), because the arbitrator would not be able to verify the transaction with z-addresses. account.altcoin.popup.ZEC.msg=When using {0} you can only use the transparent addresses (starting with t) not \ the z-addresses (private), because the arbitrator would not be able to verify the transaction with z-addresses. account.altcoin.popup.XZC.msg=When using {0} you can only use the transparent (traceable) addresses not \ @@ -2409,6 +2410,7 @@ validation.nationalAccountId={0} must consist of {1} numbers. validation.invalidInput=Invalid input: {0} validation.accountNrFormat=Account number must be of format: {0} validation.altcoin.wrongStructure=Address validation failed because it does not match the structure of a {0} address. +validation.altcoin.ltz.zAddressesNotSupported=LTZ address need to start with L. Addresses starting with z are not supported. validation.altcoin.zAddressesNotSupported=ZEC address need to start with t. Addresses starting with z are not supported. validation.altcoin.invalidAddress=Address is not a valid {0} address! {1} validation.bic.invalidLength=Input length is neither 8 nor 11 diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index 0f0bb7b7843..c2d742e4042 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -897,6 +897,7 @@ account.altcoin.popup.wallet.confirm=Ich verstehe und bestätige, dass ich weiß account.altcoin.popup.xmr.msg=Wenn Sie XMR auf Bisq handeln wollen, stellen Sie bitte sicher, dass Sie die folgenden Bedingungen verstehen und erfüllen:\n\nUm XMR zu senden, brauchen Sie entweder die offizielle Monero-GUI-Brieftasche oder die vereinfachte Monero-Brieftasche mit aktiver stor-tx-info-Option (Standard in neuen Versionen).\nStellen Sie bitte sicher, dass Sie auf den Tx-Schlüssel zugreifen können (nutzen Sie das get_tx_key-Kommando in simplewallet), da dies im Fall eines Konflikts für den Vermittler nötig ist, um mit dem XMR-checktx-Werkzeug (http://xmr.llcoins.net/checktx.html) den XMR-Transfer zu überprüfen.\nIn normalen Block-Explorern ist der Transfer nicht überprüfbar.\n\nIm Falle eines Konflikts müssen Sie dem Vermittler folgende Daten übergeben:\n- Den privaten Tx-Schlüssel\n- Den Transaktions-Hash\n- Die öffentliche Adresse des Empfängers\n\nSollten Sie die Daten nicht übergeben können oder eine inkompatible Brieftasche verwendet haben, werden Sie den Konflikt verlieren. Der XMR-Sender ist in der Verantwortung den Transfer der XMR gegenüber dem Vermittler im Falle eines Konflikts zu beweisen.\n\nEs wird keine Zahlungs-ID benötigt, nur eine normale öffentliche Adresse.\n\nFalls Sie sich über diesen Prozess im unklaren sind, besuchen Sie das Monero-Forum (https://forum.getmonero.org) um weiter Informationen zu erhalten. account.altcoin.popup.blur.msg=Stellen Sie sicher, die folgenden Bedingungen verstanden zu haben, falls Sie BLUR auf Bisq handeln möchten:\n\nUm BLUR zu senden, müssen sie die Blur CLI Brieftasche (blur-wallte-cli) nutzen. Nachdem dem Senden\nder Zahlung, wird die Brieftasche den Transaktions-Hash (tx ID). Diese müssen Sie speichern. \nSie müssen auch das 'get_tx_key'\nKommando ausführen um den privaten Transaktionschlüssel zu erhalten. Sie müssen beides im Falle eines Konflikts haben.\nIn diesem Fall müssen Sie beides mit der öffentlichen Adresse des Empfängers dem Vermittler geben,\nder dann die BLUR Übertragung mi dem Blur Transaction Viewer (https://blur.cash/#tx-viewer) bestätigt.\n\nSollten Sie die benötigten Daten nicht bereitstellen, verlieren Sie den Konflikt.\nDer BLUR Sender ist verantwortlich den BLUR Transfer dem Vermittler, im Falle eines Konflikts, zu beweisen.\n\nSollten Sie diese Bedingungen nicht verstehen, suchen Sie Hilfe im Blur Network Discord (https://discord.gg/5rwkU2g). account.altcoin.popup.ccx.msg=Stellen Sie sicher, die folgenden Bedingungen verstanden zu haben, falls Sie CCX auf Bisq handeln möchten:\n\nUm CCX zu senden, müssen sie eine offizielle Conceal Brieftasche nutzen, Cli oder GUI. Nachdem dem Senden\nder Zahlung, wird die Brieftasche den Transaktions-Hash (ID) und geheimen Schlüssel anzeigen. Sie müssen beides im Falle eines Konflikts haben.\nIn diesem Fall müssen Sie beides mit der öffentlichen Adresse des Empfängers dem Vermittler geben,\nder dann die CCX Übertragung mi dem Conceal Transaction Viewer (https://explorer.conceal.network/txviewer) bestätigt.\nWeil Conceal ein Privatsphären Coin ist, kann ein Blockforscher den Transfer nicht bestätigen.\n\nSollten Sie die benötigten Daten nicht bereitstellen können, verlieren Sie den Konflikt.\nWenn Sie den geheimen Schlüssel nicht sofort nach der CCX Transaktion speichern, kann dieser nicht wiederhergestellt werden.\nSollten Sie diese Bedingungen nicht verstehen, suchen Sie Hilfe im Conceal Discord (http://discord.conceal.network). +account.altcoin.popup.LTZ.msg=Wenn Sie {0} verwenden, können Sie nur die transparenten Adressen verwenden (diese beginnen mit L), nicht die z-Adressen (privat), da der Vermittler die Transaktionen mit z-Adressen nicht überprüfen könnte. account.altcoin.popup.ZEC.msg=Wenn Sie {0} verwenden, können Sie nur die transparenten Adressen verwenden (diese beginnen mit t), nicht die z-Adressen (privat), da der Vermittler die Transaktionen mit z-Adressen nicht überprüfen könnte. account.altcoin.popup.XZC.msg=Wenn Sie {0} verwenden, können Sie nur die transparenten (verfolgbaren) Adressen verwenden, nicht die unverfolgbaren, da der Vermittler Transaktionen mit unverfolgbaren Adressen in einem Blockforscher nicht überprüfen könnte. account.altcoin.popup.bch=Bitcoin Cash und Bitcoin Clashic leiden unter Replay-Protection. Wenn Sie diese Coins benutzen, stellen Sie sicher, dass Sie ausreichend vorsorgen und die Konsequenzen verstehen. Sie können Verluste erleiden, wenn Sie einen Coin senden und ungewollt die gleichen Gelder in einer anderen Blockkette senden. Weil diese "airdrop coins" den gleichen Verlauf wie die Bitcoin Blockkette haben, gibt es auch Sicherheitsrisiken und beachtliche Risiken für die Privatsphären.\n\nLesen Sie bitte mehr über das Thema im Bisq-Forum: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bchc @@ -2054,6 +2055,7 @@ validation.nationalAccountId={0} muss aus {1} Zahlen bestehen. validation.invalidInput=Ungültige Eingabe: {0} validation.accountNrFormat=Die Kontonummer muss folgendes Format haben: {0} validation.altcoin.wrongStructure=Die Adressvalidierung ist fehlgeschlagen, da diese nicht mit der Struktur einer {0}-Adresse übereinstimmt. +validation.altcoin.ltz.zAddressesNotSupported=Die LTZ-Adresse muss mit einem L beginnen. Adressen, die mit z beginnen werden nicht unterstützt. validation.altcoin.zAddressesNotSupported=Die ZEC-Adresse muss mit einem t beginnen. Adressen, die mit z beginnen werden nicht unterstützt. validation.altcoin.invalidAddress=Die Adresse ist keine gültige {0}-Adresse! {1} validation.bic.invalidLength=Die Eingabelänge ist weder 8 noch 11 diff --git a/core/src/main/resources/i18n/displayStrings_el.properties b/core/src/main/resources/i18n/displayStrings_el.properties index 21d8f8e38b5..9da7184c67e 100644 --- a/core/src/main/resources/i18n/displayStrings_el.properties +++ b/core/src/main/resources/i18n/displayStrings_el.properties @@ -897,6 +897,7 @@ account.altcoin.popup.wallet.confirm=Κατανοώ και επιβεβαιών account.altcoin.popup.xmr.msg=Εάν θέλεις να ανταλλάξεις XMR στο Bisq βεβαιώσου πως κατανοείς και εκπληρώνεις τις ακόλουθες προαπαιτήσεις:\n\nΓια αποστολή XMR χρειάζεσαι είτε το επίσημο Monero GUI πορτοφόλι, είτε το Monero simple wallet με την επισήμανση store-tx-info ενεργοποιημένη (προεπιλεγμένη στις νεώτερες εκδόσεις).\nΒεβαιώσου πως έχεις πρόσβαση στο tx key (χρησιμοποίησε την εντολή get_tx_key στο simplewallet) καθώς σε περίπτωση διένεξης θα χρειαστεί, ώστε να μπορέσει ο διαμεσολαβητής να επαληθεύσει την XMR συναλλαγή με το εργαλείο XMR checktx (http://xmr.llcoins.net/checktx.html).\nΣε απλούς block explorers η συναλλαγή δεν είναι επαληθεύσιμη.\n\nΣε περίπτωση διένεξης θα χρειαστεί να προσφέρεις στον διαμεσολαβητή τις ακόλουθες πληροφορίες:\n- Τι ιδιωτικό tx κλειδί\n- Το hash της συναλλαγής\n- Τη δημόσια διεύθυνση του παραλήπτη\n\nΕάν δεν μπορείς να προσφέρεις τις παραπάνω πληροφορίες ή αν χρησιμοποίησες ένα μη συμβατό πορτοφόλι, θα χάσεις την επίλυση της διένεξης. Ο αποστολέας XMR είναι υπεύθυνος να μπορεί να επιβεβαιώσει τη μεταφορά XMR στον διαμεσολαβητή σε περίπτωση διένεξης.\n\nΔεν απαιτείται η ταυτότητα πληρωμής, παρά μονάχα η δημόσια διεύθυνση.\n\nΕάν δεν είσαι σίγουρος σχετικά με τη διαδικασία, μπορείς να επισκεφτείς το φόρουμ του Monero (https://forum.getmonero.org) για περαιτέρω πληροφορίες. account.altcoin.popup.blur.msg=If you want to trade BLUR on Bisq please be sure you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI wallet (blur-wallet-cli). After sending a transfer payment, the\nwallet displays a transaction hash (tx ID). You must save this information. You must also use the 'get_tx_key'\ncommand to retrieve the transaction private key. In the event that arbitration is necessary, you must present\nboth the transaction ID and the transaction private key, along with the recipient's public address. The arbitrator\nwill then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nThe BLUR sender is responsible for the ability to verify BLUR transfers to the arbitrator in case of a dispute.\n\nIf you do not understand these requirements, seek help at the Blur Network Discord (https://discord.gg/5rwkU2g). account.altcoin.popup.ccx.msg=If you want to trade CCX on Bisq please be sure you understand the following requirements:\n\nTo send CCX you must use an official Conceal wallet, either CLI or GUI. After sending a transfer payment, the wallets\ndisplay the transaction secret key. You must save it along with the transaction hash (ID) and the recipient's public\naddress in case arbitration is necessary. In such a case, you must give all three to the arbitrator, who will then\nverify the CCX transfer using the Conceal Transaction Viewer (https://explorer.conceal.network/txviewer).\nBecause Conceal is a privacy coin, block explorers cannot verify transfers.\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nIf you do not save the transaction secret key immediately after transferring CCX, it cannot be recovered later.\nIf you do not understand these requirements, seek help at the Conceal discord (http://discord.conceal.network). +account.altcoin.popup.LTZ.msg=Όταν χρησιμοποιείς {0} μπορείς να χρησιμοποιήσεις μονάχα τη διάφανη διεύθυνση (ξεκινά με L), και όχι την z διεύθυνση (ιδιωτική), καθώς ο διαμεσολαβητής δεν θα μπορεί να επαληθεύσει τη συναλλαγή μέσω της z διεύθυνσης. account.altcoin.popup.ZEC.msg=Όταν χρησιμοποιείς {0} μπορείς να χρησιμοποιήσεις μονάχα τη διάφανη διεύθυνση (ξεκινά με t), και όχι την z διεύθυνση (ιδιωτική), καθώς ο διαμεσολαβητής δεν θα μπορεί να επαληθεύσει τη συναλλαγή μέσω της z διεύθυνσης. account.altcoin.popup.XZC.msg=Όταν χρησιμοποιείς {0} μπορείς να χρησιμοποιήσεις μονάχα τη διάφανη (ανιχνεύσιμη) διεύθυνση, και όχι τη μη ανιχνεύσιμη διεύθυνση, καθώς ο διαμεσολαβητής δεν θα μπορεί να επαληθεύσει τη συναλλαγή με μη ανιχνεύσιμες διευθύνσεις στον block explorer. account.altcoin.popup.bch=Τα Bitcoin Cash και Bitcoin Clashic δεν διαθέτουν προστασία επανάληψης (replay protection). Αν χρησιμοποιείς αυτά τα νομίσματα απαιτείται να λάβεις επαρκείς προφυλάξεις και να κατανοείς όλες τις πιθανές επιπτώσεις. Η ακούσια αποστολή σε άλλο blockchain κατά την μετακίνηση νομισμάτων, ενδέχεται να οδηγήσει σε απώλειες κεφαλαίων. Καθώς αυτά τα νομίσματα μοιράζονται το ίδιο ιστορικό με το blockchain του Bitcoin, εμπεριέχουν κινδύνους ασφαλείας και απώλειας εχεμύθειας.\n\nΔιάβασε περισσότερα στο φόρουμ του Bisq: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bchc @@ -2054,6 +2055,7 @@ validation.nationalAccountId={0} θα πρέπει να αποτελείται validation.invalidInput=Μη έγκυρη εισαγωγή: {0} validation.accountNrFormat=Ο αριθμός λογαριασμού πρέπει να είναι της μορφής: {0} validation.altcoin.wrongStructure=Η επαλήθευση διεύθυνσης απέτυχε καθώς δεν ταιριάζει στη δομή μιας διεύθυνσης {0}. +validation.altcoin.ltz.zAddressesNotSupported=Οι διευθύνσεις LTZ πρέπει να ξεκινούν με L. Διευθύνσεις που ξεκινούν με z δεν υποστηρίζονται. validation.altcoin.zAddressesNotSupported=Οι διευθύνσεις ZEC πρέπει να ξεκινούν με t. Διευθύνσεις που ξεκινούν με z δεν υποστηρίζονται. validation.altcoin.invalidAddress=Η διεύθυνση δεν είναι έγκυρη {0} διεύθυνση! {1} validation.bic.invalidLength=Το μήκος της εισαγωγής δεν είναι ούτε 8, ούτε 11 diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index 8f1f9713097..ddfed2b90e3 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -897,6 +897,7 @@ account.altcoin.popup.wallet.confirm=Entiendo y confirmo que sé qué monedero t account.altcoin.popup.xmr.msg=Si quiere comerciar XMR en Bisq, por favor asegúrese de que entiende y cumple todos los requerimientos:\n\nPara enviar XMR necesita usar o el monedero oficial Monero GUI o el monedero Monero simple con la bandera store-tx-info habilitada (por defecto en las nuevas versiones).\nPor favor asegúrese de que puede acceder a la tx key (usar el comando get_tx_key en simplewallet) porque podría requerirse en caso de disputa para habilitar al árbitro a verificar la transferencia XMR con la herramienta chcktx de XMR (http://xmr.llcoins.net/checktx.html).\nEn exploradores de bloque normales la transferencia no es verificable.\n\nNecesita entregar al árbitro la siguiente información en caso de disputa:- La clave privada de transacción (tx private key).\n- El hash de transacción.\n- La dirección pública del receptor.\n\nSi no puede proveer la información o si ha usado un monedero incompatible resultaría en la pérdida del caso de disputa. El emisor de XMR es responsable de ser capaz de verificar la transacción XMR a el árbitro en caso de disputa.\n\nNo se requiere la ID de pago, sólo la dirección pública normal.\n\nSi no está seguro del proceso visite el foro Monero (https://forum.getmonero.org) para más información. account.altcoin.popup.blur.msg=Si quiere intercambiar BLUR por favor asegúrese de que entiende y cumple los siguientes requerimientos:\n\nPara envair BLUR debe usar el monedero de la Red Blur (blur-wallet-cli). Depués de enviar el pago de la transacción, el \nmonedero muestra un hash de transacción (tx ID). Debe guardar esta información. También debe usar el comando 'get_tx_key'\npara recuperar la clave privada de la transacción, junto con la clave pública del receptor. El moderador\nverificará entonces la transferencia BLUR usando el Visor de Transacciones BLUR (https://blur.cash/#tx-viewer).\n\nSi no puede proporcionar los datos requeridos al árbitro, perderá el caso de disputa.\nEl emisor BLUR es responsable de que el árbitro pueda verificar las transferencias BLUR en caso de disputa.\n\nSi no entiende estos requerimientos, busque ayuda en la Red Discord de BLUR (https://discord.gg/5rwkU2g). account.altcoin.popup.ccx.msg=Si quiere intercambiar CCX en Bisq poar favor asegúrese de que entiende los siguientes requerimientos:\n\nPara enviar CCX debe usar un monedero ofcial Conceal, ya sea CLI o GUI. Después de enviar el pago, los monederos\nmuestran la clave secreta de la transacción. Debe guardarla junto con el hash de la transacción (ID) y la dirección\npública en caso de que sea necesario arbitraje. En tal caso, debe dar las tres al árbitro, quien\nverificará la transferencia CCX usando el Visor de Transacciones Conceal (https://explorer.conceal.network/txviewer).\nDebido a que Conceal es una moneda de privacidad, los exploradores de bloques no pueden verificar transferencias.\n\nSi no puede entregar los datos requeridos al árbitro, perderá el caso de disputa.\nSi no guarda la clave secreta de la transacción inmediatamente después de transferir CCX, no se podrá recuperar luego.\nSi no entiende estos requerimientos, busque ayuda en el discord Conceal (http://discord.conceal.network). +account.altcoin.popup.LTZ.msg=Cuando use {0} sólo puede usar direcciones transparentes (que empiecen por L) y no las direcciones-z (privadas), porque el árbitro no sería capaz de verificar la transacción con direcciones-z. account.altcoin.popup.ZEC.msg=Cuando use {0} sólo puede usar direcciones transparentes (que empiecen por t) y no las direcciones-z (privadas), porque el árbitro no sería capaz de verificar la transacción con direcciones-z. account.altcoin.popup.XZC.msg=Al usar {0} puede solamente usar direcciones transparentes (trazables), porque el árbitro no sería capaz de verificar la transacciones no trazables en el explorador de bloques. account.altcoin.popup.bch=Bitcoin cash and Bitcoin Clashic sufren de replay protection. Si usa una de estas monedes aseguŕese de que toma suficientes precauciones y entiende las implicaciones. Puede sufrir pérdidas enviando una moneda sin querer enviar las mismas monedeas a la otra cadena de bloques. Debido a que estos "airdrops" comparten la misma historia con la cadena de bloques de Bitcoin hay también riesgos de seguridad y un riesgo considerable de pérdida de privacidad.\n\nPor favor lea en el foro Bisq más acerca de este tema: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bch @@ -2054,6 +2055,7 @@ validation.nationalAccountId={0} debe consistir de {1} número(s). validation.invalidInput=Entrada inválida: {0} validation.accountNrFormat=El número de cuenta debe ser del formato: {0} validation.altcoin.wrongStructure=La validación de dirección falló porque no se corresponde con la estructura de una dirección {0}. +validation.altcoin.ltz.zAddressesNotSupported=La dirección LTZ tiene que empezar con L. Las direcciones que comienzan con z no están soportadas. validation.altcoin.zAddressesNotSupported=La dirección ZEC tiene que empezar con t. Las direcciones que comienzan con z no están soportadas. validation.altcoin.invalidAddress=La dirección no es una dirección {0} válida! {1} validation.bic.invalidLength=La longitud de la entrada no es 8 ni 11 diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index fd5e2cbae0c..d312ad9c059 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -897,6 +897,7 @@ account.altcoin.popup.wallet.confirm=من می فهمم و تأیید می کن account.altcoin.popup.xmr.msg=اگر میخواهید XMR را در Bisq معامله کنید، لطفا مطمئن شوید که شرایط زیر را درک کرده و انجام می دهید:\n\nبرای ارسال XMR، شما باید از کیف پول رسمی مونرو GUI یا کیف پول ساده مونرو با پرچم فعال store-tx-info (به طور پیش فرض در نسخه های جدید) استفاده کنید.\nلطفا مطمئن شوید که می توانید به کلید تراکنش دسترسی پیدا کنید (از دستور get_tx_key در کیف پول ساده استفاده کنید)، در صورت مناقشه لازم است که داور را قادر سازید تا انتقال XMR را با ابزار بررسی تراکنش XMR تأیید کند (http://xmr.llcoins.net/checktx.html).\nدر مرورگرهای بلاک عادی، انتقال قابل تایید نیست.\n\nدر صورت یک مناقشه، باید داده های زیر را در اختیار داور بگذارید:\n- کلید خصوصی تراکنش\n- هش تراکنش\n- آدرس عمومی گیرنده\n\nاگر شما نمی توانید داده های بالا را ارائه نموده یا اگر از کیف پول ناسازگار استفاده کرده اید، این می تواند منجر به باختن مناقشه شود. فرستنده ی XMR مسئول است تا انتقال XMR به داور را در صورت یک مناقشه، تأیید نماید.\n\nشناسه پرداخت لازم نیست، فقط آدرس عمومی معمولی.\n\nاگر شما درباره ی این فرآیند مطمئن نیستید از تالار گفتگوی مونرو (https://forum.getmonero.org) برای کسب اطلاعات بیشتر بازدید نمایید. account.altcoin.popup.blur.msg=If you want to trade BLUR on Bisq please be sure you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI wallet (blur-wallet-cli). After sending a transfer payment, the\nwallet displays a transaction hash (tx ID). You must save this information. You must also use the 'get_tx_key'\ncommand to retrieve the transaction private key. In the event that arbitration is necessary, you must present\nboth the transaction ID and the transaction private key, along with the recipient's public address. The arbitrator\nwill then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nThe BLUR sender is responsible for the ability to verify BLUR transfers to the arbitrator in case of a dispute.\n\nIf you do not understand these requirements, seek help at the Blur Network Discord (https://discord.gg/5rwkU2g). account.altcoin.popup.ccx.msg=If you want to trade CCX on Bisq please be sure you understand the following requirements:\n\nTo send CCX you must use an official Conceal wallet, either CLI or GUI. After sending a transfer payment, the wallets\ndisplay the transaction secret key. You must save it along with the transaction hash (ID) and the recipient's public\naddress in case arbitration is necessary. In such a case, you must give all three to the arbitrator, who will then\nverify the CCX transfer using the Conceal Transaction Viewer (https://explorer.conceal.network/txviewer).\nBecause Conceal is a privacy coin, block explorers cannot verify transfers.\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nIf you do not save the transaction secret key immediately after transferring CCX, it cannot be recovered later.\nIf you do not understand these requirements, seek help at the Conceal discord (http://discord.conceal.network). +account.altcoin.popup.LTZ.msg=هنگام استفاده از {0} شما فقط می توانید آدرس های شفاف (که با L شروع می شوند) و نه z-addresses (خصوصی) را استفاده کنید، زیرا داور قادر به تأیید معامله با z-addresses نخواهد بود. account.altcoin.popup.ZEC.msg=هنگام استفاده از {0} شما فقط می توانید آدرس های شفاف (که با t شروع می شوند) و نه z-addresses (خصوصی) را استفاده کنید، زیرا داور قادر به تأیید معامله با z-addresses نخواهد بود. account.altcoin.popup.XZC.msg=هنگام استفاده از {0} شما فقط می توانید از آدرس های شفاف (قابل ردیابی) استفاده کنید نه آدرس های بی نشان، زیرا داور قادر نخواهد بود تا معامله را با آدرس های غیر قابل کشف در یک مرورگر مسدود تأیید کند. account.altcoin.popup.bch=Bitcoin Cash و Bitcoin Clasics در معرض حملات بازپخش هستند. اگر از این کوین ها استفاده می کنید حتما اقدامات احتیاطی لازم را انجام دهید و همه پیامدها را متوجه شوید. شما می توانید از طریق ارسال یک کوین و ارسال ناخواسته کوین های مشابه در بلاک چین دیگر، متحمل ضرر شوید. از آنجایی که کوین های ایردراپ یا همان جایزه سابقه مشابهی با بلاک چین بیت کوین دارند، باز هم خطرات امنیتی و یک ریسک قابل ملاحظه برای از دست دادن حریم خصوصی وجود دارد.\n\nلطفا در مورد این موضوع در تالار گفتگو Bisq بیشتر بخوانید: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bchc @@ -2054,6 +2055,7 @@ validation.nationalAccountId={0} باید شامل {1} عدد باشد. validation.invalidInput=ورودی نامعتبر: {0} validation.accountNrFormat=شماره حساب باید از فرمت {0} باشد validation.altcoin.wrongStructure=تأیید آدرس ناموفق بود زیرا آن با ساختار یک آدرس {0} مطابقت ندارد. +validation.altcoin.ltz.zAddressesNotSupported=آدرس LTZ باید با L شروع شود. آدرس هایی که با z می شوند، پشتیبانی نمی شوند. validation.altcoin.zAddressesNotSupported=آدرس ZEC باید با t شروع شود. آدرس هایی که با z می شوند، پشتیبانی نمی شوند. validation.altcoin.invalidAddress=آدرس یک آدرس {0} معتبر نیست! {1} validation.bic.invalidLength=طول ورودی نه 8 و نه 11 است diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index ae5205124a1..c7eff772ac6 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -901,6 +901,7 @@ account.altcoin.yourAltcoinAccounts=Vos comptes altcoins: account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as described on the {1} web page.\nUsing wallets from centralized exchanges where you don''t have your keys under your control or using a not compatible wallet software can lead to loss of the traded funds!\nThe arbitrator is not a {2} specialist and cannot help in such cases. account.altcoin.popup.wallet.confirm=Je comprends et confirme que je sais quel portefeuille je dois utiliser. account.altcoin.popup.xmr.msg=If you want to trade XMR on Bisq please be sure you understand and fulfill the following requirements:\n\nFor sending XMR you need to use either the official Monero GUI wallet or the Monero simple wallet with the store-tx-info flag enabled (default in new versions).\nPlease be sure that you can access the tx key (use the get_tx_key command in simplewallet) as that would be required in case of a dispute to enable the arbitrator to verify the XMR transfer with the XMR checktx tool (http://xmr.llcoins.net/checktx.html).\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nIf you cannot provide the above data or if you used an incompatible wallet it would result in losing the dispute case. The XMR sender is responsible to be able to verify the XMR transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\n\nIf you are not sure about that process visit the Monero forum (https://forum.getmonero.org) to find more information. +account.altcoin.popup.LTZ.msg=When using {0} you can only use the transparent addresses (starting with L) not the z-addresses (private), because the arbitrator would not be able to verify the transaction with z-addresses. account.altcoin.popup.ZEC.msg=When using {0} you can only use the transparent addresses (starting with t) not the z-addresses (private), because the arbitrator would not be able to verify the transaction with z-addresses. account.altcoin.popup.XZC.msg=When using {0} you can only use the transparent (traceable) addresses not the untraceable addresses, because the arbitrator would not be able to verify the transaction with untraceable addresses at a block explorer. account.altcoin.popup.bch=Bitcoin Cash and Bitcoin Clashic suffer from replay protection. If you use those coins be sure you take sufficient precautions and understand all implications.You can suffer losses by sending one coin and unintentionally send the same coins on the other block chain.Because those "airdrop coins" share the same history with the Bitcoin blockchain there are also security risks and a considerable risk for losing privacy.\n\nPlease read at the Bisq Forum more about that topic: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bchc @@ -1736,6 +1737,7 @@ validation.invalidInput=Invalid input: {0} validation.accountNrFormat=Account number must be of format: {0} validation.altcoin.wrongChecksum=Address validation failed because checksum was not correct. validation.altcoin.wrongStructure=Address validation failed because it does not match the structure of a {0} address. +validation.altcoin.ltz.zAddressesNotSupported=L'adresse LTZ doit commencer par un L. Les adresses commençant par un z ne sont pas gérées. validation.altcoin.zAddressesNotSupported=L'adresse ZEC doit commencer par un t. Les adresses commençant par un z ne sont pas gérées. validation.altcoin.invalidAddress=L'adresse n'est pas un adresse valide {0}! {1} validation.bic.invalidLength=Input length is neither 8 nor 11 diff --git a/core/src/main/resources/i18n/displayStrings_hu.properties b/core/src/main/resources/i18n/displayStrings_hu.properties index 7cf07cd230d..544194ca5d4 100644 --- a/core/src/main/resources/i18n/displayStrings_hu.properties +++ b/core/src/main/resources/i18n/displayStrings_hu.properties @@ -897,6 +897,7 @@ account.altcoin.popup.wallet.confirm=Megértem és alátámasztom, hogy tudom, account.altcoin.popup.xmr.msg=Ha XMR-t szeretne váltani Bisq-en, kérjük győződjön meg hogy megértette és teljesíti a következő követelményeket:\n\nXMR küldéséhez használnia kell a hivatalos Monero GUI pénztárcát vagy a Monero egyszerű pénztárcát a store-tx-info zászlóval beiktatva (alapértelmezett az új verziókban).\nGyőződjön meg róla, hogy hozzáférhet a tx kulcshoz (használja a get_tx_key parancsot a simplewallet-ben), mivel ez egy vita esetén szükség ahhoz, hogy a bíró ellenőrizhesse az XMR-átvitelt az XMR checktx eszközzel (http://xmr.llcoins.net/checktx.html).\nNormál blokk felfedezőkön az átvitel nem ellenőrizhető.\n\nVita esetén a következő adatokat kell megadnia a bírónak:\n- A tx magánkulcsot\n- A tranzakció hasht\n- A címzett nyilvános címét\n\nHa nem tudja megadni a fenti adatokat, vagy ha nem kompatibilis pénztárcát használt, elvesztené a vitás ügyet. Az XMR feladó vita esetén felelős az XMR-átutalást ellenőrizni a bíró előtt.\n\nNincs szükség fizetési azonosítóra, csak a szokásos nyilvános címre.\n\nHa nem biztos a folyamatban, látogasson el a Monero fórumra (https://forum.getmonero.org) további információkért. account.altcoin.popup.blur.msg=If you want to trade BLUR on Bisq please be sure you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI wallet (blur-wallet-cli). After sending a transfer payment, the\nwallet displays a transaction hash (tx ID). You must save this information. You must also use the 'get_tx_key'\ncommand to retrieve the transaction private key. In the event that arbitration is necessary, you must present\nboth the transaction ID and the transaction private key, along with the recipient's public address. The arbitrator\nwill then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nThe BLUR sender is responsible for the ability to verify BLUR transfers to the arbitrator in case of a dispute.\n\nIf you do not understand these requirements, seek help at the Blur Network Discord (https://discord.gg/5rwkU2g). account.altcoin.popup.ccx.msg=If you want to trade CCX on Bisq please be sure you understand the following requirements:\n\nTo send CCX you must use an official Conceal wallet, either CLI or GUI. After sending a transfer payment, the wallets\ndisplay the transaction secret key. You must save it along with the transaction hash (ID) and the recipient's public\naddress in case arbitration is necessary. In such a case, you must give all three to the arbitrator, who will then\nverify the CCX transfer using the Conceal Transaction Viewer (https://explorer.conceal.network/txviewer).\nBecause Conceal is a privacy coin, block explorers cannot verify transfers.\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nIf you do not save the transaction secret key immediately after transferring CCX, it cannot be recovered later.\nIf you do not understand these requirements, seek help at the Conceal discord (http://discord.conceal.network). +account.altcoin.popup.LTZ.msg=A {0} használatakor csak átlátható címeket használhat (L-vel kezdődve) nem pedig a z-címeket (privát), mivel hogy a bíró nem tudja ellenőrizni a z-címekkel kezdődő tranzakciókat. account.altcoin.popup.ZEC.msg=A {0} használatakor csak átlátható címeket használhat (t-vel kezdődve) nem pedig a z-címeket (privát), mivel hogy a bíró nem tudja ellenőrizni a z-címekkel kezdődő tranzakciókat. account.altcoin.popup.XZC.msg=A {0} használatakor csak átlátható (nyomon követhető) címeket használhat, nem pedig lenyomozhatatlan címeket, mivel hogy a bíró nem tudja ellenőrizni a tranzakciót lenyomozhatatlan címmel a blokkböngészőben. account.altcoin.popup.bch=Bitcoin Cash és Bitcoin Clashic ismételt védelemben részesül. Ha ezeket az érméket használja, győződjön meg róla, hogy elegendő óvintézkedést és minden következtetést megért. Veszteségeket szenvedhet úgy, hogy egy érmét küld és szándék nélkül ugyanazokat az érméket küldi a másik blokkláncon. Mivel ezek a "légpénzes érmék" ugyanazt a történelmet osztják a Bitcoin blokkhálózattal, szintén vannak biztonsági kockázatok és jelentős rizikót jelent a magánélet elvesztését illetően.\n\nKérjük olvasson többet erről a témáról a Bisq fórumon: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bchc @@ -2054,6 +2055,7 @@ validation.nationalAccountId={0} {1} számokból kell állnia. validation.invalidInput=Érvénytelen bevitel: {0} validation.accountNrFormat=A fiók számának formátuma: {0} validation.altcoin.wrongStructure=A címellenőrzés sikertelen volt, mert nem egyezik a {0} cím szerkezetével. +validation.altcoin.ltz.zAddressesNotSupported=A LTZ címét L-vel kell kezdeni. Az z által indított címek nem támogatottak. validation.altcoin.zAddressesNotSupported=A ZEC címét t-vel kell kezdeni. Az z által indított címek nem támogatottak. validation.altcoin.invalidAddress=A cím nem érvényes {0} address! {1} validation.bic.invalidLength=A bevitel hossza sem 8, sem 11 diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index 449fc47d532..cabf8babe3f 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -897,6 +897,7 @@ account.altcoin.popup.wallet.confirm=Eu entendo e confirmo que eu sei qual carte account.altcoin.popup.xmr.msg=If you want to trade XMR on Bisq please be sure you understand and fulfill the following requirements:\n\nFor sending XMR you need to use either the official Monero GUI wallet or the Monero simple wallet with the store-tx-info flag enabled (default in new versions).\nPlease be sure that you can access the tx key (use the get_tx_key command in simplewallet) as that would be required in case of a dispute to enable the arbitrator to verify the XMR transfer with the XMR checktx tool (http://xmr.llcoins.net/checktx.html).\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nIf you cannot provide the above data or if you used an incompatible wallet it would result in losing the dispute case. The XMR sender is responsible to be able to verify the XMR transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\n\nIf you are not sure about that process visit the Monero forum (https://forum.getmonero.org) to find more information. account.altcoin.popup.blur.msg=If you want to trade BLUR on Bisq please be sure you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI wallet (blur-wallet-cli). After sending a transfer payment, the\nwallet displays a transaction hash (tx ID). You must save this information. You must also use the 'get_tx_key'\ncommand to retrieve the transaction private key. In the event that arbitration is necessary, you must present\nboth the transaction ID and the transaction private key, along with the recipient's public address. The arbitrator\nwill then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nThe BLUR sender is responsible for the ability to verify BLUR transfers to the arbitrator in case of a dispute.\n\nIf you do not understand these requirements, seek help at the Blur Network Discord (https://discord.gg/5rwkU2g). account.altcoin.popup.ccx.msg=If you want to trade CCX on Bisq please be sure you understand the following requirements:\n\nTo send CCX you must use an official Conceal wallet, either CLI or GUI. After sending a transfer payment, the wallets\ndisplay the transaction secret key. You must save it along with the transaction hash (ID) and the recipient's public\naddress in case arbitration is necessary. In such a case, you must give all three to the arbitrator, who will then\nverify the CCX transfer using the Conceal Transaction Viewer (https://explorer.conceal.network/txviewer).\nBecause Conceal is a privacy coin, block explorers cannot verify transfers.\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nIf you do not save the transaction secret key immediately after transferring CCX, it cannot be recovered later.\nIf you do not understand these requirements, seek help at the Conceal discord (http://discord.conceal.network). +account.altcoin.popup.LTZ.msg=Quando usar {0} você pode apenas utilizar endereços transparentes (começando com L) não os endereços z (privados), pois o árbitro não conseguiria verificar a transação com endereços z. account.altcoin.popup.ZEC.msg=Quando usar {0} você pode apenas utilizar endereços transparentes (começando com t) não os endereços z (privados), pois o árbitro não conseguiria verificar a transação com endereços z. account.altcoin.popup.XZC.msg=When using {0} you can only use the transparent (traceable) addresses not the untraceable addresses, because the arbitrator would not be able to verify the transaction with untraceable addresses at a block explorer. account.altcoin.popup.bch=Bitcoin Cash and Bitcoin Clashic suffer from replay protection. If you use those coins be sure you take sufficient precautions and understand all implications.You can suffer losses by sending one coin and unintentionally send the same coins on the other block chain.Because those "airdrop coins" share the same history with the Bitcoin blockchain there are also security risks and a considerable risk for losing privacy.\n\nPlease read at the Bisq Forum more about that topic: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bchc @@ -2054,6 +2055,7 @@ validation.nationalAccountId={0} deve consistir de {1 números. validation.invalidInput=Entrada inválida: {0} validation.accountNrFormat=O número da conta deve estar no formato: {0} validation.altcoin.wrongStructure=Validação do endereço falhou pois este não é compatível com a estrutura de um endereço {0}. +validation.altcoin.ltz.zAddressesNotSupported=Endereços LTZ precisam iniciar com L. Endereços iniciando com z não são suportados. validation.altcoin.zAddressesNotSupported=Endereços ZEC precisam iniciar com t. Endereços iniciando com z não são suportados. validation.altcoin.invalidAddress=Endereço não é um endereço {0} válido! {1} validation.bic.invalidLength=Comprimento da entrada não é 8 ou 11 diff --git a/core/src/main/resources/i18n/displayStrings_ro.properties b/core/src/main/resources/i18n/displayStrings_ro.properties index e6c829c28c5..177913472dd 100644 --- a/core/src/main/resources/i18n/displayStrings_ro.properties +++ b/core/src/main/resources/i18n/displayStrings_ro.properties @@ -897,6 +897,7 @@ account.altcoin.popup.wallet.confirm=Înțeleg și confirm că știu ce portofel account.altcoin.popup.xmr.msg=Dacă dorești să tranzacționezi XMR pe Bisq, asigură-te că ai înțeles și îndeplinești următoarele condiții:\n\nPentru a trimite XMR, trebuie să utilizezi portofelul oficial Monero GUI sau portofelul simplu Monero cu steagul store-tx-info activat (implicit în noile versiuni).\nAsigură-te că poți accesa cheia tx (folosește comanda get_tx_key în simplewallet) din motiv ce aceasta va fi necesară în cazul unei dispute care să permită arbitrului verificarea transferului de XMR cu ajutorul instrumentului checktx XMR (http://xmr.llcoins.net/checktx.html).\nÎn cazul exploratorilor normali ai blocurilor, transferul nu este verificabil.\n\nÎn cazul unei dispute va trebui să pui la dispoziția arbitrului următoarele date:\n- Cheia privată Tx\n- Hashul tranzacției\n- Adresa publică a destinatarului\n\nDacă nu poți furniza datele de mai sus sau dacă ai folosit un portofel incompatibil, va rezulta pierderea cazului disputei. Expeditorul XMR este responsabil pentru a face verificabil transferul XMR către arbitru în cazul unei dispute.\n\nNu este necesar un cod de plată, ci doar adresa publică normală.\n\nDacă nu ești sigur de acest proces vizitează forumul Monero (https://forum.getmonero.org) pentru mai multe informații. account.altcoin.popup.blur.msg=If you want to trade BLUR on Bisq please be sure you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI wallet (blur-wallet-cli). After sending a transfer payment, the\nwallet displays a transaction hash (tx ID). You must save this information. You must also use the 'get_tx_key'\ncommand to retrieve the transaction private key. In the event that arbitration is necessary, you must present\nboth the transaction ID and the transaction private key, along with the recipient's public address. The arbitrator\nwill then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nThe BLUR sender is responsible for the ability to verify BLUR transfers to the arbitrator in case of a dispute.\n\nIf you do not understand these requirements, seek help at the Blur Network Discord (https://discord.gg/5rwkU2g). account.altcoin.popup.ccx.msg=If you want to trade CCX on Bisq please be sure you understand the following requirements:\n\nTo send CCX you must use an official Conceal wallet, either CLI or GUI. After sending a transfer payment, the wallets\ndisplay the transaction secret key. You must save it along with the transaction hash (ID) and the recipient's public\naddress in case arbitration is necessary. In such a case, you must give all three to the arbitrator, who will then\nverify the CCX transfer using the Conceal Transaction Viewer (https://explorer.conceal.network/txviewer).\nBecause Conceal is a privacy coin, block explorers cannot verify transfers.\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nIf you do not save the transaction secret key immediately after transferring CCX, it cannot be recovered later.\nIf you do not understand these requirements, seek help at the Conceal discord (http://discord.conceal.network). +account.altcoin.popup.LTZ.msg=Atunci când folosești {0}, poți utiliza doar adresele transparente (începând cu L) nu adresele z (private), deoarece arbitrul nu va putea verifica tranzacția cu adrese z. account.altcoin.popup.ZEC.msg=Atunci când folosești {0}, poți utiliza doar adresele transparente (începând cu t) nu adresele z (private), deoarece arbitrul nu va putea verifica tranzacția cu adrese z. account.altcoin.popup.XZC.msg=Când folosești {0}, poți folosi numai adresele transparente (ce pot fi urmărite), nu adresele indetectabile, deoarece arbitrul nu va putea verifica tranzacția executată cu adrese ce nu pot fi citite de către un explorator de bloc. account.altcoin.popup.bch=Bitcoin Cash și Bitcoin Clashic suferă de protecție împotriva reluării. Dacă folosești aceste monede, asigură-te că ai luat măsurile necesare de precauție și înțelegi toate implicațiile. Poți suferi pierderi prin trimiterea unei monezi și neintenționat să trimiți aceeași monedă pe celălalt blockchain. Deoarece acele "monede airdrop" au aceeași istorie cu blockchainul Bitcoin există și riscuri de securitate cât și un risc considerabil în pierderea confidențialității.\n\nTe invităm să citești mai multe despre acest subiect pe forumul Bisq: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bchc @@ -2054,6 +2055,7 @@ validation.nationalAccountId={0} trebuie să fie format din {1} numere. validation.invalidInput=Intrarea nu este validă: {0} validation.accountNrFormat=Numărul de cont trebuie sa fie sub formatul: {0} validation.altcoin.wrongStructure=Validarea adresei a eșuat deoarece nu corespunde structurii adresei {0}. +validation.altcoin.ltzzAddressesNotSupported=Adresa de LTZ trebuie să înceapă cu L. Adresele ce încep cu z nu sunt acceptate. validation.altcoin.zAddressesNotSupported=Adresa de ZEC trebuie să înceapă cu t. Adresele ce încep cu z nu sunt acceptate. validation.altcoin.invalidAddress=Adresa nu este validă {0} address! {1} validation.bic.invalidLength=Lungimea introdusă nu e nici de 8 nici de 11 diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index 9f405c2aaa5..c4de240ae83 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -897,6 +897,7 @@ account.altcoin.popup.wallet.confirm=Я понимаю и подтверждаю account.altcoin.popup.xmr.msg=Если желаете обменивать XMR на Bisq, просьба понять и следовать следующим правилам:\n\nДля отправления XMR необходимы официальный Monero GUI кошелёк или Monero CLI кошелёк (необходим store-tx-info флажок, включённый в новейших версиях по умолчанию).\nУдостоверьтесь, что доступен ключ транзакций (используйте get_tx_key команду в Monero-CLI), необходимый в случае спора, чтоб арбитр мог подтвердить перевод XMR проверочным инструментом (http://xmr.llcoins.net/checktx.html).\nОбычным исследователем блоков переводы не проверяются.\n\nЕсли возникнет спора, арбитру потребуются от Вас следующие данные:\n- Ключ транзакции\n- Хэш(hash) транзакции\n- Публичный адрес получателя\n\nЕсли Вы не предоставите эти данные, либо используете несоответствующие кошельки, Вы проиграете спор. Посылающий XMR ответственен перед арбитром за подтверждение перевода XMR в случае спора.\n\nИдентификатор оплаты не нужен - только нормальный публичный адрес.\n\nЕсли Вам не знаком этот процесс, осведомитесь на форуме Monero (https://forum.getmonero.org). account.altcoin.popup.blur.msg=При торговле BLUR на Bisq, просьба убедиться, что Вы понимаете и выполняете следующие требования:\n\nДля отправки BLUR, необходимо использовать Blur Network CLI Wallet (Blur-Wallet-CLI). После отправки платежа,\nв кошельке покажется хэш транзакции (TX ID). Необходимо сохранить эту информацию. Для получения личного ключа транзакции\nнеобходимо также применить команду get_tx_key. В случае спора, необходимо предоставить\nидентификатор и личный ключ транзакции вместе с публичным адресом получателя. Арбитр\nзатем проверит перевод BLUR с помощью Обозревателя Транзакций BLUR (https://blur.cash/#tx-viewer).\n\nЕсли Вы не сможете предоставить необходимые данные арбитру, Вы проиграете спор.\nОтправитель BLUR несет ответственность за способность проверки перевода арбитром в случае спора.\n\nЕсли Вы не понимаете этих требований, обратитесь за помощью в Blur Network Discord (https://discord.gg/5rwkU2g). account.altcoin.popup.ccx.msg=Если Вы хотите торговать CCX на Bisq, просьба убедиться, что Вы понимаете следующие требования:\n\nДля отправки ccx вы должны использовать официальный кошелек - либо CLI, либо GUI. После отправки перевода, кошельки\nпоказывают секретный ключ транзакции. Вы должны сохранить его вместе с хэшем транзакции (ID) и общедоступным\nадресом получателя на случай возникновения спора. В таком случае Вы должны предоставить все три арбитру,\nдля проверки перевода CCX с помощью Обозревателя Скрытых Транзакций (https://explorer.скрывать.network/txviewer).\nТак как Conceal монета конфиденциальности, блок обозреватели не могут проверить переводы.\n\nЕсли Вы не сможете предоставить необходимые данные арбитру, Вы проиграете спор.\nЕсли Вы не сохраните секретный ключ транзакции сразу после передачи CCX, его нельзя будет восстановить позже.\nЕсли Вы не понимаете этих требований, обратитесь за помощью в Conceal discord (http://discord.conceal.network). +account.altcoin.popup.LTZ.msg=При использовании {0} допустимо использовать только прозрачные адреса (начиная с L) а не z-адреса (личные), потому что арбитр не сможет проверить транзакцию с z-адресами. account.altcoin.popup.ZEC.msg=При использовании {0} допустимо использовать только прозрачные адреса (начиная с t) а не z-адреса (личные), потому что арбитр не сможет проверить транзакцию с z-адресами. account.altcoin.popup.XZC.msg=При использовании {0} можно использовать только прозрачные (отслеживаемые) адреса, а не неотслеживаемые адреса, поскольку арбитр не сможет проверить транзакцию с неотслеживаемыми адресами в обозревателе блоков цепи / вlockchain. account.altcoin.popup.bch=Bitcoin Cash и Bitcoin Classic страдают отсутствием защиты воспроизведения. Если вы используете эти монеты, убедитесь, что вы принимаете достаточные меры предосторожности и понимаете все последствия. Возможно понести убытки, отправив одну монету и непреднамеренно отправить те же монеты на другую блокцепь. Поскольку эти монеты были выпущены процессом "airdrop" и разделяют исторические данные с блокчейном Биткойн, существует также риск безопасности и значительный риск потери конфиденциальности. \n\nПросьба прочесть подробнее на форуме Bisq: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bchc @@ -2054,6 +2055,7 @@ validation.nationalAccountId={0} должен состоять из {1} цифе validation.invalidInput=Недействительный ввод: {0} validation.accountNrFormat=Номер счёта должен быть в формате: {0} validation.altcoin.wrongStructure=Сбой проверки адреса, поскольку она не соответствует структуре адреса {0}. +validation.altcoin.ltz.zAddressesNotSupported=Адрес LTZ должен начинаться с "L". Адреса, начинающиеся с "z", не поддерживаются. validation.altcoin.zAddressesNotSupported=Адрес ZEC должен начинаться с "t". Адреса, начинающиеся с "z", не поддерживаются. validation.altcoin.invalidAddress=Адрес не является действительным адресом {0}! {1} validation.bic.invalidLength=Длина ввода ни 8, ни 11 diff --git a/core/src/main/resources/i18n/displayStrings_sr.properties b/core/src/main/resources/i18n/displayStrings_sr.properties index 7eea4a6a7f5..10f4634a147 100644 --- a/core/src/main/resources/i18n/displayStrings_sr.properties +++ b/core/src/main/resources/i18n/displayStrings_sr.properties @@ -897,6 +897,7 @@ account.altcoin.popup.wallet.confirm=Razumem i potvrđujem da znam koji novčani account.altcoin.popup.xmr.msg=If you want to trade XMR on Bisq please be sure you understand and fulfill the following requirements:\n\nFor sending XMR you need to use either the official Monero GUI wallet or the Monero simple wallet with the store-tx-info flag enabled (default in new versions).\nPlease be sure that you can access the tx key (use the get_tx_key command in simplewallet) as that would be required in case of a dispute to enable the arbitrator to verify the XMR transfer with the XMR checktx tool (http://xmr.llcoins.net/checktx.html).\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nIf you cannot provide the above data or if you used an incompatible wallet it would result in losing the dispute case. The XMR sender is responsible to be able to verify the XMR transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\n\nIf you are not sure about that process visit the Monero forum (https://forum.getmonero.org) to find more information. account.altcoin.popup.blur.msg=If you want to trade BLUR on Bisq please be sure you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI wallet (blur-wallet-cli). After sending a transfer payment, the\nwallet displays a transaction hash (tx ID). You must save this information. You must also use the 'get_tx_key'\ncommand to retrieve the transaction private key. In the event that arbitration is necessary, you must present\nboth the transaction ID and the transaction private key, along with the recipient's public address. The arbitrator\nwill then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nThe BLUR sender is responsible for the ability to verify BLUR transfers to the arbitrator in case of a dispute.\n\nIf you do not understand these requirements, seek help at the Blur Network Discord (https://discord.gg/5rwkU2g). account.altcoin.popup.ccx.msg=If you want to trade CCX on Bisq please be sure you understand the following requirements:\n\nTo send CCX you must use an official Conceal wallet, either CLI or GUI. After sending a transfer payment, the wallets\ndisplay the transaction secret key. You must save it along with the transaction hash (ID) and the recipient's public\naddress in case arbitration is necessary. In such a case, you must give all three to the arbitrator, who will then\nverify the CCX transfer using the Conceal Transaction Viewer (https://explorer.conceal.network/txviewer).\nBecause Conceal is a privacy coin, block explorers cannot verify transfers.\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nIf you do not save the transaction secret key immediately after transferring CCX, it cannot be recovered later.\nIf you do not understand these requirements, seek help at the Conceal discord (http://discord.conceal.network). +account.altcoin.popup.LTZ.msg=Tokom korišćenja {0} možete koristiti samo transparentne adrese (počinju sa L) a ne z-adrese (privatne), jer arbitar ne bi bio u stanju da proveri transakciju sa z-adresom. account.altcoin.popup.ZEC.msg=Tokom korišćenja {0} možete koristiti samo transparentne adrese (počinju sa t) a ne z-adrese (privatne), jer arbitar ne bi bio u stanju da proveri transakciju sa z-adresom. account.altcoin.popup.XZC.msg=When using {0} you can only use the transparent (traceable) addresses not the untraceable addresses, because the arbitrator would not be able to verify the transaction with untraceable addresses at a block explorer. account.altcoin.popup.bch=Bitcoin Cash and Bitcoin Clashic suffer from replay protection. If you use those coins be sure you take sufficient precautions and understand all implications.You can suffer losses by sending one coin and unintentionally send the same coins on the other block chain.Because those "airdrop coins" share the same history with the Bitcoin blockchain there are also security risks and a considerable risk for losing privacy.\n\nPlease read at the Bisq Forum more about that topic: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bchc @@ -2054,6 +2055,7 @@ validation.nationalAccountId={0} mora da se sastoji od {1} brojeva. validation.invalidInput=Nevažeći unos: {0} validation.accountNrFormat=Broj računa mora biti formata: {0} validation.altcoin.wrongStructure=Provera adrese nije uspela zato što ne odgovara strukturi {0} adrese. +validation.altcoin.ltz.zAddressesNotSupported=LTZ adresa mora da počinje sa L. Adrese koje počinju sa z nisu podržane. validation.altcoin.zAddressesNotSupported=ZEC adresa mora da počinje sa t. Adrese koje počinju sa z nisu podržane. validation.altcoin.invalidAddress=Adresa nije važeća {0} adresa! {1} validation.bic.invalidLength=Dužina unosa nije ni 8 ni 11 diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index 25888214133..985509cb275 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -897,6 +897,7 @@ account.altcoin.popup.wallet.confirm=ฉันเข้าใจและยื account.altcoin.popup.xmr.msg=หากคุณต้องการซื้อขาย XMR (เหรียญ Monero) ใน Bisq โปรดตรวจสอบให้แน่ใจว่าคุณเข้าใจและปฏิบัติตามข้อกำหนดต่อไปนี้:\n\nสำหรับการส่ง XMR คุณจำเป็นต้องใช้ wallet ของ Monero GUI อย่างเป็นทางการหรือ Monero wallet แบบธรรมดา พร้อมกับเปิดใช้งานการเก็บค่าสถานะการเก็บข้อมูล - tx-info ไว้ (ค่าเริ่มต้นในเวอร์ชั่นใหม่) \nโปรดตรวจสอบว่าคุณสามารถเข้าถึงคีย์ tx (ใช้คำสั่ง get_tx_key ใน simplewallet) ตามที่ต้องการในกรณีของข้อพิพาทเพื่อให้อนุญาโตตุลาการ ตรวจสอบการถ่ายโอน XMR ด้วยเครื่องมือ checktx XMR (http: //xmr.llcoins .net / checktx.html) .\nที่ตามปกติแล้วนักสำรวจบล็อกจะไม่สามารถตรวจสอบการโอนได้\n\nคุณจำเป็นต้องให้ข้อมูลแก่อนุญาโตตุลาการดั่งต่อไปนี้ในกรณีที่เกิดข้อพิพาท: \n- คีย์ส่วนตัว tx\n- การทำธุรกรรม hash (ฟังก์ชันแฮช)\n- ที่อยู่สาธารณะของผู้รับ\n\nหากคุณไม่สามารถให้ข้อมูลข้างต้นหรือหากคุณใช้ wallet ที่เข้ากันไม่ได้อาจทำให้เกิดกรณีการสูญเสียการพิพาท หรือยกฟ้องการพิพาทไป ผู้ส่ง XMR มีหน้าที่รับผิดชอบในการตรวจสอบการส่ง XMR ไปยังอนุญาโตตุลาการในกรณีที่มีข้อพิพาท\n\nไม่จำเป็นต้องมี ID การชำระเงิน เพียงแค่ที่อยู่สาธารณะตามปกติก็สามารถดำเนินการได้\n\nหากคุณไม่แน่ใจเกี่ยวกับกระบวนการดังกล่าวโปรดไปที่ฟอรัม Monero (https://forum.getmonero.org) เพื่อหาข้อมูลเพิ่มเติม\n\n\n\n\n\n\n\n\n\n\n\n account.altcoin.popup.blur.msg=If you want to trade BLUR on Bisq please be sure you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI wallet (blur-wallet-cli). After sending a transfer payment, the\nwallet displays a transaction hash (tx ID). You must save this information. You must also use the 'get_tx_key'\ncommand to retrieve the transaction private key. In the event that arbitration is necessary, you must present\nboth the transaction ID and the transaction private key, along with the recipient's public address. The arbitrator\nwill then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nThe BLUR sender is responsible for the ability to verify BLUR transfers to the arbitrator in case of a dispute.\n\nIf you do not understand these requirements, seek help at the Blur Network Discord (https://discord.gg/5rwkU2g). account.altcoin.popup.ccx.msg=If you want to trade CCX on Bisq please be sure you understand the following requirements:\n\nTo send CCX you must use an official Conceal wallet, either CLI or GUI. After sending a transfer payment, the wallets\ndisplay the transaction secret key. You must save it along with the transaction hash (ID) and the recipient's public\naddress in case arbitration is necessary. In such a case, you must give all three to the arbitrator, who will then\nverify the CCX transfer using the Conceal Transaction Viewer (https://explorer.conceal.network/txviewer).\nBecause Conceal is a privacy coin, block explorers cannot verify transfers.\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nIf you do not save the transaction secret key immediately after transferring CCX, it cannot be recovered later.\nIf you do not understand these requirements, seek help at the Conceal discord (http://discord.conceal.network). +account.altcoin.popup.LTZ.msg=เมื่อใช้ {0} คุณสามารถใช้ที่อยู่ที่ถูกทำให้มองไม่เห็น (เริ่มต้นด้วย L) ไม่ใช่ที่อยู่ z (ส่วนตัว) เนื่องจากอนุญาโตตุลาการจะไม่สามารถตรวจสอบธุรกรรมกับที่อยู่ z ได้ account.altcoin.popup.ZEC.msg=เมื่อใช้ {0} คุณสามารถใช้ที่อยู่ที่ถูกทำให้มองไม่เห็น (เริ่มต้นด้วย t) ไม่ใช่ที่อยู่ z (ส่วนตัว) เนื่องจากอนุญาโตตุลาการจะไม่สามารถตรวจสอบธุรกรรมกับที่อยู่ z ได้ account.altcoin.popup.XZC.msg=เมื่อใช้ {0} คุณสามารถใช้ที่อยู่ที่ถูกทำให้มองเห็น (สามารถตรวจสอบย้อนกลับได้) ไม่ใช่ที่อยู่ที่ไม่สามารถระบุได้เนื่องจากอนุญาโตตุลาการจะไม่สามารถตรวจสอบการทำรายการกับที่อยู่ที่ไม่สามารถเข้าถึงได้ที่ block explorer (นักสำรวจบล็อก) account.altcoin.popup.bch=Bitcoin Cash และ Bitcoin Clashic ได้รับความเสียหายจากการป้องกันการเล่นซ้ำ หากคุณใช้เหรียญเหล่านี้ ให้แน่ใจว่าคุณใช้ความระมัดระวังเพียงพอและเข้าใจผลกระทบทั้งหมด คุณอาจเผชิญกับความสูญเสียโดยการส่งเหรียญหนึ่งเหรียญโดยไม่ได้ตั้งใจและส่งเหรียญเดียวกันในห่วงโซ่อุปทานอื่น ๆ เนื่องจากเหล่า "airdrop coins" แบ่งปันประวัติเดียวกันกับ blockchain Bitcoin นอกจากนี้ยังมีความเสี่ยงด้านความปลอดภัยและความเสี่ยงที่จะสูญเสียความเป็นส่วนตัวมากขึ้น\n\nโปรดอ่านที่ Bisq Forum เพิ่มเติมเกี่ยวกับหัวข้อ: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bchc @@ -2054,6 +2055,7 @@ validation.nationalAccountId={0} ต้องประกอบด้วย {1} validation.invalidInput=ใส่ข้อมูลไม่ถูกต้อง: {0} validation.accountNrFormat=หมายเลขบัญชีต้องเป็นรูปแบบ: {0} validation.altcoin.wrongStructure=การตรวจสอบความถูกต้องของที่อยู่ล้มเหลวเนื่องจากไม่ตรงกับโครงสร้างของที่อยู่ {0} +validation.altcoin.ltz.zAddressesNotSupported=ที่อยู่ LTZ ต้องเริ่มต้นด้วย L ไม่รองรับที่อยู่ที่ขึ้นต้นด้วย z validation.altcoin.zAddressesNotSupported=ที่อยู่ ZEC ต้องเริ่มต้นด้วย t ไม่รองรับที่อยู่ที่ขึ้นต้นด้วย z validation.altcoin.invalidAddress=ที่อยู่ไม่ใช่ที่อยู่ {0} ที่ถูกต้อง! {1} validation.bic.invalidLength=ความยาวของอินพุตไม่ใช่ 8 หรือ 11 diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index ccf3b6ee194..8f865200156 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -897,6 +897,7 @@ account.altcoin.popup.wallet.confirm=Tôi hiểu và xác nhận rằng tôi đ account.altcoin.popup.xmr.msg=Nếu bạn muốn giao dịch XMR trên Bisq, hãy chắc chắn bạn hiểu và tuân thủ các yêu cầu sau:\n\nĐể gửi XMR, bạn cần sử dụng hoặc là ví Monero GUI chính thức hoặc ví Monero giản đơn với nhãn luu-thongtin-tx được kích hoạt (mặc định trong phiên bản mới).\nChắc chắn rằng bạn có thể truy cập khóa tx (sử dụng lệnh nhan-khoa-tx ở ví giản đơn) vì điều này là cần thiết trong trường hợp khiếu nại buộc trọng tài phải xác minh chuyển khoản XMR với công cụ XMR checktx tool (http://xmr.llcoins.net/checktx.html).\nVới block explorers thông thường, chuyển khoản không thể xác minh được.\n\nBạn cần cung cấp cho trọng tài các dữ liệu sau trong trường hợp khiếu nại:\n- Khóa tx riêng\n- Hash của giao dịch\n- Địa chỉ công cộng của người nhận\n\nNếu bạn không thể cung cấp các dữ liệu trên hoặc nếu bạn sử dụng ví không thích hợp sẽ dẫn tới thua trong vụ khiếu nại. Người gửi XMR chịu trách nhiệm xác minh chuyển khoản XMR cho trọng tài trong trường hợp khiếu nại.\n\nKhông có ID thanh toán cầu thiết, chỉ là địa chỉ công cộng thông thường.\n\nNếu bạn không chắc chắn về quá trình, truy cập diễn đàn Monero (https://forum.getmonero.org) để tìm thêm thông tin. account.altcoin.popup.blur.msg=If you want to trade BLUR on Bisq please be sure you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI wallet (blur-wallet-cli). After sending a transfer payment, the\nwallet displays a transaction hash (tx ID). You must save this information. You must also use the 'get_tx_key'\ncommand to retrieve the transaction private key. In the event that arbitration is necessary, you must present\nboth the transaction ID and the transaction private key, along with the recipient's public address. The arbitrator\nwill then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nThe BLUR sender is responsible for the ability to verify BLUR transfers to the arbitrator in case of a dispute.\n\nIf you do not understand these requirements, seek help at the Blur Network Discord (https://discord.gg/5rwkU2g). account.altcoin.popup.ccx.msg=If you want to trade CCX on Bisq please be sure you understand the following requirements:\n\nTo send CCX you must use an official Conceal wallet, either CLI or GUI. After sending a transfer payment, the wallets\ndisplay the transaction secret key. You must save it along with the transaction hash (ID) and the recipient's public\naddress in case arbitration is necessary. In such a case, you must give all three to the arbitrator, who will then\nverify the CCX transfer using the Conceal Transaction Viewer (https://explorer.conceal.network/txviewer).\nBecause Conceal is a privacy coin, block explorers cannot verify transfers.\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nIf you do not save the transaction secret key immediately after transferring CCX, it cannot be recovered later.\nIf you do not understand these requirements, seek help at the Conceal discord (http://discord.conceal.network). +account.altcoin.popup.LTZ.msg=Khi sử dụng {0} bạn chỉ có thể sử dụng địa chỉ rõ ràng (bắt đầu bằng L) không phải địa chỉ z (riêng tư), vì trọng tài sẽ không thể xác minh giao dịch với địa chỉ z. account.altcoin.popup.ZEC.msg=Khi sử dụng {0} bạn chỉ có thể sử dụng địa chỉ rõ ràng (bắt đầu bằng t) không phải địa chỉ z (riêng tư), vì trọng tài sẽ không thể xác minh giao dịch với địa chỉ z. account.altcoin.popup.XZC.msg=Khi sử dụng {0} bạn chỉ có thể sử dụng địa chỉ rõ ràng (có thể theo dõi) chứ không phải địa chỉ không thể theo dõi, vì trọng tài không thể xác minh giao dịch với địa chỉ không thể theo dõi tại một block explorer. account.altcoin.popup.bch=Bitcoin Cash và Bitcoin Clashic được bảo vệ không chào lại. Nếu bạn sử dụng các coin này, phải chắc chắn bạn đã thực hiện đủ biện pháp phòng ngừa và hiểu rõ tất cả nội dung. Bạn có thể bị mất khi gửi một coin và vô tình gửi coin như vậy cho block chain khác. Do các "airdrop coins" này có cùng lịch sử với Bitcoin blockchain do đó có một số nguy cơ mất an toàn và quyền riêng tư.\n\nVui lòng đọc tại diễn đàn Bisq để biết thêm về chủ đề này: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bchc @@ -2054,6 +2055,7 @@ validation.nationalAccountId={0} phải có {1} số. validation.invalidInput=Giá trị nhập không hợp lệ: {0} validation.accountNrFormat=Số tài khoản phải có định dạng : {0} validation.altcoin.wrongStructure=Xác nhận địa chỉ không thành công vì không khớp với cấu trúc của {0} địa chỉ. +validation.altcoin.ltz.zAddressesNotSupported=Địa chỉ LTZ phải bắt đầu bằng L. Địa chỉ bắng đầu bằng z không được hỗ trợ. validation.altcoin.zAddressesNotSupported=Địa chỉ ZEC phải bắt đầu bằng t. Địa chỉ bắng đầu bằng z không được hỗ trợ. validation.altcoin.invalidAddress=Địa chỉ không phải là địa chỉ {0} hợp lệ! {1} validation.bic.invalidLength=Độ dài giá trị nhập không được là 8 hoặc 11 diff --git a/core/src/main/resources/i18n/displayStrings_zh.properties b/core/src/main/resources/i18n/displayStrings_zh.properties index fd21a8be074..4b27bcd1e61 100644 --- a/core/src/main/resources/i18n/displayStrings_zh.properties +++ b/core/src/main/resources/i18n/displayStrings_zh.properties @@ -897,6 +897,7 @@ account.altcoin.popup.wallet.confirm=我了解并确定我知道我需要哪种 account.altcoin.popup.xmr.msg=如果您想在Bisq上交易XMR，请确保您了解并符合以下要求：\n\n对于发送XMR，您需要使用官方的Monero GUI钱包或启用了store-tx-info标志的Monero简单钱包(默认为新版本)。\n请确保您可以访问tx key(使用simplewallet中的get_tx_key命令)，因为如果发生纠纷，仲裁员可以使用XMR checktx工具验证XMR传输(http://xmr.llcoins.net/checktx.html).\n在正常的块浏览器中，划转是不可验证的\n\n您需要向仲裁员提供以下数据，以备发生纠纷：\n- tx私钥\n- 交易哈希\n- 收件人的公开地址\n\n如果您无法提供上述数据，或者使用不兼容的钱包，将导致失去纠纷案件。如果发生纠纷，XMR发件人有责任验证XMR向仲裁员的转移\n\n没有需要付款ID，只是正常的公共地址\n\n如果您不确定该进程，请访问Monero论坛( https://forum.getmonero.org )以查找更多信息。 account.altcoin.popup.blur.msg=If you want to trade BLUR on Bisq please be sure you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI wallet (blur-wallet-cli). After sending a transfer payment, the\nwallet displays a transaction hash (tx ID). You must save this information. You must also use the 'get_tx_key'\ncommand to retrieve the transaction private key. In the event that arbitration is necessary, you must present\nboth the transaction ID and the transaction private key, along with the recipient's public address. The arbitrator\nwill then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nThe BLUR sender is responsible for the ability to verify BLUR transfers to the arbitrator in case of a dispute.\n\nIf you do not understand these requirements, seek help at the Blur Network Discord (https://discord.gg/5rwkU2g). account.altcoin.popup.ccx.msg=If you want to trade CCX on Bisq please be sure you understand the following requirements:\n\nTo send CCX you must use an official Conceal wallet, either CLI or GUI. After sending a transfer payment, the wallets\ndisplay the transaction secret key. You must save it along with the transaction hash (ID) and the recipient's public\naddress in case arbitration is necessary. In such a case, you must give all three to the arbitrator, who will then\nverify the CCX transfer using the Conceal Transaction Viewer (https://explorer.conceal.network/txviewer).\nBecause Conceal is a privacy coin, block explorers cannot verify transfers.\n\nIf you cannot provide the required data to the arbitrator, you will lose the dispute case.\nIf you do not save the transaction secret key immediately after transferring CCX, it cannot be recovered later.\nIf you do not understand these requirements, seek help at the Conceal discord (http://discord.conceal.network). +account.altcoin.popup.LTZ.msg=当使用{0}时，您只能使用透明地址(以L开头)而不是z开头地址(私有)，因为仲裁者无法使用z地址验证事务。 account.altcoin.popup.ZEC.msg=当使用{0}时，您只能使用透明地址(以t开头)而不是z开头地址(私有)，因为仲裁者无法使用z地址验证事务。 account.altcoin.popup.XZC.msg=When using {0} you can only use the transparent (traceable) addresses not the untraceable addresses, because the arbitrator would not be able to verify the transaction with untraceable addresses at a block explorer. account.altcoin.popup.bch=Bitcoin Cash and Bitcoin Clashic suffer from replay protection. If you use those coins be sure you take sufficient precautions and understand all implications.You can suffer losses by sending one coin and unintentionally send the same coins on the other block chain.Because those "airdrop coins" share the same history with the Bitcoin blockchain there are also security risks and a considerable risk for losing privacy.\n\nPlease read at the Bisq Forum more about that topic: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bchc @@ -2054,6 +2055,7 @@ validation.nationalAccountId={0}必须由{1}个数字组成。 validation.invalidInput=输入无效：{0} validation.accountNrFormat=帐号必须是格式：{0} validation.altcoin.wrongStructure=地址验证失败，因为它与{0}地址的结构不匹配。 +validation.altcoin.ltz.zAddressesNotSupported=LTZ地址需要从L开始。 不支持以z开头的地址。 validation.altcoin.zAddressesNotSupported=ZEC地址需要从t开始。 不支持以z开头的地址。 validation.altcoin.invalidAddress=这个地址不是有效的{0}地址！{1} validation.bic.invalidLength=输入长度既不是8也不是11 diff --git a/core/src/test/java/bisq/core/user/PreferencesTest.java b/core/src/test/java/bisq/core/user/PreferencesTest.java index d5d25bfd6b6..ad28e392bd1 100644 --- a/core/src/test/java/bisq/core/user/PreferencesTest.java +++ b/core/src/test/java/bisq/core/user/PreferencesTest.java @@ -124,7 +124,7 @@ public void testGetUniqueListOfCryptoCurrencies() { preferences.readPersisted(); - assertEquals(13, preferences.getCryptoCurrenciesAsObservable().size()); + assertEquals(14, preferences.getCryptoCurrenciesAsObservable().size()); assertTrue(preferences.getCryptoCurrenciesAsObservable().contains(dash)); } diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java index baf48c1f301..486f6aadac8 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java @@ -170,6 +170,11 @@ private void onSaveNewAccount(PaymentAccount paymentAccount) { .useIUnderstandButton() .show(); break; + case "LTZ": + new Popup<>().information(Res.get("account.altcoin.popup.LTZ.msg", "LTZ")) + .useIUnderstandButton() + .show(); + break; case "ZEC": new Popup<>().information(Res.get("account.altcoin.popup.ZEC.msg", "ZEC")) .useIUnderstandButton() From c580dd1b138ec7256bb37c4e000e60a74cc4146f Mon Sep 17 00:00:00 2001 From: Mark LTZ <43173987+LitecoinZ@users.noreply.github.com> Date: Thu, 15 Nov 2018 14:57:46 +0100 Subject: [PATCH 2/2] Update Coin.java --- assets/src/main/java/bisq/asset/Coin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/src/main/java/bisq/asset/Coin.java b/assets/src/main/java/bisq/asset/Coin.java index c1c8e74b447..5eb596e4710 100644 --- a/assets/src/main/java/bisq/asset/Coin.java +++ b/assets/src/main/java/bisq/asset/Coin.java @@ -21,8 +21,8 @@ * Abstract base class for {@link Asset}s with their own dedicated blockchain, such as * {@link bisq.asset.coins.Bitcoin} itself or one of its many derivatives, competitors and * alternatives, often called "altcoins", such as {@link bisq.asset.coins.Litecoin}, - * {@link bisq.asset.coins.Ether}, {@link bisq.asset.coins.Monero}, {@link bisq.asset.coins.Zcash} - * and {@link bisq.asset.coins.LitecoinZ}. + * {@link bisq.asset.coins.Ether}, {@link bisq.asset.coins.Monero} and + * {@link bisq.asset.coins.Zcash}. *

* In addition to the usual {@code Asset} properties, a {@code Coin} maintains information * about which {@link Network} it may be used on. By default, coins are constructed with