From 12b0a5bf805d62a34088f375c707d89ecff48054 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Fri, 16 Jul 2021 20:37:10 +0200 Subject: [PATCH 01/19] Bump version number for v1.7.2 --- build.gradle | 2 +- common/src/main/java/bisq/common/app/Version.java | 2 +- desktop/package/linux/Dockerfile | 2 +- desktop/package/macosx/Info.plist | 4 ++-- desktop/package/macosx/copy_dbs.sh | 2 +- desktop/package/macosx/finalize.sh | 2 +- desktop/package/macosx/replace_version_number.sh | 4 ++-- relay/src/main/resources/version.txt | 2 +- seednode/src/main/java/bisq/seednode/SeedNodeMain.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 10761cadad2..f203ba35ea8 100644 --- a/build.gradle +++ b/build.gradle @@ -412,7 +412,7 @@ configure(project(':desktop')) { modules = ['javafx.controls', 'javafx.fxml'] } - version = '1.7.1-SNAPSHOT' + version = '1.7.2' jar.manifest.attributes( "Implementation-Title": project.name, diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java index 0bc9fc7f857..ed79544d3eb 100644 --- a/common/src/main/java/bisq/common/app/Version.java +++ b/common/src/main/java/bisq/common/app/Version.java @@ -30,7 +30,7 @@ public class Version { // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update // Therefore all sub versions start again with 1 // We use semantic versioning with major, minor and patch - public static final String VERSION = "1.7.1"; + public static final String VERSION = "1.7.2"; /** * Holds a list of the tagged resource files for optimizing the getData requests. diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile index 894aff7fc93..aadd582761d 100644 --- a/desktop/package/linux/Dockerfile +++ b/desktop/package/linux/Dockerfile @@ -8,7 +8,7 @@ # pull base image FROM openjdk:8-jdk -ENV version 1.7.1-SNAPSHOT +ENV version 1.7.2 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* && apt-get install -y vim fakeroot diff --git a/desktop/package/macosx/Info.plist b/desktop/package/macosx/Info.plist index f1aa59ce778..6711a1ecc44 100644 --- a/desktop/package/macosx/Info.plist +++ b/desktop/package/macosx/Info.plist @@ -5,10 +5,10 @@ CFBundleVersion - 1.7.1 + 1.7.2 CFBundleShortVersionString - 1.7.1 + 1.7.2 CFBundleExecutable Bisq diff --git a/desktop/package/macosx/copy_dbs.sh b/desktop/package/macosx/copy_dbs.sh index fa46eda014a..8c1f9a8d57f 100755 --- a/desktop/package/macosx/copy_dbs.sh +++ b/desktop/package/macosx/copy_dbs.sh @@ -2,7 +2,7 @@ cd $(dirname $0)/../../../ -version="1.7.1" +version="1.7.2" # Set BISQ_DIR as environment var to the path of your locally synced Bisq data directory e.g. BISQ_DIR=~/Library/Application\ Support/Bisq diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh index 7ac301f54ed..759ef07db31 100755 --- a/desktop/package/macosx/finalize.sh +++ b/desktop/package/macosx/finalize.sh @@ -2,7 +2,7 @@ cd ../../ -version="1.7.1-SNAPSHOT" +version="1.7.2" target_dir="releases/$version" diff --git a/desktop/package/macosx/replace_version_number.sh b/desktop/package/macosx/replace_version_number.sh index a6b772e3f31..4a8d66271eb 100755 --- a/desktop/package/macosx/replace_version_number.sh +++ b/desktop/package/macosx/replace_version_number.sh @@ -2,8 +2,8 @@ cd $(dirname $0)/../../../. -oldVersion=1.7.0 -newVersion=1.7.1 +oldVersion=1.7.1 +newVersion=1.7.2 find . -type f \( -name "finalize.sh" \ -o -name "create_app.sh" \ diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt index 6c2a6460aeb..f8a696c8dc5 100644 --- a/relay/src/main/resources/version.txt +++ b/relay/src/main/resources/version.txt @@ -1 +1 @@ -1.7.1-SNAPSHOT +1.7.2 diff --git a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java index 9031e573ef2..0495573f2f4 100644 --- a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java +++ b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java @@ -47,7 +47,7 @@ @Slf4j public class SeedNodeMain extends ExecutableForAppWithP2p { private static final long CHECK_CONNECTION_LOSS_SEC = 30; - private static final String VERSION = "1.7.1"; + private static final String VERSION = "1.7.2"; private SeedNode seedNode; private Timer checkConnectionLossTime; From 57473a6e23dd8b10ab5840c0f9361a2afc18c87d Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Fri, 16 Jul 2021 20:38:58 +0200 Subject: [PATCH 02/19] Update translations for v1.7.2 --- .../resources/i18n/displayStrings_cs.properties | 16 ++++++++++------ .../resources/i18n/displayStrings_de.properties | 14 +++++++++----- .../resources/i18n/displayStrings_es.properties | 14 +++++++++----- .../resources/i18n/displayStrings_fa.properties | 14 +++++++++----- .../resources/i18n/displayStrings_fr.properties | 14 +++++++++----- .../resources/i18n/displayStrings_it.properties | 14 +++++++++----- .../resources/i18n/displayStrings_ja.properties | 14 +++++++++----- .../i18n/displayStrings_pt-br.properties | 14 +++++++++----- .../resources/i18n/displayStrings_pt.properties | 14 +++++++++----- .../resources/i18n/displayStrings_ru.properties | 14 +++++++++----- .../resources/i18n/displayStrings_th.properties | 14 +++++++++----- .../resources/i18n/displayStrings_vi.properties | 14 +++++++++----- .../i18n/displayStrings_zh-hans.properties | 14 +++++++++----- .../i18n/displayStrings_zh-hant.properties | 14 +++++++++----- 14 files changed, 127 insertions(+), 71 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties index a779d3b6cf5..847fc12a4b6 100644 --- a/core/src/main/resources/i18n/displayStrings_cs.properties +++ b/core/src/main/resources/i18n/displayStrings_cs.properties @@ -124,7 +124,7 @@ shared.noDateAvailable=Žádné datum není k dispozici shared.noDetailsAvailable=Detaily nejsou k dispozici shared.notUsedYet=Ještě nepoužito shared.date=Datum -shared.sendFundsDetailsWithFee=Odesílání: {0}\nZ adresy: {1}\nNa přijímací adresu: {2}.\nPožadovaný poplatek za těžbu je: {3} ({4} satoshi/vbyte)\nTransakční vsize: {5} vKb\n\nPříjemce obdrží: {6}\n\nOpravdu chcete tuto částku vybrat? +shared.sendFundsDetailsWithFee=Odesíláno: {0}\nZ adresy: {1}\nNa přijímací adresu: {2}\nPožadovaný poplatek za těžbu je: {3} ({4} satoshi/vbyte)\nTransakční vsize: {5} vKb\n\nPříjemce obdrží: {6}\n\nOpravdu chcete tuto částku vybrat? # suppress inspection "TrailingSpacesInProperty" shared.sendFundsDetailsDust=Bisq zjistil, že tato transakce by vytvořila drobné mince, které jsou pod limitem drobných mincí (a není to povoleno pravidly pro bitcoinový konsenzus). Místo toho budou tyto drobné mince ({0} satoshi {1}) přidány k poplatku za těžbu.\n\n\n shared.copyToClipboard=Kopírovat do schránky @@ -790,8 +790,8 @@ portfolio.pending.mediationRequested=Mediace požádána portfolio.pending.refundRequested=Požadováno vrácení peněz portfolio.pending.openSupport=Otevřít úkol pro podporu portfolio.pending.supportTicketOpened=Úkol pro podporu otevřen -portfolio.pending.communicateWithArbitrator=Komunikujte prosím na obrazovce \"Podpora\" s rozhodcem. -portfolio.pending.communicateWithMediator=Komunikujte prosím na obrazovce \"Podpora\" s mediátorem. +portfolio.pending.communicateWithArbitrator=Komunikujte prosím s rozhodcem na obrazovce \"Podpora\". +portfolio.pending.communicateWithMediator=Komunikujte prosím s mediátorem na obrazovce \"Podpora\". portfolio.pending.disputeOpenedMyUser=Už jste otevřeli spor.\n{0} portfolio.pending.disputeOpenedByPeer=Váš obchodní partner otevřel spor\n{0} portfolio.pending.noReceiverAddressDefined=Není definována žádná adresa příjemce @@ -821,6 +821,7 @@ portfolio.pending.failedTrade.txChainValid.moveToFailed=Obchodní protokol naraz portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=Přesuňte obchod do neúspěšných obchodů portfolio.pending.failedTrade.warningIcon.tooltip=Kliknutím otevřete podrobnosti o problémech tohoto obchodu portfolio.failed.revertToPending.popup=Chcete přesunout tento obchod do otevřených obchodů? +portfolio.failed.revertToPending.failed=Chyba při přesouvání tohoto obchodu mezi otevřené obchody. portfolio.failed.revertToPending=Přesunout obchod do otevřených obchodů portfolio.closed.completed=Dokončeno @@ -941,6 +942,7 @@ support.sigCheck.popup.failed=Ověření podpisu selhalo support.sigCheck.popup.invalidFormat=Zpráva nemá očekávaný formát. Zkopírujte a vložte souhrnnou zprávu ze sporu. support.reOpenByTrader.prompt=Opravdu chcete spor znovu otevřít? +support.reOpenByTrader.failed=Chyba při znovuotevírání sporu. support.reOpenButton.label=Znovu otevřít support.sendNotificationButton.label=Soukromé oznámení support.reportButton.label=Zpráva @@ -2417,6 +2419,8 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys byly podepsány popup.accountSigning.unsignedPubKeys.result.signed=Podepsané pubkeys popup.accountSigning.unsignedPubKeys.result.failed=Nepodařilo se podepsat +popup.info.torMigration.msg=Váš klient Bisq aktuálně používá adresu Tor v2. Podpora Tor v2 bude brzy ukončena [HYPERLINK:https://blog.torproject.org/v2-deprecation-timeline]. Bisq klienty s adresami Tor v2 nebudou moci od 15. srpna 2021 obchodovat.\n\nPřepněte prosím svůj Bisq klient na adresu Tor v3. Je to rychlé a jednoduché - viz podrobnosti v tomto dokumentu [HYPERLINK:https://bisq.wiki/Changing_your_onion_address] nebo v tomto videu [HYPERLINK:https://bitcointv.com/videos/watch/f96adc20-4092-4253-84c0-1b18088b4b95]. \n\nPřed provedením upgradu si nejprve zazálohujte datový adresář. + #################################################################### # Notifications #################################################################### @@ -2516,8 +2520,8 @@ addressTextField.addressCopiedToClipboard=Adresa byla zkopírována do schránky addressTextField.openWallet.failed=Otevření výchozí bitcoinové peněženky se nezdařilo. Možná nemáte žádnou nainstalovanou? explorerAddressTextField.copyToClipboard=Zkopírujte adresu do schránky -explorerAddressTextField.blockExplorerIcon.tooltip=Open a blockchain explorer with this address -explorerAddressTextField.missingTx.warning.tooltip=Missing required address +explorerAddressTextField.blockExplorerIcon.tooltip=Otevřít blockchain explorer s touto adresou +explorerAddressTextField.missingTx.warning.tooltip=Je vyžadována adresa peerInfoIcon.tooltip={0}\nŠtítek: {1} @@ -2531,7 +2535,7 @@ txIdTextField.missingTx.warning.tooltip=Chybí požadovaná transakce #################################################################### navigation.account=\"Účet\" -navigation.account.walletSeed=\"Účet/Seed peněženky\" +navigation.account.backup=\"Účet/Záloha\" navigation.funds.availableForWithdrawal=\"Prostředky/Odeslat prostředky\" navigation.portfolio.myOpenOffers=\"Portfolio/Moje otevřené nabídky\" navigation.portfolio.pending=\"Portfolio/Otevřené obchody\" diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index e6c26b461ec..0fc119ea7b5 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -124,7 +124,7 @@ shared.noDateAvailable=Kein Datum verfügbar shared.noDetailsAvailable=Keine Details vorhanden shared.notUsedYet=Noch ungenutzt shared.date=Datum -shared.sendFundsDetailsWithFee=Gesendet: {0}\nVon Adresse: {1}\nAn Empfangsadresse: {2}.\nBenötigte Mining-Gebühr ist: {3} ({4} satoshis/vbyte)\nTransaktionsgröße (vsize): {5} vKb\n\nDer Empfänger erhält: {6}\n\nSind Sie sicher, dass Sie diesen Betrag abheben wollen? +shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" shared.sendFundsDetailsDust=Diese Transaktion würde ein Wechselgeld erzeugen das unterhalb des Dust-Grenzwerts liegt (und daher von den Bitcoin-Konsensregeln nicht erlaubt wäre). Stattdessen wird dieser Dust ({0} Satoshi{1}) der Mining-Gebühr hinzugefügt.\n\n\n shared.copyToClipboard=In Zwischenablage kopieren @@ -790,9 +790,9 @@ portfolio.pending.mediationRequested=Mediation beantragt portfolio.pending.refundRequested=Rückerstattung beantragt portfolio.pending.openSupport=Support-Ticket öffnen portfolio.pending.supportTicketOpened=Support-Ticket geöffnet -portfolio.pending.communicateWithArbitrator=Bitte setzen Sie sich im \"Support\"-Bildschirm mit dem Vermittler in Verbindung. -portfolio.pending.communicateWithMediator=Bitte kommunizieren Sie im \"Support\" Bildschirm mit dem Mediator. -portfolio.pending.disputeOpenedMyUser=Sie haben bereits einen Konflikt geöffnet.\n{0} +portfolio.pending.communicateWithArbitrator=Please communicate with the arbitrator on the \"Support\" screen. +portfolio.pending.communicateWithMediator=Please communicate with the mediator on the \"Support\" screen. +portfolio.pending.disputeOpenedMyUser=You have already opened a dispute.\n{0} portfolio.pending.disputeOpenedByPeer=Ihr Handelspartner hat einen Konflikt geöffnet\n{0} portfolio.pending.noReceiverAddressDefined=Keine Empfangsadresse festgelegt @@ -821,6 +821,7 @@ portfolio.pending.failedTrade.txChainValid.moveToFailed=Das Handels-Protokoll ha portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=Handel zu den fehlgeschlagenen Händeln verschieben. portfolio.pending.failedTrade.warningIcon.tooltip=Klicken Sie hier um herauszufinden welche Probleme beim Handel aufgetreten sind. portfolio.failed.revertToPending.popup=Wollen Sie diesen Handel zu den offenen Händeln verschieben? +portfolio.failed.revertToPending.failed=Failed to move this trade to open trades. portfolio.failed.revertToPending=Handel zu den offenen Händeln verschieben portfolio.closed.completed=Abgeschlossen @@ -941,6 +942,7 @@ support.sigCheck.popup.failed=Unterzeichnung der Signatur ist fehlgeschlagen support.sigCheck.popup.invalidFormat=Nachricht ist nicht im erwarteten Format. Copy & paste Konflikt-Zusammenfassung. support.reOpenByTrader.prompt=Sind Sie sicher, dass Sie den Konflikt wiedereröffnen möchten? +support.reOpenByTrader.failed=Failed to re-open the dispute. support.reOpenButton.label=Wiedereröffnen support.sendNotificationButton.label=Private Benachrichtigung support.reportButton.label=Melden @@ -2417,6 +2419,8 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys wurden unterzeichnet popup.accountSigning.unsignedPubKeys.result.signed=Unterzeichnete Pubkeys popup.accountSigning.unsignedPubKeys.result.failed=Unterzeichnung fehlgeschlagen +popup.info.torMigration.msg=Your Bisq node is currently using a Tor v2 address. Tor v2 is being deprecated soon [HYPERLINK:https://blog.torproject.org/v2-deprecation-timeline], and Bisq nodes with Tor v2 addresses will no longer be able to trade on August 15th, 2021.\n\nPlease switch your Bisq node to a Tor v3 address. It's quick and simple -- see details in this doc [HYPERLINK:https://bisq.wiki/Changing_your_onion_address] or in this video [HYPERLINK:https://bitcointv.com/videos/watch/f96adc20-4092-4253-84c0-1b18088b4b95]. \n\nMake sure to back up your data directory beforehand. + #################################################################### # Notifications #################################################################### @@ -2531,7 +2535,7 @@ txIdTextField.missingTx.warning.tooltip=Erforderliche Transaktion fehlt #################################################################### navigation.account=\"Konto\" -navigation.account.walletSeed=\"Konto/Wallet-Seed\" +navigation.account.backup=\"Account/Backup\" navigation.funds.availableForWithdrawal=\"Funds/Funds senden\" navigation.portfolio.myOpenOffers=\"Portfolio/Meine offenen Angebote\" navigation.portfolio.pending=\"Portfolio/Offene Trades\" diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index a7b8951bb1a..188903a244f 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -124,7 +124,7 @@ shared.noDateAvailable=Sin fecha disponible shared.noDetailsAvailable=Sin detalles disponibles shared.notUsedYet=Sin usar aún shared.date=Fecha -shared.sendFundsDetailsWithFee=Enviando: {0}\nDesde la dirección: {1}\nA la dirección receptora: {2}.\nLa comisión requerida de transacción es: {3} ({4} Satoshis/vbyte)\nTamaño de la transacción: {5} vKb\n\nEl receptor recibirá: {6}\n\nSeguro que quiere retirar esta cantidad? +shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" shared.sendFundsDetailsDust=Bisq detectó que esta transacción crearía una salida que está por debajo del umbral mínimo considerada polvo (y no está permitida por las reglas de consenso en Bitcoin). En cambio, esta transacción polvo ({0} satoshi {1}) se agregará a la tarifa de minería.\n\n\n shared.copyToClipboard=Copiar al portapapeles @@ -790,9 +790,9 @@ portfolio.pending.mediationRequested=Mediación solicitada portfolio.pending.refundRequested=Devolución de fondos solicitada portfolio.pending.openSupport=Abrir ticket de soporte portfolio.pending.supportTicketOpened=Ticket de soporte abierto -portfolio.pending.communicateWithArbitrator=Por favor, comuníquese en la pantalla de \"Soporte\" con el árbitro. -portfolio.pending.communicateWithMediator=Por favor, comuníquese en la pantalla \"Soporte\" con el mediador. -portfolio.pending.disputeOpenedMyUser=Ya ha abierto una disputa.\n{0} +portfolio.pending.communicateWithArbitrator=Please communicate with the arbitrator on the \"Support\" screen. +portfolio.pending.communicateWithMediator=Please communicate with the mediator on the \"Support\" screen. +portfolio.pending.disputeOpenedMyUser=You have already opened a dispute.\n{0} portfolio.pending.disputeOpenedByPeer=Su pareja de intercambio ha abierto una disputa\n{0} portfolio.pending.noReceiverAddressDefined=No se ha definido la dirección del receptor. @@ -821,6 +821,7 @@ portfolio.pending.failedTrade.txChainValid.moveToFailed=El protocolo de intercam portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=Mover intercambio a intercambios fallidos portfolio.pending.failedTrade.warningIcon.tooltip=Clique para mostrar los detalles sobre los problemas en este intercambio portfolio.failed.revertToPending.popup=¿Quiere mover este intercambio a intercambios abiertos? +portfolio.failed.revertToPending.failed=Failed to move this trade to open trades. portfolio.failed.revertToPending=Mueva intercambio a intercambios abiertos portfolio.closed.completed=Completado @@ -941,6 +942,7 @@ support.sigCheck.popup.failed=La verificación de la firma ha fallado support.sigCheck.popup.invalidFormat=El mensaje no tiene el formato esperado. Copie y pegue el resumen del mensaje desde la disputa. support.reOpenByTrader.prompt=¿Está seguro de que quiere reabrir la disputa? +support.reOpenByTrader.failed=Failed to re-open the dispute. support.reOpenButton.label=Volver a abrir support.sendNotificationButton.label=Notificación privada support.reportButton.label=Reportar @@ -2417,6 +2419,8 @@ popup.accountSigning.unsignedPubKeys.signed=Las claves públicas se firmaron popup.accountSigning.unsignedPubKeys.result.signed=Claves públicas firmadas popup.accountSigning.unsignedPubKeys.result.failed=Error al firmar +popup.info.torMigration.msg=Your Bisq node is currently using a Tor v2 address. Tor v2 is being deprecated soon [HYPERLINK:https://blog.torproject.org/v2-deprecation-timeline], and Bisq nodes with Tor v2 addresses will no longer be able to trade on August 15th, 2021.\n\nPlease switch your Bisq node to a Tor v3 address. It's quick and simple -- see details in this doc [HYPERLINK:https://bisq.wiki/Changing_your_onion_address] or in this video [HYPERLINK:https://bitcointv.com/videos/watch/f96adc20-4092-4253-84c0-1b18088b4b95]. \n\nMake sure to back up your data directory beforehand. + #################################################################### # Notifications #################################################################### @@ -2531,7 +2535,7 @@ txIdTextField.missingTx.warning.tooltip=Falta la transacción requerida #################################################################### navigation.account=\"Cuenta\" -navigation.account.walletSeed=\"Cuenta/Semilla de cartera\" +navigation.account.backup=\"Account/Backup\" navigation.funds.availableForWithdrawal=\"Fondos/Enviar fondos"\" navigation.portfolio.myOpenOffers=\"Portafolio/Mis ofertas abiertas\" navigation.portfolio.pending=\"Portafolio/Intercambios abiertos\" diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index 0c1347875ad..f8f022b6a4a 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -124,7 +124,7 @@ shared.noDateAvailable=تاریخ موجود نیست shared.noDetailsAvailable=جزئیاتی در دسترس نیست shared.notUsedYet=هنوز مورد استفاده قرار نگرفته shared.date=تاریخ -shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}.\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? +shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" shared.sendFundsDetailsDust=Bisq detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n shared.copyToClipboard=کپی در کلیپ‌بورد @@ -790,9 +790,9 @@ portfolio.pending.mediationRequested=Mediation requested portfolio.pending.refundRequested=Refund requested portfolio.pending.openSupport=باز کردن تیکت پشتیبانی portfolio.pending.supportTicketOpened=تیکت پشتیبانی باز شد -portfolio.pending.communicateWithArbitrator=لطفا در صفحه‌ی \"پشتیبانی\" با داور در ارتباط باشید. -portfolio.pending.communicateWithMediator=Please communicate in the \"Support\" screen with the mediator. -portfolio.pending.disputeOpenedMyUser=شما در حال حاضر یک مناقشه باز کرده‌اید.\n{0} +portfolio.pending.communicateWithArbitrator=Please communicate with the arbitrator on the \"Support\" screen. +portfolio.pending.communicateWithMediator=Please communicate with the mediator on the \"Support\" screen. +portfolio.pending.disputeOpenedMyUser=You have already opened a dispute.\n{0} portfolio.pending.disputeOpenedByPeer=طرف معامله شما یک مناقشه باز کرده است\n{0} portfolio.pending.noReceiverAddressDefined=آدرسی برای گیرنده تعیین نشده است @@ -821,6 +821,7 @@ portfolio.pending.failedTrade.txChainValid.moveToFailed=The trade protocol encou portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=Move trade to failed trades portfolio.pending.failedTrade.warningIcon.tooltip=Click to open details about the issues of this trade portfolio.failed.revertToPending.popup=Do you want to move this trade to open trades? +portfolio.failed.revertToPending.failed=Failed to move this trade to open trades. portfolio.failed.revertToPending=Move trade to open trades portfolio.closed.completed=تکمیل شده @@ -941,6 +942,7 @@ support.sigCheck.popup.failed=Signature verification failed support.sigCheck.popup.invalidFormat=Message is not of expected format. Copy & paste summary message from dispute. support.reOpenByTrader.prompt=Are you sure you want to re-open the dispute? +support.reOpenByTrader.failed=Failed to re-open the dispute. support.reOpenButton.label=Re-open support.sendNotificationButton.label=اعلان خصوصی support.reportButton.label=Report @@ -2417,6 +2419,8 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign +popup.info.torMigration.msg=Your Bisq node is currently using a Tor v2 address. Tor v2 is being deprecated soon [HYPERLINK:https://blog.torproject.org/v2-deprecation-timeline], and Bisq nodes with Tor v2 addresses will no longer be able to trade on August 15th, 2021.\n\nPlease switch your Bisq node to a Tor v3 address. It's quick and simple -- see details in this doc [HYPERLINK:https://bisq.wiki/Changing_your_onion_address] or in this video [HYPERLINK:https://bitcointv.com/videos/watch/f96adc20-4092-4253-84c0-1b18088b4b95]. \n\nMake sure to back up your data directory beforehand. + #################################################################### # Notifications #################################################################### @@ -2531,7 +2535,7 @@ txIdTextField.missingTx.warning.tooltip=Missing required transaction #################################################################### navigation.account=\"حساب\" -navigation.account.walletSeed=\"حساب/رمز پشتیبان کیف پول\" +navigation.account.backup=\"Account/Backup\" navigation.funds.availableForWithdrawal=\"Funds/Send funds\" navigation.portfolio.myOpenOffers=\"سبد سهام /پیشنهادهای باز من\" navigation.portfolio.pending=\"سبد سهام /معاملات باز\" diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index ac8f87d7244..c20141b5eed 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -124,7 +124,7 @@ shared.noDateAvailable=Pas de date disponible shared.noDetailsAvailable=Pas de détails disponibles shared.notUsedYet=Pas encore utilisé shared.date=Date -shared.sendFundsDetailsWithFee=Envoi: {0}\nDepuis l'adresse: {1}\nVers l'adresse de réception: {2}\nLes frais de minage requis sont : {3} ({4} satoshis/byte)\nVsize de la transaction: {5} vKb\n\nLe destinataire recevra: {6}\n\nÊtes-vous certain de vouloir retirer ce montant? +shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" shared.sendFundsDetailsDust=Bisq détecte que la transaction produira une sortie inférieure au seuil de fraction minimum (non autorisé par les règles de consensus Bitcoin). Au lieu de cela, ces fractions ({0} satoshi {1}) seront ajoutées aux frais de minage.\n\n\n shared.copyToClipboard=Copier dans le presse-papiers @@ -790,9 +790,9 @@ portfolio.pending.mediationRequested=Médiation demandée portfolio.pending.refundRequested=Remboursement demandé portfolio.pending.openSupport=Ouvrir un ticket d'assistance portfolio.pending.supportTicketOpened=Ticket d'assistance ouvert -portfolio.pending.communicateWithArbitrator=Veuillez communiquer avec l'arbitre depuis l'écran "Support". -portfolio.pending.communicateWithMediator=Veuillez communiquer avec le médiateur dans l'onglet \"Support \". -portfolio.pending.disputeOpenedMyUser=Vous avez déjà ouvert un litige.\n{0} +portfolio.pending.communicateWithArbitrator=Please communicate with the arbitrator on the \"Support\" screen. +portfolio.pending.communicateWithMediator=Please communicate with the mediator on the \"Support\" screen. +portfolio.pending.disputeOpenedMyUser=You have already opened a dispute.\n{0} portfolio.pending.disputeOpenedByPeer=Votre pair de trading à ouvert un litige\n{0} portfolio.pending.noReceiverAddressDefined=Aucune adresse de destinataire définie @@ -821,6 +821,7 @@ portfolio.pending.failedTrade.txChainValid.moveToFailed=Il y a des problèmes av portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=Déplacer le trade vers les trades échoués portfolio.pending.failedTrade.warningIcon.tooltip=Cliquer pour avoir plus de détails à propos des problèmes engendrés par ce trade portfolio.failed.revertToPending.popup=Voulez-vous déplacer ce trade vers les trades en cours? +portfolio.failed.revertToPending.failed=Failed to move this trade to open trades. portfolio.failed.revertToPending=Déplacer le trade vers les trades en cours portfolio.closed.completed=Terminé @@ -941,6 +942,7 @@ support.sigCheck.popup.failed=La vérification de la signature a échoué support.sigCheck.popup.invalidFormat=Le message n'est pas au format attendu. Copiez et collez le message résumant le litige. support.reOpenByTrader.prompt=Êtes-vous sûr de vouloir réouvrir le litige? +support.reOpenByTrader.failed=Failed to re-open the dispute. support.reOpenButton.label=Réouvrir support.sendNotificationButton.label=Notification privée support.reportButton.label=Signaler @@ -2417,6 +2419,8 @@ popup.accountSigning.unsignedPubKeys.signed=Les clés publiques ont été signé popup.accountSigning.unsignedPubKeys.result.signed=Clés publiques signées popup.accountSigning.unsignedPubKeys.result.failed=Échec de la signature +popup.info.torMigration.msg=Your Bisq node is currently using a Tor v2 address. Tor v2 is being deprecated soon [HYPERLINK:https://blog.torproject.org/v2-deprecation-timeline], and Bisq nodes with Tor v2 addresses will no longer be able to trade on August 15th, 2021.\n\nPlease switch your Bisq node to a Tor v3 address. It's quick and simple -- see details in this doc [HYPERLINK:https://bisq.wiki/Changing_your_onion_address] or in this video [HYPERLINK:https://bitcointv.com/videos/watch/f96adc20-4092-4253-84c0-1b18088b4b95]. \n\nMake sure to back up your data directory beforehand. + #################################################################### # Notifications #################################################################### @@ -2531,7 +2535,7 @@ txIdTextField.missingTx.warning.tooltip=Transaction requise manquante #################################################################### navigation.account=\"Compte\" -navigation.account.walletSeed=\"Compte/Seed du portefeuille\" +navigation.account.backup=\"Account/Backup\" navigation.funds.availableForWithdrawal=\"Fonds/Envoyer des fonds\" navigation.portfolio.myOpenOffers=\"Portfolio/Mes ordres en cours\" navigation.portfolio.pending=\"Portfolio/Échanges en cours\" diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties index ee0a6cc7803..16a4827e94a 100644 --- a/core/src/main/resources/i18n/displayStrings_it.properties +++ b/core/src/main/resources/i18n/displayStrings_it.properties @@ -124,7 +124,7 @@ shared.noDateAvailable=Nessuna data disponibile shared.noDetailsAvailable=Dettagli non disponibili shared.notUsedYet=Non ancora usato shared.date=Data -shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}.\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? +shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" shared.sendFundsDetailsDust=Bisq detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n shared.copyToClipboard=Copia negli appunti @@ -790,9 +790,9 @@ portfolio.pending.mediationRequested=Mediazione richiesta portfolio.pending.refundRequested=Rimborso richiesto portfolio.pending.openSupport=Apri ticket di supporto portfolio.pending.supportTicketOpened=Ticket di supporto aperto -portfolio.pending.communicateWithArbitrator=Si prega di comunicare nella schermata \"Supporto\" con l'arbitro. -portfolio.pending.communicateWithMediator=Si prega di comunicare nella schermata \"Supporto\" con il mediatore. -portfolio.pending.disputeOpenedMyUser=Hai già aperto una disputa.\n{0} +portfolio.pending.communicateWithArbitrator=Please communicate with the arbitrator on the \"Support\" screen. +portfolio.pending.communicateWithMediator=Please communicate with the mediator on the \"Support\" screen. +portfolio.pending.disputeOpenedMyUser=You have already opened a dispute.\n{0} portfolio.pending.disputeOpenedByPeer=Il tuo pari commerciale ha aperto una controversia\n{0} portfolio.pending.noReceiverAddressDefined=Nessun indirizzo del destinatario definito @@ -821,6 +821,7 @@ portfolio.pending.failedTrade.txChainValid.moveToFailed=The trade protocol encou portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=Move trade to failed trades portfolio.pending.failedTrade.warningIcon.tooltip=Click to open details about the issues of this trade portfolio.failed.revertToPending.popup=Do you want to move this trade to open trades? +portfolio.failed.revertToPending.failed=Failed to move this trade to open trades. portfolio.failed.revertToPending=Move trade to open trades portfolio.closed.completed=Completato @@ -941,6 +942,7 @@ support.sigCheck.popup.failed=Signature verification failed support.sigCheck.popup.invalidFormat=Message is not of expected format. Copy & paste summary message from dispute. support.reOpenByTrader.prompt=Are you sure you want to re-open the dispute? +support.reOpenByTrader.failed=Failed to re-open the dispute. support.reOpenButton.label=Re-open support.sendNotificationButton.label=Notifica privata support.reportButton.label=Report @@ -2417,6 +2419,8 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign +popup.info.torMigration.msg=Your Bisq node is currently using a Tor v2 address. Tor v2 is being deprecated soon [HYPERLINK:https://blog.torproject.org/v2-deprecation-timeline], and Bisq nodes with Tor v2 addresses will no longer be able to trade on August 15th, 2021.\n\nPlease switch your Bisq node to a Tor v3 address. It's quick and simple -- see details in this doc [HYPERLINK:https://bisq.wiki/Changing_your_onion_address] or in this video [HYPERLINK:https://bitcointv.com/videos/watch/f96adc20-4092-4253-84c0-1b18088b4b95]. \n\nMake sure to back up your data directory beforehand. + #################################################################### # Notifications #################################################################### @@ -2531,7 +2535,7 @@ txIdTextField.missingTx.warning.tooltip=Missing required transaction #################################################################### navigation.account=\"Conto\" -navigation.account.walletSeed=\"Conto/Seed wallet\" +navigation.account.backup=\"Account/Backup\" navigation.funds.availableForWithdrawal=\"Funds/Send funds\" navigation.portfolio.myOpenOffers=\"Portfolio/Le mie offerte aperte\" navigation.portfolio.pending=\"Portafoglio/Scambi aperti\" diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties index d4a1eed120f..6c95fe10442 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -124,7 +124,7 @@ shared.noDateAvailable=日付がありません shared.noDetailsAvailable=詳細不明 shared.notUsedYet=未使用 shared.date=日付 -shared.sendFundsDetailsWithFee=送金中: {0}\n送金元アドレス: {1}\n入金先アドレス: {2}\n必要なマイニング手数料: {3} ({4} Satoshis/byte)\nトランザクションvサイズ: {5} vKb\n\n入金先の受け取る金額: {6}\n\n本当にこの金額を出金しますか？ +shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" shared.sendFundsDetailsDust=Bisqがこのトランザクションはダストの最小閾値以下のおつりアウトプットを生じることを検出しました(それにしたがって、ビットコインのコンセンサス・ルールによって許されない)。代わりに、その ({0} satoshi{1}) のダストはマイニング手数料に追加されます。\n\n\n shared.copyToClipboard=クリップボードにコピー @@ -790,9 +790,9 @@ portfolio.pending.mediationRequested=調停は依頼されました portfolio.pending.refundRequested=返金は請求されました portfolio.pending.openSupport=サポートチケットをオープン portfolio.pending.supportTicketOpened=サポートチケットがオープンされた -portfolio.pending.communicateWithArbitrator=「サポート」画面で調停人と連絡を取ってください。 -portfolio.pending.communicateWithMediator=\"サポート\" 画面で調停者と連絡を取ってください。 -portfolio.pending.disputeOpenedMyUser=あなたは既に係争を開始しています\n{0} +portfolio.pending.communicateWithArbitrator=Please communicate with the arbitrator on the \"Support\" screen. +portfolio.pending.communicateWithMediator=Please communicate with the mediator on the \"Support\" screen. +portfolio.pending.disputeOpenedMyUser=You have already opened a dispute.\n{0} portfolio.pending.disputeOpenedByPeer=あなたのトレード相手は係争を開始しました\n{0} portfolio.pending.noReceiverAddressDefined=受信者のアドレスが定義されていません @@ -821,6 +821,7 @@ portfolio.pending.failedTrade.txChainValid.moveToFailed=トレードプロトコ portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=トレードを「失敗トレード」へ送る portfolio.pending.failedTrade.warningIcon.tooltip=このトレードに関する問題の詳細を開くのにクリックする portfolio.failed.revertToPending.popup=このトレードを「オープントレード」に送りますか？ +portfolio.failed.revertToPending.failed=Failed to move this trade to open trades. portfolio.failed.revertToPending=トレードを「オープントレード」へ送る portfolio.closed.completed=完了 @@ -941,6 +942,7 @@ support.sigCheck.popup.failed=署名検証失敗 support.sigCheck.popup.invalidFormat=メッセージは期待されるフォーマットではありません。係争からの概要メッセージをコピーして貼り付けて下さい。 support.reOpenByTrader.prompt=係争を再開しても本当によろしいですか？ +support.reOpenByTrader.failed=Failed to re-open the dispute. support.reOpenButton.label=再開する support.sendNotificationButton.label=プライベート通知 support.reportButton.label=報告する @@ -2417,6 +2419,8 @@ popup.accountSigning.unsignedPubKeys.signed=パブリックキーは署名され popup.accountSigning.unsignedPubKeys.result.signed=署名されたパブリックキー popup.accountSigning.unsignedPubKeys.result.failed=署名が失敗しました +popup.info.torMigration.msg=Your Bisq node is currently using a Tor v2 address. Tor v2 is being deprecated soon [HYPERLINK:https://blog.torproject.org/v2-deprecation-timeline], and Bisq nodes with Tor v2 addresses will no longer be able to trade on August 15th, 2021.\n\nPlease switch your Bisq node to a Tor v3 address. It's quick and simple -- see details in this doc [HYPERLINK:https://bisq.wiki/Changing_your_onion_address] or in this video [HYPERLINK:https://bitcointv.com/videos/watch/f96adc20-4092-4253-84c0-1b18088b4b95]. \n\nMake sure to back up your data directory beforehand. + #################################################################### # Notifications #################################################################### @@ -2531,7 +2535,7 @@ txIdTextField.missingTx.warning.tooltip=必要なトランザクションは欠 #################################################################### navigation.account=「アカウント」 -navigation.account.walletSeed=「アカウント/ウォレットシード」 +navigation.account.backup=\"Account/Backup\" navigation.funds.availableForWithdrawal=\"資金/送金する\" navigation.portfolio.myOpenOffers=「ポートフォリオ/私の公開オファー navigation.portfolio.pending=「ポートフォリオ/オープントレード」 diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties index e32d6d3e665..3c4c47f2b15 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -124,7 +124,7 @@ shared.noDateAvailable=Sem data disponível shared.noDetailsAvailable=Sem detalhes disponíveis shared.notUsedYet=Ainda não usado shared.date=Data -shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}.\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? +shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" shared.sendFundsDetailsDust=Bisq detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n shared.copyToClipboard=Copiar para área de transferência @@ -790,9 +790,9 @@ portfolio.pending.mediationRequested=Mediação requerida portfolio.pending.refundRequested=Reembolso requerido portfolio.pending.openSupport=Abrir ticket de suporte portfolio.pending.supportTicketOpened=Ticket de suporte aberto -portfolio.pending.communicateWithArbitrator=Por favor, vá até a seção \"Suporte\" e entre em contato com o árbitro. -portfolio.pending.communicateWithMediator=Por favor, entre em contato com o mediador na seção \"Suporte\". -portfolio.pending.disputeOpenedMyUser=Você já abriu uma disputa.\n{0} +portfolio.pending.communicateWithArbitrator=Please communicate with the arbitrator on the \"Support\" screen. +portfolio.pending.communicateWithMediator=Please communicate with the mediator on the \"Support\" screen. +portfolio.pending.disputeOpenedMyUser=You have already opened a dispute.\n{0} portfolio.pending.disputeOpenedByPeer=Seu parceiro de negociação abriu uma disputa\n{0} portfolio.pending.noReceiverAddressDefined=Nenhum endereço de recebimento definido @@ -821,6 +821,7 @@ portfolio.pending.failedTrade.txChainValid.moveToFailed=The trade protocol encou portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=Move trade to failed trades portfolio.pending.failedTrade.warningIcon.tooltip=Click to open details about the issues of this trade portfolio.failed.revertToPending.popup=Do you want to move this trade to open trades? +portfolio.failed.revertToPending.failed=Failed to move this trade to open trades. portfolio.failed.revertToPending=Move trade to open trades portfolio.closed.completed=Concluído @@ -941,6 +942,7 @@ support.sigCheck.popup.failed=Signature verification failed support.sigCheck.popup.invalidFormat=Message is not of expected format. Copy & paste summary message from dispute. support.reOpenByTrader.prompt=Are you sure you want to re-open the dispute? +support.reOpenByTrader.failed=Failed to re-open the dispute. support.reOpenButton.label=Re-open support.sendNotificationButton.label=Notificação privada support.reportButton.label=Report @@ -2417,6 +2419,8 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign +popup.info.torMigration.msg=Your Bisq node is currently using a Tor v2 address. Tor v2 is being deprecated soon [HYPERLINK:https://blog.torproject.org/v2-deprecation-timeline], and Bisq nodes with Tor v2 addresses will no longer be able to trade on August 15th, 2021.\n\nPlease switch your Bisq node to a Tor v3 address. It's quick and simple -- see details in this doc [HYPERLINK:https://bisq.wiki/Changing_your_onion_address] or in this video [HYPERLINK:https://bitcointv.com/videos/watch/f96adc20-4092-4253-84c0-1b18088b4b95]. \n\nMake sure to back up your data directory beforehand. + #################################################################### # Notifications #################################################################### @@ -2531,7 +2535,7 @@ txIdTextField.missingTx.warning.tooltip=Missing required transaction #################################################################### navigation.account=\"Conta\" -navigation.account.walletSeed=\"Conta/Semente da carteira\" +navigation.account.backup=\"Account/Backup\" navigation.funds.availableForWithdrawal=\"Funds/Send funds\" navigation.portfolio.myOpenOffers=\"Portfolio/Minhas ofertas\" navigation.portfolio.pending=\"Portfolio/Negociações em aberto\" diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index 82131e1f6c1..435e5ca8dd9 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -124,7 +124,7 @@ shared.noDateAvailable=Sem dada disponível shared.noDetailsAvailable=Sem detalhes disponíveis shared.notUsedYet=Ainda não usado shared.date=Data -shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}.\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? +shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" shared.sendFundsDetailsDust=Bisq detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n shared.copyToClipboard=Copiar para área de transferência @@ -790,9 +790,9 @@ portfolio.pending.mediationRequested=Mediação solicitada portfolio.pending.refundRequested=Reembolso pedido portfolio.pending.openSupport=Abrir bilhete de apoio portfolio.pending.supportTicketOpened=Bilhete de apoio aberto -portfolio.pending.communicateWithArbitrator=Por favor comunique no ecrã \"Apoio\" com o árbitro. -portfolio.pending.communicateWithMediator=Por favor comunique com o mediador no ecrã \"Apoio\". -portfolio.pending.disputeOpenedMyUser=Você já abriu uma disputa.\n{0} +portfolio.pending.communicateWithArbitrator=Please communicate with the arbitrator on the \"Support\" screen. +portfolio.pending.communicateWithMediator=Please communicate with the mediator on the \"Support\" screen. +portfolio.pending.disputeOpenedMyUser=You have already opened a dispute.\n{0} portfolio.pending.disputeOpenedByPeer=O seu par de negociação abriu uma disputa\n{0} portfolio.pending.noReceiverAddressDefined=Nenhum endereço de recipiente definido @@ -821,6 +821,7 @@ portfolio.pending.failedTrade.txChainValid.moveToFailed=The trade protocol encou portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=Move trade to failed trades portfolio.pending.failedTrade.warningIcon.tooltip=Click to open details about the issues of this trade portfolio.failed.revertToPending.popup=Do you want to move this trade to open trades? +portfolio.failed.revertToPending.failed=Failed to move this trade to open trades. portfolio.failed.revertToPending=Move trade to open trades portfolio.closed.completed=Concluído @@ -941,6 +942,7 @@ support.sigCheck.popup.failed=Signature verification failed support.sigCheck.popup.invalidFormat=Message is not of expected format. Copy & paste summary message from dispute. support.reOpenByTrader.prompt=Are you sure you want to re-open the dispute? +support.reOpenByTrader.failed=Failed to re-open the dispute. support.reOpenButton.label=Re-open support.sendNotificationButton.label=Notificação privada support.reportButton.label=Report @@ -2417,6 +2419,8 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign +popup.info.torMigration.msg=Your Bisq node is currently using a Tor v2 address. Tor v2 is being deprecated soon [HYPERLINK:https://blog.torproject.org/v2-deprecation-timeline], and Bisq nodes with Tor v2 addresses will no longer be able to trade on August 15th, 2021.\n\nPlease switch your Bisq node to a Tor v3 address. It's quick and simple -- see details in this doc [HYPERLINK:https://bisq.wiki/Changing_your_onion_address] or in this video [HYPERLINK:https://bitcointv.com/videos/watch/f96adc20-4092-4253-84c0-1b18088b4b95]. \n\nMake sure to back up your data directory beforehand. + #################################################################### # Notifications #################################################################### @@ -2531,7 +2535,7 @@ txIdTextField.missingTx.warning.tooltip=Missing required transaction #################################################################### navigation.account=\"Conta\" -navigation.account.walletSeed=\"Conta/Semente da carteira\" +navigation.account.backup=\"Account/Backup\" navigation.funds.availableForWithdrawal=\"Funds/Send funds\" navigation.portfolio.myOpenOffers=\"Portefólio/As minhas ofertas abertas\" navigation.portfolio.pending=\"Portefólio/Negócios abertos\" diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index 083cb894ba0..943c2c10dbe 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -124,7 +124,7 @@ shared.noDateAvailable=Дата не указана shared.noDetailsAvailable=Подробности не указаны shared.notUsedYet=Ещё не использовано shared.date=Дата -shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}.\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? +shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" shared.sendFundsDetailsDust=Bisq detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n shared.copyToClipboard=Скопировать в буфер @@ -790,9 +790,9 @@ portfolio.pending.mediationRequested=Mediation requested portfolio.pending.refundRequested=Refund requested portfolio.pending.openSupport=Обратиться за поддержкой portfolio.pending.supportTicketOpened=Запрос на поддержку отправлен -portfolio.pending.communicateWithArbitrator=Свяжитесь с арбитром в разделе \«Поддержка\». -portfolio.pending.communicateWithMediator=Please communicate in the \"Support\" screen with the mediator. -portfolio.pending.disputeOpenedMyUser=Вы уже начали спор.\n{0} +portfolio.pending.communicateWithArbitrator=Please communicate with the arbitrator on the \"Support\" screen. +portfolio.pending.communicateWithMediator=Please communicate with the mediator on the \"Support\" screen. +portfolio.pending.disputeOpenedMyUser=You have already opened a dispute.\n{0} portfolio.pending.disputeOpenedByPeer=Ваш контрагент начал спор\n{0} portfolio.pending.noReceiverAddressDefined=Адрес получателя не установлен @@ -821,6 +821,7 @@ portfolio.pending.failedTrade.txChainValid.moveToFailed=The trade protocol encou portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=Move trade to failed trades portfolio.pending.failedTrade.warningIcon.tooltip=Click to open details about the issues of this trade portfolio.failed.revertToPending.popup=Do you want to move this trade to open trades? +portfolio.failed.revertToPending.failed=Failed to move this trade to open trades. portfolio.failed.revertToPending=Move trade to open trades portfolio.closed.completed=Завершена @@ -941,6 +942,7 @@ support.sigCheck.popup.failed=Signature verification failed support.sigCheck.popup.invalidFormat=Message is not of expected format. Copy & paste summary message from dispute. support.reOpenByTrader.prompt=Are you sure you want to re-open the dispute? +support.reOpenByTrader.failed=Failed to re-open the dispute. support.reOpenButton.label=Re-open support.sendNotificationButton.label=Личное уведомление support.reportButton.label=Report @@ -2417,6 +2419,8 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign +popup.info.torMigration.msg=Your Bisq node is currently using a Tor v2 address. Tor v2 is being deprecated soon [HYPERLINK:https://blog.torproject.org/v2-deprecation-timeline], and Bisq nodes with Tor v2 addresses will no longer be able to trade on August 15th, 2021.\n\nPlease switch your Bisq node to a Tor v3 address. It's quick and simple -- see details in this doc [HYPERLINK:https://bisq.wiki/Changing_your_onion_address] or in this video [HYPERLINK:https://bitcointv.com/videos/watch/f96adc20-4092-4253-84c0-1b18088b4b95]. \n\nMake sure to back up your data directory beforehand. + #################################################################### # Notifications #################################################################### @@ -2531,7 +2535,7 @@ txIdTextField.missingTx.warning.tooltip=Missing required transaction #################################################################### navigation.account=\«Счёт\» -navigation.account.walletSeed=\«Счёт/Мнемоническая фраза\» +navigation.account.backup=\"Account/Backup\" navigation.funds.availableForWithdrawal=\"Funds/Send funds\" navigation.portfolio.myOpenOffers=\«Сделки/Мои текущие предложения\» navigation.portfolio.pending=\«Сделки/Текущие сделки\» diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index 12f88d4cbd2..6876c6ccd78 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -124,7 +124,7 @@ shared.noDateAvailable=ไม่มีวันที่ให้แสดง shared.noDetailsAvailable=ไม่มีรายละเอียด shared.notUsedYet=ยังไม่ได้ใช้งาน shared.date=วันที่ -shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}.\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? +shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" shared.sendFundsDetailsDust=Bisq detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n shared.copyToClipboard=คัดลอกไปที่คลิปบอร์ด @@ -790,9 +790,9 @@ portfolio.pending.mediationRequested=Mediation requested portfolio.pending.refundRequested=Refund requested portfolio.pending.openSupport=เปิดปุ่มช่วยเหลือ portfolio.pending.supportTicketOpened=ปุ่มช่วยเหลือถูกเปิดแล้ว -portfolio.pending.communicateWithArbitrator=กรุณาติดต่อโดยไปที่ \"ช่วยเหลือและสนับสนุน \" กับผู้ไกล่เกลี่ย -portfolio.pending.communicateWithMediator=Please communicate in the \"Support\" screen with the mediator. -portfolio.pending.disputeOpenedMyUser=คุณได้เปิดข้อพิพาทแล้ว\n{0} +portfolio.pending.communicateWithArbitrator=Please communicate with the arbitrator on the \"Support\" screen. +portfolio.pending.communicateWithMediator=Please communicate with the mediator on the \"Support\" screen. +portfolio.pending.disputeOpenedMyUser=You have already opened a dispute.\n{0} portfolio.pending.disputeOpenedByPeer=ผู้ร่วมการค้าของคุณได้เปิดประเด็นการอภิปรายขึ้น\n{0} portfolio.pending.noReceiverAddressDefined=ไม่ได้ระบุที่อยู่ผู้รับ @@ -821,6 +821,7 @@ portfolio.pending.failedTrade.txChainValid.moveToFailed=The trade protocol encou portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=Move trade to failed trades portfolio.pending.failedTrade.warningIcon.tooltip=Click to open details about the issues of this trade portfolio.failed.revertToPending.popup=Do you want to move this trade to open trades? +portfolio.failed.revertToPending.failed=Failed to move this trade to open trades. portfolio.failed.revertToPending=Move trade to open trades portfolio.closed.completed=เสร็จสิ้น @@ -941,6 +942,7 @@ support.sigCheck.popup.failed=Signature verification failed support.sigCheck.popup.invalidFormat=Message is not of expected format. Copy & paste summary message from dispute. support.reOpenByTrader.prompt=Are you sure you want to re-open the dispute? +support.reOpenByTrader.failed=Failed to re-open the dispute. support.reOpenButton.label=Re-open support.sendNotificationButton.label=การแจ้งเตือนส่วนตัว support.reportButton.label=Report @@ -2417,6 +2419,8 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign +popup.info.torMigration.msg=Your Bisq node is currently using a Tor v2 address. Tor v2 is being deprecated soon [HYPERLINK:https://blog.torproject.org/v2-deprecation-timeline], and Bisq nodes with Tor v2 addresses will no longer be able to trade on August 15th, 2021.\n\nPlease switch your Bisq node to a Tor v3 address. It's quick and simple -- see details in this doc [HYPERLINK:https://bisq.wiki/Changing_your_onion_address] or in this video [HYPERLINK:https://bitcointv.com/videos/watch/f96adc20-4092-4253-84c0-1b18088b4b95]. \n\nMake sure to back up your data directory beforehand. + #################################################################### # Notifications #################################################################### @@ -2531,7 +2535,7 @@ txIdTextField.missingTx.warning.tooltip=Missing required transaction #################################################################### navigation.account=\"บัญชี\" -navigation.account.walletSeed=\ "บัญชี / รหัสลับป้องกันกระเป๋าสตางค์\" +navigation.account.backup=\"Account/Backup\" navigation.funds.availableForWithdrawal=\"Funds/Send funds\" navigation.portfolio.myOpenOffers=\"แฟ้มผลงาน / ข้อเสนอของฉัน \" navigation.portfolio.pending=\"แฟ้มผลงาน / เปิดการซื้อขาย \" diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index b6d4a8764c8..7d77a6512ce 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -124,7 +124,7 @@ shared.noDateAvailable=Ngày tháng không hiển thị shared.noDetailsAvailable=Không có thông tin shared.notUsedYet=Chưa được sử dụng shared.date=Ngày -shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}.\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? +shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" shared.sendFundsDetailsDust=Bisq detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n shared.copyToClipboard=Sao chép đến clipboard @@ -790,9 +790,9 @@ portfolio.pending.mediationRequested=Mediation requested portfolio.pending.refundRequested=Refund requested portfolio.pending.openSupport=Mở đơn hỗ trợ portfolio.pending.supportTicketOpened=Đơn hỗ trợ đã mở -portfolio.pending.communicateWithArbitrator=Vui lòng liên lạc với trong tài qua màn hình \"Hỗ trợ\". -portfolio.pending.communicateWithMediator=Please communicate in the \"Support\" screen with the mediator. -portfolio.pending.disputeOpenedMyUser=Bạn đã mở một khiếu nại.\n{0} +portfolio.pending.communicateWithArbitrator=Please communicate with the arbitrator on the \"Support\" screen. +portfolio.pending.communicateWithMediator=Please communicate with the mediator on the \"Support\" screen. +portfolio.pending.disputeOpenedMyUser=You have already opened a dispute.\n{0} portfolio.pending.disputeOpenedByPeer=Đối tác giao dịch của bạn đã mở một khiếu nại\n{0} portfolio.pending.noReceiverAddressDefined=Không có địa chỉ người nhận @@ -821,6 +821,7 @@ portfolio.pending.failedTrade.txChainValid.moveToFailed=The trade protocol encou portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=Move trade to failed trades portfolio.pending.failedTrade.warningIcon.tooltip=Click to open details about the issues of this trade portfolio.failed.revertToPending.popup=Do you want to move this trade to open trades? +portfolio.failed.revertToPending.failed=Failed to move this trade to open trades. portfolio.failed.revertToPending=Move trade to open trades portfolio.closed.completed=Hoàn thành @@ -941,6 +942,7 @@ support.sigCheck.popup.failed=Signature verification failed support.sigCheck.popup.invalidFormat=Message is not of expected format. Copy & paste summary message from dispute. support.reOpenByTrader.prompt=Are you sure you want to re-open the dispute? +support.reOpenByTrader.failed=Failed to re-open the dispute. support.reOpenButton.label=Re-open support.sendNotificationButton.label=Thông báo riêng tư support.reportButton.label=Report @@ -2417,6 +2419,8 @@ popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign +popup.info.torMigration.msg=Your Bisq node is currently using a Tor v2 address. Tor v2 is being deprecated soon [HYPERLINK:https://blog.torproject.org/v2-deprecation-timeline], and Bisq nodes with Tor v2 addresses will no longer be able to trade on August 15th, 2021.\n\nPlease switch your Bisq node to a Tor v3 address. It's quick and simple -- see details in this doc [HYPERLINK:https://bisq.wiki/Changing_your_onion_address] or in this video [HYPERLINK:https://bitcointv.com/videos/watch/f96adc20-4092-4253-84c0-1b18088b4b95]. \n\nMake sure to back up your data directory beforehand. + #################################################################### # Notifications #################################################################### @@ -2531,7 +2535,7 @@ txIdTextField.missingTx.warning.tooltip=Missing required transaction #################################################################### navigation.account=\"Tài khoản\" -navigation.account.walletSeed=\"Tài khoản/Khởi tạo ví\" +navigation.account.backup=\"Account/Backup\" navigation.funds.availableForWithdrawal=\"Funds/Send funds\" navigation.portfolio.myOpenOffers=\"Portfolio/Các Báo giá mở của tôi\" navigation.portfolio.pending=\"Portfolio/Các giao dịch mở\" diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties index bdc0423628f..5987f5b799b 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -124,7 +124,7 @@ shared.noDateAvailable=没有可用数据 shared.noDetailsAvailable=没有可用详细 shared.notUsedYet=尚未使用 shared.date=日期 -shared.sendFundsDetailsWithFee=发送：{0}\n来自：{1}\n接收地址：{2}\n要求的最低交易费：{3}（{4} 聪/byte）\n交易大小：{5} Kb\n\n收款方将收到：{6}\n\n您确定您想要提现吗？ +shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" shared.sendFundsDetailsDust=Bisq 检测到，该交易将产生一个低于最低零头阈值的输出（不被比特币共识规则所允许）。相反，这些零头（{0}satoshi{1}）将被添加到挖矿手续费中。 shared.copyToClipboard=复制到剪贴板 @@ -790,9 +790,9 @@ portfolio.pending.mediationRequested=已请求调解员协助 portfolio.pending.refundRequested=已请求退款 portfolio.pending.openSupport=创建帮助话题 portfolio.pending.supportTicketOpened=帮助话题已经创建 -portfolio.pending.communicateWithArbitrator=请在“帮助”界面上与仲裁员联系。 -portfolio.pending.communicateWithMediator=请在“支持”页面中与调解员进行联系。 -portfolio.pending.disputeOpenedMyUser=您创建了一个纠纷。\n{0} +portfolio.pending.communicateWithArbitrator=Please communicate with the arbitrator on the \"Support\" screen. +portfolio.pending.communicateWithMediator=Please communicate with the mediator on the \"Support\" screen. +portfolio.pending.disputeOpenedMyUser=You have already opened a dispute.\n{0} portfolio.pending.disputeOpenedByPeer=您的交易对象创建了一个纠纷。\n{0} portfolio.pending.noReceiverAddressDefined=没有定义接收地址 @@ -821,6 +821,7 @@ portfolio.pending.failedTrade.txChainValid.moveToFailed=这个交易协议存在 portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=将交易移至失败交易 portfolio.pending.failedTrade.warningIcon.tooltip=点击打开该交易的问题细节 portfolio.failed.revertToPending.popup=您想要将该交易移至未完成交易吗 +portfolio.failed.revertToPending.failed=Failed to move this trade to open trades. portfolio.failed.revertToPending=将交易移至未完成交易 portfolio.closed.completed=完成 @@ -941,6 +942,7 @@ support.sigCheck.popup.failed=签名验证失败 support.sigCheck.popup.invalidFormat=消息并不是正确的格式。请复制粘贴纠纷总结消息。 support.reOpenByTrader.prompt=您确定想要重新开启纠纷？ +support.reOpenByTrader.failed=Failed to re-open the dispute. support.reOpenButton.label=重新打开 support.sendNotificationButton.label=私人通知 support.reportButton.label=报告 @@ -2417,6 +2419,8 @@ popup.accountSigning.unsignedPubKeys.signed=公钥已被验证 popup.accountSigning.unsignedPubKeys.result.signed=已验证公钥 popup.accountSigning.unsignedPubKeys.result.failed=未能验证公钥 +popup.info.torMigration.msg=Your Bisq node is currently using a Tor v2 address. Tor v2 is being deprecated soon [HYPERLINK:https://blog.torproject.org/v2-deprecation-timeline], and Bisq nodes with Tor v2 addresses will no longer be able to trade on August 15th, 2021.\n\nPlease switch your Bisq node to a Tor v3 address. It's quick and simple -- see details in this doc [HYPERLINK:https://bisq.wiki/Changing_your_onion_address] or in this video [HYPERLINK:https://bitcointv.com/videos/watch/f96adc20-4092-4253-84c0-1b18088b4b95]. \n\nMake sure to back up your data directory beforehand. + #################################################################### # Notifications #################################################################### @@ -2531,7 +2535,7 @@ txIdTextField.missingTx.warning.tooltip=所需的交易缺失 #################################################################### navigation.account=“账户” -navigation.account.walletSeed=“账户/钱包密钥” +navigation.account.backup=\"Account/Backup\" navigation.funds.availableForWithdrawal=“资金/提现” navigation.portfolio.myOpenOffers=“资料/未完成报价” navigation.portfolio.pending=“业务/未完成交易” diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties index 2dab0c130cc..f91f1486026 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -124,7 +124,7 @@ shared.noDateAvailable=沒有可用數據 shared.noDetailsAvailable=沒有可用詳細 shared.notUsedYet=尚未使用 shared.date=日期 -shared.sendFundsDetailsWithFee=發送：{0}\n來自：{1}\n接收地址：{2}\n要求的最低交易費：{3}（{4} 聰/byte）\n交易大小：{5} Kb\n\n收款方將收到：{6}\n\n您確定您想要提現嗎？ +shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" shared.sendFundsDetailsDust=Bisq 檢測到，該交易將產生一個低於最低零頭閾值的輸出（不被比特幣共識規則所允許）。相反，這些零頭（{0}satoshi{1}）將被添加到挖礦手續費中。 shared.copyToClipboard=複製到剪貼板 @@ -790,9 +790,9 @@ portfolio.pending.mediationRequested=已請求調解員協助 portfolio.pending.refundRequested=已請求退款 portfolio.pending.openSupport=創建幫助話題 portfolio.pending.supportTicketOpened=幫助話題已經創建 -portfolio.pending.communicateWithArbitrator=請在“幫助”界面上與仲裁員聯繫。 -portfolio.pending.communicateWithMediator=請在“支持”頁面中與調解員進行聯繫。 -portfolio.pending.disputeOpenedMyUser=您創建了一個糾紛。\n{0} +portfolio.pending.communicateWithArbitrator=Please communicate with the arbitrator on the \"Support\" screen. +portfolio.pending.communicateWithMediator=Please communicate with the mediator on the \"Support\" screen. +portfolio.pending.disputeOpenedMyUser=You have already opened a dispute.\n{0} portfolio.pending.disputeOpenedByPeer=您的交易對象創建了一個糾紛。\n{0} portfolio.pending.noReceiverAddressDefined=沒有定義接收地址 @@ -821,6 +821,7 @@ portfolio.pending.failedTrade.txChainValid.moveToFailed=這個交易協議存在 portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=將交易移至失敗交易 portfolio.pending.failedTrade.warningIcon.tooltip=點擊打開該交易的問題細節 portfolio.failed.revertToPending.popup=您想要將該交易移至未完成交易嗎 +portfolio.failed.revertToPending.failed=Failed to move this trade to open trades. portfolio.failed.revertToPending=將交易移至未完成交易 portfolio.closed.completed=完成 @@ -941,6 +942,7 @@ support.sigCheck.popup.failed=簽名驗證失敗 support.sigCheck.popup.invalidFormat=消息並不是正確的格式。請複製粘貼糾紛總結消息。 support.reOpenByTrader.prompt=您確定想要重新開啟糾紛？ +support.reOpenByTrader.failed=Failed to re-open the dispute. support.reOpenButton.label=重新打開 support.sendNotificationButton.label=私人通知 support.reportButton.label=報吿 @@ -2417,6 +2419,8 @@ popup.accountSigning.unsignedPubKeys.signed=公鑰已被驗證 popup.accountSigning.unsignedPubKeys.result.signed=已驗證公鑰 popup.accountSigning.unsignedPubKeys.result.failed=未能驗證公鑰 +popup.info.torMigration.msg=Your Bisq node is currently using a Tor v2 address. Tor v2 is being deprecated soon [HYPERLINK:https://blog.torproject.org/v2-deprecation-timeline], and Bisq nodes with Tor v2 addresses will no longer be able to trade on August 15th, 2021.\n\nPlease switch your Bisq node to a Tor v3 address. It's quick and simple -- see details in this doc [HYPERLINK:https://bisq.wiki/Changing_your_onion_address] or in this video [HYPERLINK:https://bitcointv.com/videos/watch/f96adc20-4092-4253-84c0-1b18088b4b95]. \n\nMake sure to back up your data directory beforehand. + #################################################################### # Notifications #################################################################### @@ -2531,7 +2535,7 @@ txIdTextField.missingTx.warning.tooltip=所需的交易缺失 #################################################################### navigation.account=“賬户” -navigation.account.walletSeed=“賬户/錢包密鑰” +navigation.account.backup=\"Account/Backup\" navigation.funds.availableForWithdrawal=“資金/提現” navigation.portfolio.myOpenOffers=“資料/未完成報價” navigation.portfolio.pending=“業務/未完成交易” From 0523e44fa51e9b80952503ae4688fe4764e5c7f6 Mon Sep 17 00:00:00 2001 From: jmacxx <47253594+jmacxx@users.noreply.github.com> Date: Sun, 18 Jul 2021 18:48:36 -0500 Subject: [PATCH 03/19] add dontShowAgain option to DAO resync popup --- desktop/src/main/java/bisq/desktop/util/GUIUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java index 226c79d9b1f..6160a860cae 100644 --- a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java +++ b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java @@ -795,12 +795,16 @@ public static boolean isBootstrappedOrShowPopup(P2PService p2PService) { } public static void showDaoNeedsResyncPopup(Navigation navigation) { - UserThread.runAfter(() -> new Popup().warning(Res.get("popup.warning.daoNeedsResync")) + String key = "showDaoNeedsResyncPopup"; + if (DontShowAgainLookup.showAgain(key)) { + UserThread.runAfter(() -> new Popup().warning(Res.get("popup.warning.daoNeedsResync")) + .dontShowAgainId(key) .actionButtonTextWithGoTo("navigation.dao.networkMonitor") .onAction(() -> { navigation.navigateTo(MainView.class, DaoView.class, MonitorView.class, DaoStateMonitorView.class); }) .show(), 5, TimeUnit.SECONDS); + } } public static boolean isReadyForTxBroadcastOrShowPopup(P2PService p2PService, WalletsSetup walletsSetup) { From 50b6f42525d45bb5fbff4a3aead3d4c0117545c4 Mon Sep 17 00:00:00 2001 From: BtcContributor <79100296+BtcContributor@users.noreply.github.com> Date: Sun, 16 May 2021 11:11:32 +0200 Subject: [PATCH 04/19] Add Capitual payment method. Waiting for final Info text to add. --- .../java/bisq/core/locale/CurrencyUtil.java | 11 ++ .../bisq/core/payment/CapitualAccount.java | 46 +++++++ .../core/payment/PaymentAccountFactory.java | 2 + .../payload/CapitualAccountPayload.java | 99 ++++++++++++++ .../core/payment/payload/PaymentMethod.java | 4 + .../bisq/core/proto/CoreProtoResolver.java | 3 + .../trade/statistics/TradeStatistics3.java | 3 +- .../resources/i18n/displayStrings.properties | 8 +- .../paymentmethods/CapitualForm.java | 126 ++++++++++++++++++ .../fiataccounts/FiatAccountsView.java | 18 ++- .../steps/buyer/BuyerStep2View.java | 4 + .../util/validation/CapitualValidator.java | 25 ++++ .../validation/CapitualValidatorTest.java | 45 +++++++ proto/src/main/proto/pb.proto | 5 + 14 files changed, 396 insertions(+), 3 deletions(-) create mode 100644 core/src/main/java/bisq/core/payment/CapitualAccount.java create mode 100644 core/src/main/java/bisq/core/payment/payload/CapitualAccountPayload.java create mode 100644 desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java create mode 100644 desktop/src/main/java/bisq/desktop/util/validation/CapitualValidator.java create mode 100644 desktop/src/test/java/bisq/desktop/util/validation/CapitualValidatorTest.java diff --git a/core/src/main/java/bisq/core/locale/CurrencyUtil.java b/core/src/main/java/bisq/core/locale/CurrencyUtil.java index d38729f8f0b..988db39c915 100644 --- a/core/src/main/java/bisq/core/locale/CurrencyUtil.java +++ b/core/src/main/java/bisq/core/locale/CurrencyUtil.java @@ -348,6 +348,17 @@ public static List getAllAmazonGiftCardCurrencies() { return currencies; } + public static List getAllCapitualCurrencies() { + List currencies = new ArrayList<>(Arrays.asList( + new FiatCurrency("EUR"), + new FiatCurrency("BRL"), + new FiatCurrency("GBP"), + new FiatCurrency("USD") + )); + currencies.sort(Comparator.comparing(TradeCurrency::getCode)); + return currencies; + } + // https://www.revolut.com/help/getting-started/exchanging-currencies/what-fiat-currencies-are-supported-for-holding-and-exchange public static List getAllRevolutCurrencies() { ArrayList currencies = new ArrayList<>(Arrays.asList( diff --git a/core/src/main/java/bisq/core/payment/CapitualAccount.java b/core/src/main/java/bisq/core/payment/CapitualAccount.java new file mode 100644 index 00000000000..46ba14a43f1 --- /dev/null +++ b/core/src/main/java/bisq/core/payment/CapitualAccount.java @@ -0,0 +1,46 @@ +/* + * This file is part of Bisq. + * + * Bisq is free software: you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or (at + * your option) any later version. + * + * Bisq is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public + * License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Bisq. If not, see . + */ + +package bisq.core.payment; + +import bisq.core.locale.CurrencyUtil; +import bisq.core.payment.payload.CapitualAccountPayload; +import bisq.core.payment.payload.PaymentAccountPayload; +import bisq.core.payment.payload.PaymentMethod; + +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +public final class CapitualAccount extends PaymentAccount { + public CapitualAccount() { + super(PaymentMethod.CAPITUAL); + tradeCurrencies.addAll(CurrencyUtil.getAllCapitualCurrencies()); + } + + @Override + protected PaymentAccountPayload createPayload() { + return new CapitualAccountPayload(paymentMethod.getId(), id); + } + + public void setAccountNr(String accountNr) { + ((CapitualAccountPayload) paymentAccountPayload).setAccountNr(accountNr); + } + + public String getAccountNr() { + return ((CapitualAccountPayload) paymentAccountPayload).getAccountNr(); + } +} diff --git a/core/src/main/java/bisq/core/payment/PaymentAccountFactory.java b/core/src/main/java/bisq/core/payment/PaymentAccountFactory.java index faed57acd34..0cceb0cb865 100644 --- a/core/src/main/java/bisq/core/payment/PaymentAccountFactory.java +++ b/core/src/main/java/bisq/core/payment/PaymentAccountFactory.java @@ -86,6 +86,8 @@ public static PaymentAccount getPaymentAccount(PaymentMethod paymentMethod) { return new AmazonGiftCardAccount(); case PaymentMethod.BLOCK_CHAINS_INSTANT_ID: return new InstantCryptoCurrencyAccount(); + case PaymentMethod.CAPITUAL_ID: + return new CapitualAccount(); // Cannot be deleted as it would break old trade history entries case PaymentMethod.OK_PAY_ID: diff --git a/core/src/main/java/bisq/core/payment/payload/CapitualAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/CapitualAccountPayload.java new file mode 100644 index 00000000000..e8db6f0b50a --- /dev/null +++ b/core/src/main/java/bisq/core/payment/payload/CapitualAccountPayload.java @@ -0,0 +1,99 @@ +/* + * This file is part of Bisq. + * + * Bisq is free software: you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or (at + * your option) any later version. + * + * Bisq is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public + * License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Bisq. If not, see . + */ + +package bisq.core.payment.payload; + +import bisq.core.locale.Res; + +import com.google.protobuf.Message; + +import java.nio.charset.StandardCharsets; + +import java.util.HashMap; +import java.util.Map; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.extern.slf4j.Slf4j; + +@EqualsAndHashCode(callSuper = true) +@ToString +@Setter +@Getter +@Slf4j +public final class CapitualAccountPayload extends PaymentAccountPayload { + private String accountNr = ""; + + public CapitualAccountPayload(String paymentMethod, String id) { + super(paymentMethod, id); + } + + + /////////////////////////////////////////////////////////////////////////////////////////// + // PROTO BUFFER + /////////////////////////////////////////////////////////////////////////////////////////// + + private CapitualAccountPayload(String paymentMethod, + String id, + String accountNr, + long maxTradePeriod, + Map excludeFromJsonDataMap) { + super(paymentMethod, + id, + maxTradePeriod, + excludeFromJsonDataMap); + + this.accountNr = accountNr; + } + + @Override + public Message toProtoMessage() { + return getPaymentAccountPayloadBuilder() + .setCapitualAccountPayload(protobuf.CapitualAccountPayload.newBuilder() + .setAccountNr(accountNr)) + .build(); + } + + public static CapitualAccountPayload fromProto(protobuf.PaymentAccountPayload proto) { + return new CapitualAccountPayload(proto.getPaymentMethodId(), + proto.getId(), + proto.getCapitualAccountPayload().getAccountNr(), + proto.getMaxTradePeriod(), + new HashMap<>(proto.getExcludeFromJsonDataMap())); + } + + /////////////////////////////////////////////////////////////////////////////////////////// + // API + /////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public String getPaymentDetails() { + return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.capitual.cap") + " " + accountNr; + } + + @Override + public String getPaymentDetailsForTradePopup() { + return getPaymentDetails(); + } + + @Override + public byte[] getAgeWitnessInputData() { + return super.getAgeWitnessInputData(accountNr.getBytes(StandardCharsets.UTF_8)); + } +} diff --git a/core/src/main/java/bisq/core/payment/payload/PaymentMethod.java b/core/src/main/java/bisq/core/payment/payload/PaymentMethod.java index 3d2c3004f27..0a6072e69dd 100644 --- a/core/src/main/java/bisq/core/payment/payload/PaymentMethod.java +++ b/core/src/main/java/bisq/core/payment/payload/PaymentMethod.java @@ -99,6 +99,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable. + */ + +package bisq.desktop.components.paymentmethods; + +import bisq.desktop.components.InputTextField; +import bisq.desktop.util.FormBuilder; +import bisq.desktop.util.Layout; +import bisq.desktop.util.validation.CapitualValidator; + +import bisq.core.account.witness.AccountAgeWitnessService; +import bisq.core.locale.CurrencyUtil; +import bisq.core.locale.Res; +import bisq.core.payment.CapitualAccount; +import bisq.core.payment.PaymentAccount; +import bisq.core.payment.payload.CapitualAccountPayload; +import bisq.core.payment.payload.PaymentAccountPayload; +import bisq.core.util.coin.CoinFormatter; +import bisq.core.util.validation.InputValidator; + +import bisq.common.util.Tuple2; + +import org.apache.commons.lang3.StringUtils; + +import javafx.scene.control.Label; +import javafx.scene.layout.FlowPane; +import javafx.scene.layout.GridPane; + +import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static bisq.desktop.util.FormBuilder.addTopLabelFlowPane; + +public class CapitualForm extends PaymentMethodForm { + private final CapitualAccount capitualAccount; + private final CapitualValidator capitualValidator; + private InputTextField accountNrInputTextField; + + public static int addFormForBuyer(GridPane gridPane, int gridRow, + PaymentAccountPayload paymentAccountPayload) { + addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.capitual.cap"), + ((CapitualAccountPayload) paymentAccountPayload).getAccountNr()); + return gridRow; + } + + public CapitualForm(PaymentAccount paymentAccount, AccountAgeWitnessService accountAgeWitnessService, CapitualValidator capitualValidator, + InputValidator inputValidator, GridPane gridPane, int gridRow, CoinFormatter formatter) { + super(paymentAccount, accountAgeWitnessService, inputValidator, gridPane, gridRow, formatter); + this.capitualAccount = (CapitualAccount) paymentAccount; + this.capitualValidator = capitualValidator; + } + + @Override + public void addFormForAddAccount() { + gridRowFrom = gridRow + 1; + + accountNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.capitual.cap")); + accountNrInputTextField.setValidator(capitualValidator); + accountNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { + capitualAccount.setAccountNr(newValue); + updateFromInputs(); + }); + + addCurrenciesGrid(true); + addLimitations(false); + addAccountNameTextFieldWithAutoFillToggleButton(); + } + + private void addCurrenciesGrid(boolean isEditable) { + final Tuple2 labelFlowPaneTuple2 = addTopLabelFlowPane(gridPane, ++gridRow, Res.get("payment.supportedCurrencies"), 0); + + FlowPane flowPane = labelFlowPaneTuple2.second; + + if (isEditable) + flowPane.setId("flow-pane-checkboxes-bg"); + else + flowPane.setId("flow-pane-checkboxes-non-editable-bg"); + + CurrencyUtil.getAllCapitualCurrencies().stream().forEach(e -> + fillUpFlowPaneWithCurrencies(isEditable, flowPane, e, capitualAccount)); + } + + @Override + protected void autoFillNameTextField() { + if (useCustomAccountNameToggleButton != null && !useCustomAccountNameToggleButton.isSelected()) { + String accountNr = accountNrInputTextField.getText(); + accountNr = StringUtils.abbreviate(accountNr, 9); + String method = Res.get(paymentAccount.getPaymentMethod().getId()); + accountNameTextField.setText(method.concat(": ").concat(accountNr)); + } + } + + @Override + public void addFormForDisplayAccount() { + gridRowFrom = gridRow; + addCompactTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), + capitualAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), + Res.get(capitualAccount.getPaymentMethod().getId())); + addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.capitual.cap"), + capitualAccount.getAccountNr()); + addLimitations(true); + addCurrenciesGrid(false); + } + + @Override + public void updateAllInputsValid() { + allInputsValid.set(isAccountNameValid() + && capitualValidator.validate(capitualAccount.getAccountNr()).isValid + && capitualAccount.getTradeCurrencies().size() > 0); + } + +} diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java index 728c87156e2..663abcb7d27 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java @@ -23,6 +23,7 @@ import bisq.desktop.components.paymentmethods.AliPayForm; import bisq.desktop.components.paymentmethods.AmazonGiftCardForm; import bisq.desktop.components.paymentmethods.AustraliaPayidForm; +import bisq.desktop.components.paymentmethods.CapitualForm; import bisq.desktop.components.paymentmethods.CashByMailForm; import bisq.desktop.components.paymentmethods.CashDepositForm; import bisq.desktop.components.paymentmethods.ChaseQuickPayForm; @@ -59,6 +60,7 @@ import bisq.desktop.util.validation.AliPayValidator; import bisq.desktop.util.validation.AustraliaPayidValidator; import bisq.desktop.util.validation.BICValidator; +import bisq.desktop.util.validation.CapitualValidator; import bisq.desktop.util.validation.ChaseQuickPayValidator; import bisq.desktop.util.validation.ClearXchangeValidator; import bisq.desktop.util.validation.F2FValidator; @@ -83,6 +85,7 @@ import bisq.core.offer.OfferRestrictions; import bisq.core.payment.AmazonGiftCardAccount; import bisq.core.payment.AustraliaPayid; +import bisq.core.payment.CapitualAccount; import bisq.core.payment.CashByMailAccount; import bisq.core.payment.CashDepositAccount; import bisq.core.payment.ClearXchangeAccount; @@ -135,6 +138,7 @@ public class FiatAccountsView extends PaymentAccountsView doSaveNewAccount(paymentAccount)) .show(); - } else { + } else if (paymentAccount instanceof CapitualAccount) { + new Popup().information(Res.get("payment.capitual.info", currencyName, currencyName)) + .width(900) + .closeButtonText(Res.get("shared.cancel")) + .actionButtonText(Res.get("shared.iUnderstand")) + .onAction(() -> doSaveNewAccount(paymentAccount)) + .show(); + } + else { doSaveNewAccount(paymentAccount); } }) @@ -530,6 +544,8 @@ private PaymentMethodForm getPaymentMethodForm(PaymentMethod paymentMethod, Paym return new TransferwiseForm(paymentAccount, accountAgeWitnessService, transferwiseValidator, inputValidator, root, gridRow, formatter); case PaymentMethod.AMAZON_GIFT_CARD_ID: return new AmazonGiftCardForm(paymentAccount, accountAgeWitnessService, inputValidator, root, gridRow, formatter); + case PaymentMethod.CAPITUAL_ID: + return new CapitualForm(paymentAccount, accountAgeWitnessService, capitualValidator, inputValidator, root, gridRow, formatter); default: log.error("Not supported PaymentMethod: " + paymentMethod); return null; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java index fd6e456ba2a..dc051613f62 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java @@ -25,6 +25,7 @@ import bisq.desktop.components.paymentmethods.AliPayForm; import bisq.desktop.components.paymentmethods.AmazonGiftCardForm; import bisq.desktop.components.paymentmethods.AssetsForm; +import bisq.desktop.components.paymentmethods.CapitualForm; import bisq.desktop.components.paymentmethods.CashByMailForm; import bisq.desktop.components.paymentmethods.CashDepositForm; import bisq.desktop.components.paymentmethods.ChaseQuickPayForm; @@ -323,6 +324,9 @@ protected void addContent() { case PaymentMethod.AMAZON_GIFT_CARD_ID: gridRow = AmazonGiftCardForm.addFormForBuyer(gridPane, gridRow, paymentAccountPayload); break; + case PaymentMethod.CAPITUAL_ID: + gridRow = CapitualForm.addFormForBuyer(gridPane, gridRow, paymentAccountPayload); + break; default: log.error("Not supported PaymentMethod: " + paymentMethodId); } diff --git a/desktop/src/main/java/bisq/desktop/util/validation/CapitualValidator.java b/desktop/src/main/java/bisq/desktop/util/validation/CapitualValidator.java new file mode 100644 index 00000000000..a9ed18d92a8 --- /dev/null +++ b/desktop/src/main/java/bisq/desktop/util/validation/CapitualValidator.java @@ -0,0 +1,25 @@ +package bisq.desktop.util.validation; + +import bisq.core.locale.Res; +import bisq.core.util.validation.InputValidator; +import bisq.core.util.validation.RegexValidator; + +import javax.inject.Inject; + +public class CapitualValidator extends InputValidator { + private RegexValidator regexValidator; + + @Inject + public CapitualValidator(RegexValidator regexValidator) { + regexValidator.setPattern("CAP-[A-Za-z0-9]{6}"); + regexValidator.setErrorMessage(Res.get("validation.capitual.invalidFormat")); + this.regexValidator = regexValidator; + } + + @Override + public ValidationResult validate(String input) { + ValidationResult result = regexValidator.validate(input); + + return result; + } +} diff --git a/desktop/src/test/java/bisq/desktop/util/validation/CapitualValidatorTest.java b/desktop/src/test/java/bisq/desktop/util/validation/CapitualValidatorTest.java new file mode 100644 index 00000000000..a8c3ce69b9a --- /dev/null +++ b/desktop/src/test/java/bisq/desktop/util/validation/CapitualValidatorTest.java @@ -0,0 +1,45 @@ +package bisq.desktop.util.validation; + +import bisq.core.locale.CurrencyUtil; +import bisq.core.locale.Res; +import bisq.core.util.validation.RegexValidator; + +import bisq.common.config.BaseCurrencyNetwork; +import bisq.common.config.Config; + +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +public class CapitualValidatorTest { + @Before + public void setup() { + final BaseCurrencyNetwork baseCurrencyNetwork = Config.baseCurrencyNetwork(); + final String currencyCode = baseCurrencyNetwork.getCurrencyCode(); + Res.setBaseCurrencyCode(currencyCode); + Res.setBaseCurrencyName(baseCurrencyNetwork.getCurrencyName()); + CurrencyUtil.setBaseCurrencyCode(currencyCode); + } + + @Test + public void validate(){ + CapitualValidator validator = new CapitualValidator( + new RegexValidator() + ); + + assertTrue(validator.validate("CAP-123456").isValid); + assertTrue(validator.validate("CAP-XXXXXX").isValid); + assertTrue(validator.validate("CAP-123XXX").isValid); + + assertFalse(validator.validate("").isValid); + assertFalse(validator.validate(null).isValid); + assertFalse(validator.validate("123456").isValid); + assertFalse(validator.validate("XXXXXX").isValid); + assertFalse(validator.validate("123XXX").isValid); + assertFalse(validator.validate("12XXX").isValid); + assertFalse(validator.validate("CAP-12XXX").isValid); + assertFalse(validator.validate("CA-12XXXx").isValid); + } +} diff --git a/proto/src/main/proto/pb.proto b/proto/src/main/proto/pb.proto index c4ee1dd88fa..cc833037170 100644 --- a/proto/src/main/proto/pb.proto +++ b/proto/src/main/proto/pb.proto @@ -996,6 +996,7 @@ message PaymentAccountPayload { AustraliaPayidPayload australia_payid_payload = 30; AmazonGiftCardAccountPayload amazon_gift_card_account_payload = 31; CashByMailAccountPayload cash_by_mail_account_payload = 32; + CapitualAccountPayload capitual_account_payload = 33; } map exclude_from_json_data = 15; } @@ -1217,6 +1218,10 @@ message TransferwiseAccountPayload { string email = 1; } +message CapitualAccountPayload { + string account_nr = 1; +} + /////////////////////////////////////////////////////////////////////////////////////////// // PersistableEnvelope /////////////////////////////////////////////////////////////////////////////////////////// From 41e4e91044019aad3bd2f3014f61e8581cc10d98 Mon Sep 17 00:00:00 2001 From: BtcContributor <79100296+BtcContributor@users.noreply.github.com> Date: Mon, 17 May 2021 11:54:24 +0200 Subject: [PATCH 05/19] Fix Codacy issues --- .../main/account/content/fiataccounts/FiatAccountsView.java | 3 +-- .../bisq/desktop/util/validation/CapitualValidatorTest.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java index 663abcb7d27..93da865815f 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java @@ -352,8 +352,7 @@ private void onSaveNewAccount(PaymentAccount paymentAccount) { .actionButtonText(Res.get("shared.iUnderstand")) .onAction(() -> doSaveNewAccount(paymentAccount)) .show(); - } - else { + } else { doSaveNewAccount(paymentAccount); } }) diff --git a/desktop/src/test/java/bisq/desktop/util/validation/CapitualValidatorTest.java b/desktop/src/test/java/bisq/desktop/util/validation/CapitualValidatorTest.java index a8c3ce69b9a..36260dfdff1 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/CapitualValidatorTest.java +++ b/desktop/src/test/java/bisq/desktop/util/validation/CapitualValidatorTest.java @@ -24,7 +24,7 @@ public void setup() { } @Test - public void validate(){ + public void validate() { CapitualValidator validator = new CapitualValidator( new RegexValidator() ); From 870448f5fad874312ea8ea2ad5ea10f1e96e24db Mon Sep 17 00:00:00 2001 From: BtcContributor <79100296+BtcContributor@users.noreply.github.com> Date: Mon, 14 Jun 2021 16:37:09 +0200 Subject: [PATCH 06/19] Add review feedbacks from KaiWitt --- core/src/main/java/bisq/core/locale/CurrencyUtil.java | 6 ++---- .../desktop/components/paymentmethods/CapitualForm.java | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/bisq/core/locale/CurrencyUtil.java b/core/src/main/java/bisq/core/locale/CurrencyUtil.java index 988db39c915..b7275ddf4a8 100644 --- a/core/src/main/java/bisq/core/locale/CurrencyUtil.java +++ b/core/src/main/java/bisq/core/locale/CurrencyUtil.java @@ -349,14 +349,12 @@ public static List getAllAmazonGiftCardCurrencies() { } public static List getAllCapitualCurrencies() { - List currencies = new ArrayList<>(Arrays.asList( - new FiatCurrency("EUR"), + return new ArrayList<>(Arrays.asList( new FiatCurrency("BRL"), + new FiatCurrency("EUR"), new FiatCurrency("GBP"), new FiatCurrency("USD") )); - currencies.sort(Comparator.comparing(TradeCurrency::getCode)); - return currencies; } // https://www.revolut.com/help/getting-started/exchanging-currencies/what-fiat-currencies-are-supported-for-holding-and-exchange diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java index dee3d81babc..00bfd9bedf5 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java @@ -89,7 +89,7 @@ private void addCurrenciesGrid(boolean isEditable) { else flowPane.setId("flow-pane-checkboxes-non-editable-bg"); - CurrencyUtil.getAllCapitualCurrencies().stream().forEach(e -> + CurrencyUtil.getAllCapitualCurrencies().forEach(e -> fillUpFlowPaneWithCurrencies(isEditable, flowPane, e, capitualAccount)); } @@ -120,7 +120,7 @@ public void addFormForDisplayAccount() { public void updateAllInputsValid() { allInputsValid.set(isAccountNameValid() && capitualValidator.validate(capitualAccount.getAccountNr()).isValid - && capitualAccount.getTradeCurrencies().size() > 0); + && !capitualAccount.getTradeCurrencies().isEmpty()); } } From fb639c1e6dae28e7ca4ce8c4343e7b5128e3368d Mon Sep 17 00:00:00 2001 From: BtcContributor <79100296+BtcContributor@users.noreply.github.com> Date: Mon, 14 Jun 2021 16:47:44 +0200 Subject: [PATCH 07/19] Add missing info text for Capitual payment method --- core/src/main/resources/i18n/displayStrings.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index cd221bd9f9e..68011bbbb2b 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -3481,7 +3481,7 @@ payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send - try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat \ to tell your trading peer the reference text you picked so they can verify your payment)\n\ - Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) -payment.capitual.info=TODO +payment.capitual.info=Include any special instructions for the payment method that both buyer and seller might need to be aware of # We use constants from the code so we do not use our normal naming convention # dynamic values are not recognized by IntelliJ From 351d26555e76813b4e12a2dc84a14af407b82a5b Mon Sep 17 00:00:00 2001 From: BtcContributor <79100296+BtcContributor@users.noreply.github.com> Date: Thu, 1 Jul 2021 15:45:40 +0200 Subject: [PATCH 08/19] Remove payment account info popup --- .../account/content/fiataccounts/FiatAccountsView.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java index 93da865815f..344a54ba0fe 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java @@ -345,13 +345,6 @@ private void onSaveNewAccount(PaymentAccount paymentAccount) { .actionButtonText(Res.get("shared.iUnderstand")) .onAction(() -> doSaveNewAccount(paymentAccount)) .show(); - } else if (paymentAccount instanceof CapitualAccount) { - new Popup().information(Res.get("payment.capitual.info", currencyName, currencyName)) - .width(900) - .closeButtonText(Res.get("shared.cancel")) - .actionButtonText(Res.get("shared.iUnderstand")) - .onAction(() -> doSaveNewAccount(paymentAccount)) - .show(); } else { doSaveNewAccount(paymentAccount); } From e357528ba54c5f71f7c3cb9972141d68b8a1f429 Mon Sep 17 00:00:00 2001 From: BtcContributor <79100296+BtcContributor@users.noreply.github.com> Date: Thu, 1 Jul 2021 16:02:47 +0200 Subject: [PATCH 09/19] Remove unused import --- .../main/account/content/fiataccounts/FiatAccountsView.java | 1 - 1 file changed, 1 deletion(-) diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java index 344a54ba0fe..eb86ac98e25 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java @@ -85,7 +85,6 @@ import bisq.core.offer.OfferRestrictions; import bisq.core.payment.AmazonGiftCardAccount; import bisq.core.payment.AustraliaPayid; -import bisq.core.payment.CapitualAccount; import bisq.core.payment.CashByMailAccount; import bisq.core.payment.CashDepositAccount; import bisq.core.payment.ClearXchangeAccount; From f0258d6dd1bee598710b58e1930912c05fef97ef Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 19 Jul 2021 13:36:48 +0200 Subject: [PATCH 10/19] Remove unused translation --- core/src/main/resources/i18n/displayStrings.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 68011bbbb2b..0c7c1d863c5 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -3481,7 +3481,6 @@ payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send - try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat \ to tell your trading peer the reference text you picked so they can verify your payment)\n\ - Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) -payment.capitual.info=Include any special instructions for the payment method that both buyer and seller might need to be aware of # We use constants from the code so we do not use our normal naming convention # dynamic values are not recognized by IntelliJ From 4ae8ecaecbc99ab14b34790df36dcd051d9895a5 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 19 Jul 2021 13:38:00 +0200 Subject: [PATCH 11/19] Improve formatting and simplify code --- .../desktop/components/paymentmethods/CapitualForm.java | 9 +++++++-- .../bisq/desktop/util/validation/CapitualValidator.java | 5 ++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java index 00bfd9bedf5..e4fa6163a4d 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java @@ -56,8 +56,13 @@ public static int addFormForBuyer(GridPane gridPane, int gridRow, return gridRow; } - public CapitualForm(PaymentAccount paymentAccount, AccountAgeWitnessService accountAgeWitnessService, CapitualValidator capitualValidator, - InputValidator inputValidator, GridPane gridPane, int gridRow, CoinFormatter formatter) { + public CapitualForm(PaymentAccount paymentAccount, + AccountAgeWitnessService accountAgeWitnessService, + CapitualValidator capitualValidator, + InputValidator inputValidator, + GridPane gridPane, + int gridRow, + CoinFormatter formatter) { super(paymentAccount, accountAgeWitnessService, inputValidator, gridPane, gridRow, formatter); this.capitualAccount = (CapitualAccount) paymentAccount; this.capitualValidator = capitualValidator; diff --git a/desktop/src/main/java/bisq/desktop/util/validation/CapitualValidator.java b/desktop/src/main/java/bisq/desktop/util/validation/CapitualValidator.java index a9ed18d92a8..f94b933340c 100644 --- a/desktop/src/main/java/bisq/desktop/util/validation/CapitualValidator.java +++ b/desktop/src/main/java/bisq/desktop/util/validation/CapitualValidator.java @@ -7,7 +7,7 @@ import javax.inject.Inject; public class CapitualValidator extends InputValidator { - private RegexValidator regexValidator; + private final RegexValidator regexValidator; @Inject public CapitualValidator(RegexValidator regexValidator) { @@ -18,8 +18,7 @@ public CapitualValidator(RegexValidator regexValidator) { @Override public ValidationResult validate(String input) { - ValidationResult result = regexValidator.validate(input); - return result; + return regexValidator.validate(input); } } From e2e23a86119fe373aaf5c998497cfb968c432271 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 19 Jul 2021 15:34:08 +0200 Subject: [PATCH 12/19] Update bitcoinj checkpoints for v1.7.2 --- core/src/main/resources/wallet/checkpoints.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/wallet/checkpoints.txt b/core/src/main/resources/wallet/checkpoints.txt index 9cec36a2c47..e86a803b902 100644 --- a/core/src/main/resources/wallet/checkpoints.txt +++ b/core/src/main/resources/wallet/checkpoints.txt @@ -1,6 +1,6 @@ TXT CHECKPOINTS 1 0 -341 +342 AAAAAAAAB+EH4QfhAAAH4AEAAABjl7tqvU/FIcDT9gcbVlA4nwtFUbxAtOawZzBpAAAAAKzkcK7NqciBjI/ldojNKncrWleVSgDfBCCn3VRrbSxXaw5/Sf//AB0z8Bkv AAAAAAAAD8EPwQ/BAAAPwAEAAADfP83Sx8MZ9RsrnZCvqzAwqB2Ma+ZesNAJrTfwAAAAACwESaNKhvRgz6WuE7UFdFk1xwzfRY/OIdIOPzX5yaAdjnWUSf//AB0GrNq5 AAAAAAAAF6EXoRehAAAXoAEAAADonWzAaUAKd30XT3NnHKobZMnLOuHdzm/xtehsAAAAAD8cUJA6NBIHHcqPHLc4IrfHw+6mjCGu3e+wRO81EvpnMVqrSf//AB1ffy8G @@ -342,3 +342,4 @@ HMXPiA7Yq2TAvg7oAAplwADg/y8PoNXZqux7J22Tt6OACK3gtzyoGFxdAwAAAAAAAAAAAJJlpztE1417 HVlvUHhtZuK/0YNBAAptoAAAACDh3dGZyflMEQKf8NvR3vmO7MEz9i2IDQAAAAAAAAAAAD75AXEYjGSu6ZpHyNYEaaakf00ekgDHHmPsKXObB4tGUuqcYOk8CxcuZVP2 HgzQJegOgC4WcVNBAAp1gATg/y8ddh05DBnfhtwB+XDA9TZjFxp1KIwkBgAAAAAAAAAAACRUcNZEFKFcczPK4jw/qcqpLLRJD2GmohVmDgmqE05T8eeyYHtfDReSrtZv HqOPm0g0EfB2QAYpAAp9YAQAACBzRspT3kPAohduihLzvxeIYTuJKERGAQAAAAAAAAAAABjAluwpHEG4GSBIoiOYvLyyOPteUqSlw3yjGKU2//kudGXGYPkeDhdfieEn +HzJOscdjFrQ7x9Y6AAqFQAQg0Sl8ZamELBFwKHC2/U/CnHoOQx2rFsjLCQAAAAAAAAAAAC0DUmlmVCbJlkTRzzzd4cqsFN48Bzewwps4aOsWTwF43gTgYM6YExcvPyOY From b92d1c25ac2bbd191fc850385c2420968479b427 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 19 Jul 2021 20:06:02 +0200 Subject: [PATCH 13/19] Update data stores for v1.7.2 --- common/src/main/java/bisq/common/app/Version.java | 2 +- .../main/resources/AccountAgeWitnessStore_1.7.2_BTC_MAINNET | 3 +++ p2p/src/main/resources/DaoStateStore_BTC_MAINNET | 4 ++-- p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET | 4 ++-- .../main/resources/TradeStatistics3Store_1.7.2_BTC_MAINNET | 3 +++ 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 p2p/src/main/resources/AccountAgeWitnessStore_1.7.2_BTC_MAINNET create mode 100644 p2p/src/main/resources/TradeStatistics3Store_1.7.2_BTC_MAINNET diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java index ed79544d3eb..47d444e0274 100644 --- a/common/src/main/java/bisq/common/app/Version.java +++ b/common/src/main/java/bisq/common/app/Version.java @@ -38,7 +38,7 @@ public class Version { * historical data stores. */ public static final List HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2", - "1.5.5", "1.5.7", "1.6.0", "1.6.3", "1.6.5"); + "1.5.5", "1.5.7", "1.6.0", "1.6.3", "1.6.5", "1.7.2"); public static int getMajorVersion(String version) { return getSubVersion(version, 0); diff --git a/p2p/src/main/resources/AccountAgeWitnessStore_1.7.2_BTC_MAINNET b/p2p/src/main/resources/AccountAgeWitnessStore_1.7.2_BTC_MAINNET new file mode 100644 index 00000000000..9d01d69a195 --- /dev/null +++ b/p2p/src/main/resources/AccountAgeWitnessStore_1.7.2_BTC_MAINNET @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b892de010ce64b5721a55a4730665a51f412041b700c473ff1ddaab443ceaabf +size 118365 diff --git a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET index 87af4fbfb4b..956623e6913 100644 --- a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET +++ b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef042b2b48fd1237360806ae87329fa0f1af4d5bbe6b2ff08cdd5d42ac7a801a -size 132527715 +oid sha256:5a1091ae27ba6f9c9b79fc3528312a98c89a292c790fe150c004a9773c9b5ae6 +size 135684376 diff --git a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET index 4818ae88a3e..da4e5cbb9ba 100644 --- a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET +++ b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27d7c2a8d74aa02f21a7aab25316cb34dac017d307dd934086c0efda4845d8a0 -size 7978273 +oid sha256:c30d4d24884a29b71b5fd1e38112865d95d2985b081336ccedf527c4bf671793 +size 8183869 diff --git a/p2p/src/main/resources/TradeStatistics3Store_1.7.2_BTC_MAINNET b/p2p/src/main/resources/TradeStatistics3Store_1.7.2_BTC_MAINNET new file mode 100644 index 00000000000..ca02567262d --- /dev/null +++ b/p2p/src/main/resources/TradeStatistics3Store_1.7.2_BTC_MAINNET @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:348a9a94709a5cc1838eb8be762b2ea0d226fcef9fea537f4b6b5fc87ea9e002 +size 319534 From 548ecaa595d7e58b9193618fa1fd7b8476f68674 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 19 Jul 2021 14:18:18 +0200 Subject: [PATCH 14/19] Update Java options as described in #5609 and #5550 --- desktop/package/package.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/desktop/package/package.gradle b/desktop/package/package.gradle index 4f0e9bdb4a9..a9d65647022 100644 --- a/desktop/package/package.gradle +++ b/desktop/package/package.gradle @@ -231,7 +231,11 @@ task packageInstallers { " --main-jar ${mainJarName}" + " --main-class bisq.desktop.app.BisqAppMain" + " --java-options -Xss1280k" + - " --java-options -XX:MaxRAM=4g" + + " --java-options -XX:MaxRAM=6g" + + " --java-options -XX:+UseG1GC" + + " --java-options -XX:MaxHeapFreeRatio=10" + + " --java-options -XX:MinHeapFreeRatio=5" + + " --java-options -XX:+UseStringDeduplication" + " --java-options -Djava.net.preferIPv4Stack=true" // Warning: this will cause guice reflection exceptions and lead to issues with the guice internal cache // resulting in the UI not loading From 401f9d25f016ddcc9c1ed73dc464c2aadb9cf903 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 19 Jul 2021 15:48:26 +0200 Subject: [PATCH 15/19] Update remaining Java max ram default settings --- apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java | 4 ++-- build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java b/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java index 08a7531ca30..bebea12b25a 100644 --- a/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java +++ b/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java @@ -66,7 +66,7 @@ public enum BisqAppConfig { 49998), alicedesktop("bisq-BTC_REGTEST_Alice_dao", "bisq-desktop", - "-XX:MaxRAM=4g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", + "-XX:MaxRAM=6g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", BisqAppMain.class.getName(), 7777, 5122, @@ -82,7 +82,7 @@ public enum BisqAppConfig { 49999), bobdesktop("bisq-BTC_REGTEST_Bob_dao", "bisq-desktop", - "-XX:MaxRAM=4g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", + "-XX:MaxRAM=6g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", BisqAppMain.class.getName(), 8888, 5123, diff --git a/build.gradle b/build.gradle index f203ba35ea8..ca3ce80fc52 100644 --- a/build.gradle +++ b/build.gradle @@ -145,7 +145,7 @@ configure([project(':cli'), if (applicationName == 'desktop') { def script = file("${rootProject.projectDir}/bisq-$applicationName") script.text = script.text.replace( - 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=4g"') + 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=6g"') } if (applicationName == 'apitest') { From 6648ab04f7d30913ffb6b0b1f7b3d03444cf4592 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 19 Jul 2021 15:53:46 +0200 Subject: [PATCH 16/19] Add new JVM arguments also to build script --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ca3ce80fc52..bc2ae8a7ee1 100644 --- a/build.gradle +++ b/build.gradle @@ -145,7 +145,9 @@ configure([project(':cli'), if (applicationName == 'desktop') { def script = file("${rootProject.projectDir}/bisq-$applicationName") script.text = script.text.replace( - 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=6g"') + 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=6g -Xss1280k -XX:+UseG1GC ' + + '-XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication ' + + '-Djava.net.preferIPv4Stack=true"') } if (applicationName == 'apitest') { From 0cd20d6cc5992f6f21890a511d7fdbdc765ec63b Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 19 Jul 2021 20:51:13 +0200 Subject: [PATCH 17/19] Increase MaxRam setting to 8g --- apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java | 4 ++-- build.gradle | 2 +- desktop/package/package.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java b/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java index bebea12b25a..eb0934d4a07 100644 --- a/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java +++ b/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java @@ -66,7 +66,7 @@ public enum BisqAppConfig { 49998), alicedesktop("bisq-BTC_REGTEST_Alice_dao", "bisq-desktop", - "-XX:MaxRAM=6g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", + "-XX:MaxRAM=8g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", BisqAppMain.class.getName(), 7777, 5122, @@ -82,7 +82,7 @@ public enum BisqAppConfig { 49999), bobdesktop("bisq-BTC_REGTEST_Bob_dao", "bisq-desktop", - "-XX:MaxRAM=6g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", + "-XX:MaxRAM=8g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", BisqAppMain.class.getName(), 8888, 5123, diff --git a/build.gradle b/build.gradle index bc2ae8a7ee1..b8d44e05be1 100644 --- a/build.gradle +++ b/build.gradle @@ -145,7 +145,7 @@ configure([project(':cli'), if (applicationName == 'desktop') { def script = file("${rootProject.projectDir}/bisq-$applicationName") script.text = script.text.replace( - 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=6g -Xss1280k -XX:+UseG1GC ' + + 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=8g -Xss1280k -XX:+UseG1GC ' + '-XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication ' + '-Djava.net.preferIPv4Stack=true"') } diff --git a/desktop/package/package.gradle b/desktop/package/package.gradle index a9d65647022..aaba761f66c 100644 --- a/desktop/package/package.gradle +++ b/desktop/package/package.gradle @@ -231,7 +231,7 @@ task packageInstallers { " --main-jar ${mainJarName}" + " --main-class bisq.desktop.app.BisqAppMain" + " --java-options -Xss1280k" + - " --java-options -XX:MaxRAM=6g" + + " --java-options -XX:MaxRAM=8g" + " --java-options -XX:+UseG1GC" + " --java-options -XX:MaxHeapFreeRatio=10" + " --java-options -XX:MinHeapFreeRatio=5" + From 5cc3f8680e0a46b2dd9ad7c8c0f543806a5a6f7b Mon Sep 17 00:00:00 2001 From: jmacxx <47253594+jmacxx@users.noreply.github.com> Date: Thu, 22 Jul 2021 23:20:22 -0500 Subject: [PATCH 18/19] keep chatview listener open until ack, mailbox, or error --- .../core/support/messages/ChatMessage.java | 2 +- .../bisq/desktop/main/shared/ChatView.java | 21 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/bisq/core/support/messages/ChatMessage.java b/core/src/main/java/bisq/core/support/messages/ChatMessage.java index 8dbbd4be361..cf3af61abc6 100644 --- a/core/src/main/java/bisq/core/support/messages/ChatMessage.java +++ b/core/src/main/java/bisq/core/support/messages/ChatMessage.java @@ -306,7 +306,7 @@ public void startAckTimer() { this.setArrived(false); this.setAckError(Res.get("support.errorTimeout")); } - }, 5, TimeUnit.SECONDS); + }, 60, TimeUnit.SECONDS); } public ReadOnlyBooleanProperty acknowledgedProperty() { diff --git a/desktop/src/main/java/bisq/desktop/main/shared/ChatView.java b/desktop/src/main/java/bisq/desktop/main/shared/ChatView.java index 344de0ae8d7..07a24889b7b 100644 --- a/desktop/src/main/java/bisq/desktop/main/shared/ChatView.java +++ b/desktop/src/main/java/bisq/desktop/main/shared/ChatView.java @@ -130,7 +130,7 @@ public class ChatView extends AnchorPane { private ListChangeListener disputeDirectMessageListListener; private Subscription inputTextAreaTextSubscription; private final List tempAttachments = new ArrayList<>(); - private ChangeListener storedInMailboxPropertyListener, arrivedPropertyListener; + private ChangeListener storedInMailboxPropertyListener, acknowledgedPropertyListener; private ChangeListener sendMessageErrorPropertyListener; protected final CoinFormatter formatter; @@ -483,6 +483,10 @@ private void updateMsgState(ChatMessage message) { visible = true; icon = AwesomeIcon.OK_SIGN; text = Res.get("support.acknowledged"); + } else if (message.storedInMailboxProperty().get()) { + visible = true; + icon = AwesomeIcon.ENVELOPE; + text = Res.get("support.savedInMailbox"); } else if (message.ackErrorProperty().get() != null) { visible = true; icon = AwesomeIcon.EXCLAMATION_SIGN; @@ -493,10 +497,6 @@ private void updateMsgState(ChatMessage message) { visible = true; icon = AwesomeIcon.MAIL_REPLY; text = Res.get("support.transient"); - } else if (message.storedInMailboxProperty().get()) { - visible = true; - icon = AwesomeIcon.ENVELOPE; - text = Res.get("support.savedInMailbox"); } else { visible = false; log.debug("updateMsgState called but no msg state available. message={}", message); @@ -598,7 +598,7 @@ private void onOpenAttachment(Attachment attachment) { private void onSendMessage(String inputText) { if (chatMessage != null) { - chatMessage.arrivedProperty().removeListener(arrivedPropertyListener); + chatMessage.acknowledgedProperty().removeListener(acknowledgedPropertyListener); chatMessage.storedInMailboxProperty().removeListener(storedInMailboxPropertyListener); chatMessage.sendMessageErrorProperty().removeListener(sendMessageErrorPropertyListener); } @@ -620,8 +620,9 @@ private void onSendMessage(String inputText) { sendMsgBusyAnimation.play(); }, 500, TimeUnit.MILLISECONDS); - arrivedPropertyListener = (observable, oldValue, newValue) -> { + acknowledgedPropertyListener = (observable, oldValue, newValue) -> { if (newValue) { + sendMsgInfoLabel.setVisible(false); hideSendMsgInfo(timer); } }; @@ -642,7 +643,7 @@ private void onSendMessage(String inputText) { } }; if (chatMessage != null) { - chatMessage.arrivedProperty().addListener(arrivedPropertyListener); + chatMessage.acknowledgedProperty().addListener(acknowledgedPropertyListener); chatMessage.storedInMailboxProperty().addListener(storedInMailboxPropertyListener); chatMessage.sendMessageErrorProperty().addListener(sendMessageErrorPropertyListener); } @@ -715,8 +716,8 @@ private void removeListenersOnSessionChange() { chatMessages.removeListener(disputeDirectMessageListListener); if (chatMessage != null) { - if (arrivedPropertyListener != null) - chatMessage.arrivedProperty().removeListener(arrivedPropertyListener); + if (acknowledgedPropertyListener != null) + chatMessage.arrivedProperty().removeListener(acknowledgedPropertyListener); if (storedInMailboxPropertyListener != null) chatMessage.storedInMailboxProperty().removeListener(storedInMailboxPropertyListener); } From 4c451ebc11ef9e1bfa56e9715287ed561b474e3a Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Fri, 23 Jul 2021 14:02:37 +0200 Subject: [PATCH 19/19] Revert to SNAPSHOT version --- build.gradle | 2 +- desktop/package/linux/Dockerfile | 2 +- desktop/package/macosx/finalize.sh | 2 +- desktop/package/macosx/insert_snapshot_version.sh | 2 +- relay/src/main/resources/version.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index b8d44e05be1..90087191fc8 100644 --- a/build.gradle +++ b/build.gradle @@ -414,7 +414,7 @@ configure(project(':desktop')) { modules = ['javafx.controls', 'javafx.fxml'] } - version = '1.7.2' + version = '1.7.2-SNAPSHOT' jar.manifest.attributes( "Implementation-Title": project.name, diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile index aadd582761d..db51ee65f9e 100644 --- a/desktop/package/linux/Dockerfile +++ b/desktop/package/linux/Dockerfile @@ -8,7 +8,7 @@ # pull base image FROM openjdk:8-jdk -ENV version 1.7.2 +ENV version 1.7.2-SNAPSHOT RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* && apt-get install -y vim fakeroot diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh index 759ef07db31..b3c779c2a95 100755 --- a/desktop/package/macosx/finalize.sh +++ b/desktop/package/macosx/finalize.sh @@ -2,7 +2,7 @@ cd ../../ -version="1.7.2" +version="1.7.2-SNAPSHOT" target_dir="releases/$version" diff --git a/desktop/package/macosx/insert_snapshot_version.sh b/desktop/package/macosx/insert_snapshot_version.sh index 852c505697c..0baba93029a 100755 --- a/desktop/package/macosx/insert_snapshot_version.sh +++ b/desktop/package/macosx/insert_snapshot_version.sh @@ -2,7 +2,7 @@ cd $(dirname $0)/../../../ -version=1.7.1 +version=1.7.2 find . -type f \( -name "finalize.sh" \ -o -name "create_app.sh" \ diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt index f8a696c8dc5..ae1fde61115 100644 --- a/relay/src/main/resources/version.txt +++ b/relay/src/main/resources/version.txt @@ -1 +1 @@ -1.7.2 +1.7.2-SNAPSHOT