From f2cac86b50af9fcbcdf8eb82a274e19ebbb22c36 Mon Sep 17 00:00:00 2001 From: jan zens <89642092+sneznaj@users.noreply.github.com> Date: Tue, 19 Oct 2021 14:53:48 +0200 Subject: [PATCH 1/9] Trade Step 1: add popup "no BSQ while Synchronizing DAO" --- .../resources/i18n/displayStrings.properties | 1 + .../resources/i18n/displayStrings_cs.properties | 1 + .../resources/i18n/displayStrings_de.properties | 1 + .../resources/i18n/displayStrings_es.properties | 1 + .../resources/i18n/displayStrings_fa.properties | 1 + .../resources/i18n/displayStrings_fr.properties | 1 + .../resources/i18n/displayStrings_it.properties | 1 + .../resources/i18n/displayStrings_ja.properties | 1 + .../i18n/displayStrings_pt-br.properties | 1 + .../resources/i18n/displayStrings_pt.properties | 1 + .../resources/i18n/displayStrings_ru.properties | 1 + .../resources/i18n/displayStrings_th.properties | 1 + .../resources/i18n/displayStrings_vi.properties | 1 + .../i18n/displayStrings_zh-hans.properties | 1 + .../i18n/displayStrings_zh-hant.properties | 1 + .../desktop/main/offer/MutableOfferView.java | 17 +++++++++-------- .../main/offer/takeoffer/TakeOfferView.java | 16 ++++++++-------- 17 files changed, 32 insertions(+), 16 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index d6106e5559e..23ee295b77d 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -2891,6 +2891,7 @@ popup.warning.btcChangeBelowDustException=This transaction creates a change outp You need to add the dust amount to your sending amount to avoid to generate a dust output.\n\n\ The dust output is {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last \ 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\n\ You can either buy more BSQ or pay trade fees with BTC.\n\n\ diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties index 91443a812fc..42d26fcacf1 100644 --- a/core/src/main/resources/i18n/displayStrings_cs.properties +++ b/core/src/main/resources/i18n/displayStrings_cs.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=Nemáte dostatečné prostředky BTC popup.warning.bsqChangeBelowDustException=Tato transakce vytváří výstup BSQ, který je pod limitem drobných (5,46 BSQ) a byl by bitcoinovou sítí odmítnut.\n\nMusíte buď poslat vyšší částku, abyste se vyhnuli drobným (např. přidáním drobné částky do vaší odeslané částky), nebo přidejte do své peněženky další prostředky BSQ, abyste se vyhnuli generování drobných.\n\nVýstup drobných {0}. popup.warning.btcChangeBelowDustException=Tato transakce vytváří výstup, který je pod limitem drobných (546 satoshi) a byl by bitcoinovou sítí odmítnut.\n\nMusíte přidat vyšší množství drobných k vašemu odesílanému množství, abyste se vyhnuli vytváření drobných.\n\nVýstup drobných je {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=K provedení této transakce budete potřebovat více BSQ - posledních 5,46 BSQ ve vaší peněžence nelze použít k placení obchodních poplatků kvůli omezení prachových mincí v bitcoinovém protokolu.\n\nMůžete si buď koupit více BSQ, nebo zaplatit obchodní poplatky pomocí BTC.\n\nChybějící prostředky: {0} popup.warning.noBsqFundsForBtcFeePayment=Peněženka BSQ nemá dostatečné prostředky na zaplacení obchodního poplatku v BSQ. popup.warning.messageTooLong=Vaše zpráva překračuje max. povolená velikost. Zašlete jej prosím v několika částech nebo ji nahrajte do služby, jako je https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index b932a8b41a2..8886904dada 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=Sie haben nicht genügend BTC-Gelder, popup.warning.bsqChangeBelowDustException=Diese Transaktion erzeugt eine BSQ-Wechselgeld-Ausgabe, die unter dem Dust-Limit (5.46 BSQ) liegt und vom Bitcoin-Netzwerk abgelehnt werden würde.\n\nSie müssen entweder einen höheren Betrag senden, um die Wechselgeld-Ausgabe zu vermeiden (z.B. indem Sie den Dust-Betrag zu Ihrem Sende-Betrag hinzufügen) oder mehr BSQ-Guthaben zu Ihrer Wallet hinzufügen, damit Sie vermeiden, eine Dust-Ausgabe zu generieren.\n\nDie Dust-Ausgabe ist {0}. popup.warning.btcChangeBelowDustException=Diese Transaktion erzeugt eine Wechselgeld-Ausgabe, die unter dem Dust-Limit (546 Satoshi) liegt und vom Bitcoin-Netzwerk abgelehnt würde.\n\nSie müssen den Dust-Betrag zu Ihrem Sende-Betrag hinzufügen, um zu vermeiden, dass eine Dust-Ausgabe generiert wird.\n\nDie Dust-Ausgabe ist {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Ihr BSQ-Wallet ist deaktiviert während DAO synchronisiert und Ihr BSQ-Guthaben kann während dieser Zeit auf Null erscheinen. Bitte überprüfen Sie die Statusleiste und versuchen Sie es später erneut, wenn die DAO-Synchronisierung abgeschlossen ist, oder fahren Sie jetzt mit diesem Handel fort und verwenden Sie BTC, um die Handelsgebühren zu bezahlen. popup.warning.insufficientBsqFundsForBtcFeePayment=Sie benötigen mehr BSQ um diese Transaktion durchzuführen - die letzten 5.46 BSQ in Ihrer Wallet können aufgrund der Dust-Limits im Bitcoin Protokoll nicht für die Trading-Gebühren verwendet werden.\n\nSie können entweder mehr BSQ kaufen oder die Trading-Gebühren in BTC bezahlen.\n\nFehlende Funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Ihre BSQ-Wallet hat keine ausreichenden Gelder, um die Handels-Gebühr in BSQ zu bezahlen. popup.warning.messageTooLong=Ihre Nachricht überschreitet die maximal erlaubte Größe. Sende Sie diese in mehreren Teilen oder laden Sie sie in einen Dienst wie https://pastebin.com hoch. diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index ca345e2bc07..b07c5cea793 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=No tiene suficientes fondos BTC para popup.warning.bsqChangeBelowDustException=Esta transacción crea un output BSQ de cambio que está por debajo del límite dust (5.46 BSQ) y sería rechazado por la red Bitcoin.\n\nTiene que enviar una cantidad mayor para evitar el output de cambio (Ej. agregando la cantidad de dust a su cantidad de envío) o añadir más fondos BSQ a su cartera para evitar generar un output de dust.\n\nEl output dust es {0}. popup.warning.btcChangeBelowDustException=Esta transacción crea un output de cambio que está por debajo del límite de dust (546 Satoshi) y sería rechazada por la red Bitcoin.\n\nDebe agregar la cantidad de dust a su cantidad de envío para evitar generar un output de dust.\n\nEl output de dust es {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=Necesitará más BSQ para hacer esta transacción -los últimos 5.46BSQ en su monedero no pueden usarse para pagar tasas de intercambio debido a límites dust en el protocolo Bitcoin.\n\nPuede comprar más BSQ o pagar las tasas de intercambio con BTC.\n\nFondos necesarios: {0} popup.warning.noBsqFundsForBtcFeePayment=Su monedero BSQ no tiene suficientes fondos para pagar la comisión de intercambio en BSQ. popup.warning.messageTooLong=Su mensaje excede el tamaño máximo permitido. Por favor, envíelo por partes o súbalo a un servicio como https://pastebin.com diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index d6add3c0ca5..3effc95bb4a 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=شما BTC کافی برای پردا popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=کیف‌پول BSQ شما BSQ کافی برای پرداخت کارمزد معامله به BSQ را ندارد. popup.warning.messageTooLong=پیام شما بیش از حداکثر اندازه مجاز است. لطفا آن را در چند بخش ارسال کنید یا آن را در یک سرویس مانند https://pastebin.com آپلود کنید. diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index 418989485f0..dd93fed60e1 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=Vous ne disposez pas de suffisamment popup.warning.bsqChangeBelowDustException=Cette transaction crée une BSQ change output qui est inférieure à la dust limit (5,46 BSQ) et serait rejetée par le réseau Bitcoin.\n\nVous devez soit envoyer un montant plus élevé pour éviter la change output (par exemple en ajoutant le montant de dust à votre montant d''envoi), soit ajouter plus de fonds BSQ à votre portefeuille pour éviter de générer une dust output.\n\nLa dust output est {0}. popup.warning.btcChangeBelowDustException=Cette transaction crée une change output qui est inférieure à la dust limit (546 Satoshi) et serait rejetée par le réseau Bitcoin.\n\nVous devez ajouter la quantité de dust à votre montant envoyé pour éviter de générer une dust output.\n\nLa dust output est {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=Vous avez besoin de plus de BSQ pour effectuer cette transaction - les 5,46 BSQ restant dans le portefeuille ne seront pas utilisés pour payer les frais de transaction en raison des limites de dust du protocole BTC.\n\nVous pouvez acheter plus de BSQ ou utiliser BTC pour payer les frais de transaction\n\nManque de fonds BSQ: {0} popup.warning.noBsqFundsForBtcFeePayment=Votre portefeuille BSQ ne dispose pas de suffisamment de fonds pour payer les frais de transaction en BSQ. popup.warning.messageTooLong=Votre message dépasse la taille maximale autorisée. Veuillez l'envoyer en plusieurs parties ou le télécharger depuis un service comme https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties index 968ddd8e7cb..8cdfc8eeff4 100644 --- a/core/src/main/resources/i18n/displayStrings_it.properties +++ b/core/src/main/resources/i18n/displayStrings_it.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=Non hai fondi BTC sufficienti per pag popup.warning.bsqChangeBelowDustException=Questa transazione crea un output di cambio BSQ che è inferiore al limite di polvere (5,46 BSQ) e verrebbe rifiutato dalla rete Bitcoin.\n\nÈ necessario inviare una quantità maggiore per evitare l'output di cambio (ad es. aggiungendo la quantità di polvere alla quantità di invio) o aggiungere più fondi BSQ al portafoglio in modo da evitare di generare una produzione di polvere.\n\nL'output della polvere è {0}. popup.warning.btcChangeBelowDustException=Questa transazione crea un output di cambio che è al di sotto del limite di polvere (546 Satoshi) e verrebbe rifiutato dalla rete Bitcoin.\n\nÈ necessario aggiungere la quantità di polvere alla quantità di invio per evitare di generare un output di polvere.\n\nL'output della polvere è {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Il tuo portafoglio BSQ non ha fondi sufficienti per pagare la commissione commerciale in BSQ. popup.warning.messageTooLong=Il tuo messaggio supera la dimensione massima consentita. Si prega di inviarlo in più parti o caricarlo su un servizio come https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties index 9d4a6767fdd..b8cf284ab67 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=あなたはそのトランザクシ popup.warning.bsqChangeBelowDustException=このトランザクションは、ダスト制限(5.46 BSQ)を下回るBSQおつりアウトプットを作成し、ビットコインネットワークによって拒否されます。\n\nおつりアウトプットを回避するために、より高い金額を送信する必要があります(たとえば、送金額にダスト額を追加することによって)、またはダストアウトプットを生成しないようにウォレットにBSQ残高を追加する必要があります。\n\nダストアウトプットは{0}。 popup.warning.btcChangeBelowDustException=このトランザクションは、ダスト制限(546 Satoshi)を下回るBSQおつりアウトプットを作成し、ビットコインネットワークによって拒否されます。\n\nダストアウトプットを生成しないように、あなたの送金額にダスト額を追加する必要があります。\n\nダストアウトプットは{0}。 +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=このトランザクションにはBSQが足りません。ビットコインプロトコルのダスト制限によると、ウォレットから最後の5.46BSQはトレード手数料に使われることができません。\n\nもっとBSQを買うか、BTCでトレード手数料を支払うことができます。\n\n不足している資金: {0} popup.warning.noBsqFundsForBtcFeePayment=BSQウォレットにBSQのトレード手数料を支払うのに十分な残高がありません。 popup.warning.messageTooLong=メッセージが許容サイズ上限を超えています。いくつかに分けて送信するか、 https://pastebin.com のようなサービスにアップロードしてください。 diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties index 754c497c397..12fd2d73748 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=Você não possui fundos BTC suficien popup.warning.bsqChangeBelowDustException=Esta transação cria um troco BSQ menor do que o limite poeira (5.46 BSQ) e seria rejeitada pela rede Bitcoin.\nVocê precisa ou enviar uma quantia maior para evitar o troco (ex: adicionando a quantia poeira ao montante a ser enviado) ou adicionar mais fundos BSQ à sua carteira para evitar gerar uma saída de poeira.\nA saída de poeira é {0}. popup.warning.btcChangeBelowDustException=Esta transação cria um troco menor do que o limite poeira (546 Satoshi) e seria rejeitada pela rede Bitcoin.\nVocê precisa adicionar a quantia poeira ao montante de envio para evitar gerar uma saída de poeira.\nA saída de poeira é {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Sua carteira BSQ não possui fundos suficientes para pagar a taxa de transação em BSQ. popup.warning.messageTooLong=Sua mensagem excede o tamanho máximo permitido. Favor enviá-la em várias partes ou utilizando um serviço como https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index 387a7bf9c45..2b8d33cf19a 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=Você não tem fundos BTC suficientes popup.warning.bsqChangeBelowDustException=Esta transação cria um output de trocos de BSQ que está abaixo do limite de poeira (5,46 BSQ) e seria rejeitada pela rede do bitcoin.\n\nVocê precisa enviar uma quantia mais elevada para evitar o output de trocos (por exemplo, adicionando a quantia de poeira ao seu montante a ser enviado) ou adicionar mais fundos de BSQ à sua carteira de modo a evitar a gerar um output de poeira.\n\nO output de poeira é {0}. popup.warning.btcChangeBelowDustException=Esta transação cria um output de trocos que está abaixo do limite de poeira (546 satoshis) e seria rejeitada pela rede do bitcoin.\n\nVocê precisa adicionar a quantia de poeira ao seu montante à ser enviado para evitar gerar um output de poeira.\n\nO output de poeira é {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Sua carteira BSQ não possui fundos suficientes para pagar a taxa de negócio em BSQ. popup.warning.messageTooLong=Sua mensagem excede o tamanho máx. permitido. Por favor enviá-la em várias partes ou carregá-la utilizando um serviço como https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index 8911b2cd077..5c1909ba5a0 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=У вас недостаточно BT popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=В вашем кошельке BSQ недостаточно средств для оплаты комиссии за сделку в BSQ. popup.warning.messageTooLong=Ваше сообщение превышает макс. разрешённый размер. Разбейте его на несколько частей или загрузите в веб-приложение для работы с отрывками текста, например https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index dd076c8a874..b94a6d855f0 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=คุณไม่มีเงิน popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=กระเป๋าสตางค์ BSQ ของคุณไม่มีจำนวนเงินทุนที่มากพอสำหรับการชำระการเทรดใน BSQ popup.warning.messageTooLong=ข้อความของคุณเกินขีดจำกัดสูงสุดที่อนุญาต โปรดแบ่งส่งเป็นหลายส่วนหรืออัปโหลดไปยังบริการเช่น https://pastebin.com diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index 5ac5afa933b..15b84e10e9a 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=Bạn không có đủ vốn BTC đ popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Ví BSQ của bạn không đủ tiền để trả phí giao dịch bằng BSQ. popup.warning.messageTooLong=Tin nhắn của bạn vượt quá kích cỡ tối đa cho phép. Vui lòng gửi thành nhiều lần hoặc tải lên mạng như https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties index 32822c053c6..9f19c33d749 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=你没有足够的 BTC 资金支付 popup.warning.bsqChangeBelowDustException=该交易产生的 BSQ 变化输出低于零头限制(5.46 BSQ),将被比特币网络拒绝。\n\n您需要发送更高的金额以避免更改输出(例如,通过在您的发送金额中添加零头),或者向您的钱包中添加更多的 BSQ 资金,以避免生成零头输出。\n\n零头输出为 {0}。 popup.warning.btcChangeBelowDustException=该交易创建的更改输出低于零头限制(546 聪),将被比特币网络拒绝。\n\n您需要将零头添加到发送量中,以避免生成零头输出。\n\n零头输出为{0}。 +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=您需要更多的 BSQ 去完成这笔交易 - 钱包中最后剩余 5.46 BSQ 将无法用于支付交易手续费因为 BTC 协议中的零头限制。\n\n你可以购买更多的 BSQ 或用 BTC支付交易手续费\n\n缺少 BSQ 资金:{0} popup.warning.noBsqFundsForBtcFeePayment=您的 BSQ 钱包没有足够的资金支付 BSQ 的交易费用。 popup.warning.messageTooLong=您的信息超过最大允许的大小。请将其分成多个部分发送,或将其上传到 https://pastebin.com 之类的服务器。 diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties index c9032f0b013..ff0117e85f0 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=你沒有足夠的 BTC 資金支付 popup.warning.bsqChangeBelowDustException=該交易產生的 BSQ 變化輸出低於零頭限制(5.46 BSQ),將被比特幣網絡拒絕。\n\n您需要發送更高的金額以避免更改輸出(例如,通過在您的發送金額中添加零頭),或者向您的錢包中添加更多的 BSQ 資金,以避免生成零頭輸出。\n\n零頭輸出為 {0}。 popup.warning.btcChangeBelowDustException=該交易創建的更改輸出低於零頭限制(546 聰),將被比特幣網絡拒絕。\n\n您需要將零頭添加到發送量中,以避免生成零頭輸出。\n\n零頭輸出為{0}。 +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=您需要更多的 BSQ 去完成這筆交易 - 錢包中最後剩餘 5.46 BSQ 將無法用於支付交易手續費因為 BTC 協議中的零頭限制。\n\n你可以購買更多的 BSQ 或用 BTC支付交易手續費\n\n缺少 BSQ 資金:{0} popup.warning.noBsqFundsForBtcFeePayment=您的 BSQ 錢包沒有足夠的資金支付 BSQ 的交易費用。 popup.warning.messageTooLong=您的信息超過最大允許的大小。請將其分成多個部分發送,或將其上傳到 https://pastebin.com 之類的服務器。 diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java index f0f42d5e5d1..82e42cfaf26 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java @@ -361,14 +361,15 @@ private void onPlaceOffer() { } } - private void showInsufficientBsqFundsForBtcFeePaymentPopup() { + private void showNoBsqFundsAvailableForBtcFeePaymentPopup() { Coin makerFee = model.getDataModel().getMakerFee(false); String message = null; - if (makerFee != null) { + if((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) + message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); + else if (makerFee != null) message = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", bsqFormatter.formatCoinWithCode(makerFee.subtract(model.getDataModel().getUsableBsqBalance()))); - - } else if (model.getDataModel().getUsableBsqBalance().isZero()) + else if (model.getDataModel().getUsableBsqBalance().isZero()) message = Res.get("popup.warning.noBsqFundsForBtcFeePayment"); if (message != null) @@ -1132,13 +1133,13 @@ private void showFeeOption() { if (!isPreferredFeeCurrencyBtc && !isBsqForFeeAvailable) { Coin makerFee = model.getDataModel().getMakerFee(false); String missingBsq = null; - if (makerFee != null) { + if((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) + message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); + else if (makerFee != null) missingBsq = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", bsqFormatter.formatCoinWithCode(makerFee.subtract(model.getDataModel().getUsableBsqBalance()))); - - } else if (model.getDataModel().getUsableBsqBalance().isZero()) { + else if (model.getDataModel().getUsableBsqBalance().isZero()) missingBsq = Res.get("popup.warning.noBsqFundsForBtcFeePayment"); - } if (missingBsq != null) { new Popup().warning(missingBsq) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java index caeab48c27c..e878cd7653c 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java @@ -939,13 +939,13 @@ private void showFeeOption() { if (!isPreferredFeeCurrencyBtc && !isBsqForFeeAvailable) { Coin takerFee = model.dataModel.getTakerFee(false); String missingBsq = null; - if (takerFee != null) { + if((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) + message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); + else if (takerFee != null) missingBsq = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", bsqFormatter.formatCoinWithCode(takerFee.subtract(model.dataModel.getUsableBsqBalance()))); - - } else if (model.dataModel.getUsableBsqBalance().isZero()) { + else if (model.dataModel.getUsableBsqBalance().isZero()) missingBsq = Res.get("popup.warning.noBsqFundsForBtcFeePayment"); - } if (missingBsq != null) { new Popup().warning(missingBsq) @@ -1234,13 +1234,14 @@ private VBox getTradeFeeFieldsBox() { /////////////////////////////////////////////////////////////////////////////////////////// - private void showInsufficientBsqFundsForBtcFeePaymentPopup() { + private void showNoBsqFundsAvailabeForBtcFeePaymentPopup() { Coin takerFee = model.dataModel.getTakerFee(false); String message = null; - if (takerFee != null) + if((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)){ + message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); + else if (takerFee != null) { message = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", bsqFormatter.formatCoinWithCode(takerFee.subtract(model.dataModel.getUsableBsqBalance()))); - else if (model.dataModel.getUsableBsqBalance().isZero()) message = Res.get("popup.warning.noBsqFundsForBtcFeePayment"); @@ -1357,4 +1358,3 @@ private void addPayInfoEntry(GridPane infoGridPane, int row, String labelText, S infoGridPane.getChildren().addAll(label, textField); } } - From 2dd95846beca8d01cd08ac80f2774722799b4d6a Mon Sep 17 00:00:00 2001 From: jan zens <89642092+sneznaj@users.noreply.github.com> Date: Sat, 30 Oct 2021 18:51:47 +0200 Subject: [PATCH 2/9] Update TakeOfferView.java --- .../bisq/desktop/main/offer/takeoffer/TakeOfferView.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java index e878cd7653c..e55aed0e1c0 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java @@ -430,7 +430,7 @@ private void onTakeOffer() { } if (!model.dataModel.isTakerFeeValid()) { - showInsufficientBsqFundsForBtcFeePaymentPopup(); + showNoBsqFundsAvailabeForBtcFeePaymentPopup(); return; } @@ -941,7 +941,7 @@ private void showFeeOption() { String missingBsq = null; if((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); - else if (takerFee != null) + else if (takerFee != null) missingBsq = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", bsqFormatter.formatCoinWithCode(takerFee.subtract(model.dataModel.getUsableBsqBalance()))); else if (model.dataModel.getUsableBsqBalance().isZero()) @@ -1237,7 +1237,7 @@ private VBox getTradeFeeFieldsBox() { private void showNoBsqFundsAvailabeForBtcFeePaymentPopup() { Coin takerFee = model.dataModel.getTakerFee(false); String message = null; - if((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)){ + if ((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)){ message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); else if (takerFee != null) { message = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", From 97cf21931139a83d70111b80e8db02fc0d1e7816 Mon Sep 17 00:00:00 2001 From: jan zens <89642092+sneznaj@users.noreply.github.com> Date: Sat, 30 Oct 2021 19:07:34 +0200 Subject: [PATCH 3/9] Update TakeOfferView.java --- .../java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java index e55aed0e1c0..dd76b782ea8 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java @@ -939,7 +939,7 @@ private void showFeeOption() { if (!isPreferredFeeCurrencyBtc && !isBsqForFeeAvailable) { Coin takerFee = model.dataModel.getTakerFee(false); String missingBsq = null; - if((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) + if ((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); else if (takerFee != null) missingBsq = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", From f64584b5339397c194f28f8e2a75f65ffc9f159d Mon Sep 17 00:00:00 2001 From: jan zens <89642092+sneznaj@users.noreply.github.com> Date: Sat, 30 Oct 2021 19:26:11 +0200 Subject: [PATCH 4/9] Update MutableOfferView.java --- .../main/java/bisq/desktop/main/offer/MutableOfferView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java index 82e42cfaf26..2fce16f67c4 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java @@ -364,7 +364,7 @@ private void onPlaceOffer() { private void showNoBsqFundsAvailableForBtcFeePaymentPopup() { Coin makerFee = model.getDataModel().getMakerFee(false); String message = null; - if((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) + if ((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); else if (makerFee != null) message = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", @@ -1133,7 +1133,7 @@ private void showFeeOption() { if (!isPreferredFeeCurrencyBtc && !isBsqForFeeAvailable) { Coin makerFee = model.getDataModel().getMakerFee(false); String missingBsq = null; - if((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) + if ((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); else if (makerFee != null) missingBsq = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", From 21599d80a65cbce03dfb2c28c57b312d3391899d Mon Sep 17 00:00:00 2001 From: jan zens <89642092+sneznaj@users.noreply.github.com> Date: Sat, 30 Oct 2021 19:28:08 +0200 Subject: [PATCH 5/9] Update MutableOfferView.java --- .../main/java/bisq/desktop/main/offer/MutableOfferView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java index 2fce16f67c4..c7fbe94a87c 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java @@ -323,7 +323,7 @@ public void initWithData(OfferPayload.Direction direction, TradeCurrency tradeCu updatePriceToggle(); if (!model.getDataModel().isMakerFeeValid() && model.getDataModel().getMakerFee() != null) - showInsufficientBsqFundsForBtcFeePaymentPopup(); + showNoBsqFundsAvailableForBtcFeePaymentPopup(); } // called form parent as the view does not get notified when the tab is closed @@ -356,7 +356,7 @@ private void onPlaceOffer() { }); } } else { - showInsufficientBsqFundsForBtcFeePaymentPopup(); + howNoBsqFundsAvailableForBtcFeePaymentPopup(); } } } From 56a1b5d9ee5796586c054a1e6a5822e2b33727fb Mon Sep 17 00:00:00 2001 From: jan zens <89642092+sneznaj@users.noreply.github.com> Date: Tue, 2 Nov 2021 16:37:37 +0100 Subject: [PATCH 6/9] remove non english strings --- core/src/main/resources/i18n/displayStrings.properties | 4 +++- core/src/main/resources/i18n/displayStrings_cs.properties | 1 - core/src/main/resources/i18n/displayStrings_de.properties | 1 - core/src/main/resources/i18n/displayStrings_es.properties | 1 - core/src/main/resources/i18n/displayStrings_fa.properties | 1 - core/src/main/resources/i18n/displayStrings_fr.properties | 1 - core/src/main/resources/i18n/displayStrings_it.properties | 1 - core/src/main/resources/i18n/displayStrings_ja.properties | 1 - core/src/main/resources/i18n/displayStrings_pt-br.properties | 1 - core/src/main/resources/i18n/displayStrings_pt.properties | 1 - core/src/main/resources/i18n/displayStrings_ru.properties | 1 - core/src/main/resources/i18n/displayStrings_th.properties | 1 - core/src/main/resources/i18n/displayStrings_vi.properties | 1 - .../src/main/resources/i18n/displayStrings_zh-hans.properties | 1 - .../src/main/resources/i18n/displayStrings_zh-hant.properties | 1 - 15 files changed, 3 insertions(+), 15 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 23ee295b77d..e544a75ca6b 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -2891,7 +2891,9 @@ popup.warning.btcChangeBelowDustException=This transaction creates a change outp You need to add the dust amount to your sending amount to avoid to generate a dust output.\n\n\ The dust output is {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing \ + and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when \ + Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last \ 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\n\ You can either buy more BSQ or pay trade fees with BTC.\n\n\ diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties index 42d26fcacf1..91443a812fc 100644 --- a/core/src/main/resources/i18n/displayStrings_cs.properties +++ b/core/src/main/resources/i18n/displayStrings_cs.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=Nemáte dostatečné prostředky BTC popup.warning.bsqChangeBelowDustException=Tato transakce vytváří výstup BSQ, který je pod limitem drobných (5,46 BSQ) a byl by bitcoinovou sítí odmítnut.\n\nMusíte buď poslat vyšší částku, abyste se vyhnuli drobným (např. přidáním drobné částky do vaší odeslané částky), nebo přidejte do své peněženky další prostředky BSQ, abyste se vyhnuli generování drobných.\n\nVýstup drobných {0}. popup.warning.btcChangeBelowDustException=Tato transakce vytváří výstup, který je pod limitem drobných (546 satoshi) a byl by bitcoinovou sítí odmítnut.\n\nMusíte přidat vyšší množství drobných k vašemu odesílanému množství, abyste se vyhnuli vytváření drobných.\n\nVýstup drobných je {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=K provedení této transakce budete potřebovat více BSQ - posledních 5,46 BSQ ve vaší peněžence nelze použít k placení obchodních poplatků kvůli omezení prachových mincí v bitcoinovém protokolu.\n\nMůžete si buď koupit více BSQ, nebo zaplatit obchodní poplatky pomocí BTC.\n\nChybějící prostředky: {0} popup.warning.noBsqFundsForBtcFeePayment=Peněženka BSQ nemá dostatečné prostředky na zaplacení obchodního poplatku v BSQ. popup.warning.messageTooLong=Vaše zpráva překračuje max. povolená velikost. Zašlete jej prosím v několika částech nebo ji nahrajte do služby, jako je https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index 8886904dada..b932a8b41a2 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=Sie haben nicht genügend BTC-Gelder, popup.warning.bsqChangeBelowDustException=Diese Transaktion erzeugt eine BSQ-Wechselgeld-Ausgabe, die unter dem Dust-Limit (5.46 BSQ) liegt und vom Bitcoin-Netzwerk abgelehnt werden würde.\n\nSie müssen entweder einen höheren Betrag senden, um die Wechselgeld-Ausgabe zu vermeiden (z.B. indem Sie den Dust-Betrag zu Ihrem Sende-Betrag hinzufügen) oder mehr BSQ-Guthaben zu Ihrer Wallet hinzufügen, damit Sie vermeiden, eine Dust-Ausgabe zu generieren.\n\nDie Dust-Ausgabe ist {0}. popup.warning.btcChangeBelowDustException=Diese Transaktion erzeugt eine Wechselgeld-Ausgabe, die unter dem Dust-Limit (546 Satoshi) liegt und vom Bitcoin-Netzwerk abgelehnt würde.\n\nSie müssen den Dust-Betrag zu Ihrem Sende-Betrag hinzufügen, um zu vermeiden, dass eine Dust-Ausgabe generiert wird.\n\nDie Dust-Ausgabe ist {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Ihr BSQ-Wallet ist deaktiviert während DAO synchronisiert und Ihr BSQ-Guthaben kann während dieser Zeit auf Null erscheinen. Bitte überprüfen Sie die Statusleiste und versuchen Sie es später erneut, wenn die DAO-Synchronisierung abgeschlossen ist, oder fahren Sie jetzt mit diesem Handel fort und verwenden Sie BTC, um die Handelsgebühren zu bezahlen. popup.warning.insufficientBsqFundsForBtcFeePayment=Sie benötigen mehr BSQ um diese Transaktion durchzuführen - die letzten 5.46 BSQ in Ihrer Wallet können aufgrund der Dust-Limits im Bitcoin Protokoll nicht für die Trading-Gebühren verwendet werden.\n\nSie können entweder mehr BSQ kaufen oder die Trading-Gebühren in BTC bezahlen.\n\nFehlende Funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Ihre BSQ-Wallet hat keine ausreichenden Gelder, um die Handels-Gebühr in BSQ zu bezahlen. popup.warning.messageTooLong=Ihre Nachricht überschreitet die maximal erlaubte Größe. Sende Sie diese in mehreren Teilen oder laden Sie sie in einen Dienst wie https://pastebin.com hoch. diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index b07c5cea793..ca345e2bc07 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=No tiene suficientes fondos BTC para popup.warning.bsqChangeBelowDustException=Esta transacción crea un output BSQ de cambio que está por debajo del límite dust (5.46 BSQ) y sería rechazado por la red Bitcoin.\n\nTiene que enviar una cantidad mayor para evitar el output de cambio (Ej. agregando la cantidad de dust a su cantidad de envío) o añadir más fondos BSQ a su cartera para evitar generar un output de dust.\n\nEl output dust es {0}. popup.warning.btcChangeBelowDustException=Esta transacción crea un output de cambio que está por debajo del límite de dust (546 Satoshi) y sería rechazada por la red Bitcoin.\n\nDebe agregar la cantidad de dust a su cantidad de envío para evitar generar un output de dust.\n\nEl output de dust es {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=Necesitará más BSQ para hacer esta transacción -los últimos 5.46BSQ en su monedero no pueden usarse para pagar tasas de intercambio debido a límites dust en el protocolo Bitcoin.\n\nPuede comprar más BSQ o pagar las tasas de intercambio con BTC.\n\nFondos necesarios: {0} popup.warning.noBsqFundsForBtcFeePayment=Su monedero BSQ no tiene suficientes fondos para pagar la comisión de intercambio en BSQ. popup.warning.messageTooLong=Su mensaje excede el tamaño máximo permitido. Por favor, envíelo por partes o súbalo a un servicio como https://pastebin.com diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index 3effc95bb4a..d6add3c0ca5 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=شما BTC کافی برای پردا popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=کیف‌پول BSQ شما BSQ کافی برای پرداخت کارمزد معامله به BSQ را ندارد. popup.warning.messageTooLong=پیام شما بیش از حداکثر اندازه مجاز است. لطفا آن را در چند بخش ارسال کنید یا آن را در یک سرویس مانند https://pastebin.com آپلود کنید. diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index dd93fed60e1..418989485f0 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=Vous ne disposez pas de suffisamment popup.warning.bsqChangeBelowDustException=Cette transaction crée une BSQ change output qui est inférieure à la dust limit (5,46 BSQ) et serait rejetée par le réseau Bitcoin.\n\nVous devez soit envoyer un montant plus élevé pour éviter la change output (par exemple en ajoutant le montant de dust à votre montant d''envoi), soit ajouter plus de fonds BSQ à votre portefeuille pour éviter de générer une dust output.\n\nLa dust output est {0}. popup.warning.btcChangeBelowDustException=Cette transaction crée une change output qui est inférieure à la dust limit (546 Satoshi) et serait rejetée par le réseau Bitcoin.\n\nVous devez ajouter la quantité de dust à votre montant envoyé pour éviter de générer une dust output.\n\nLa dust output est {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=Vous avez besoin de plus de BSQ pour effectuer cette transaction - les 5,46 BSQ restant dans le portefeuille ne seront pas utilisés pour payer les frais de transaction en raison des limites de dust du protocole BTC.\n\nVous pouvez acheter plus de BSQ ou utiliser BTC pour payer les frais de transaction\n\nManque de fonds BSQ: {0} popup.warning.noBsqFundsForBtcFeePayment=Votre portefeuille BSQ ne dispose pas de suffisamment de fonds pour payer les frais de transaction en BSQ. popup.warning.messageTooLong=Votre message dépasse la taille maximale autorisée. Veuillez l'envoyer en plusieurs parties ou le télécharger depuis un service comme https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties index 8cdfc8eeff4..968ddd8e7cb 100644 --- a/core/src/main/resources/i18n/displayStrings_it.properties +++ b/core/src/main/resources/i18n/displayStrings_it.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=Non hai fondi BTC sufficienti per pag popup.warning.bsqChangeBelowDustException=Questa transazione crea un output di cambio BSQ che è inferiore al limite di polvere (5,46 BSQ) e verrebbe rifiutato dalla rete Bitcoin.\n\nÈ necessario inviare una quantità maggiore per evitare l'output di cambio (ad es. aggiungendo la quantità di polvere alla quantità di invio) o aggiungere più fondi BSQ al portafoglio in modo da evitare di generare una produzione di polvere.\n\nL'output della polvere è {0}. popup.warning.btcChangeBelowDustException=Questa transazione crea un output di cambio che è al di sotto del limite di polvere (546 Satoshi) e verrebbe rifiutato dalla rete Bitcoin.\n\nÈ necessario aggiungere la quantità di polvere alla quantità di invio per evitare di generare un output di polvere.\n\nL'output della polvere è {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Il tuo portafoglio BSQ non ha fondi sufficienti per pagare la commissione commerciale in BSQ. popup.warning.messageTooLong=Il tuo messaggio supera la dimensione massima consentita. Si prega di inviarlo in più parti o caricarlo su un servizio come https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties index b8cf284ab67..9d4a6767fdd 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=あなたはそのトランザクシ popup.warning.bsqChangeBelowDustException=このトランザクションは、ダスト制限(5.46 BSQ)を下回るBSQおつりアウトプットを作成し、ビットコインネットワークによって拒否されます。\n\nおつりアウトプットを回避するために、より高い金額を送信する必要があります(たとえば、送金額にダスト額を追加することによって)、またはダストアウトプットを生成しないようにウォレットにBSQ残高を追加する必要があります。\n\nダストアウトプットは{0}。 popup.warning.btcChangeBelowDustException=このトランザクションは、ダスト制限(546 Satoshi)を下回るBSQおつりアウトプットを作成し、ビットコインネットワークによって拒否されます。\n\nダストアウトプットを生成しないように、あなたの送金額にダスト額を追加する必要があります。\n\nダストアウトプットは{0}。 -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=このトランザクションにはBSQが足りません。ビットコインプロトコルのダスト制限によると、ウォレットから最後の5.46BSQはトレード手数料に使われることができません。\n\nもっとBSQを買うか、BTCでトレード手数料を支払うことができます。\n\n不足している資金: {0} popup.warning.noBsqFundsForBtcFeePayment=BSQウォレットにBSQのトレード手数料を支払うのに十分な残高がありません。 popup.warning.messageTooLong=メッセージが許容サイズ上限を超えています。いくつかに分けて送信するか、 https://pastebin.com のようなサービスにアップロードしてください。 diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties index 12fd2d73748..754c497c397 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=Você não possui fundos BTC suficien popup.warning.bsqChangeBelowDustException=Esta transação cria um troco BSQ menor do que o limite poeira (5.46 BSQ) e seria rejeitada pela rede Bitcoin.\nVocê precisa ou enviar uma quantia maior para evitar o troco (ex: adicionando a quantia poeira ao montante a ser enviado) ou adicionar mais fundos BSQ à sua carteira para evitar gerar uma saída de poeira.\nA saída de poeira é {0}. popup.warning.btcChangeBelowDustException=Esta transação cria um troco menor do que o limite poeira (546 Satoshi) e seria rejeitada pela rede Bitcoin.\nVocê precisa adicionar a quantia poeira ao montante de envio para evitar gerar uma saída de poeira.\nA saída de poeira é {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Sua carteira BSQ não possui fundos suficientes para pagar a taxa de transação em BSQ. popup.warning.messageTooLong=Sua mensagem excede o tamanho máximo permitido. Favor enviá-la em várias partes ou utilizando um serviço como https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index 2b8d33cf19a..387a7bf9c45 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=Você não tem fundos BTC suficientes popup.warning.bsqChangeBelowDustException=Esta transação cria um output de trocos de BSQ que está abaixo do limite de poeira (5,46 BSQ) e seria rejeitada pela rede do bitcoin.\n\nVocê precisa enviar uma quantia mais elevada para evitar o output de trocos (por exemplo, adicionando a quantia de poeira ao seu montante a ser enviado) ou adicionar mais fundos de BSQ à sua carteira de modo a evitar a gerar um output de poeira.\n\nO output de poeira é {0}. popup.warning.btcChangeBelowDustException=Esta transação cria um output de trocos que está abaixo do limite de poeira (546 satoshis) e seria rejeitada pela rede do bitcoin.\n\nVocê precisa adicionar a quantia de poeira ao seu montante à ser enviado para evitar gerar um output de poeira.\n\nO output de poeira é {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Sua carteira BSQ não possui fundos suficientes para pagar a taxa de negócio em BSQ. popup.warning.messageTooLong=Sua mensagem excede o tamanho máx. permitido. Por favor enviá-la em várias partes ou carregá-la utilizando um serviço como https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index 5c1909ba5a0..8911b2cd077 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=У вас недостаточно BT popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=В вашем кошельке BSQ недостаточно средств для оплаты комиссии за сделку в BSQ. popup.warning.messageTooLong=Ваше сообщение превышает макс. разрешённый размер. Разбейте его на несколько частей или загрузите в веб-приложение для работы с отрывками текста, например https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index b94a6d855f0..dd076c8a874 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=คุณไม่มีเงิน popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=กระเป๋าสตางค์ BSQ ของคุณไม่มีจำนวนเงินทุนที่มากพอสำหรับการชำระการเทรดใน BSQ popup.warning.messageTooLong=ข้อความของคุณเกินขีดจำกัดสูงสุดที่อนุญาต โปรดแบ่งส่งเป็นหลายส่วนหรืออัปโหลดไปยังบริการเช่น https://pastebin.com diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index 15b84e10e9a..5ac5afa933b 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=Bạn không có đủ vốn BTC đ popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Ví BSQ của bạn không đủ tiền để trả phí giao dịch bằng BSQ. popup.warning.messageTooLong=Tin nhắn của bạn vượt quá kích cỡ tối đa cho phép. Vui lòng gửi thành nhiều lần hoặc tải lên mạng như https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties index 9f19c33d749..32822c053c6 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=你没有足够的 BTC 资金支付 popup.warning.bsqChangeBelowDustException=该交易产生的 BSQ 变化输出低于零头限制(5.46 BSQ),将被比特币网络拒绝。\n\n您需要发送更高的金额以避免更改输出(例如,通过在您的发送金额中添加零头),或者向您的钱包中添加更多的 BSQ 资金,以避免生成零头输出。\n\n零头输出为 {0}。 popup.warning.btcChangeBelowDustException=该交易创建的更改输出低于零头限制(546 聪),将被比特币网络拒绝。\n\n您需要将零头添加到发送量中,以避免生成零头输出。\n\n零头输出为{0}。 -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=您需要更多的 BSQ 去完成这笔交易 - 钱包中最后剩余 5.46 BSQ 将无法用于支付交易手续费因为 BTC 协议中的零头限制。\n\n你可以购买更多的 BSQ 或用 BTC支付交易手续费\n\n缺少 BSQ 资金:{0} popup.warning.noBsqFundsForBtcFeePayment=您的 BSQ 钱包没有足够的资金支付 BSQ 的交易费用。 popup.warning.messageTooLong=您的信息超过最大允许的大小。请将其分成多个部分发送,或将其上传到 https://pastebin.com 之类的服务器。 diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties index ff0117e85f0..c9032f0b013 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=你沒有足夠的 BTC 資金支付 popup.warning.bsqChangeBelowDustException=該交易產生的 BSQ 變化輸出低於零頭限制(5.46 BSQ),將被比特幣網絡拒絕。\n\n您需要發送更高的金額以避免更改輸出(例如,通過在您的發送金額中添加零頭),或者向您的錢包中添加更多的 BSQ 資金,以避免生成零頭輸出。\n\n零頭輸出為 {0}。 popup.warning.btcChangeBelowDustException=該交易創建的更改輸出低於零頭限制(546 聰),將被比特幣網絡拒絕。\n\n您需要將零頭添加到發送量中,以避免生成零頭輸出。\n\n零頭輸出為{0}。 -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=您需要更多的 BSQ 去完成這筆交易 - 錢包中最後剩餘 5.46 BSQ 將無法用於支付交易手續費因為 BTC 協議中的零頭限制。\n\n你可以購買更多的 BSQ 或用 BTC支付交易手續費\n\n缺少 BSQ 資金:{0} popup.warning.noBsqFundsForBtcFeePayment=您的 BSQ 錢包沒有足夠的資金支付 BSQ 的交易費用。 popup.warning.messageTooLong=您的信息超過最大允許的大小。請將其分成多個部分發送,或將其上傳到 https://pastebin.com 之類的服務器。 From 5327740889ff238e1116edbd8a13146f649706e2 Mon Sep 17 00:00:00 2001 From: jan zens <89642092+sneznaj@users.noreply.github.com> Date: Tue, 19 Oct 2021 14:53:48 +0200 Subject: [PATCH 7/9] Trade Step 1: add popup "no BSQ while Synchronizing DAO" --- .../resources/i18n/displayStrings.properties | 1 + .../i18n/displayStrings_cs.properties | 1 + .../i18n/displayStrings_de.properties | 1 + .../i18n/displayStrings_es.properties | 1 + .../i18n/displayStrings_fa.properties | 1 + .../i18n/displayStrings_fr.properties | 1 + .../i18n/displayStrings_it.properties | 1 + .../i18n/displayStrings_ja.properties | 1 + .../i18n/displayStrings_pt-br.properties | 1 + .../i18n/displayStrings_pt.properties | 1 + .../i18n/displayStrings_ru.properties | 1 + .../i18n/displayStrings_th.properties | 1 + .../i18n/displayStrings_vi.properties | 1 + .../i18n/displayStrings_zh-hans.properties | 1 + .../i18n/displayStrings_zh-hant.properties | 1 + .../desktop/main/offer/MutableOfferView.java | 21 ++++++++++--------- .../main/offer/takeoffer/TakeOfferView.java | 18 ++++++++-------- 17 files changed, 35 insertions(+), 19 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index d6106e5559e..23ee295b77d 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -2891,6 +2891,7 @@ popup.warning.btcChangeBelowDustException=This transaction creates a change outp You need to add the dust amount to your sending amount to avoid to generate a dust output.\n\n\ The dust output is {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last \ 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\n\ You can either buy more BSQ or pay trade fees with BTC.\n\n\ diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties index 91443a812fc..42d26fcacf1 100644 --- a/core/src/main/resources/i18n/displayStrings_cs.properties +++ b/core/src/main/resources/i18n/displayStrings_cs.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=Nemáte dostatečné prostředky BTC popup.warning.bsqChangeBelowDustException=Tato transakce vytváří výstup BSQ, který je pod limitem drobných (5,46 BSQ) a byl by bitcoinovou sítí odmítnut.\n\nMusíte buď poslat vyšší částku, abyste se vyhnuli drobným (např. přidáním drobné částky do vaší odeslané částky), nebo přidejte do své peněženky další prostředky BSQ, abyste se vyhnuli generování drobných.\n\nVýstup drobných {0}. popup.warning.btcChangeBelowDustException=Tato transakce vytváří výstup, který je pod limitem drobných (546 satoshi) a byl by bitcoinovou sítí odmítnut.\n\nMusíte přidat vyšší množství drobných k vašemu odesílanému množství, abyste se vyhnuli vytváření drobných.\n\nVýstup drobných je {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=K provedení této transakce budete potřebovat více BSQ - posledních 5,46 BSQ ve vaší peněžence nelze použít k placení obchodních poplatků kvůli omezení prachových mincí v bitcoinovém protokolu.\n\nMůžete si buď koupit více BSQ, nebo zaplatit obchodní poplatky pomocí BTC.\n\nChybějící prostředky: {0} popup.warning.noBsqFundsForBtcFeePayment=Peněženka BSQ nemá dostatečné prostředky na zaplacení obchodního poplatku v BSQ. popup.warning.messageTooLong=Vaše zpráva překračuje max. povolená velikost. Zašlete jej prosím v několika částech nebo ji nahrajte do služby, jako je https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index b932a8b41a2..8886904dada 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=Sie haben nicht genügend BTC-Gelder, popup.warning.bsqChangeBelowDustException=Diese Transaktion erzeugt eine BSQ-Wechselgeld-Ausgabe, die unter dem Dust-Limit (5.46 BSQ) liegt und vom Bitcoin-Netzwerk abgelehnt werden würde.\n\nSie müssen entweder einen höheren Betrag senden, um die Wechselgeld-Ausgabe zu vermeiden (z.B. indem Sie den Dust-Betrag zu Ihrem Sende-Betrag hinzufügen) oder mehr BSQ-Guthaben zu Ihrer Wallet hinzufügen, damit Sie vermeiden, eine Dust-Ausgabe zu generieren.\n\nDie Dust-Ausgabe ist {0}. popup.warning.btcChangeBelowDustException=Diese Transaktion erzeugt eine Wechselgeld-Ausgabe, die unter dem Dust-Limit (546 Satoshi) liegt und vom Bitcoin-Netzwerk abgelehnt würde.\n\nSie müssen den Dust-Betrag zu Ihrem Sende-Betrag hinzufügen, um zu vermeiden, dass eine Dust-Ausgabe generiert wird.\n\nDie Dust-Ausgabe ist {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Ihr BSQ-Wallet ist deaktiviert während DAO synchronisiert und Ihr BSQ-Guthaben kann während dieser Zeit auf Null erscheinen. Bitte überprüfen Sie die Statusleiste und versuchen Sie es später erneut, wenn die DAO-Synchronisierung abgeschlossen ist, oder fahren Sie jetzt mit diesem Handel fort und verwenden Sie BTC, um die Handelsgebühren zu bezahlen. popup.warning.insufficientBsqFundsForBtcFeePayment=Sie benötigen mehr BSQ um diese Transaktion durchzuführen - die letzten 5.46 BSQ in Ihrer Wallet können aufgrund der Dust-Limits im Bitcoin Protokoll nicht für die Trading-Gebühren verwendet werden.\n\nSie können entweder mehr BSQ kaufen oder die Trading-Gebühren in BTC bezahlen.\n\nFehlende Funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Ihre BSQ-Wallet hat keine ausreichenden Gelder, um die Handels-Gebühr in BSQ zu bezahlen. popup.warning.messageTooLong=Ihre Nachricht überschreitet die maximal erlaubte Größe. Sende Sie diese in mehreren Teilen oder laden Sie sie in einen Dienst wie https://pastebin.com hoch. diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index ca345e2bc07..b07c5cea793 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=No tiene suficientes fondos BTC para popup.warning.bsqChangeBelowDustException=Esta transacción crea un output BSQ de cambio que está por debajo del límite dust (5.46 BSQ) y sería rechazado por la red Bitcoin.\n\nTiene que enviar una cantidad mayor para evitar el output de cambio (Ej. agregando la cantidad de dust a su cantidad de envío) o añadir más fondos BSQ a su cartera para evitar generar un output de dust.\n\nEl output dust es {0}. popup.warning.btcChangeBelowDustException=Esta transacción crea un output de cambio que está por debajo del límite de dust (546 Satoshi) y sería rechazada por la red Bitcoin.\n\nDebe agregar la cantidad de dust a su cantidad de envío para evitar generar un output de dust.\n\nEl output de dust es {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=Necesitará más BSQ para hacer esta transacción -los últimos 5.46BSQ en su monedero no pueden usarse para pagar tasas de intercambio debido a límites dust en el protocolo Bitcoin.\n\nPuede comprar más BSQ o pagar las tasas de intercambio con BTC.\n\nFondos necesarios: {0} popup.warning.noBsqFundsForBtcFeePayment=Su monedero BSQ no tiene suficientes fondos para pagar la comisión de intercambio en BSQ. popup.warning.messageTooLong=Su mensaje excede el tamaño máximo permitido. Por favor, envíelo por partes o súbalo a un servicio como https://pastebin.com diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index d6add3c0ca5..3effc95bb4a 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=شما BTC کافی برای پردا popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=کیف‌پول BSQ شما BSQ کافی برای پرداخت کارمزد معامله به BSQ را ندارد. popup.warning.messageTooLong=پیام شما بیش از حداکثر اندازه مجاز است. لطفا آن را در چند بخش ارسال کنید یا آن را در یک سرویس مانند https://pastebin.com آپلود کنید. diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index 418989485f0..dd93fed60e1 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=Vous ne disposez pas de suffisamment popup.warning.bsqChangeBelowDustException=Cette transaction crée une BSQ change output qui est inférieure à la dust limit (5,46 BSQ) et serait rejetée par le réseau Bitcoin.\n\nVous devez soit envoyer un montant plus élevé pour éviter la change output (par exemple en ajoutant le montant de dust à votre montant d''envoi), soit ajouter plus de fonds BSQ à votre portefeuille pour éviter de générer une dust output.\n\nLa dust output est {0}. popup.warning.btcChangeBelowDustException=Cette transaction crée une change output qui est inférieure à la dust limit (546 Satoshi) et serait rejetée par le réseau Bitcoin.\n\nVous devez ajouter la quantité de dust à votre montant envoyé pour éviter de générer une dust output.\n\nLa dust output est {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=Vous avez besoin de plus de BSQ pour effectuer cette transaction - les 5,46 BSQ restant dans le portefeuille ne seront pas utilisés pour payer les frais de transaction en raison des limites de dust du protocole BTC.\n\nVous pouvez acheter plus de BSQ ou utiliser BTC pour payer les frais de transaction\n\nManque de fonds BSQ: {0} popup.warning.noBsqFundsForBtcFeePayment=Votre portefeuille BSQ ne dispose pas de suffisamment de fonds pour payer les frais de transaction en BSQ. popup.warning.messageTooLong=Votre message dépasse la taille maximale autorisée. Veuillez l'envoyer en plusieurs parties ou le télécharger depuis un service comme https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties index 968ddd8e7cb..8cdfc8eeff4 100644 --- a/core/src/main/resources/i18n/displayStrings_it.properties +++ b/core/src/main/resources/i18n/displayStrings_it.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=Non hai fondi BTC sufficienti per pag popup.warning.bsqChangeBelowDustException=Questa transazione crea un output di cambio BSQ che è inferiore al limite di polvere (5,46 BSQ) e verrebbe rifiutato dalla rete Bitcoin.\n\nÈ necessario inviare una quantità maggiore per evitare l'output di cambio (ad es. aggiungendo la quantità di polvere alla quantità di invio) o aggiungere più fondi BSQ al portafoglio in modo da evitare di generare una produzione di polvere.\n\nL'output della polvere è {0}. popup.warning.btcChangeBelowDustException=Questa transazione crea un output di cambio che è al di sotto del limite di polvere (546 Satoshi) e verrebbe rifiutato dalla rete Bitcoin.\n\nÈ necessario aggiungere la quantità di polvere alla quantità di invio per evitare di generare un output di polvere.\n\nL'output della polvere è {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Il tuo portafoglio BSQ non ha fondi sufficienti per pagare la commissione commerciale in BSQ. popup.warning.messageTooLong=Il tuo messaggio supera la dimensione massima consentita. Si prega di inviarlo in più parti o caricarlo su un servizio come https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties index 9d4a6767fdd..b8cf284ab67 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=あなたはそのトランザクシ popup.warning.bsqChangeBelowDustException=このトランザクションは、ダスト制限(5.46 BSQ)を下回るBSQおつりアウトプットを作成し、ビットコインネットワークによって拒否されます。\n\nおつりアウトプットを回避するために、より高い金額を送信する必要があります(たとえば、送金額にダスト額を追加することによって)、またはダストアウトプットを生成しないようにウォレットにBSQ残高を追加する必要があります。\n\nダストアウトプットは{0}。 popup.warning.btcChangeBelowDustException=このトランザクションは、ダスト制限(546 Satoshi)を下回るBSQおつりアウトプットを作成し、ビットコインネットワークによって拒否されます。\n\nダストアウトプットを生成しないように、あなたの送金額にダスト額を追加する必要があります。\n\nダストアウトプットは{0}。 +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=このトランザクションにはBSQが足りません。ビットコインプロトコルのダスト制限によると、ウォレットから最後の5.46BSQはトレード手数料に使われることができません。\n\nもっとBSQを買うか、BTCでトレード手数料を支払うことができます。\n\n不足している資金: {0} popup.warning.noBsqFundsForBtcFeePayment=BSQウォレットにBSQのトレード手数料を支払うのに十分な残高がありません。 popup.warning.messageTooLong=メッセージが許容サイズ上限を超えています。いくつかに分けて送信するか、 https://pastebin.com のようなサービスにアップロードしてください。 diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties index 754c497c397..12fd2d73748 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=Você não possui fundos BTC suficien popup.warning.bsqChangeBelowDustException=Esta transação cria um troco BSQ menor do que o limite poeira (5.46 BSQ) e seria rejeitada pela rede Bitcoin.\nVocê precisa ou enviar uma quantia maior para evitar o troco (ex: adicionando a quantia poeira ao montante a ser enviado) ou adicionar mais fundos BSQ à sua carteira para evitar gerar uma saída de poeira.\nA saída de poeira é {0}. popup.warning.btcChangeBelowDustException=Esta transação cria um troco menor do que o limite poeira (546 Satoshi) e seria rejeitada pela rede Bitcoin.\nVocê precisa adicionar a quantia poeira ao montante de envio para evitar gerar uma saída de poeira.\nA saída de poeira é {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Sua carteira BSQ não possui fundos suficientes para pagar a taxa de transação em BSQ. popup.warning.messageTooLong=Sua mensagem excede o tamanho máximo permitido. Favor enviá-la em várias partes ou utilizando um serviço como https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index 387a7bf9c45..2b8d33cf19a 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=Você não tem fundos BTC suficientes popup.warning.bsqChangeBelowDustException=Esta transação cria um output de trocos de BSQ que está abaixo do limite de poeira (5,46 BSQ) e seria rejeitada pela rede do bitcoin.\n\nVocê precisa enviar uma quantia mais elevada para evitar o output de trocos (por exemplo, adicionando a quantia de poeira ao seu montante a ser enviado) ou adicionar mais fundos de BSQ à sua carteira de modo a evitar a gerar um output de poeira.\n\nO output de poeira é {0}. popup.warning.btcChangeBelowDustException=Esta transação cria um output de trocos que está abaixo do limite de poeira (546 satoshis) e seria rejeitada pela rede do bitcoin.\n\nVocê precisa adicionar a quantia de poeira ao seu montante à ser enviado para evitar gerar um output de poeira.\n\nO output de poeira é {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Sua carteira BSQ não possui fundos suficientes para pagar a taxa de negócio em BSQ. popup.warning.messageTooLong=Sua mensagem excede o tamanho máx. permitido. Por favor enviá-la em várias partes ou carregá-la utilizando um serviço como https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index 8911b2cd077..5c1909ba5a0 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=У вас недостаточно BT popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=В вашем кошельке BSQ недостаточно средств для оплаты комиссии за сделку в BSQ. popup.warning.messageTooLong=Ваше сообщение превышает макс. разрешённый размер. Разбейте его на несколько частей или загрузите в веб-приложение для работы с отрывками текста, например https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index dd076c8a874..b94a6d855f0 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=คุณไม่มีเงิน popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=กระเป๋าสตางค์ BSQ ของคุณไม่มีจำนวนเงินทุนที่มากพอสำหรับการชำระการเทรดใน BSQ popup.warning.messageTooLong=ข้อความของคุณเกินขีดจำกัดสูงสุดที่อนุญาต โปรดแบ่งส่งเป็นหลายส่วนหรืออัปโหลดไปยังบริการเช่น https://pastebin.com diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index 5ac5afa933b..15b84e10e9a 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=Bạn không có đủ vốn BTC đ popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Ví BSQ của bạn không đủ tiền để trả phí giao dịch bằng BSQ. popup.warning.messageTooLong=Tin nhắn của bạn vượt quá kích cỡ tối đa cho phép. Vui lòng gửi thành nhiều lần hoặc tải lên mạng như https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties index 32822c053c6..9f19c33d749 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=你没有足够的 BTC 资金支付 popup.warning.bsqChangeBelowDustException=该交易产生的 BSQ 变化输出低于零头限制(5.46 BSQ),将被比特币网络拒绝。\n\n您需要发送更高的金额以避免更改输出(例如,通过在您的发送金额中添加零头),或者向您的钱包中添加更多的 BSQ 资金,以避免生成零头输出。\n\n零头输出为 {0}。 popup.warning.btcChangeBelowDustException=该交易创建的更改输出低于零头限制(546 聪),将被比特币网络拒绝。\n\n您需要将零头添加到发送量中,以避免生成零头输出。\n\n零头输出为{0}。 +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=您需要更多的 BSQ 去完成这笔交易 - 钱包中最后剩余 5.46 BSQ 将无法用于支付交易手续费因为 BTC 协议中的零头限制。\n\n你可以购买更多的 BSQ 或用 BTC支付交易手续费\n\n缺少 BSQ 资金:{0} popup.warning.noBsqFundsForBtcFeePayment=您的 BSQ 钱包没有足够的资金支付 BSQ 的交易费用。 popup.warning.messageTooLong=您的信息超过最大允许的大小。请将其分成多个部分发送,或将其上传到 https://pastebin.com 之类的服务器。 diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties index c9032f0b013..ff0117e85f0 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -2345,6 +2345,7 @@ popup.warning.insufficientBtcFundsForBsqTx=你沒有足夠的 BTC 資金支付 popup.warning.bsqChangeBelowDustException=該交易產生的 BSQ 變化輸出低於零頭限制(5.46 BSQ),將被比特幣網絡拒絕。\n\n您需要發送更高的金額以避免更改輸出(例如,通過在您的發送金額中添加零頭),或者向您的錢包中添加更多的 BSQ 資金,以避免生成零頭輸出。\n\n零頭輸出為 {0}。 popup.warning.btcChangeBelowDustException=該交易創建的更改輸出低於零頭限制(546 聰),將被比特幣網絡拒絕。\n\n您需要將零頭添加到發送量中,以避免生成零頭輸出。\n\n零頭輸出為{0}。 +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=您需要更多的 BSQ 去完成這筆交易 - 錢包中最後剩餘 5.46 BSQ 將無法用於支付交易手續費因為 BTC 協議中的零頭限制。\n\n你可以購買更多的 BSQ 或用 BTC支付交易手續費\n\n缺少 BSQ 資金:{0} popup.warning.noBsqFundsForBtcFeePayment=您的 BSQ 錢包沒有足夠的資金支付 BSQ 的交易費用。 popup.warning.messageTooLong=您的信息超過最大允許的大小。請將其分成多個部分發送,或將其上傳到 https://pastebin.com 之類的服務器。 diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java index f0f42d5e5d1..c7fbe94a87c 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java @@ -323,7 +323,7 @@ public void initWithData(OfferPayload.Direction direction, TradeCurrency tradeCu updatePriceToggle(); if (!model.getDataModel().isMakerFeeValid() && model.getDataModel().getMakerFee() != null) - showInsufficientBsqFundsForBtcFeePaymentPopup(); + showNoBsqFundsAvailableForBtcFeePaymentPopup(); } // called form parent as the view does not get notified when the tab is closed @@ -356,19 +356,20 @@ private void onPlaceOffer() { }); } } else { - showInsufficientBsqFundsForBtcFeePaymentPopup(); + howNoBsqFundsAvailableForBtcFeePaymentPopup(); } } } - private void showInsufficientBsqFundsForBtcFeePaymentPopup() { + private void showNoBsqFundsAvailableForBtcFeePaymentPopup() { Coin makerFee = model.getDataModel().getMakerFee(false); String message = null; - if (makerFee != null) { + if ((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) + message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); + else if (makerFee != null) message = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", bsqFormatter.formatCoinWithCode(makerFee.subtract(model.getDataModel().getUsableBsqBalance()))); - - } else if (model.getDataModel().getUsableBsqBalance().isZero()) + else if (model.getDataModel().getUsableBsqBalance().isZero()) message = Res.get("popup.warning.noBsqFundsForBtcFeePayment"); if (message != null) @@ -1132,13 +1133,13 @@ private void showFeeOption() { if (!isPreferredFeeCurrencyBtc && !isBsqForFeeAvailable) { Coin makerFee = model.getDataModel().getMakerFee(false); String missingBsq = null; - if (makerFee != null) { + if ((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) + message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); + else if (makerFee != null) missingBsq = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", bsqFormatter.formatCoinWithCode(makerFee.subtract(model.getDataModel().getUsableBsqBalance()))); - - } else if (model.getDataModel().getUsableBsqBalance().isZero()) { + else if (model.getDataModel().getUsableBsqBalance().isZero()) missingBsq = Res.get("popup.warning.noBsqFundsForBtcFeePayment"); - } if (missingBsq != null) { new Popup().warning(missingBsq) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java index caeab48c27c..dd76b782ea8 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java @@ -430,7 +430,7 @@ private void onTakeOffer() { } if (!model.dataModel.isTakerFeeValid()) { - showInsufficientBsqFundsForBtcFeePaymentPopup(); + showNoBsqFundsAvailabeForBtcFeePaymentPopup(); return; } @@ -939,13 +939,13 @@ private void showFeeOption() { if (!isPreferredFeeCurrencyBtc && !isBsqForFeeAvailable) { Coin takerFee = model.dataModel.getTakerFee(false); String missingBsq = null; - if (takerFee != null) { + if ((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) + message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); + else if (takerFee != null) missingBsq = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", bsqFormatter.formatCoinWithCode(takerFee.subtract(model.dataModel.getUsableBsqBalance()))); - - } else if (model.dataModel.getUsableBsqBalance().isZero()) { + else if (model.dataModel.getUsableBsqBalance().isZero()) missingBsq = Res.get("popup.warning.noBsqFundsForBtcFeePayment"); - } if (missingBsq != null) { new Popup().warning(missingBsq) @@ -1234,13 +1234,14 @@ private VBox getTradeFeeFieldsBox() { /////////////////////////////////////////////////////////////////////////////////////////// - private void showInsufficientBsqFundsForBtcFeePaymentPopup() { + private void showNoBsqFundsAvailabeForBtcFeePaymentPopup() { Coin takerFee = model.dataModel.getTakerFee(false); String message = null; - if (takerFee != null) + if ((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)){ + message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); + else if (takerFee != null) { message = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", bsqFormatter.formatCoinWithCode(takerFee.subtract(model.dataModel.getUsableBsqBalance()))); - else if (model.dataModel.getUsableBsqBalance().isZero()) message = Res.get("popup.warning.noBsqFundsForBtcFeePayment"); @@ -1357,4 +1358,3 @@ private void addPayInfoEntry(GridPane infoGridPane, int row, String labelText, S infoGridPane.getChildren().addAll(label, textField); } } - From f10b4b0e9c813ab2b837268f02ea39adaf872761 Mon Sep 17 00:00:00 2001 From: jan zens <89642092+sneznaj@users.noreply.github.com> Date: Tue, 2 Nov 2021 16:37:37 +0100 Subject: [PATCH 8/9] remove non english strings --- core/src/main/resources/i18n/displayStrings.properties | 4 +++- core/src/main/resources/i18n/displayStrings_cs.properties | 1 - core/src/main/resources/i18n/displayStrings_de.properties | 1 - core/src/main/resources/i18n/displayStrings_es.properties | 1 - core/src/main/resources/i18n/displayStrings_fa.properties | 1 - core/src/main/resources/i18n/displayStrings_fr.properties | 1 - core/src/main/resources/i18n/displayStrings_it.properties | 1 - core/src/main/resources/i18n/displayStrings_ja.properties | 1 - core/src/main/resources/i18n/displayStrings_pt-br.properties | 1 - core/src/main/resources/i18n/displayStrings_pt.properties | 1 - core/src/main/resources/i18n/displayStrings_ru.properties | 1 - core/src/main/resources/i18n/displayStrings_th.properties | 1 - core/src/main/resources/i18n/displayStrings_vi.properties | 1 - .../src/main/resources/i18n/displayStrings_zh-hans.properties | 1 - .../src/main/resources/i18n/displayStrings_zh-hant.properties | 1 - 15 files changed, 3 insertions(+), 15 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 23ee295b77d..e544a75ca6b 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -2891,7 +2891,9 @@ popup.warning.btcChangeBelowDustException=This transaction creates a change outp You need to add the dust amount to your sending amount to avoid to generate a dust output.\n\n\ The dust output is {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing \ + and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when \ + Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last \ 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\n\ You can either buy more BSQ or pay trade fees with BTC.\n\n\ diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties index 42d26fcacf1..91443a812fc 100644 --- a/core/src/main/resources/i18n/displayStrings_cs.properties +++ b/core/src/main/resources/i18n/displayStrings_cs.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=Nemáte dostatečné prostředky BTC popup.warning.bsqChangeBelowDustException=Tato transakce vytváří výstup BSQ, který je pod limitem drobných (5,46 BSQ) a byl by bitcoinovou sítí odmítnut.\n\nMusíte buď poslat vyšší částku, abyste se vyhnuli drobným (např. přidáním drobné částky do vaší odeslané částky), nebo přidejte do své peněženky další prostředky BSQ, abyste se vyhnuli generování drobných.\n\nVýstup drobných {0}. popup.warning.btcChangeBelowDustException=Tato transakce vytváří výstup, který je pod limitem drobných (546 satoshi) a byl by bitcoinovou sítí odmítnut.\n\nMusíte přidat vyšší množství drobných k vašemu odesílanému množství, abyste se vyhnuli vytváření drobných.\n\nVýstup drobných je {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=K provedení této transakce budete potřebovat více BSQ - posledních 5,46 BSQ ve vaší peněžence nelze použít k placení obchodních poplatků kvůli omezení prachových mincí v bitcoinovém protokolu.\n\nMůžete si buď koupit více BSQ, nebo zaplatit obchodní poplatky pomocí BTC.\n\nChybějící prostředky: {0} popup.warning.noBsqFundsForBtcFeePayment=Peněženka BSQ nemá dostatečné prostředky na zaplacení obchodního poplatku v BSQ. popup.warning.messageTooLong=Vaše zpráva překračuje max. povolená velikost. Zašlete jej prosím v několika částech nebo ji nahrajte do služby, jako je https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index 8886904dada..b932a8b41a2 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=Sie haben nicht genügend BTC-Gelder, popup.warning.bsqChangeBelowDustException=Diese Transaktion erzeugt eine BSQ-Wechselgeld-Ausgabe, die unter dem Dust-Limit (5.46 BSQ) liegt und vom Bitcoin-Netzwerk abgelehnt werden würde.\n\nSie müssen entweder einen höheren Betrag senden, um die Wechselgeld-Ausgabe zu vermeiden (z.B. indem Sie den Dust-Betrag zu Ihrem Sende-Betrag hinzufügen) oder mehr BSQ-Guthaben zu Ihrer Wallet hinzufügen, damit Sie vermeiden, eine Dust-Ausgabe zu generieren.\n\nDie Dust-Ausgabe ist {0}. popup.warning.btcChangeBelowDustException=Diese Transaktion erzeugt eine Wechselgeld-Ausgabe, die unter dem Dust-Limit (546 Satoshi) liegt und vom Bitcoin-Netzwerk abgelehnt würde.\n\nSie müssen den Dust-Betrag zu Ihrem Sende-Betrag hinzufügen, um zu vermeiden, dass eine Dust-Ausgabe generiert wird.\n\nDie Dust-Ausgabe ist {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Ihr BSQ-Wallet ist deaktiviert während DAO synchronisiert und Ihr BSQ-Guthaben kann während dieser Zeit auf Null erscheinen. Bitte überprüfen Sie die Statusleiste und versuchen Sie es später erneut, wenn die DAO-Synchronisierung abgeschlossen ist, oder fahren Sie jetzt mit diesem Handel fort und verwenden Sie BTC, um die Handelsgebühren zu bezahlen. popup.warning.insufficientBsqFundsForBtcFeePayment=Sie benötigen mehr BSQ um diese Transaktion durchzuführen - die letzten 5.46 BSQ in Ihrer Wallet können aufgrund der Dust-Limits im Bitcoin Protokoll nicht für die Trading-Gebühren verwendet werden.\n\nSie können entweder mehr BSQ kaufen oder die Trading-Gebühren in BTC bezahlen.\n\nFehlende Funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Ihre BSQ-Wallet hat keine ausreichenden Gelder, um die Handels-Gebühr in BSQ zu bezahlen. popup.warning.messageTooLong=Ihre Nachricht überschreitet die maximal erlaubte Größe. Sende Sie diese in mehreren Teilen oder laden Sie sie in einen Dienst wie https://pastebin.com hoch. diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index b07c5cea793..ca345e2bc07 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=No tiene suficientes fondos BTC para popup.warning.bsqChangeBelowDustException=Esta transacción crea un output BSQ de cambio que está por debajo del límite dust (5.46 BSQ) y sería rechazado por la red Bitcoin.\n\nTiene que enviar una cantidad mayor para evitar el output de cambio (Ej. agregando la cantidad de dust a su cantidad de envío) o añadir más fondos BSQ a su cartera para evitar generar un output de dust.\n\nEl output dust es {0}. popup.warning.btcChangeBelowDustException=Esta transacción crea un output de cambio que está por debajo del límite de dust (546 Satoshi) y sería rechazada por la red Bitcoin.\n\nDebe agregar la cantidad de dust a su cantidad de envío para evitar generar un output de dust.\n\nEl output de dust es {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=Necesitará más BSQ para hacer esta transacción -los últimos 5.46BSQ en su monedero no pueden usarse para pagar tasas de intercambio debido a límites dust en el protocolo Bitcoin.\n\nPuede comprar más BSQ o pagar las tasas de intercambio con BTC.\n\nFondos necesarios: {0} popup.warning.noBsqFundsForBtcFeePayment=Su monedero BSQ no tiene suficientes fondos para pagar la comisión de intercambio en BSQ. popup.warning.messageTooLong=Su mensaje excede el tamaño máximo permitido. Por favor, envíelo por partes o súbalo a un servicio como https://pastebin.com diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index 3effc95bb4a..d6add3c0ca5 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=شما BTC کافی برای پردا popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=کیف‌پول BSQ شما BSQ کافی برای پرداخت کارمزد معامله به BSQ را ندارد. popup.warning.messageTooLong=پیام شما بیش از حداکثر اندازه مجاز است. لطفا آن را در چند بخش ارسال کنید یا آن را در یک سرویس مانند https://pastebin.com آپلود کنید. diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index dd93fed60e1..418989485f0 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=Vous ne disposez pas de suffisamment popup.warning.bsqChangeBelowDustException=Cette transaction crée une BSQ change output qui est inférieure à la dust limit (5,46 BSQ) et serait rejetée par le réseau Bitcoin.\n\nVous devez soit envoyer un montant plus élevé pour éviter la change output (par exemple en ajoutant le montant de dust à votre montant d''envoi), soit ajouter plus de fonds BSQ à votre portefeuille pour éviter de générer une dust output.\n\nLa dust output est {0}. popup.warning.btcChangeBelowDustException=Cette transaction crée une change output qui est inférieure à la dust limit (546 Satoshi) et serait rejetée par le réseau Bitcoin.\n\nVous devez ajouter la quantité de dust à votre montant envoyé pour éviter de générer une dust output.\n\nLa dust output est {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=Vous avez besoin de plus de BSQ pour effectuer cette transaction - les 5,46 BSQ restant dans le portefeuille ne seront pas utilisés pour payer les frais de transaction en raison des limites de dust du protocole BTC.\n\nVous pouvez acheter plus de BSQ ou utiliser BTC pour payer les frais de transaction\n\nManque de fonds BSQ: {0} popup.warning.noBsqFundsForBtcFeePayment=Votre portefeuille BSQ ne dispose pas de suffisamment de fonds pour payer les frais de transaction en BSQ. popup.warning.messageTooLong=Votre message dépasse la taille maximale autorisée. Veuillez l'envoyer en plusieurs parties ou le télécharger depuis un service comme https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties index 8cdfc8eeff4..968ddd8e7cb 100644 --- a/core/src/main/resources/i18n/displayStrings_it.properties +++ b/core/src/main/resources/i18n/displayStrings_it.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=Non hai fondi BTC sufficienti per pag popup.warning.bsqChangeBelowDustException=Questa transazione crea un output di cambio BSQ che è inferiore al limite di polvere (5,46 BSQ) e verrebbe rifiutato dalla rete Bitcoin.\n\nÈ necessario inviare una quantità maggiore per evitare l'output di cambio (ad es. aggiungendo la quantità di polvere alla quantità di invio) o aggiungere più fondi BSQ al portafoglio in modo da evitare di generare una produzione di polvere.\n\nL'output della polvere è {0}. popup.warning.btcChangeBelowDustException=Questa transazione crea un output di cambio che è al di sotto del limite di polvere (546 Satoshi) e verrebbe rifiutato dalla rete Bitcoin.\n\nÈ necessario aggiungere la quantità di polvere alla quantità di invio per evitare di generare un output di polvere.\n\nL'output della polvere è {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Il tuo portafoglio BSQ non ha fondi sufficienti per pagare la commissione commerciale in BSQ. popup.warning.messageTooLong=Il tuo messaggio supera la dimensione massima consentita. Si prega di inviarlo in più parti o caricarlo su un servizio come https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties index b8cf284ab67..9d4a6767fdd 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=あなたはそのトランザクシ popup.warning.bsqChangeBelowDustException=このトランザクションは、ダスト制限(5.46 BSQ)を下回るBSQおつりアウトプットを作成し、ビットコインネットワークによって拒否されます。\n\nおつりアウトプットを回避するために、より高い金額を送信する必要があります(たとえば、送金額にダスト額を追加することによって)、またはダストアウトプットを生成しないようにウォレットにBSQ残高を追加する必要があります。\n\nダストアウトプットは{0}。 popup.warning.btcChangeBelowDustException=このトランザクションは、ダスト制限(546 Satoshi)を下回るBSQおつりアウトプットを作成し、ビットコインネットワークによって拒否されます。\n\nダストアウトプットを生成しないように、あなたの送金額にダスト額を追加する必要があります。\n\nダストアウトプットは{0}。 -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=このトランザクションにはBSQが足りません。ビットコインプロトコルのダスト制限によると、ウォレットから最後の5.46BSQはトレード手数料に使われることができません。\n\nもっとBSQを買うか、BTCでトレード手数料を支払うことができます。\n\n不足している資金: {0} popup.warning.noBsqFundsForBtcFeePayment=BSQウォレットにBSQのトレード手数料を支払うのに十分な残高がありません。 popup.warning.messageTooLong=メッセージが許容サイズ上限を超えています。いくつかに分けて送信するか、 https://pastebin.com のようなサービスにアップロードしてください。 diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties index 12fd2d73748..754c497c397 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=Você não possui fundos BTC suficien popup.warning.bsqChangeBelowDustException=Esta transação cria um troco BSQ menor do que o limite poeira (5.46 BSQ) e seria rejeitada pela rede Bitcoin.\nVocê precisa ou enviar uma quantia maior para evitar o troco (ex: adicionando a quantia poeira ao montante a ser enviado) ou adicionar mais fundos BSQ à sua carteira para evitar gerar uma saída de poeira.\nA saída de poeira é {0}. popup.warning.btcChangeBelowDustException=Esta transação cria um troco menor do que o limite poeira (546 Satoshi) e seria rejeitada pela rede Bitcoin.\nVocê precisa adicionar a quantia poeira ao montante de envio para evitar gerar uma saída de poeira.\nA saída de poeira é {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Sua carteira BSQ não possui fundos suficientes para pagar a taxa de transação em BSQ. popup.warning.messageTooLong=Sua mensagem excede o tamanho máximo permitido. Favor enviá-la em várias partes ou utilizando um serviço como https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index 2b8d33cf19a..387a7bf9c45 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=Você não tem fundos BTC suficientes popup.warning.bsqChangeBelowDustException=Esta transação cria um output de trocos de BSQ que está abaixo do limite de poeira (5,46 BSQ) e seria rejeitada pela rede do bitcoin.\n\nVocê precisa enviar uma quantia mais elevada para evitar o output de trocos (por exemplo, adicionando a quantia de poeira ao seu montante a ser enviado) ou adicionar mais fundos de BSQ à sua carteira de modo a evitar a gerar um output de poeira.\n\nO output de poeira é {0}. popup.warning.btcChangeBelowDustException=Esta transação cria um output de trocos que está abaixo do limite de poeira (546 satoshis) e seria rejeitada pela rede do bitcoin.\n\nVocê precisa adicionar a quantia de poeira ao seu montante à ser enviado para evitar gerar um output de poeira.\n\nO output de poeira é {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Sua carteira BSQ não possui fundos suficientes para pagar a taxa de negócio em BSQ. popup.warning.messageTooLong=Sua mensagem excede o tamanho máx. permitido. Por favor enviá-la em várias partes ou carregá-la utilizando um serviço como https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index 5c1909ba5a0..8911b2cd077 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=У вас недостаточно BT popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=В вашем кошельке BSQ недостаточно средств для оплаты комиссии за сделку в BSQ. popup.warning.messageTooLong=Ваше сообщение превышает макс. разрешённый размер. Разбейте его на несколько частей или загрузите в веб-приложение для работы с отрывками текста, например https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index b94a6d855f0..dd076c8a874 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=คุณไม่มีเงิน popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=กระเป๋าสตางค์ BSQ ของคุณไม่มีจำนวนเงินทุนที่มากพอสำหรับการชำระการเทรดใน BSQ popup.warning.messageTooLong=ข้อความของคุณเกินขีดจำกัดสูงสุดที่อนุญาต โปรดแบ่งส่งเป็นหลายส่วนหรืออัปโหลดไปยังบริการเช่น https://pastebin.com diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index 15b84e10e9a..5ac5afa933b 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=Bạn không có đủ vốn BTC đ popup.warning.bsqChangeBelowDustException=This transaction creates a BSQ change output which is below dust limit (5.46 BSQ) and would be rejected by the Bitcoin network.\n\nYou need to either send a higher amount to avoid the change output (e.g. by adding the dust amount to your sending amount) or add more BSQ funds to your wallet so you avoid to generate a dust output.\n\nThe dust output is {0}. popup.warning.btcChangeBelowDustException=This transaction creates a change output which is below dust limit (546 Satoshi) and would be rejected by the Bitcoin network.\n\nYou need to add the dust amount to your sending amount to avoid to generate a dust output.\n\nThe dust output is {0}. -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\nYou can either buy more BSQ or pay trade fees with BTC.\n\nMissing funds: {0} popup.warning.noBsqFundsForBtcFeePayment=Ví BSQ của bạn không đủ tiền để trả phí giao dịch bằng BSQ. popup.warning.messageTooLong=Tin nhắn của bạn vượt quá kích cỡ tối đa cho phép. Vui lòng gửi thành nhiều lần hoặc tải lên mạng như https://pastebin.com. diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties index 9f19c33d749..32822c053c6 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=你没有足够的 BTC 资金支付 popup.warning.bsqChangeBelowDustException=该交易产生的 BSQ 变化输出低于零头限制(5.46 BSQ),将被比特币网络拒绝。\n\n您需要发送更高的金额以避免更改输出(例如,通过在您的发送金额中添加零头),或者向您的钱包中添加更多的 BSQ 资金,以避免生成零头输出。\n\n零头输出为 {0}。 popup.warning.btcChangeBelowDustException=该交易创建的更改输出低于零头限制(546 聪),将被比特币网络拒绝。\n\n您需要将零头添加到发送量中,以避免生成零头输出。\n\n零头输出为{0}。 -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=您需要更多的 BSQ 去完成这笔交易 - 钱包中最后剩余 5.46 BSQ 将无法用于支付交易手续费因为 BTC 协议中的零头限制。\n\n你可以购买更多的 BSQ 或用 BTC支付交易手续费\n\n缺少 BSQ 资金:{0} popup.warning.noBsqFundsForBtcFeePayment=您的 BSQ 钱包没有足够的资金支付 BSQ 的交易费用。 popup.warning.messageTooLong=您的信息超过最大允许的大小。请将其分成多个部分发送,或将其上传到 https://pastebin.com 之类的服务器。 diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties index ff0117e85f0..c9032f0b013 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -2345,7 +2345,6 @@ popup.warning.insufficientBtcFundsForBsqTx=你沒有足夠的 BTC 資金支付 popup.warning.bsqChangeBelowDustException=該交易產生的 BSQ 變化輸出低於零頭限制(5.46 BSQ),將被比特幣網絡拒絕。\n\n您需要發送更高的金額以避免更改輸出(例如,通過在您的發送金額中添加零頭),或者向您的錢包中添加更多的 BSQ 資金,以避免生成零頭輸出。\n\n零頭輸出為 {0}。 popup.warning.btcChangeBelowDustException=該交易創建的更改輸出低於零頭限制(546 聰),將被比特幣網絡拒絕。\n\n您需要將零頭添加到發送量中,以避免生成零頭輸出。\n\n零頭輸出為{0}。 -popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=您需要更多的 BSQ 去完成這筆交易 - 錢包中最後剩餘 5.46 BSQ 將無法用於支付交易手續費因為 BTC 協議中的零頭限制。\n\n你可以購買更多的 BSQ 或用 BTC支付交易手續費\n\n缺少 BSQ 資金:{0} popup.warning.noBsqFundsForBtcFeePayment=您的 BSQ 錢包沒有足夠的資金支付 BSQ 的交易費用。 popup.warning.messageTooLong=您的信息超過最大允許的大小。請將其分成多個部分發送,或將其上傳到 https://pastebin.com 之類的服務器。 From df1d0e9052d32b9a4974a4df4bf04b6607d122e5 Mon Sep 17 00:00:00 2001 From: jan zens <89642092+sneznaj@users.noreply.github.com> Date: Tue, 19 Oct 2021 14:53:48 +0200 Subject: [PATCH 9/9] Trade Step 1: add popup "no BSQ while Synchronizing DAO" --- .../resources/i18n/displayStrings.properties | 3 +++ .../desktop/main/offer/MutableOfferView.java | 21 ++++++++++--------- .../main/offer/takeoffer/TakeOfferView.java | 18 ++++++++-------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index d6106e5559e..e544a75ca6b 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -2891,6 +2891,9 @@ popup.warning.btcChangeBelowDustException=This transaction creates a change outp You need to add the dust amount to your sending amount to avoid to generate a dust output.\n\n\ The dust output is {0}. +popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment=Your BSQ wallet is disabled while DAO is synchronizing \ + and your BSQ balance may appear to be zero during this period. Please check the status bar and try again later when \ + Synchronizing DAO is complete, or continue now with this trade and use BTC to pay the trade fees. popup.warning.insufficientBsqFundsForBtcFeePayment=You''ll need more BSQ to do this transaction—the last \ 5.46 BSQ in your wallet cannot be used to pay trade fees because of dust limits in the Bitcoin protocol.\n\n\ You can either buy more BSQ or pay trade fees with BTC.\n\n\ diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java index f0f42d5e5d1..c7fbe94a87c 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java @@ -323,7 +323,7 @@ public void initWithData(OfferPayload.Direction direction, TradeCurrency tradeCu updatePriceToggle(); if (!model.getDataModel().isMakerFeeValid() && model.getDataModel().getMakerFee() != null) - showInsufficientBsqFundsForBtcFeePaymentPopup(); + showNoBsqFundsAvailableForBtcFeePaymentPopup(); } // called form parent as the view does not get notified when the tab is closed @@ -356,19 +356,20 @@ private void onPlaceOffer() { }); } } else { - showInsufficientBsqFundsForBtcFeePaymentPopup(); + howNoBsqFundsAvailableForBtcFeePaymentPopup(); } } } - private void showInsufficientBsqFundsForBtcFeePaymentPopup() { + private void showNoBsqFundsAvailableForBtcFeePaymentPopup() { Coin makerFee = model.getDataModel().getMakerFee(false); String message = null; - if (makerFee != null) { + if ((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) + message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); + else if (makerFee != null) message = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", bsqFormatter.formatCoinWithCode(makerFee.subtract(model.getDataModel().getUsableBsqBalance()))); - - } else if (model.getDataModel().getUsableBsqBalance().isZero()) + else if (model.getDataModel().getUsableBsqBalance().isZero()) message = Res.get("popup.warning.noBsqFundsForBtcFeePayment"); if (message != null) @@ -1132,13 +1133,13 @@ private void showFeeOption() { if (!isPreferredFeeCurrencyBtc && !isBsqForFeeAvailable) { Coin makerFee = model.getDataModel().getMakerFee(false); String missingBsq = null; - if (makerFee != null) { + if ((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) + message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); + else if (makerFee != null) missingBsq = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", bsqFormatter.formatCoinWithCode(makerFee.subtract(model.getDataModel().getUsableBsqBalance()))); - - } else if (model.getDataModel().getUsableBsqBalance().isZero()) { + else if (model.getDataModel().getUsableBsqBalance().isZero()) missingBsq = Res.get("popup.warning.noBsqFundsForBtcFeePayment"); - } if (missingBsq != null) { new Popup().warning(missingBsq) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java index caeab48c27c..dd76b782ea8 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java @@ -430,7 +430,7 @@ private void onTakeOffer() { } if (!model.dataModel.isTakerFeeValid()) { - showInsufficientBsqFundsForBtcFeePaymentPopup(); + showNoBsqFundsAvailabeForBtcFeePaymentPopup(); return; } @@ -939,13 +939,13 @@ private void showFeeOption() { if (!isPreferredFeeCurrencyBtc && !isBsqForFeeAvailable) { Coin takerFee = model.dataModel.getTakerFee(false); String missingBsq = null; - if (takerFee != null) { + if ((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)) + message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); + else if (takerFee != null) missingBsq = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", bsqFormatter.formatCoinWithCode(takerFee.subtract(model.dataModel.getUsableBsqBalance()))); - - } else if (model.dataModel.getUsableBsqBalance().isZero()) { + else if (model.dataModel.getUsableBsqBalance().isZero()) missingBsq = Res.get("popup.warning.noBsqFundsForBtcFeePayment"); - } if (missingBsq != null) { new Popup().warning(missingBsq) @@ -1234,13 +1234,14 @@ private VBox getTradeFeeFieldsBox() { /////////////////////////////////////////////////////////////////////////////////////////// - private void showInsufficientBsqFundsForBtcFeePaymentPopup() { + private void showNoBsqFundsAvailabeForBtcFeePaymentPopup() { Coin takerFee = model.dataModel.getTakerFee(false); String message = null; - if (takerFee != null) + if ((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)){ + message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment"); + else if (takerFee != null) { message = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment", bsqFormatter.formatCoinWithCode(takerFee.subtract(model.dataModel.getUsableBsqBalance()))); - else if (model.dataModel.getUsableBsqBalance().isZero()) message = Res.get("popup.warning.noBsqFundsForBtcFeePayment"); @@ -1357,4 +1358,3 @@ private void addPayInfoEntry(GridPane infoGridPane, int row, String labelText, S infoGridPane.getChildren().addAll(label, textField); } } -